booglybob / pyglet

Automatically exported from code.google.com/p/pyglet
BSD 3-Clause "New" or "Revised" License
0 stars 0 forks source link

Patch for /pyglet/image/codecs/dds.py #715

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago
Camparison needs to take place with a bytestring.

Original issue reported on code.google.com by daniel.n...@gmail.com on 25 Mar 2014 at 6:24

GoogleCodeExporter commented 8 years ago
ummm... the patch is an empty file

Original comment by ccanepacc@gmail.com on 27 Mar 2014 at 5:45

GoogleCodeExporter commented 8 years ago
Strange, I created that patch from the Google online editor.

The problem is that dds.py compares string values to byte values at several 
points, which always fails because '' and b'' are not the same.

Original comment by daniel.n...@gmail.com on 27 Mar 2014 at 7:31

GoogleCodeExporter commented 8 years ago
Theres more than a simple glitched comparison but nothing esoteric. 

I created a pyglet clone at
hg clone https://ccanepacc@code.google.com/r/ccanepacc-fixups/
to fix different issues with pyglet/image/codecs/dds.py

The last four commits deals with this issue, and each commit log comments the 
details.

The second commit (r35262e3ee397) includes a local variable renaming thats 
completed in the last commit (r613cc5b71b6e), sorry for the slip.

I started by running the pyglet test DDS_RGB_DXT1_LOAD.py under py3 and fixing 
the problems as they appear, then tested all the DDS_*; they look fine now.

The final commit was also tested with py 2.6.6 , rendering is the same as in 
3.2.1

Original comment by ccanepacc@gmail.com on 30 Mar 2014 at 11:17

GoogleCodeExporter commented 8 years ago
just for convenience a single patch with all the changes

To recap
    fixed bytes vs str issues, a failing unpacking when the dds variant was unknown, a type mismatch due to division changes in py2 - py3

Now tests/image/DDS_* tests are working in both pythons, with same rendering.

Original comment by ccanepacc@gmail.com on 2 Apr 2014 at 7:15

Attachments:

GoogleCodeExporter commented 8 years ago

Original comment by useboxnet on 3 Apr 2014 at 5:56

GoogleCodeExporter commented 8 years ago
This issue was closed by revision a59131e8f8cf.

Original comment by useboxnet on 3 Apr 2014 at 6:14