Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 307487 | Differences between
and this patch

Collapse All | Expand All

(-)a/Makefile.fip (-4 / +4 lines)
Lines 11-24 INSTALLDIR ?= $(DESTDIR)/usr/lib Link Here
11
# Converts cr/lf to just lf
11
# Converts cr/lf to just lf
12
DOS2UNIX = dos2unix
12
DOS2UNIX = dos2unix
13
13
14
LIBRARIES = -lstdc++
14
LIBRARIES = -lstdc++ `pkg-config --libs OpenEXR libpng` -ljpeg -lmng -ltiff -lopenjpeg -lz
15
15
16
MODULES = $(SRCS:.c=.o)
16
MODULES = $(SRCS:.c=.o)
17
MODULES := $(MODULES:.cpp=.o)
17
MODULES := $(MODULES:.cpp=.o)
18
CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
18
CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
19
CFLAGS += $(INCLUDE)
19
CFLAGS += $(INCLUDE) `pkg-config --cflags OpenEXR libpng`
20
CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
20
CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
21
CXXFLAGS += $(INCLUDE)
21
CXXFLAGS += $(INCLUDE) `pkg-config --cflags OpenEXR libpng`
22
22
23
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
23
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
24
	CFLAGS += -fPIC
24
	CFLAGS += -fPIC
Lines 45-51 dist: FreeImage Link Here
45
	cp Wrapper/FreeImagePlus/FreeImagePlus.h Dist
45
	cp Wrapper/FreeImagePlus/FreeImagePlus.h Dist
46
46
47
dos2unix:
47
dos2unix:
48
	@$(DOS2UNIX) $(SRCS)
48
	@$(DOS2UNIX) $(SRCS) $(INCLS)
49
49
50
FreeImage: $(STATICLIB) $(SHAREDLIB)
50
FreeImage: $(STATICLIB) $(SHAREDLIB)
51
51
(-)a/Makefile.gnu (-3 / +3 lines)
Lines 11-24 INSTALLDIR ?= $(DESTDIR)/usr/lib Link Here
11
# Converts cr/lf to just lf
11
# Converts cr/lf to just lf
12
DOS2UNIX = dos2unix
12
DOS2UNIX = dos2unix
13
13
14
LIBRARIES = -lstdc++
14
LIBRARIES = -lstdc++ `pkg-config --libs OpenEXR libpng` -ljpeg -lmng -ltiff -lopenjpeg -lz
15
15
16
MODULES = $(SRCS:.c=.o)
16
MODULES = $(SRCS:.c=.o)
17
MODULES := $(MODULES:.cpp=.o)
17
MODULES := $(MODULES:.cpp=.o)
18
CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
18
CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
19
CFLAGS += $(INCLUDE)
19
CFLAGS += $(INCLUDE) `pkg-config --cflags OpenEXR libpng`
20
CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
20
CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
21
CXXFLAGS += $(INCLUDE)
21
CXXFLAGS += $(INCLUDE) `pkg-config --cflags OpenEXR libpng`
22
22
23
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
23
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
24
	CFLAGS += -fPIC
24
	CFLAGS += -fPIC
