From Per Fahlberg, "I ran into a problem when using another library that implemented the same functions as the osg jpeg plugin, i guess they both originated from the same example code :) As a solution I added a namespace in ReaderWriterJPEG.cpp around the functions.

"
This commit is contained in:
Robert Osfield
2008-10-21 16:27:22 +00:00
parent 01593240ed
commit 144e44a749

View File

@@ -56,6 +56,9 @@ extern "C"
#include <assert.h>
#include <stdlib.h>
namespace osgDBJPEG
{
#define ERR_NO_ERROR 0
#define ERR_OPEN 1
#define ERR_MEM 2
@@ -608,7 +611,7 @@ int *numComponents_ret)
}
return buffer;
}
} // namespace osgDBJPEG
class ReaderWriterJPEG : public osgDB::ReaderWriter
{
@@ -662,8 +665,9 @@ class ReaderWriterJPEG : public osgDB::ReaderWriter
{
return WriteResult::ERROR_IN_WRITING_FILE;
}*/
//jpeg_stdio_dest(&cinfo, outfile);
jpeg_stream_dest(&cinfo, &fout);
osgDBJPEG::jpeg_stream_dest(&cinfo, &fout);
/* Step 3: set parameters for compression */
@@ -757,7 +761,7 @@ class ReaderWriterJPEG : public osgDB::ReaderWriter
int height_ret;
int numComponents_ret;
imageData = simage_jpeg_load(fin,&width_ret,&height_ret,&numComponents_ret);
imageData = osgDBJPEG::simage_jpeg_load(fin,&width_ret,&height_ret,&numComponents_ret);
if (imageData==NULL) return ReadResult::ERROR_IN_READING_FILE;