FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Stephan Huber, clean up of QTexture.cpp's scaling code and additions

Browse Source 
of handling of different extensions in ReaderWriterQT.cpp
This commit is contained in:
Robert Osfield
2003-11-21 16:30:59 +00:00
parent 709e1de9c8
commit 454b474f37
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/quicktime/QTtexture.cpp
View File

@@ -294,7 +294,6 @@ static unsigned char * LoadBufferFromImageFile ( FSSpec fsspecImage,
GetGWorld (&origPort, &origDevice); // save onscreen graphics port
// decompress (draw) to gworld and thus fill buffer
#ifdef NO_SCALING
SetIdentityMatrix (&matrix); // set transform matrix to identity (basically pass through)
TranslateMatrix ( &matrix, -X2Fix(0.5f * *pOrigImageWidth), -X2Fix(0.5f * *pOrigImageHeight));
@@ -302,16 +301,7 @@ static unsigned char * LoadBufferFromImageFile ( FSSpec fsspecImage,
TranslateMatrix ( &matrix, X2Fix(0.5f * *pOrigImageWidth), X2Fix(0.5f * *pOrigImageHeight));
err = GraphicsImportSetMatrix(giComp, &matrix); // set our matrix as the importer matrix
#else
SetIdentityMatrix (&matrix); // set transform matrix to identity (basically pass thorugh)
TranslateMatrix ( &matrix, -X2Fix(0.5f * *pOrigImageWidth), -X2Fix(0.5f * *pOrigImageHeight));
ScaleMatrix (&matrix, X2Fix(1.0), X2Fix(-1.0), X2Fix (0.0), X2Fix (0.0));
TranslateMatrix ( &matrix, X2Fix(0.5f * *pOrigImageWidth), X2Fix(0.5f * *pOrigImageHeight));
err = GraphicsImportSetMatrix(giComp, &matrix); // set our matrix as the importer matrix
#endif
if (err == noErr)
err = GraphicsImportSetGWorld (giComp, pGWorld, NULL); // set the destination of the importer component
if (err == noErr)

5
src/osgPlugins/quicktime/ReaderWriterQT.cpp
View File

@@ -35,7 +35,10 @@ class ReaderWriterQT : public osgDB::ReaderWriter
osgDB::equalCaseInsensitive(extension,"jpeg") ||
osgDB::equalCaseInsensitive(extension,"tiff") ||
osgDB::equalCaseInsensitive(extension,"pict") ||
osgDB::equalCaseInsensitive(extension,"gif") ||
osgDB::equalCaseInsensitive(extension,"gif") ||
osgDB::equalCaseInsensitive(extension,"png") ||
osgDB::equalCaseInsensitive(extension,"pict") ||
osgDB::equalCaseInsensitive(extension,"pct") ||
osgDB::equalCaseInsensitive(extension,"tga");
}