(-)a/Makefile.srcs (-3 / +3 lines)
Lines 1-6 Link Here
1
VER_MAJOR = 3
1
VER_MAJOR = 3
2
VER_MINOR = 13.1
2
VER_MINOR = 13.1
3
SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ././Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ././Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ././Source/FreeImage/PluginJ2K.cpp ././Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ././Source/FreeImage/PluginPFM.cpp ././Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ././Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ././Source/FreeImage/PSDParser.cpp ././Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ././Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ././Source/DeprecationManager/Deprecated.cpp ./Source/DeprecationManager/DeprecationMgr.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ././Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ././Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/./jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/./jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/./jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibMNG/libmng_callback_xs.c Source/LibMNG/libmng_chunk_descr.c Source/LibMNG/libmng_chunk_io.c Source/LibMNG/libmng_chunk_prc.c Source/LibMNG/libmng_chunk_xs.c Source/LibMNG/libmng_cms.c Source/LibMNG/libmng_display.c Source/LibMNG/libmng_dither.c Source/LibMNG/libmng_error.c Source/LibMNG/libmng_filter.c Source/LibMNG/libmng_hlapi.c Source/LibMNG/libmng_jpeg.c Source/LibMNG/libmng_object_prc.c Source/LibMNG/libmng_pixels.c Source/LibMNG/libmng_prop_xs.c Source/LibMNG/libmng_read.c Source/LibMNG/libmng_trace.c Source/LibMNG/libmng_write.c Source/LibMNG/libmng_zlib.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pnggccrd.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngvcrd.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF/tif_aux.c Source/LibTIFF/tif_close.c Source/LibTIFF/tif_codec.c Source/LibTIFF/tif_color.c Source/LibTIFF/tif_compress.c Source/LibTIFF/tif_dir.c Source/LibTIFF/tif_dirinfo.c Source/LibTIFF/tif_dirread.c Source/LibTIFF/tif_dirwrite.c Source/LibTIFF/tif_dumpmode.c Source/LibTIFF/tif_error.c Source/LibTIFF/tif_extension.c Source/LibTIFF/tif_fax3.c Source/LibTIFF/tif_fax3sm.c Source/LibTIFF/tif_flush.c Source/LibTIFF/tif_getimage.c Source/LibTIFF/tif_jpeg.c Source/LibTIFF/tif_luv.c Source/LibTIFF/tif_lzw.c Source/LibTIFF/tif_next.c Source/LibTIFF/./tif_ojpeg.c Source/LibTIFF/tif_open.c Source/LibTIFF/tif_packbits.c Source/LibTIFF/tif_pixarlog.c Source/LibTIFF/tif_predict.c Source/LibTIFF/tif_print.c Source/LibTIFF/tif_read.c Source/LibTIFF/tif_strip.c Source/LibTIFF/tif_swab.c Source/LibTIFF/tif_thunder.c Source/LibTIFF/tif_tile.c Source/LibTIFF/tif_version.c Source/LibTIFF/tif_warning.c Source/LibTIFF/tif_write.c Source/LibTIFF/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzio.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/j2k_lib.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/jpt.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/./IlmImf/ImfAttribute.cpp Source/OpenEXR/./IlmImf/ImfB44Compressor.cpp Source/OpenEXR/./IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/./IlmImf/ImfChannelList.cpp Source/OpenEXR/./IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/./IlmImf/ImfChromaticities.cpp Source/OpenEXR/./IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/./IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/./IlmImf/ImfCompressor.cpp Source/OpenEXR/./IlmImf/ImfConvert.cpp Source/OpenEXR/./IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/./IlmImf/ImfEnvmap.cpp Source/OpenEXR/./IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/./IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/./IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/./IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/./IlmImf/ImfHeader.cpp Source/OpenEXR/./IlmImf/ImfHuf.cpp Source/OpenEXR/./IlmImf/ImfInputFile.cpp Source/OpenEXR/./IlmImf/ImfIntAttribute.cpp Source/OpenEXR/./IlmImf/ImfIO.cpp Source/OpenEXR/./IlmImf/ImfKeyCode.cpp Source/OpenEXR/./IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/./IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/./IlmImf/ImfLut.cpp Source/OpenEXR/./IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/./IlmImf/ImfMisc.cpp Source/OpenEXR/./IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/./IlmImf/ImfOutputFile.cpp Source/OpenEXR/./IlmImf/ImfPizCompressor.cpp Source/OpenEXR/./IlmImf/ImfPreviewImage.cpp Source/OpenEXR/./IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/./IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/./IlmImf/ImfRational.cpp Source/OpenEXR/./IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/./IlmImf/ImfRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfRgbaYca.cpp Source/OpenEXR/./IlmImf/ImfRleCompressor.cpp Source/OpenEXR/./IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/./IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/./IlmImf/ImfStdIO.cpp Source/OpenEXR/./IlmImf/ImfStringAttribute.cpp Source/OpenEXR/./IlmImf/ImfTestFile.cpp Source/OpenEXR/./IlmImf/ImfThreading.cpp Source/OpenEXR/./IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/./IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/./IlmImf/ImfTiledMisc.cpp Source/OpenEXR/./IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/./IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfTileOffsets.cpp Source/OpenEXR/./IlmImf/ImfTimeCode.cpp Source/OpenEXR/./IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/./IlmImf/ImfVecAttribute.cpp Source/OpenEXR/./IlmImf/ImfVersion.cpp Source/OpenEXR/./IlmImf/ImfWav.cpp Source/OpenEXR/./IlmImf/ImfZipCompressor.cpp Source/OpenEXR/./Imath/ImathBox.cpp Source/OpenEXR/./Imath/ImathColorAlgo.cpp Source/OpenEXR/./Imath/ImathFun.cpp Source/OpenEXR/./Imath/ImathMatrixAlgo.cpp Source/OpenEXR/./Imath/ImathRandom.cpp Source/OpenEXR/./Imath/ImathShear.cpp Source/OpenEXR/./Imath/ImathVec.cpp Source/OpenEXR/./Iex/IexBaseExc.cpp Source/OpenEXR/./Iex/IexThrowErrnoExc.cpp Source/OpenEXR/./Half/half.cpp Source/OpenEXR/./IlmThread/IlmThread.cpp Source/OpenEXR/./IlmThread/IlmThreadMutex.cpp Source/OpenEXR/./IlmThread/IlmThreadPool.cpp Source/OpenEXR/./IlmThread/IlmThreadSemaphore.cpp Source/LibRawLite/./internal/dcraw_common.cpp Source/LibRawLite/./internal/dcraw_fileio.cpp Source/LibRawLite/./src/libraw_c_api.cpp Source/LibRawLite/./src/libraw_cxx.cpp 
3
SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ././Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ././Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ././Source/FreeImage/PluginJ2K.cpp ././Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ././Source/FreeImage/PluginPFM.cpp ././Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ././Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ././Source/FreeImage/PSDParser.cpp ././Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ././Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ././Source/DeprecationManager/Deprecated.cpp ./Source/DeprecationManager/DeprecationMgr.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ././Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ././Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibRawLite/./internal/dcraw_common.cpp Source/LibRawLite/./internal/dcraw_fileio.cpp Source/LibRawLite/./src/libraw_c_api.cpp Source/LibRawLite/./src/libraw_cxx.cpp 
4
INCLS = ./Source/FreeImage.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/toFloat.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/CacheFile.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/tgt.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/fix.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/j2k_lib.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/int.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/jpt.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/tcd.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/dwt.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/Utilities.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/transupp.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/jpegint.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jerror.h ./Source/LibMNG/libmng_display.h ./Source/LibMNG/libmng_dither.h ./Source/LibMNG/libmng_trace.h ./Source/LibMNG/libmng_chunks.h ./Source/LibMNG/libmng_filter.h ./Source/LibMNG/libmng_read.h ./Source/LibMNG/libmng_objects.h ./Source/LibMNG/libmng_cms.h ./Source/LibMNG/libmng_chunk_io.h ./Source/LibMNG/libmng_jpeg.h ./Source/LibMNG/libmng_memory.h ./Source/LibMNG/libmng_zlib.h ./Source/LibMNG/libmng_object_prc.h ./Source/LibMNG/libmng_write.h ./Source/LibMNG/libmng_data.h ./Source/LibMNG/libmng_conf.h ./Source/LibMNG/libmng_types.h ./Source/LibMNG/libmng_chunk_descr.h ./Source/LibMNG/libmng_pixels.h ./Source/LibMNG/libmng_chunk_prc.h ./Source/LibMNG/libmng_error.h ./Source/LibMNG/libmng.h ./Source/LibPNG/png.h ./Source/LibPNG/pngconf.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/FreeImageIO.h ./Source/LibTIFF/tiff.h ./Source/LibTIFF/tif_config.vc.h ./Source/LibTIFF/tiffvers.h ./Source/LibTIFF/tif_dir.h ./Source/LibTIFF/tif_predict.h ./Source/LibTIFF/tif_config.wince.h ./Source/LibTIFF/tiffconf.vc.h ./Source/LibTIFF/tiffconf.wince.h ./Source/LibTIFF/t4.h ./Source/LibTIFF/tiffiop.h ./Source/LibTIFF/uvcode.h ./Source/LibTIFF/tiffio.h ./Source/LibTIFF/tif_config.h ./Source/LibTIFF/tif_fax3.h ./Source/ZLib/inflate.h ./Source/ZLib/trees.h ./Source/ZLib/zconf.h ./Source/ZLib/zlib.h ./Source/ZLib/crc32.h ./Source/ZLib/inftrees.h ./Source/ZLib/zutil.h ./Source/ZLib/inffixed.h ./Source/ZLib/inffast.h ./Source/ZLib/zconf.in.h ./Source/ZLib/deflate.h ./Source/FreeImage/PSDParser.h ./Source/ToneMapping.h ./Source/DeprecationManager/DeprecationMgr.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/test/fipTest.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./TestAPI/TestSuite.h
4
INCLS = ./Source/FreeImage.h ./Source/FreeImage/PSDParser.h ./Source/FreeImageToolkit/Resize.h ./Source/FreeImageToolkit/Filters.h ./Source/ToneMapping.h ./Source/Quantizers.h ./Source/FreeImageIO.h ./Source/DeprecationManager/DeprecationMgr.h ./Source/Plugin.h ./Source/Utilities.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/CacheFile.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/test/fipTest.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Examples/Generic/FIIO_Mem.h ./TestAPI/TestSuite.h
5
5
6
INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibMNG -ISource/LibPNG -ISource/LibTIFF -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src
6
INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src
(-)a/Source/FreeImage/J2KHelper.cpp (-1 / +1 lines)
Lines 21-27 Link Here
21
21
22
#include "FreeImage.h"
22
#include "FreeImage.h"
23
#include "Utilities.h"
23
#include "Utilities.h"
24
#include "../LibOpenJPEG/openjpeg.h"
24
#include "openjpeg.h"
25
25
26
/**
26
/**
27
Divide an integer by a power of 2 and round upwards
27
Divide an integer by a power of 2 and round upwards
(-)a/Source/FreeImage/PluginEXR.cpp (-9 / +9 lines)
Lines 21-35 Link Here
21
21
22
#include "FreeImage.h"
22
#include "FreeImage.h"
23
#include "Utilities.h"
23
#include "Utilities.h"
24
#include "../OpenEXR/IlmImf/ImfIO.h"
24
#include "OpenEXR/ImfIO.h"
25
#include "../OpenEXR/Iex/Iex.h"
25
#include "OpenEXR/Iex.h"
26
#include "../OpenEXR/IlmImf/ImfOutputFile.h"
26
#include "OpenEXR/ImfOutputFile.h"
27
#include "../OpenEXR/IlmImf/ImfInputFile.h"
27
#include "OpenEXR/ImfInputFile.h"
28
#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
28
#include "OpenEXR/ImfRgbaFile.h"
29
#include "../OpenEXR/IlmImf/ImfChannelList.h"
29
#include "OpenEXR/ImfChannelList.h"
30
#include "../OpenEXR/IlmImf/ImfRgba.h"
30
#include "OpenEXR/ImfRgba.h"
31
#include "../OpenEXR/IlmImf/ImfArray.h"
31
#include "OpenEXR/ImfArray.h"
32
#include "../OpenEXR/Half/half.h"
32
#include "OpenEXR/half.h"
33
33
34
34
35
// ==========================================================
35
// ==========================================================
(-)a/Source/FreeImage/PluginG3.cpp (-2 / +2 lines)
Lines 19-26 Link Here
19
//
19
//
20
// Use at your own risk!
20
// Use at your own risk!
21
// ==========================================================
21
// ==========================================================
22
22
23
#include "../LibTIFF/tiffiop.h"
23
#include "../tiffiop.h"
24
24
25
#include "FreeImage.h"
25
#include "FreeImage.h"
26
#include "Utilities.h"
26
#include "Utilities.h"
(-)a/Source/FreeImage/PluginJ2K.cpp (-1 / +1 lines)
Lines 21-27 Link Here
21
21
22
#include "FreeImage.h"
22
#include "FreeImage.h"
23
#include "Utilities.h"
23
#include "Utilities.h"
24
#include "../LibOpenJPEG/openjpeg.h"
24
#include <openjpeg.h>
25
25
26
// ==========================================================
26
// ==========================================================
27
// Plugin Interface
27
// Plugin Interface
(-)a/Source/FreeImage/PluginJP2.cpp (-1 / +1 lines)
Lines 21-27 Link Here
21
21
22
#include "FreeImage.h"
22
#include "FreeImage.h"
23
#include "Utilities.h"
23
#include "Utilities.h"
24
#include "../LibOpenJPEG/openjpeg.h"
24
#include <openjpeg.h>
25
25
26
// ==========================================================
26
// ==========================================================
27
// Plugin Interface
27
// Plugin Interface
(-)a/Source/FreeImage/PluginJPEG.cpp (-3 / +5 lines)
Lines 34-42 extern "C" { Link Here
34
#undef FAR
34
#undef FAR
35
#include <setjmp.h>
35
#include <setjmp.h>
36
36
37
#include "../LibJPEG/jinclude.h"
37
#include <sys/types.h>
38
#include "../LibJPEG/jpeglib.h"
38
#include <stdio.h>
39
#include "../LibJPEG/jerror.h"
39
#include <jpeglib.h>
40
#include <jerror.h>
40
}
41
}
41
42
42
#include "FreeImage.h"
43
#include "FreeImage.h"
Lines 44-49 extern "C" { Link Here
44
45
45
#include "../Metadata/FreeImageTag.h"
46
#include "../Metadata/FreeImageTag.h"
46
47
48
#define SIZEOF(object)  ((size_t) sizeof(object))
47
49
48
// ==========================================================
50
// ==========================================================
49
// Plugin Interface
51
// Plugin Interface
(-)a/Source/FreeImage/PluginMNG.cpp (-4 / +2 lines)
Lines 22-29 Link Here
22
#include "FreeImage.h"
22
#include "FreeImage.h"
23
#include "Utilities.h"
23
#include "Utilities.h"
24
24
25
#include "../LibMNG/libmng.h"
25
#include <libmng.h>
26
#include "../LibMNG/libmng_data.h"
27
26
28
// ==========================================================
27
// ==========================================================
29
// Plugin Interface
28
// Plugin Interface
Lines 259-266 Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { Link Here
259
258
260
			// read all bitmaps
259
			// read all bitmaps
261
			int retval = MNG_NOERROR;
260
			int retval = MNG_NOERROR;
262
			mng_datap pData = (mng_datap)hmng;
261
			while(mng_status_reading(hmng)) {
263
			while(pData->bReading) {
264
				retval = mng_display_resume(hmng);
262
				retval = mng_display_resume(hmng);
265
				if((retval == MNG_NEEDTIMERWAIT) || (retval == MNG_FUNCTIONINVALID))
263
				if((retval == MNG_NEEDTIMERWAIT) || (retval == MNG_FUNCTIONINVALID))
266
					break;
264
					break;
(-)a/Source/FreeImage/PluginPNG.cpp (-1 / +2 lines)
Lines 37-43 Link Here
37
37
38
// ----------------------------------------------------------
38
// ----------------------------------------------------------
39
39
40
#include "../LibPNG/png.h"
40
#define PNG_iTXt_SUPPORTED
41
#include <png.h>
41
42
42
// ----------------------------------------------------------
43
// ----------------------------------------------------------
43
44
(-)a/Source/FreeImage/PluginTIFF.cpp (-1 / +1 lines)
Lines 34-40 Link Here
34
#undef __unix
34
#undef __unix
35
#endif
35
#endif
36
36
37
#include "../LibTIFF/tiffiop.h"
37
#include "../tiffiop.h"
38
#include "FreeImage.h"
38
#include "FreeImage.h"
39
#include "Utilities.h"
39
#include "Utilities.h"
40
#include "../Metadata/FreeImageTag.h"
40
#include "../Metadata/FreeImageTag.h"
(-)a/Source/FreeImage/ZLibInterface.cpp (-2 / +2 lines)
Lines 19-28 Link Here
19
// Use at your own risk!
19
// Use at your own risk!
20
// ==========================================================
20
// ==========================================================
21
21
22
#include "../ZLib/zlib.h"
22
#include <zlib.h>
23
#include "FreeImage.h"
23
#include "FreeImage.h"
24
#include "Utilities.h"
24
#include "Utilities.h"
25
#include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
25
#define OS_CODE 0x03
26
26
27
/**
27
/**
28
Compresses a source buffer into a target buffer, using the ZLib library. 
28
Compresses a source buffer into a target buffer, using the ZLib library. 
(-)a/Source/FreeImageToolkit/JPEGTransform.cpp (-6 / +76 lines)
Lines 25-36 extern "C" { Link Here
25
#undef FAR
25
#undef FAR
26
#include <setjmp.h>
26
#include <setjmp.h>
27
27
28
#include "../LibJPEG/jinclude.h"
28
#include <sys/types.h>
29
#include "../LibJPEG/jpeglib.h"
29
#include <stdio.h>
30
#include "../LibJPEG/jerror.h"
30
#include <jpeglib.h>
31
#include "../LibJPEG/transupp.h"
31
#include <jerror.h>
32
typedef enum {
33
        JCOPYOPT_NONE,          /* copy no optional markers */
