← Back to branch summary

~mgiuca/irrlicht/trunk

« back to all changes in this revision

Viewing changes to source/Irrlicht/CImageLoaderDDS.cpp

  • Committer: cutealien
  • Date: 2015-07-12 21:21:45 UTC
  • Revision ID: svn-v4:dfc29bdd-3216-0410-991c-e03cc46cb475:trunk:5108
Fix copy-paste bug in DDS image loader (could have caused problems in images where height > width).

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/Irrlicht/CImageLoaderDDS.cpp
825
825
 
826
826
                                                dataSize += ((curWidth + 3) / 4) * ((curHeight + 3) / 4) * 8;
827
827
                                        }
828
 
                                        while (curWidth != 1 || curWidth != 1);
 
828
                                        while (curWidth != 1 || curHeight != 1);
829
829
 
830
830
                                        format = ECF_DXT1;
831
831
                                        break;
848
848
 
849
849
                                                dataSize += ((curWidth + 3) / 4) * ((curHeight + 3) / 4) * 16;
850
850
                                        }
851
 
                                        while (curWidth != 1 || curWidth != 1);
 
851
                                        while (curWidth != 1 || curHeight != 1);
852
852
 
853
853
                                        format = ECF_DXT3;
854
854
                                        break;
871
871
 
872
872
                                                dataSize += ((curWidth + 3) / 4) * ((curHeight + 3) / 4) * 16;
873
873
                                        }
874
 
                                        while (curWidth != 1 || curWidth != 1);
 
874
                                        while (curWidth != 1 || curHeight != 1);
875
875
 
876
876
                                        format = ECF_DXT5;
877
877
                                        break;