diff options
| author | Brian Paul <brianp@vmware.com> | 2009-12-11 10:04:07 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-12-11 10:04:07 -0700 |
| commit | a087eb590d780cb82b49464e05ffc85123adce7e (patch) | |
| tree | a2ac3ec2cc0b9001b350664d6e7915aba5e087a9 /progs/util/readtex.c | |
| parent | cb640c8d40c4ee34160a14d646c244f44a5013f6 (diff) | |
| parent | e128cc205e30540597ecd57849060a6bf4714d9f (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/intel/intel_span.c
Diffstat (limited to 'progs/util/readtex.c')
| -rw-r--r-- | progs/util/readtex.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/progs/util/readtex.c b/progs/util/readtex.c index 81cb626e91..d1c50a494a 100644 --- a/progs/util/readtex.c +++ b/progs/util/readtex.c @@ -117,7 +117,12 @@ static rawImageRec *RawImageOpen(const char *fileName) fread(raw, 1, 12, raw->file); if (swapFlag) { - ConvertShort(&raw->imagic, 6); + ConvertShort(&raw->imagic, 1); + ConvertShort(&raw->type, 1); + ConvertShort(&raw->dim, 1); + ConvertShort(&raw->sizeX, 1); + ConvertShort(&raw->sizeY, 1); + ConvertShort(&raw->sizeZ, 1); } raw->tmp = (unsigned char *)malloc(raw->sizeX*256); |