34
        JCOPYOPT_COMMENTS,      /* copy only comment (COM) markers */
35
        JCOPYOPT_ALL            /* copy all optional markers */
36
} JCOPY_OPTION;
37
typedef enum {
38
        JCROP_UNSET,
39
        JCROP_POS,
40
        JCROP_NEG
41
} JCROP_CODE;
42
typedef enum {
43
        JXFORM_NONE,            /* no transformation */
44
        JXFORM_FLIP_H,          /* horizontal flip */
45
        JXFORM_FLIP_V,          /* vertical flip */
46
        JXFORM_TRANSPOSE,       /* transpose across UL-to-LR axis */
47
        JXFORM_TRANSVERSE,      /* transpose across UR-to-LL axis */
48
        JXFORM_ROT_90,          /* 90-degree clockwise rotation */
49
        JXFORM_ROT_180,         /* 180-degree rotation */
50
        JXFORM_ROT_270          /* 270-degree clockwise (or 90 ccw) */
51
} JXFORM_CODE;
52
typedef struct {
53
  /* Options: set by caller */
54
  JXFORM_CODE transform;        /* image transform operator */
55
  boolean perfect;              /* if TRUE, fail if partial MCUs are requested */
56
  boolean trim;                 /* if TRUE, trim partial MCUs as needed */
57
  boolean force_grayscale;      /* if TRUE, convert color image to grayscale */
58
  boolean crop;                 /* if TRUE, crop source image */
59
60
  /* Crop parameters: application need not set these unless crop is TRUE.
61
   * These can be filled in by jtransform_parse_crop_spec().
62
   */
63
  JDIMENSION crop_width;        /* Width of selected region */
64
  JCROP_CODE crop_width_set;
65
  JDIMENSION crop_height;       /* Height of selected region */
66
  JCROP_CODE crop_height_set;
67
  JDIMENSION crop_xoffset;      /* X offset of selected region */
68
  JCROP_CODE crop_xoffset_set;  /* (negative measures from right edge) */
69
  JDIMENSION crop_yoffset;      /* Y offset of selected region */
70
  JCROP_CODE crop_yoffset_set;  /* (negative measures from bottom edge) */
71
72
  /* Internal workspace: caller should not touch these */
73
  int num_components;           /* # of components in workspace */
74
  jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */
75
  JDIMENSION output_width;      /* cropped destination dimensions */
76
  JDIMENSION output_height;
77
  JDIMENSION x_crop_offset;     /* destination crop offsets measured in iMCUs */
78
  JDIMENSION y_crop_offset;
79
  int iMCU_sample_width;        /* destination iMCU size */
80
  int iMCU_sample_height;
81
} jpeg_transform_info;
82
EXTERN(boolean) jtransform_parse_crop_spec
83
        JPP((jpeg_transform_info *info, const char *spec));
