← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/imbuf/intern/openexr/openexr_api.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2007-05-17 11:47:59 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517114759-yp4ybrnhp2u7pk66
Tags: 2.44-1
* New upstream release.
* Drop debian/patches/01_64bits_stupidity, not needed anymore: as of this
  version blender is 64 bits safe again. Adjust README.Debian accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/imbuf/intern/openexr/openexr_api.cpp
37
37
{
38
38
 
39
39
// The following prevents a linking error in debug mode for MSVC using the libs in CVS
40
 
#if defined(_WIN32) && defined(_DEBUG) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 
40
#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(_DEBUG) && !defined(__MINGW32__) && !defined(__CYGWIN__)
41
41
_CRTIMP void __cdecl _invalid_parameter_noinfo(void)
42
42
{
43
43
}
873
873
        
874
874
        try
875
875
        {
876
 
                Mem_IStream membuf(mem, size); 
 
876
                Mem_IStream *membuf = new Mem_IStream(mem, size); 
877
877
                int is_multi;
878
 
                file = new InputFile(membuf);
 
878
                file = new InputFile(*membuf);
879
879
                
880
880
                Box2i dw = file->header().dataWindow();
881
881
                int width  = dw.max.x - dw.min.x + 1;
946
946
                                }
947
947
                        }
948
948
                        
949
 
                        delete file;
950
949
                }
 
950
                delete file;
951
951
                
952
952
                return(ibuf);
953
953
                                
956
956
        {
957
957
                std::cerr << exc.what() << std::endl;
958
958
                if (ibuf) IMB_freeImBuf(ibuf);
 
959
                delete file;
959
960
                
960
961
                return (0);
961
962
        }