32
}
84
}
33
85
EXTERN(void) jcopy_markers_setup
86
        JPP((j_decompress_ptr srcinfo, JCOPY_OPTION option));
87
EXTERN(boolean) jtransform_perfect_transform
88
        JPP((JDIMENSION image_width, JDIMENSION image_height,
89
             int MCU_width, int MCU_height,
90
             JXFORM_CODE transform));
91
EXTERN(jvirt_barray_ptr *) jtransform_adjust_parameters
92
        JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
93
             jvirt_barray_ptr *src_coef_arrays,
94
             jpeg_transform_info *info));
95
EXTERN(boolean) jtransform_request_workspace
96
        JPP((j_decompress_ptr srcinfo, jpeg_transform_info *info));
97
EXTERN(void) jcopy_markers_execute
98
        JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
99
             JCOPY_OPTION option));
100
EXTERN(void) jtransform_execute_transform
101
        JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
102
             jvirt_barray_ptr *src_coef_arrays,
103
             jpeg_transform_info *info));
34
#include "FreeImage.h"
104
#include "FreeImage.h"
35
#include "Utilities.h"
105
#include "Utilities.h"
36
106
Lines 266-272 LosslessTransform(const FilenameIO *filenameIO, FREE_IMAGE_JPEG_OPERATION operat Link Here
266
		jcopy_markers_execute(&srcinfo, &dstinfo, copyoption);
336
		jcopy_markers_execute(&srcinfo, &dstinfo, copyoption);
267
		
337
		
268
		// Execute image transformation, if any
338
		// Execute image transformation, if any
269
		jtransform_execute_transformation(&srcinfo, &dstinfo, src_coef_arrays, &transfoptions);
339
		jtransform_execute_transform(&srcinfo, &dstinfo, src_coef_arrays, &transfoptions);
270
		
340
		
271
		// Finish compression and release memory
341
		// Finish compression and release memory
272
		jpeg_finish_compress(&dstinfo);
342
		jpeg_finish_compress(&dstinfo);
(-)a/Source/Metadata/XTIFF.cpp (-1 / +1 lines)
Lines 28-34 Link Here
28
#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
28
#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
29
#endif
29
#endif
30
30
31
#include "../LibTIFF/tiffiop.h"
31
#include "../tiffiop.h"
32
32
33
#include "FreeImage.h"
33
#include "FreeImage.h"
34
#include "Utilities.h"
34
#include "Utilities.h"
(-)a/Source/tiffiop.h (+185 lines)
Line 0 Link Here
1
#ifndef _HACKED_TIFFIOP_H_
2
#define _HACKED_TIFFIOP_H_
3
4
#include <fcntl.h>
5
#include "tiffio.h"
6
typedef unsigned char tidataval_t;      /* internal image data value type */
7
typedef tidataval_t* tidata_t;          /* reference to internal image data */
8
9
typedef	struct {
10
#define	FIELD_SETLONGS	4
11
	/* bit vector of fields that are set */
12
	unsigned long	td_fieldsset[FIELD_SETLONGS];
13
14
	uint32  td_imagewidth, td_imagelength, td_imagedepth;
15
	uint32  td_tilewidth, td_tilelength, td_tiledepth;
16
	uint32  td_subfiletype;
17
	uint16  td_bitspersample;
18
	uint16  td_sampleformat;
19
	uint16  td_compression;
20
	uint16  td_photometric;
21
	uint16  td_threshholding;
22
	uint16  td_fillorder;
23
	uint16  td_orientation;
24
	uint16  td_samplesperpixel;
25
	uint32  td_rowsperstrip;
26
	uint16  td_minsamplevalue, td_maxsamplevalue;
27
	double  td_sminsamplevalue, td_smaxsamplevalue;
28
	float   td_xresolution, td_yresolution;
29
	uint16  td_resolutionunit;
30
	uint16  td_planarconfig;
31
	float   td_xposition, td_yposition;
32
	uint16  td_pagenumber[2];
33
	uint16* td_colormap[3];
34
	uint16  td_halftonehints[2];
35
	uint16  td_extrasamples;
36
	uint16* td_sampleinfo;
37
	/* even though the name is misleading, td_stripsperimage is the number
38
	 * of striles (=strips or tiles) per plane, and td_nstrips the total
39
	 * number of striles */
40
	tstrile_t td_stripsperimage;
41
	tstrile_t td_nstrips;            /* size of offset & bytecount arrays */
42
	toff_t* td_stripoffset;
43
	toff_t* td_stripbytecount;	 /* FIXME: it should be tsize_t array */
44
	int     td_stripbytecountsorted; /* is the bytecount array sorted ascending? */
45
	uint16  td_nsubifd;
46
	uint32* td_subifd;
47
	/* YCbCr parameters */
48
	uint16  td_ycbcrsubsampling[2];
49
	uint16  td_ycbcrpositioning;
50
	/* Colorimetry parameters */
51
	uint16* td_transferfunction[3];
52
	/* CMYK parameters */
53
	int     td_inknameslen;
54
	char*   td_inknames;
55
56
	int     td_customValueCount;
57
        TIFFTagValue *td_customValues;
58
} TIFFDirectory;
59
60
typedef void (*TIFFVoidMethod)(TIFF*);
61
typedef int (*TIFFBoolMethod)(TIFF*);
62
typedef int (*TIFFPreMethod)(TIFF*, tsample_t);
63
typedef int (*TIFFCodeMethod)(TIFF*, tidata_t, tsize_t, tsample_t);
64
typedef int (*TIFFSeekMethod)(TIFF*, uint32);
65
typedef void (*TIFFPostMethod)(TIFF*, tidata_t, tsize_t);
66
typedef uint32 (*TIFFStripMethod)(TIFF*, uint32);
67
typedef void (*TIFFTileMethod)(TIFF*, uint32*, uint32*);
68
69
typedef struct client_info {
70
    struct client_info *next;
71
    void      *data;
72
    char      *name;
73
} TIFFClientInfoLink;
74
75
struct tiff {
76
	char*		tif_name;	/* name of open file */
77
	int		tif_fd;		/* open file descriptor */
78
	int		tif_mode;	/* open mode (O_*) */
79
	uint32		tif_flags;
80
#define	TIFF_FILLORDER		0x00003	/* natural bit fill order for machine */
81
#define	TIFF_DIRTYHEADER	0x00004	/* header must be written on close */
82
#define	TIFF_DIRTYDIRECT	0x00008	/* current directory must be written */
83
#define	TIFF_BUFFERSETUP	0x00010	/* data buffers setup */
84
#define	TIFF_CODERSETUP		0x00020	/* encoder/decoder setup done */
85
#define	TIFF_BEENWRITING	0x00040	/* written 1+ scanlines to file */
86
#define	TIFF_SWAB		0x00080	/* byte swap file information */
87
#define	TIFF_NOBITREV		0x00100	/* inhibit bit reversal logic */
88
#define	TIFF_MYBUFFER		0x00200	/* my raw data buffer; free on close */
89
#define	TIFF_ISTILED		0x00400	/* file is tile, not strip- based */
90
#define	TIFF_MAPPED		0x00800	/* file is mapped into memory */
91
#define	TIFF_POSTENCODE		0x01000	/* need call to postencode routine */
92
#define	TIFF_INSUBIFD		0x02000	/* currently writing a subifd */
93
#define	TIFF_UPSAMPLED		0x04000	/* library is doing data up-sampling */ 
94
#define	TIFF_STRIPCHOP		0x08000	/* enable strip chopping support */
95
#define	TIFF_HEADERONLY		0x10000	/* read header only, do not process */
96
					/* the first directory */
97
#define TIFF_NOREADRAW		0x20000 /* skip reading of raw uncompressed */
98
					/* image data */
99
#define	TIFF_INCUSTOMIFD	0x40000	/* currently writing a custom IFD */
100
	toff_t		tif_diroff;	/* file offset of current directory */
101
	toff_t		tif_nextdiroff;	/* file offset of following directory */
102
	toff_t*		tif_dirlist;	/* list of offsets to already seen */
103
					/* directories to prevent IFD looping */
104
	tsize_t		tif_dirlistsize;/* number of entires in offset list */
105
	uint16		tif_dirnumber;  /* number of already seen directories */
106
	TIFFDirectory	tif_dir;	/* internal rep of current directory */
107
	TIFFDirectory	tif_customdir;	/* custom IFDs are separated from
108
					   the main ones */
109
	TIFFHeader	tif_header;	/* file's header block */
110
	const int*	tif_typeshift;	/* data type shift counts */
111
	const long*	tif_typemask;	/* data type masks */
112
	uint32		tif_row;	/* current scanline */
113
	tdir_t		tif_curdir;	/* current directory (index) */
114
	tstrip_t	tif_curstrip;	/* current strip for read/write */
115
	toff_t		tif_curoff;	/* current offset for read/write */
116
	toff_t		tif_dataoff;	/* current offset for writing dir */
117
/* SubIFD support */
118
	uint16		tif_nsubifd;	/* remaining subifds to write */
119
	toff_t		tif_subifdoff;	/* offset for patching SubIFD link */
120
/* tiling support */
121
	uint32 		tif_col;	/* current column (offset by row too) */
122
	ttile_t		tif_curtile;	/* current tile for read/write */
123
	tsize_t		tif_tilesize;	/* # of bytes in a tile */
124
/* compression scheme hooks */
125
	int		tif_decodestatus;
126
	TIFFBoolMethod	tif_setupdecode;/* called once before predecode */
127
	TIFFPreMethod	tif_predecode;	/* pre- row/strip/tile decoding */
128
	TIFFBoolMethod	tif_setupencode;/* called once before preencode */
129
	int		tif_encodestatus;
130
	TIFFPreMethod	tif_preencode;	/* pre- row/strip/tile encoding */
131
	TIFFBoolMethod	tif_postencode;	/* post- row/strip/tile encoding */
132
	TIFFCodeMethod	tif_decoderow;	/* scanline decoding routine */
133
	TIFFCodeMethod	tif_encoderow;	/* scanline encoding routine */
134
	TIFFCodeMethod	tif_decodestrip;/* strip decoding routine */
135
	TIFFCodeMethod	tif_encodestrip;/* strip encoding routine */
136
	TIFFCodeMethod	tif_decodetile;	/* tile decoding routine */
137
	TIFFCodeMethod	tif_encodetile;	/* tile encoding routine */
138
	TIFFVoidMethod	tif_close;	/* cleanup-on-close routine */
139
	TIFFSeekMethod	tif_seek;	/* position within a strip routine */
140
	TIFFVoidMethod	tif_cleanup;	/* cleanup state routine */
141
	TIFFStripMethod	tif_defstripsize;/* calculate/constrain strip size */
142
	TIFFTileMethod	tif_deftilesize;/* calculate/constrain tile size */
143
	tidata_t	tif_data;	/* compression scheme private data */
144
/* input/output buffering */
145
	tsize_t		tif_scanlinesize;/* # of bytes in a scanline */
146
	tsize_t		tif_scanlineskew;/* scanline skew for reading strips */
147
	tidata_t	tif_rawdata;	/* raw data buffer */
148
	tsize_t		tif_rawdatasize;/* # of bytes in raw data buffer */
149
	tidata_t	tif_rawcp;	/* current spot in raw buffer */
150
	tsize_t		tif_rawcc;	/* bytes unread from raw buffer */
151
/* memory-mapped file support */
152
	tidata_t	tif_base;	/* base of mapped file */
153
	toff_t		tif_size;	/* size of mapped file region (bytes)
154
					   FIXME: it should be tsize_t */
155
	TIFFMapFileProc	tif_mapproc;	/* map file method */
156
	TIFFUnmapFileProc tif_unmapproc;/* unmap file method */
157
/* input/output callback methods */
158
	thandle_t	tif_clientdata;	/* callback parameter */
159
	TIFFReadWriteProc tif_readproc;	/* read method */
160
	TIFFReadWriteProc tif_writeproc;/* write method */
161
	TIFFSeekProc	tif_seekproc;	/* lseek method */
162
	TIFFCloseProc	tif_closeproc;	/* close method */
163
	TIFFSizeProc	tif_sizeproc;	/* filesize method */
164
/* post-decoding support */
165
	TIFFPostMethod	tif_postdecode;	/* post decoding routine */
166
/* tag support */
167
	TIFFFieldInfo**	tif_fieldinfo;	/* sorted table of registered tags */
168
	size_t		tif_nfields;	/* # entries in registered tag table */
169
	const TIFFFieldInfo *tif_foundfield;/* cached pointer to already found tag */
170
        TIFFTagMethods  tif_tagmethods; /* tag get/set/print routines */
171
        TIFFClientInfoLink *tif_clientinfo; /* extra client information. */
172
};
173
174
#if defined(__cplusplus)
175
extern "C" {
176
#endif
177
178
extern  int _TIFFDataSize(TIFFDataType);
179
180
#if defined(__cplusplus)
181
}
182
#endif
183
184
185
#endif
(-)a/fipMakefile.srcs (-2 / +2 lines)
Lines 1-4 Link Here
1
VER_MAJOR = 3
1
VER_MAJOR = 3
2
VER_MINOR = 13.1
2
VER_MINOR = 13.1
3
SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ././Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ././Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ././Source/FreeImage/PluginJ2K.cpp ././Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ././Source/FreeImage/PluginPFM.cpp ././Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ././Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ././Source/FreeImage/PSDParser.cpp ././Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ././Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ././Source/DeprecationManager/Deprecated.cpp ./Source/DeprecationManager/DeprecationMgr.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ././Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ././Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/./jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/./jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/./jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibMNG/libmng_callback_xs.c Source/LibMNG/libmng_chunk_descr.c Source/LibMNG/libmng_chunk_io.c Source/LibMNG/libmng_chunk_prc.c Source/LibMNG/libmng_chunk_xs.c Source/LibMNG/libmng_cms.c Source/LibMNG/libmng_display.c Source/LibMNG/libmng_dither.c Source/LibMNG/libmng_error.c Source/LibMNG/libmng_filter.c Source/LibMNG/libmng_hlapi.c Source/LibMNG/libmng_jpeg.c Source/LibMNG/libmng_object_prc.c Source/LibMNG/libmng_pixels.c Source/LibMNG/libmng_prop_xs.c Source/LibMNG/libmng_read.c Source/LibMNG/libmng_trace.c Source/LibMNG/libmng_write.c Source/LibMNG/libmng_zlib.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pnggccrd.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngvcrd.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF/tif_aux.c Source/LibTIFF/tif_close.c Source/LibTIFF/tif_codec.c Source/LibTIFF/tif_color.c Source/LibTIFF/tif_compress.c Source/LibTIFF/tif_dir.c Source/LibTIFF/tif_dirinfo.c Source/LibTIFF/tif_dirread.c Source/LibTIFF/tif_dirwrite.c Source/LibTIFF/tif_dumpmode.c Source/LibTIFF/tif_error.c Source/LibTIFF/tif_extension.c Source/LibTIFF/tif_fax3.c Source/LibTIFF/tif_fax3sm.c Source/LibTIFF/tif_flush.c Source/LibTIFF/tif_getimage.c Source/LibTIFF/tif_jpeg.c Source/LibTIFF/tif_luv.c Source/LibTIFF/tif_lzw.c Source/LibTIFF/tif_next.c Source/LibTIFF/./tif_ojpeg.c Source/LibTIFF/tif_open.c Source/LibTIFF/tif_packbits.c Source/LibTIFF/tif_pixarlog.c Source/LibTIFF/tif_predict.c Source/LibTIFF/tif_print.c Source/LibTIFF/tif_read.c Source/LibTIFF/tif_strip.c Source/LibTIFF/tif_swab.c Source/LibTIFF/tif_thunder.c Source/LibTIFF/tif_tile.c Source/LibTIFF/tif_version.c Source/LibTIFF/tif_warning.c Source/LibTIFF/tif_write.c Source/LibTIFF/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzio.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/j2k_lib.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/jpt.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/./IlmImf/ImfAttribute.cpp Source/OpenEXR/./IlmImf/ImfB44Compressor.cpp Source/OpenEXR/./IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/./IlmImf/ImfChannelList.cpp Source/OpenEXR/./IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/./IlmImf/ImfChromaticities.cpp Source/OpenEXR/./IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/./IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/./IlmImf/ImfCompressor.cpp Source/OpenEXR/./IlmImf/ImfConvert.cpp Source/OpenEXR/./IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/./IlmImf/ImfEnvmap.cpp Source/OpenEXR/./IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/./IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/./IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/./IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/./IlmImf/ImfHeader.cpp Source/OpenEXR/./IlmImf/ImfHuf.cpp Source/OpenEXR/./IlmImf/ImfInputFile.cpp Source/OpenEXR/./IlmImf/ImfIntAttribute.cpp Source/OpenEXR/./IlmImf/ImfIO.cpp Source/OpenEXR/./IlmImf/ImfKeyCode.cpp Source/OpenEXR/./IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/./IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/./IlmImf/ImfLut.cpp Source/OpenEXR/./IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/./IlmImf/ImfMisc.cpp Source/OpenEXR/./IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/./IlmImf/ImfOutputFile.cpp Source/OpenEXR/./IlmImf/ImfPizCompressor.cpp Source/OpenEXR/./IlmImf/ImfPreviewImage.cpp Source/OpenEXR/./IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/./IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/./IlmImf/ImfRational.cpp Source/OpenEXR/./IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/./IlmImf/ImfRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfRgbaYca.cpp Source/OpenEXR/./IlmImf/ImfRleCompressor.cpp Source/OpenEXR/./IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/./IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/./IlmImf/ImfStdIO.cpp Source/OpenEXR/./IlmImf/ImfStringAttribute.cpp Source/OpenEXR/./IlmImf/ImfTestFile.cpp Source/OpenEXR/./IlmImf/ImfThreading.cpp Source/OpenEXR/./IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/./IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/./IlmImf/ImfTiledMisc.cpp Source/OpenEXR/./IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/./IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfTileOffsets.cpp Source/OpenEXR/./IlmImf/ImfTimeCode.cpp Source/OpenEXR/./IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/./IlmImf/ImfVecAttribute.cpp Source/OpenEXR/./IlmImf/ImfVersion.cpp Source/OpenEXR/./IlmImf/ImfWav.cpp Source/OpenEXR/./IlmImf/ImfZipCompressor.cpp Source/OpenEXR/./Imath/ImathBox.cpp Source/OpenEXR/./Imath/ImathColorAlgo.cpp Source/OpenEXR/./Imath/ImathFun.cpp Source/OpenEXR/./Imath/ImathMatrixAlgo.cpp Source/OpenEXR/./Imath/ImathRandom.cpp Source/OpenEXR/./Imath/ImathShear.cpp Source/OpenEXR/./Imath/ImathVec.cpp Source/OpenEXR/./Iex/IexBaseExc.cpp Source/OpenEXR/./Iex/IexThrowErrnoExc.cpp Source/OpenEXR/./Half/half.cpp Source/OpenEXR/./IlmThread/IlmThread.cpp Source/OpenEXR/./IlmThread/IlmThreadMutex.cpp Source/OpenEXR/./IlmThread/IlmThreadPool.cpp Source/OpenEXR/./IlmThread/IlmThreadSemaphore.cpp Source/LibRawLite/./internal/dcraw_common.cpp Source/LibRawLite/./internal/dcraw_fileio.cpp Source/LibRawLite/./src/libraw_c_api.cpp Source/LibRawLite/./src/libraw_cxx.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
3
SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ././Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ././Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ././Source/FreeImage/PluginJ2K.cpp ././Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ././Source/FreeImage/PluginPFM.cpp ././Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ././Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ././Source/FreeImage/PSDParser.cpp ././Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ././Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ././Source/DeprecationManager/Deprecated.cpp ./Source/DeprecationManager/DeprecationMgr.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ././Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ././Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibRawLite/./internal/dcraw_common.cpp Source/LibRawLite/./internal/dcraw_fileio.cpp Source/LibRawLite/./src/libraw_c_api.cpp Source/LibRawLite/./src/libraw_cxx.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
4
INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibMNG -ISource/LibPNG -ISource/LibTIFF -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -IWrapper/FreeImagePlus
4
INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -IWrapper/FreeImagePlus
(-)a/genfipsrclist.sh (-1 / +1 lines)
Lines 1-6 Link Here
1
#!/bin/sh
1
#!/bin/sh
2
2
3
DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibMNG Source/LibPNG Source/LibTIFF Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Wrapper/FreeImagePlus"
3
DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Wrapper/FreeImagePlus"
4
4
5
5
6
echo "VER_MAJOR = 3" > fipMakefile.srcs
6
echo "VER_MAJOR = 3" > fipMakefile.srcs

Return to bug 307487