summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/.gitattributes1
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-thai.c33
-rw-r--r--src/3rdparty/libgq.pri9
-rw-r--r--src/3rdparty/libgq/.gitignore37
-rw-r--r--src/3rdparty/libgq/Makefile.am4
-rw-r--r--src/3rdparty/libgq/README6
-rwxr-xr-xsrc/3rdparty/libgq/autogen.sh2
-rw-r--r--src/3rdparty/libgq/configure.ac23
-rw-r--r--src/3rdparty/libgq/debian/README.scratchbox28
-rw-r--r--src/3rdparty/libgq/debian/changelog31
-rw-r--r--src/3rdparty/libgq/debian/compat1
-rw-r--r--src/3rdparty/libgq/debian/control43
-rw-r--r--src/3rdparty/libgq/debian/copyright8
-rwxr-xr-xsrc/3rdparty/libgq/debian/fixup-scratchbox79
-rw-r--r--src/3rdparty/libgq/debian/libgq-gconf-dev.install5
-rw-r--r--src/3rdparty/libgq/debian/libgq-gconf-doc.install1
-rw-r--r--src/3rdparty/libgq/debian/libgq-gconf0.install1
-rw-r--r--src/3rdparty/libgq/debian/maemo-sanitize0
-rwxr-xr-xsrc/3rdparty/libgq/debian/rules32
-rw-r--r--src/3rdparty/libgq/gconf/Doxyfile1514
-rw-r--r--src/3rdparty/libgq/gconf/GConfItem1
-rw-r--r--src/3rdparty/libgq/gconf/Makefile.am37
-rw-r--r--src/3rdparty/libgq/gconf/gconfitem.cpp376
-rw-r--r--src/3rdparty/libgq/gconf/gconfitem.h147
-rw-r--r--src/3rdparty/libgq/gconf/gq-gconf.pc.in11
-rwxr-xr-xsrc/3rdparty/libgq/gconf/run-test-gconf49
-rw-r--r--src/3rdparty/libgq/gconf/test-gconf.cpp299
-rw-r--r--src/3rdparty/libgq/gconf/test-gconf.h86
-rw-r--r--src/3rdparty/libjpeg.pri5
-rw-r--r--src/3rdparty/libmng.pri25
-rw-r--r--src/3rdparty/libmng/CHANGES1447
-rw-r--r--src/3rdparty/libmng/LICENSE57
-rw-r--r--src/3rdparty/libmng/README36
-rw-r--r--src/3rdparty/libmng/README.autoconf213
-rw-r--r--src/3rdparty/libmng/README.config104
-rw-r--r--src/3rdparty/libmng/README.contrib95
-rw-r--r--src/3rdparty/libmng/README.dll41
-rw-r--r--src/3rdparty/libmng/README.examples48
-rw-r--r--src/3rdparty/libmng/README.footprint46
-rw-r--r--src/3rdparty/libmng/README.packaging24
-rw-r--r--src/3rdparty/libmng/doc/Plan1.pngbin9058 -> 0 bytes
-rw-r--r--src/3rdparty/libmng/doc/Plan2.pngbin8849 -> 0 bytes
-rw-r--r--src/3rdparty/libmng/doc/doc.readme19
-rw-r--r--src/3rdparty/libmng/doc/libmng.txt1107
-rw-r--r--src/3rdparty/libmng/doc/man/jng.537
-rw-r--r--src/3rdparty/libmng/doc/man/libmng.31146
-rw-r--r--src/3rdparty/libmng/doc/man/mng.542
-rw-r--r--src/3rdparty/libmng/doc/misc/magic.dif30
-rw-r--r--src/3rdparty/libmng/doc/rpm/libmng-1.0.10-rhconf.patch38
-rw-r--r--src/3rdparty/libmng/doc/rpm/libmng.spec116
-rw-r--r--src/3rdparty/libmng/libmng.h2932
-rw-r--r--src/3rdparty/libmng/libmng_callback_xs.c1239
-rw-r--r--src/3rdparty/libmng/libmng_chunk_descr.c6090
-rw-r--r--src/3rdparty/libmng/libmng_chunk_descr.h146
-rw-r--r--src/3rdparty/libmng/libmng_chunk_io.c10740
-rw-r--r--src/3rdparty/libmng/libmng_chunk_io.h415
-rw-r--r--src/3rdparty/libmng/libmng_chunk_prc.c4452
-rw-r--r--src/3rdparty/libmng/libmng_chunk_prc.h381
-rw-r--r--src/3rdparty/libmng/libmng_chunk_xs.c7016
-rw-r--r--src/3rdparty/libmng/libmng_chunks.h1026
-rw-r--r--src/3rdparty/libmng/libmng_cms.c758
-rw-r--r--src/3rdparty/libmng/libmng_cms.h92
-rw-r--r--src/3rdparty/libmng/libmng_conf.h295
-rw-r--r--src/3rdparty/libmng/libmng_data.h1032
-rw-r--r--src/3rdparty/libmng/libmng_display.c7140
-rw-r--r--src/3rdparty/libmng/libmng_display.h343
-rw-r--r--src/3rdparty/libmng/libmng_dither.c58
-rw-r--r--src/3rdparty/libmng/libmng_dither.h45
-rw-r--r--src/3rdparty/libmng/libmng_error.c326
-rw-r--r--src/3rdparty/libmng/libmng_error.h119
-rw-r--r--src/3rdparty/libmng/libmng_filter.c978
-rw-r--r--src/3rdparty/libmng/libmng_filter.h69
-rw-r--r--src/3rdparty/libmng/libmng_hlapi.c3001
-rw-r--r--src/3rdparty/libmng/libmng_jpeg.c1088
-rw-r--r--src/3rdparty/libmng/libmng_jpeg.h57
-rw-r--r--src/3rdparty/libmng/libmng_memory.h64
-rw-r--r--src/3rdparty/libmng/libmng_object_prc.c6998
-rw-r--r--src/3rdparty/libmng/libmng_object_prc.h690
-rw-r--r--src/3rdparty/libmng/libmng_objects.h635
-rw-r--r--src/3rdparty/libmng/libmng_pixels.c24610
-rw-r--r--src/3rdparty/libmng/libmng_pixels.h1147
-rw-r--r--src/3rdparty/libmng/libmng_prop_xs.c2799
-rw-r--r--src/3rdparty/libmng/libmng_read.c1369
-rw-r--r--src/3rdparty/libmng/libmng_read.h53
-rw-r--r--src/3rdparty/libmng/libmng_trace.c1683
-rw-r--r--src/3rdparty/libmng/libmng_trace.h1474
-rw-r--r--src/3rdparty/libmng/libmng_types.h574
-rw-r--r--src/3rdparty/libmng/libmng_write.c198
-rw-r--r--src/3rdparty/libmng/libmng_write.h49
-rw-r--r--src/3rdparty/libmng/libmng_zlib.c607
-rw-r--r--src/3rdparty/libmng/libmng_zlib.h60
-rw-r--r--src/3rdparty/libmng/makefiles/Makefile.am29
-rw-r--r--src/3rdparty/libmng/makefiles/README27
-rw-r--r--src/3rdparty/libmng/makefiles/configure.in193
-rw-r--r--src/3rdparty/libmng/makefiles/makefile.bcb3108
-rw-r--r--src/3rdparty/libmng/makefiles/makefile.dj155
-rw-r--r--src/3rdparty/libmng/makefiles/makefile.linux180
-rw-r--r--src/3rdparty/libmng/makefiles/makefile.mingw164
-rw-r--r--src/3rdparty/libmng/makefiles/makefile.mingwdll158
-rw-r--r--src/3rdparty/libmng/makefiles/makefile.qnx160
-rw-r--r--src/3rdparty/libmng/makefiles/makefile.unix67
-rw-r--r--src/3rdparty/libmng/makefiles/makefile.vcwin3299
-rwxr-xr-xsrc/3rdparty/libmng/unmaintained/autogen.sh50
-rw-r--r--src/3rdparty/libpng/pngpriv.h4
-rw-r--r--src/3rdparty/libtiff.pri43
-rw-r--r--src/3rdparty/libtiff/COPYRIGHT21
-rw-r--r--src/3rdparty/libtiff/ChangeLog4426
-rw-r--r--src/3rdparty/libtiff/HOWTO-RELEASE105
-rw-r--r--src/3rdparty/libtiff/README59
-rw-r--r--src/3rdparty/libtiff/README.vms12
-rw-r--r--src/3rdparty/libtiff/RELEASE-DATE1
-rw-r--r--src/3rdparty/libtiff/SConstruct171
-rw-r--r--src/3rdparty/libtiff/TODO12
-rw-r--r--src/3rdparty/libtiff/VERSION1
-rw-r--r--src/3rdparty/libtiff/html/TIFFTechNote2.html707
-rw-r--r--src/3rdparty/libtiff/html/addingtags.html292
-rw-r--r--src/3rdparty/libtiff/html/bugs.html63
-rw-r--r--src/3rdparty/libtiff/html/build.html880
-rw-r--r--src/3rdparty/libtiff/html/contrib.html209
-rw-r--r--src/3rdparty/libtiff/html/document.html48
-rw-r--r--src/3rdparty/libtiff/html/images.html41
-rw-r--r--src/3rdparty/libtiff/html/images/back.gifbin1000 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/bali.jpgbin26152 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/cat.gifbin12477 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/cover.jpgbin20189 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/cramps.gifbin13137 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/dave.gifbin8220 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/info.gifbin131 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/jello.jpgbin13744 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/jim.gifbin14493 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/note.gifbin264 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/oxford.gifbin6069 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/quad.jpgbin23904 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/ring.gifbin4275 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/smallliz.jpgbin16463 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/strike.gifbin5610 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/images/warning.gifbin287 -> 0 bytes
-rw-r--r--src/3rdparty/libtiff/html/index.html123
-rw-r--r--src/3rdparty/libtiff/html/internals.html572
-rw-r--r--src/3rdparty/libtiff/html/intro.html68
-rw-r--r--src/3rdparty/libtiff/html/libtiff.html747
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFClose.3tiff.html87
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFDataWidth.3tiff.html98
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFError.3tiff.html106
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFFlush.3tiff.html113
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFGetField.3tiff.html1446
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFOpen.3tiff.html421
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFPrintDirectory.3tiff.html225
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFRGBAImage.3tiff.html319
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFReadDirectory.3tiff.html218
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFReadEncodedStrip.3tiff.html133
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFReadEncodedTile.3tiff.html130
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFReadRGBAImage.3tiff.html301
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFReadRGBAStrip.3tiff.html208
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFReadRGBATile.3tiff.html261
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFReadRawStrip.3tiff.html109
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFReadRawTile.3tiff.html111
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFReadScanline.3tiff.html157
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFReadTile.3tiff.html133
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFSetDirectory.3tiff.html122
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFSetField.3tiff.html1362
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFWarning.3tiff.html108
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFWriteDirectory.3tiff.html176
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFWriteEncodedStrip.3tiff.html153
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFWriteEncodedTile.3tiff.html147
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFWriteRawStrip.3tiff.html144
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFWriteRawTile.3tiff.html128
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFWriteScanline.3tiff.html206
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFWriteTile.3tiff.html115
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFbuffer.3tiff.html116
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFcodec.3tiff.html116
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFcolor.3tiff.html975
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFmemory.3tiff.html110
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFquery.3tiff.html148
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFsize.3tiff.html95
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFstrip.3tiff.html129
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFswab.3tiff.html110
-rw-r--r--src/3rdparty/libtiff/html/man/TIFFtile.3tiff.html141
-rw-r--r--src/3rdparty/libtiff/html/man/fax2ps.1.html252
-rw-r--r--src/3rdparty/libtiff/html/man/fax2tiff.1.html607
-rw-r--r--src/3rdparty/libtiff/html/man/gif2tiff.1.html141
-rw-r--r--src/3rdparty/libtiff/html/man/index.html64
-rw-r--r--src/3rdparty/libtiff/html/man/libtiff.3tiff.html3137
-rw-r--r--src/3rdparty/libtiff/html/man/pal2rgb.1.html189
-rw-r--r--src/3rdparty/libtiff/html/man/ppm2tiff.1.html141
-rw-r--r--src/3rdparty/libtiff/html/man/ras2tiff.1.html139
-rw-r--r--src/3rdparty/libtiff/html/man/raw2tiff.1.html510
-rw-r--r--src/3rdparty/libtiff/html/man/rgb2ycbcr.1.html155
-rw-r--r--src/3rdparty/libtiff/html/man/sgi2tiff.1.html147
-rw-r--r--src/3rdparty/libtiff/html/man/thumbnail.1.html148
-rw-r--r--src/3rdparty/libtiff/html/man/tiff2bw.1.html161
-rw-r--r--src/3rdparty/libtiff/html/man/tiff2pdf.1.html609
-rw-r--r--src/3rdparty/libtiff/html/man/tiff2ps.1.html532
-rw-r--r--src/3rdparty/libtiff/html/man/tiff2rgba.1.html162
-rw-r--r--src/3rdparty/libtiff/html/man/tiffcmp.1.html156
-rw-r--r--src/3rdparty/libtiff/html/man/tiffcp.1.html522
-rw-r--r--src/3rdparty/libtiff/html/man/tiffcrop.1.html851
-rw-r--r--src/3rdparty/libtiff/html/man/tiffdither.1.html183
-rw-r--r--src/3rdparty/libtiff/html/man/tiffdump.1.html145
-rw-r--r--src/3rdparty/libtiff/html/man/tiffgt.1.html551
-rw-r--r--src/3rdparty/libtiff/html/man/tiffinfo.1.html196
-rw-r--r--src/3rdparty/libtiff/html/man/tiffmedian.1.html183
-rw-r--r--src/3rdparty/libtiff/html/man/tiffset.1.html176
-rw-r--r--src/3rdparty/libtiff/html/man/tiffsplit.1.html102
-rw-r--r--src/3rdparty/libtiff/html/man/tiffsv.1.html207
-rw-r--r--src/3rdparty/libtiff/html/misc.html116
-rw-r--r--src/3rdparty/libtiff/html/support.html655
-rw-r--r--src/3rdparty/libtiff/html/tools.html164
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta007.html112
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta016.html122
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta018.html84
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta024.html139
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta028.html146
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta029.html86
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta031.html94
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta032.html90
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta033.html82
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta034.html68
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta035.html63
-rw-r--r--src/3rdparty/libtiff/html/v3.4beta036.html117
-rw-r--r--src/3rdparty/libtiff/html/v3.5.1.html75
-rw-r--r--src/3rdparty/libtiff/html/v3.5.2.html108
-rw-r--r--src/3rdparty/libtiff/html/v3.5.3.html132
-rw-r--r--src/3rdparty/libtiff/html/v3.5.4.html88
-rw-r--r--src/3rdparty/libtiff/html/v3.5.5.html155
-rw-r--r--src/3rdparty/libtiff/html/v3.5.6-beta.html185
-rw-r--r--src/3rdparty/libtiff/html/v3.5.7.html259
-rw-r--r--src/3rdparty/libtiff/html/v3.6.0.html434
-rw-r--r--src/3rdparty/libtiff/html/v3.6.1.html199
-rw-r--r--src/3rdparty/libtiff/html/v3.7.0.html144
-rw-r--r--src/3rdparty/libtiff/html/v3.7.0alpha.html249
-rw-r--r--src/3rdparty/libtiff/html/v3.7.0beta.html162
-rw-r--r--src/3rdparty/libtiff/html/v3.7.0beta2.html131
-rw-r--r--src/3rdparty/libtiff/html/v3.7.1.html233
-rw-r--r--src/3rdparty/libtiff/html/v3.7.2.html222
-rw-r--r--src/3rdparty/libtiff/html/v3.7.3.html230
-rw-r--r--src/3rdparty/libtiff/html/v3.7.4.html133
-rw-r--r--src/3rdparty/libtiff/html/v3.8.0.html199
-rw-r--r--src/3rdparty/libtiff/html/v3.8.1.html217
-rw-r--r--src/3rdparty/libtiff/html/v3.8.2.html137
-rw-r--r--src/3rdparty/libtiff/html/v3.9.0beta.html304
-rw-r--r--src/3rdparty/libtiff/html/v3.9.1.html115
-rw-r--r--src/3rdparty/libtiff/html/v3.9.2.html122
-rw-r--r--src/3rdparty/libtiff/libtiff/SConstruct73
-rw-r--r--src/3rdparty/libtiff/libtiff/libtiff.def140
-rw-r--r--src/3rdparty/libtiff/libtiff/mkg3states.c444
-rw-r--r--src/3rdparty/libtiff/libtiff/t4.h285
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_acorn.c519
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_apple.c274
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_atari.c243
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_aux.c275
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_close.c119
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_codec.c153
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_color.c275
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_compress.c288
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_config.h337
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_config.h-vms46
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_config.h.in309
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_config.vc.h56
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_config.wince.h67
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_dir.c1369
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_dir.h202
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_dirinfo.c881
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_dirread.c2016
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_dirwrite.c1407
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_dumpmode.c119
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_error.c73
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_extension.c111
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_fax3.c1603
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_fax3.h525
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_fax3sm.c1253
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_flush.c67
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_getimage.c2669
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_jbig.c378
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_jpeg.c2035
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_luv.c1622
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_lzw.c1122
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_msdos.c186
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_next.c147
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_ojpeg.c2427
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_open.c688
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_packbits.c293
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_pixarlog.c1364
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_predict.c729
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_predict.h70
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_print.c639
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_read.c741
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_stream.cxx295
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_strip.c363
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_swab.c235
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_thunder.c158
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_tile.c273
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_unix.c293
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_version.c33
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_warning.c74
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_win3.c225
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_win32.c402
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_wince.c281
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_write.c711
-rw-r--r--src/3rdparty/libtiff/libtiff/tif_zip.c412
-rw-r--r--src/3rdparty/libtiff/libtiff/tiff.h647
-rw-r--r--src/3rdparty/libtiff/libtiff/tiffconf.h110
-rw-r--r--src/3rdparty/libtiff/libtiff/tiffconf.h.in103
-rw-r--r--src/3rdparty/libtiff/libtiff/tiffconf.vc.h109
-rw-r--r--src/3rdparty/libtiff/libtiff/tiffconf.wince.h129
-rw-r--r--src/3rdparty/libtiff/libtiff/tiffio.h521
-rw-r--r--src/3rdparty/libtiff/libtiff/tiffio.hxx42
-rw-r--r--src/3rdparty/libtiff/libtiff/tiffiop.h343
-rw-r--r--src/3rdparty/libtiff/libtiff/tiffvers.h9
-rw-r--r--src/3rdparty/libtiff/libtiff/uvcode.h173
-rw-r--r--src/3rdparty/libtiff/nmake.opt218
-rw-r--r--src/3rdparty/libtiff/port/dummy.c12
-rw-r--r--src/3rdparty/libtiff/port/getopt.c124
-rw-r--r--src/3rdparty/libtiff/port/lfind.c62
-rw-r--r--src/3rdparty/libtiff/port/libport.h51
-rw-r--r--src/3rdparty/libtiff/port/strcasecmp.c50
-rw-r--r--src/3rdparty/libtiff/port/strtoul.c109
-rw-r--r--src/3rdparty/patches/libmng-1.0.10-endless-loop.patch65
-rw-r--r--src/3rdparty/pcre.pri38
-rw-r--r--src/3rdparty/pcre/config.h15
-rwxr-xr-xsrc/3rdparty/pcre/import_from_pcre_tarball.sh154
-rw-r--r--src/3rdparty/s60/eiksoftkeyimage.h95
-rw-r--r--src/3rdparty/sha1/sha1.cpp6
-rw-r--r--src/3rdparty/zlib_dependency.pri5
324 files changed, 240 insertions, 171641 deletions
diff --git a/src/3rdparty/.gitattributes b/src/3rdparty/.gitattributes
index 8cb308ab3c..c0f08ed4d7 100644
--- a/src/3rdparty/.gitattributes
+++ b/src/3rdparty/.gitattributes
@@ -11,7 +11,6 @@ libpng/projects/visualc71/libpng.sln -crlf
libpng/projects/visualc71/libpng.vcproj -crlf
libpng/projects/visualc71/pngtest.vcproj -crlf
libpng/projects/visualc71/zlib.vcproj -crlf
-libtiff/nmake.opt -crlf
zlib/projects/visualc6/example.dsp -crlf
zlib/projects/visualc6/minigzip.dsp -crlf
zlib/projects/visualc6/README.txt -crlf
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
index 262cee6a8e..deff61be7e 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
@@ -258,20 +258,39 @@ static HB_Bool HB_ThaiConvertStringToGlyphIndices (HB_ShaperItem *item)
/* Add glyphs to glyphs string and setting some attributes */
for (int lgi = 0; lgi < lgn; lgi++) {
if ( rglyphs[lgi] == 0xdd/*TH_BLANK_BASE_GLYPH*/ ) {
- //if ( !item->fixedPitch ) {
- glyphString[slen++] = C_DOTTED_CIRCLE;
- item->attributes[slen-1].dontPrint = true; // FIXME this will hide all dotted circle
- //}
+ glyphString[slen++] = C_DOTTED_CIRCLE;
}
else {
glyphString[slen++] = (HB_UChar16) thai_get_glyph_index (font_type, rglyphs[lgi]);
}
}
+ /* Special case to handle U+0E33 (SARA AM, ำ): SARA AM is normally written at the end of a
+ * word with a base character and an optional top character before it. For example, U+0E0B
+ * (base), U+0E49 (top), U+0E33 (SARA AM). The sequence should be converted to 4 glyphs:
+ * base, hilo (the little circle in the top left part of SARA AM, NIKHAHIT), top, then the
+ * right part of SARA AM (SARA AA).
+ *
+ * The painting process finds out the starting glyph and ending glyph of a character
+ * sequence by checking the logClusters array. In this case, logClusters array should
+ * ideally be [ 0, 1, 3 ] so that glyphsStart = 0 and glyphsEnd = 3 (slen - 1) to paint out
+ * all the glyphs generated.
+ *
+ * A special case in this special case is when we have no base character. When an isolated
+ * SARA AM is processed (cell_length = 1), libthai will produce 3 glyphs: dotted circle
+ * (indicates that the base is empty), NIKHAHIT then SARA AA. If logClusters[0] = 1, it will
+ * paint from the second glyph in the glyphs array. So in this case logClusters[0] should
+ * point to the first glyph it produces, aka. the dotted circle. */
if (haveSaraAm) {
- logClusters[i + cell_length - 1] = slen - 1; // Set logClusters before NIKAHIT
- if (tis_cell.top != 0)
- logClusters[i + cell_length - 2] = slen - 2; // Set logClusters before NIKAHIT when tis_cell has top
+ logClusters[i + cell_length - 1] = cell_length == 1 ? slen - 3 : slen - 1;
+ if (tis_cell.top != 0) {
+ if (cell_length > 1) {
+ /* set the logClusters[top character] to slen - 2 as it points to the second to
+ * lastglyph (slen - 2) */
+ logClusters[i + cell_length - 2] = slen - 2;
+ }
+ }
+ /* check for overflow */
if (logClusters[i + cell_length - 1] > slen)
logClusters[i + cell_length - 1] = 0;
}
diff --git a/src/3rdparty/libgq.pri b/src/3rdparty/libgq.pri
deleted file mode 100644
index a89706a1e7..0000000000
--- a/src/3rdparty/libgq.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-INCLUDEPATH += $$PWD/libgq/gconf
-
-HEADERS += \
- $$PWD/libgq/gconf/gconfitem.h \
- $$PWD/libgq/gconf/GConfItem
-
-SOURCES += \
- $$PWD/libgq/gconf/gconfitem.cpp
-
diff --git a/src/3rdparty/libgq/.gitignore b/src/3rdparty/libgq/.gitignore
deleted file mode 100644
index 70a4735f37..0000000000
--- a/src/3rdparty/libgq/.gitignore
+++ /dev/null
@@ -1,37 +0,0 @@
-/Makefile.in
-/aclocal.m4
-/autom4te.cache/
-/config.guess
-/config.sub
-/configure
-/depcomp
-/gconf/Makefile.in
-/install-sh
-/ltmain.sh
-/missing
-/Makefile
-/config.log
-/config.status
-/gconf/.deps/
-/gconf/Makefile
-/libtool
-/confdefs.h
-/gconf/.libs/
-/gconf/libgq-gconf.la
-/gconf/gq-gconf.pc
-/gconf/moc_gconfitem_h.cpp
-/gconf/mocs.cpp
-/gconf/test-gconf
-/gconf/gconfitem_moc.cpp
-/gconf/test-gconf_moc.cpp
-/libgq-*.tar.gz
-/debian/libgq-gconf-dev/
-/debian/libgq-gconf0/
-/debian/tmp/
-/debian/libgq-gconf0-dbg/
-/debian/libgq-gconf-doc/
-/debian/*.debhelper.log
-/debian/*.substvars
-/debian/files
-/debian/*.debhelper
-/gconf/html/
diff --git a/src/3rdparty/libgq/Makefile.am b/src/3rdparty/libgq/Makefile.am
deleted file mode 100644
index 42b3ece04b..0000000000
--- a/src/3rdparty/libgq/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = gconf
-
-dist-hook:
- rm -rf `find $(distdir) -name '*_moc.cpp'`
diff --git a/src/3rdparty/libgq/README b/src/3rdparty/libgq/README
deleted file mode 100644
index c37abba8ae..0000000000
--- a/src/3rdparty/libgq/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This is libgq, a set of small libraries with Q wrappers for G things.
-
-* GConf
-
-The libgq-gconf library contains the GConfItem class for accessing
-GConf.
diff --git a/src/3rdparty/libgq/autogen.sh b/src/3rdparty/libgq/autogen.sh
deleted file mode 100755
index 0a4a0343ab..0000000000
--- a/src/3rdparty/libgq/autogen.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-autoreconf --install --force -v
diff --git a/src/3rdparty/libgq/configure.ac b/src/3rdparty/libgq/configure.ac
deleted file mode 100644
index f4fc2be604..0000000000
--- a/src/3rdparty/libgq/configure.ac
+++ /dev/null
@@ -1,23 +0,0 @@
-AC_INIT([libgq],[0.2],[marius.vollmer@nokia.com],[libgq])
-AC_CONFIG_SRCDIR([Makefile.am])
-AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign])
-
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-
-PKG_CHECK_MODULES([QT], [QtCore])
-PKG_CHECK_MODULES([QTEST], [QtTest])
-PKG_CHECK_MODULES([GLIB], [glib-2.0])
-PKG_CHECK_MODULES([GCONF], [gconf-2.0])
-
-MOC=`pkg-config QtCore --variable=moc_location`
-RCC=`pkg-config QtCore --variable=exec_prefix`/bin/rcc
-
-AC_SUBST([MOC])
-AC_SUBST([RCC])
-
-AC_CONFIG_FILES([Makefile
- gconf/Makefile
- gconf/gq-gconf.pc])
-
-AC_OUTPUT
diff --git a/src/3rdparty/libgq/debian/README.scratchbox b/src/3rdparty/libgq/debian/README.scratchbox
deleted file mode 100644
index 23ba7935ce..0000000000
--- a/src/3rdparty/libgq/debian/README.scratchbox
+++ /dev/null
@@ -1,28 +0,0 @@
-This packages behaves a bit wierdly inside Scratchbox 1, by design.
-
-When building it with dpkg-buildpackage or equivalent, it will disable
-all devkits and adjust PATH. This means that almost all build
-dependencies will come from your installed packages, and not from
-Scratchbox or the configured devkits.
-
-Since some of our packages do not work with Scratchboxes fakeroot
-(because the latter is too old), you should use the targets fakeroot
-instead.
-
-You can disable this behavior by setting SBOX_DONT_SANITIZE in the
-environment.
-
-When this package is build in a certain buildbot, it will go further
-and permantly change the Scratchbox target. This should not happen to
-anyone but the buildbot, but there is a chance it will happen to you
-by accident.
-
-The buildbot is recognized via the $USER environment variable. If it
-matches "bifh[0-9]", the permanent changes will be done.
-
-The permanent changes mostly consist of running apt-get dist-upgrade
-and making sure that the targets fakeroot is used.
-
-This weirdness is brought to you by:
-
- http://maemo.gitorious.org/maemo-af/maemoify-tools
diff --git a/src/3rdparty/libgq/debian/changelog b/src/3rdparty/libgq/debian/changelog
deleted file mode 100644
index f6242540bf..0000000000
--- a/src/3rdparty/libgq/debian/changelog
+++ /dev/null
@@ -1,31 +0,0 @@
-libgq (0.4+0m6) unstable; urgency=low
-
- * This entry has been added by BIFH queue processor
- version has been changed to 0.4+0m6
-
- -- Marius Vollmer <marius.vollmer@nokia.com> Fri, 04 Jun 2010 18:28:43 +0300
-
-libgq (0.4) unstable; urgency=low
-
- * Never release the GConf client, to avoid having to recreate it
- immediately. Might fix NB#164690.
-
- -- Marius Vollmer <marius.vollmer@nokia.com> Fri, 04 Jun 2010 18:10:50 +0300
-
-libgq (0.3) unstable; urgency=low
-
- * Added autotools to Build-Depends.
-
- -- Marius Vollmer <marius.vollmer@nokia.com> Tue, 23 Feb 2010 12:04:45 +0200
-
-libgq (0.2) unstable; urgency=low
-
- * Build fixes.
-
- -- Marius Vollmer <marius.vollmer@nokia.com> Wed, 16 Dec 2009 15:56:05 +0200
-
-libgq (0.1) unstable; urgency=low
-
- * Initial release.
-
- -- Marius Vollmer <marius.vollmer@nokia.com> Wed, 16 Dec 2009 15:54:46 +0200
diff --git a/src/3rdparty/libgq/debian/compat b/src/3rdparty/libgq/debian/compat
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/src/3rdparty/libgq/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/src/3rdparty/libgq/debian/control b/src/3rdparty/libgq/debian/control
deleted file mode 100644
index 3feaa466ea..0000000000
--- a/src/3rdparty/libgq/debian/control
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: libgq
-Section: libs
-Priority: extra
-Maintainer: Marius Vollmer <marius.vollmer@nokia.com>
-Origin: maemo
-Build-Depends: debhelper (>= 7), libqt4-dev, doxygen, libgconf2-dev, libglib2.0-dev, autoconf, automake, libtool
-Vcs-Browser: http://gitorious.org/maemo-af/libgq
-Vcs-Git: git@gitorious.org:maemo-af/libgq.git
-
-Package: libgq-gconf0
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: a Qt wrapper for GConf
- This library contains the GConfItem class, for easy
- access to GConf from Qt programs.
- .
- This package contains the shared run-time library.
-
-Package: libgq-gconf0-dbg
-Architecture: any
-Depends: libgq-gconf0 (= ${source:Version})
-Description: a Qt wrapper for GConf
- This library contains the GConfItem class, for easy
- access to GConf from Qt programs.
- .
- This package contains the debugging symbols.
-
-Package: libgq-gconf-dev
-Architecture: any
-Depends: libgq-gconf0 (= ${source:Version}), libqt4-dev, libgconf2-dev
-Description: a Qt wrapper for GConf
- This library contains the GConfItem class, for easy
- access to GConf from Qt programs.
- .
- This package contains the development files.
-
-Package: libgq-gconf-doc
-Architecture: all
-Description: a Qt wrapper for GConf
- This library contains the GConfItem class, for easy
- access to GConf from Qt programs.
- .
- This package contains the documentation.
diff --git a/src/3rdparty/libgq/debian/copyright b/src/3rdparty/libgq/debian/copyright
deleted file mode 100644
index 45b04e6929..0000000000
--- a/src/3rdparty/libgq/debian/copyright
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2009 Nokia Corporation.
-
-This program, is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License version
-2.1 as published by the Free Software Foundation.
-
-The full text of the LGPL 2.1 can be found in
-/usr/share/common-licenses.
diff --git a/src/3rdparty/libgq/debian/fixup-scratchbox b/src/3rdparty/libgq/debian/fixup-scratchbox
deleted file mode 100755
index b39ad5fc28..0000000000
--- a/src/3rdparty/libgq/debian/fixup-scratchbox
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh
-
-# XXX - this needs to run under fakeroot...
-
-exec 3>&1 1>&2
-
-real_dpkg_checkbuilddeps () {
- SBOX_REDIRECT_IGNORE=/usr/bin/perl /usr/bin/perl /usr/bin/dpkg-checkbuilddeps "$@"
-}
-
-finish () {
- if ! real_dpkg_checkbuilddeps; then
- echo "This package does not use any devkits."
- echo "Please install all build dependencies as real packages."
- echo >&3 FAIL
- fi
- exit 0
-}
-
-# The stamp file can not be in the source tree because then it would
-# end up in the source package, which is not what we want. We put it
-# into /var/tmp so that it gets deleted when a new rootstrap is
-# extracted.
-
-STAMP=/var/tmp/SANITIZED.$(head debian/changelog | md5sum | cut -d' ' -f1)
-
-if [ -e $STAMP ]; then
- exit 0;
-fi
-
-# Only do permanent changes if this is BIFH
-
-echo "$USER" | grep -q 'bifh[0-9]' || finish
-
-# prevent bash from killing the system
-rm -f /var/lib/bash/provide-sh
-
-# clean ~/.texmf-var to avoid trouble with stale things hiding there.
-rm -rf ~/.texmf-var/
-
-pfx="dpkg-checkbuilddeps: Unmet build dependencies:"
-deps=`real_dpkg_checkbuilddeps 2>&1 | grep "^$pfx" | \
- sed -e "s/$pfx//" -e s'/([^)]*)//g' -e 's/|//'`
-deps="$deps build-essential automake autoconf libtool ed gawk diff dpkg-dev"
-for d in $deps; do
- echo apt-get "$@" install $d
- apt-get -o DPkg::Options::=--force-confold -q --force-yes --yes install $d
-done
-apt-get -o DPkg::Options::=--force-confold -q --force-yes --yes dist-upgrade
-
-# Make sure we get a fresh fakeroot installation
-
-# We can't seem to control the value of LD_PRELOAD well enough, so we
-# just copy the good version of libfakeroot over the bad one that
-# Scratchbox uses. This will result in a good version of libfakeroot
-# talking to a bad version of faked, but that seems to work well
-# enough. The protocol between the two is really simple and unlikely
-# to change even when new syscalls are wrapped. And this is a
-# desperate hack anyway, so it's OK if there is blood all over the
-# floor from time to time.
-#
-# After we have overwritten libfakeroot, it no longer works with any
-# host binaries, such as the ones in /scratchbox/compilers/bin or
-# /scratchbox/tools/bin. Thus, we must avoid running those when
-# fakerooted.
-#
-# We use "cp -l" here to avoid overwriting a library that is in use.
-#
-if [ "$(fakeroot -v)" = "fakeroot version 1.4.2" ]; then
- apt-get -q --force-yes --yes --reinstall install fakeroot
- cp -fl /usr/lib/libfakeroot/libfakeroot-sysv.so /usr/lib/libfakeroot-sysv/libfakeroot.so.0
- cp -fl /usr/lib/libfakeroot/libfakeroot-tcp.so /usr/lib/libfakeroot-tcp/libfakeroot.so.0
-else
- echo "We have $(fakeroot -v), hurray!"
-fi
-
-touch $STAMP
-
-finish
diff --git a/src/3rdparty/libgq/debian/libgq-gconf-dev.install b/src/3rdparty/libgq/debian/libgq-gconf-dev.install
deleted file mode 100644
index b3d949f416..0000000000
--- a/src/3rdparty/libgq/debian/libgq-gconf-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/gq/GConfItem
-usr/include/gq/gconfitem.h
-usr/lib/libgq-gconf.so
-usr/lib/libgq-gconf.a
-usr/lib/pkgconfig/gq-gconf.pc
diff --git a/src/3rdparty/libgq/debian/libgq-gconf-doc.install b/src/3rdparty/libgq/debian/libgq-gconf-doc.install
deleted file mode 100644
index 9007055b25..0000000000
--- a/src/3rdparty/libgq/debian/libgq-gconf-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-gconf/html usr/share/doc/libgq-gconf-doc/
diff --git a/src/3rdparty/libgq/debian/libgq-gconf0.install b/src/3rdparty/libgq/debian/libgq-gconf0.install
deleted file mode 100644
index 4ca628315b..0000000000
--- a/src/3rdparty/libgq/debian/libgq-gconf0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libgq-gconf.so.*
diff --git a/src/3rdparty/libgq/debian/maemo-sanitize b/src/3rdparty/libgq/debian/maemo-sanitize
deleted file mode 100644
index e69de29bb2..0000000000
--- a/src/3rdparty/libgq/debian/maemo-sanitize
+++ /dev/null
diff --git a/src/3rdparty/libgq/debian/rules b/src/3rdparty/libgq/debian/rules
deleted file mode 100755
index 1f293b3348..0000000000
--- a/src/3rdparty/libgq/debian/rules
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /usr/bin/make -f
-
-# Sanitize build environment when running inside Scratchbox 1
-ifneq (,$(wildcard /targets))
- ifeq (,$(SBOX_DONT_SANITIZE))
- export PATH:=/bin:/usr/bin
- export MAKE:=make
- ifeq (,$(FAKEROOTKEY))
- export SBOX_REDIRECT_TO_DIRS:=/scratchbox/compilers/bin
- else
- export SBOX_REDIRECT_TO_DIRS:=
- endif
- ifneq (,$(shell debian/fixup-scratchbox))
- $(error Error)
- endif
- endif
-endif
-
-override_dh_auto_configure:
- ./autogen.sh
- dh_auto_configure
-
-override_dh_auto_build:
- dh_auto_build
- cd gconf && doxygen
-
-override_dh_strip:
- dh_strip -plibgq-gconf0 --dbg-package=libgq-gconf0-dbg
- dh_strip
-
-%:
- dh $@
diff --git a/src/3rdparty/libgq/gconf/Doxyfile b/src/3rdparty/libgq/gconf/Doxyfile
deleted file mode 100644
index 7f5c11a3d5..0000000000
--- a/src/3rdparty/libgq/gconf/Doxyfile
+++ /dev/null
@@ -1,1514 +0,0 @@
-# Doxyfile 1.6.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME = gq-gconf
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY =
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 8
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses.
-# With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this tag.
-# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
-# doxygen. The layout file controls the global structure of the generated output files
-# in an output format independent way. The create the layout file that represents
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name
-# of the layout file.
-
-LAYOUT_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT = gconfitem.h gconfitem.cpp
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS =
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
-# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
-# HTML documentation.
-
-GENERATE_QHP = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE =
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
-# For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION =
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW = NO
-
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH = 250
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE = 10
-
-# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
-# there is already a search function so this one should typically
-# be disabled.
-
-SEARCHENGINE = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
-
-CLASS_DIAGRAMS = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = NO
-
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
-
-DOT_FONTNAME = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
-
-DOT_FONTPATH =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS = YES
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP = YES
diff --git a/src/3rdparty/libgq/gconf/GConfItem b/src/3rdparty/libgq/gconf/GConfItem
deleted file mode 100644
index 0a5867141d..0000000000
--- a/src/3rdparty/libgq/gconf/GConfItem
+++ /dev/null
@@ -1 +0,0 @@
-#include "gconfitem.h"
diff --git a/src/3rdparty/libgq/gconf/Makefile.am b/src/3rdparty/libgq/gconf/Makefile.am
deleted file mode 100644
index 353970d452..0000000000
--- a/src/3rdparty/libgq/gconf/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-AM_CXXFLAGS = $(QT_CFLAGS) $(GLIB_CFLAGS) $(GCONF_CFLAGS)
-LIBS += $(QT_LIBS) $(GLIB_LIBS) $(GCONF_LIBS)
-
-lib_LTLIBRARIES = libgq-gconf.la
-
-libgq_gconf_la_SOURCES = GConfItem \
- gconfitem.h \
- gconfitem.cpp \
- gconfitem_moc.cpp
-
-gqincludedir=$(includedir)/gq
-gqinclude_HEADERS = gconfitem.h GConfItem
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gq-gconf.pc
-
-# Tests
-
-check_PROGRAMS = test-gconf
-
-test_gconf_SOURCES = test-gconf.h test-gconf.cpp test-gconf_moc.cpp
-test_gconf_CFLAGS = $(QTEST_CFLAGS)
-test_gconf_LDADD = libgq-gconf.la $(QTEST_LIBS)
-
-TESTS = run-test-gconf
-
-EXTRA_DIST = run-test-gconf
-
-# Moccing
-
-%_moc.cpp: %.h
- $(MOC) -o "$@" "$<"
-
-clean-moc:
- rm -f *_moc.cpp *_moc.lo
-
-clean-local: clean-moc
diff --git a/src/3rdparty/libgq/gconf/gconfitem.cpp b/src/3rdparty/libgq/gconf/gconfitem.cpp
deleted file mode 100644
index d8c565a7c9..0000000000
--- a/src/3rdparty/libgq/gconf/gconfitem.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-/* * This file is part of libgq *
- *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: Marius Vollmer <marius.vollmer@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#include <QString>
-#include <QStringList>
-#include <QByteArray>
-#include <QVariant>
-#include <QtDebug>
-
-#include "gconfitem.h"
-
-#include <glib.h>
-#include <gconf/gconf-value.h>
-#include <gconf/gconf-client.h>
-
-struct GConfItemPrivate {
- QString key;
- QVariant value;
- guint notify_id;
-
- static void notify_trampoline(GConfClient*, guint, GConfEntry *, gpointer);
-};
-
-/* We get the default client and never release it, on purpose, to
- avoid disconnecting from the GConf daemon when a program happens to
- not have any GConfItems for short periods of time.
- */
-static GConfClient *
-get_gconf_client ()
-{
- static bool initialized = false;
- static GConfClient *client;
-
- if (initialized)
- return client;
-
- g_type_init ();
- client = gconf_client_get_default();
- initialized = true;
-
- return client;
-}
-
-/* Sometimes I like being too clever...
- */
-#define withClient(c) for (GConfClient *c = get_gconf_client (); c; c = NULL)
-
-static QByteArray convertKey (QString key)
-{
- if (key.startsWith('/'))
- return key.toUtf8();
- else
- {
- qWarning() << "Using dot-separated key names with GConfItem is deprecated.";
- qWarning() << "Please use" << '/' + key.replace('.', '/') << "instead of" << key;
- return '/' + key.replace('.', '/').toUtf8();
- }
-}
-
-static QString convertKey(const char *key)
-{
- return QString::fromUtf8(key);
-}
-
-static QVariant convertValue(GConfValue *src)
-{
- if (!src) {
- return QVariant();
- } else {
- switch (src->type) {
- case GCONF_VALUE_INVALID:
- return QVariant(QVariant::Invalid);
- case GCONF_VALUE_BOOL:
- return QVariant((bool)gconf_value_get_bool(src));
- case GCONF_VALUE_INT:
- return QVariant(gconf_value_get_int(src));
- case GCONF_VALUE_FLOAT:
- return QVariant(gconf_value_get_float(src));
- case GCONF_VALUE_STRING:
- return QVariant(QString::fromUtf8(gconf_value_get_string(src)));
- case GCONF_VALUE_LIST:
- switch (gconf_value_get_list_type(src)) {
- case GCONF_VALUE_STRING:
- {
- QStringList result;
- for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next)
- result.append(QString::fromUtf8(gconf_value_get_string((GConfValue *)elts->data)));
- return QVariant(result);
- }
- default:
- {
- QList<QVariant> result;
- for (GSList *elts = gconf_value_get_list(src); elts; elts = elts->next)
- result.append(convertValue((GConfValue *)elts->data));
- return QVariant(result);
- }
- }
- case GCONF_VALUE_SCHEMA:
- default:
- return QVariant();
- }
- }
-}
-
-static GConfValue *convertString(const QString &str)
-{
- GConfValue *v = gconf_value_new (GCONF_VALUE_STRING);
- gconf_value_set_string (v, str.toUtf8().data());
- return v;
-}
-
-static GConfValueType primitiveType (const QVariant &elt)
-{
- switch(elt.type()) {
- case QVariant::String:
- return GCONF_VALUE_STRING;
- case QVariant::Int:
- return GCONF_VALUE_INT;
- case QVariant::Double:
- return GCONF_VALUE_FLOAT;
- case QVariant::Bool:
- return GCONF_VALUE_BOOL;
- default:
- return GCONF_VALUE_INVALID;
- }
-}
-
-static GConfValueType uniformType(const QList<QVariant> &list)
-{
- GConfValueType result = GCONF_VALUE_INVALID;
-
- foreach (const QVariant &elt, list) {
- GConfValueType elt_type = primitiveType (elt);
-
- if (elt_type == GCONF_VALUE_INVALID)
- return GCONF_VALUE_INVALID;
-
- if (result == GCONF_VALUE_INVALID)
- result = elt_type;
- else if (result != elt_type)
- return GCONF_VALUE_INVALID;
- }
-
- if (result == GCONF_VALUE_INVALID)
- return GCONF_VALUE_STRING; // empty list.
- else
- return result;
-}
-
-static int convertValue(const QVariant &src, GConfValue **valp)
-{
- GConfValue *v;
-
- switch(src.type()) {
- case QVariant::Invalid:
- v = NULL;
- break;
- case QVariant::Bool:
- v = gconf_value_new (GCONF_VALUE_BOOL);
- gconf_value_set_bool (v, src.toBool());
- break;
- case QVariant::Int:
- v = gconf_value_new (GCONF_VALUE_INT);
- gconf_value_set_int (v, src.toInt());
- break;
- case QVariant::Double:
- v = gconf_value_new (GCONF_VALUE_FLOAT);
- gconf_value_set_float (v, src.toDouble());
- break;
- case QVariant::String:
- v = convertString(src.toString());
- break;
- case QVariant::StringList:
- {
- GSList *elts = NULL;
- v = gconf_value_new(GCONF_VALUE_LIST);
- gconf_value_set_list_type(v, GCONF_VALUE_STRING);
- foreach (const QString &str, src.toStringList())
- elts = g_slist_prepend(elts, convertString(str));
- gconf_value_set_list_nocopy(v, g_slist_reverse(elts));
- break;
- }
- case QVariant::List:
- {
- GConfValueType elt_type = uniformType(src.toList());
- if (elt_type == GCONF_VALUE_INVALID)
- v = NULL;
- else
- {
- GSList *elts = NULL;
- v = gconf_value_new(GCONF_VALUE_LIST);
- gconf_value_set_list_type(v, elt_type);
- foreach (const QVariant &elt, src.toList())
- {
- GConfValue *val = NULL;
- convertValue(elt, &val); // guaranteed to succeed.
- elts = g_slist_prepend(elts, val);
- }
- gconf_value_set_list_nocopy(v, g_slist_reverse(elts));
- }
- break;
- }
- default:
- return 0;
- }
-
- *valp = v;
- return 1;
-}
-
-void GConfItemPrivate::notify_trampoline (GConfClient*,
- guint,
- GConfEntry *,
- gpointer data)
-{
- GConfItem *item = (GConfItem *)data;
- item->update_value (true);
-}
-
-void GConfItem::update_value (bool emit_signal)
-{
- QVariant new_value;
-
- withClient(client) {
- GError *error = NULL;
- QByteArray k = convertKey(priv->key);
- GConfValue *v = gconf_client_get(client, k.data(), &error);
-
- if (error) {
- qWarning() << error->message;
- g_error_free (error);
- new_value = priv->value;
- } else {
- new_value = convertValue(v);
- if (v)
- gconf_value_free(v);
- }
- }
-
- if (new_value != priv->value) {
- priv->value = new_value;
- if (emit_signal)
- emit valueChanged();
- }
-}
-
-QString GConfItem::key() const
-{
- return priv->key;
-}
-
-QVariant GConfItem::value() const
-{
- return priv->value;
-}
-
-QVariant GConfItem::value(const QVariant &def) const
-{
- if (priv->value.isNull())
- return def;
- else
- return priv->value;
-}
-
-void GConfItem::set(const QVariant &val)
-{
- withClient(client) {
- QByteArray k = convertKey(priv->key);
- GConfValue *v;
- if (convertValue(val, &v)) {
- GError *error = NULL;
-
- if (v) {
- gconf_client_set(client, k.data(), v, &error);
- gconf_value_free(v);
- } else {
- gconf_client_unset(client, k.data(), &error);
- }
-
- if (error) {
- qWarning() << error->message;
- g_error_free(error);
- } else if (priv->value != val) {
- priv->value = val;
- emit valueChanged();
- }
-
- } else
- qWarning() << "Can't store a" << val.typeName();
- }
-}
-
-void GConfItem::unset() {
- set(QVariant());
-}
-
-QList<QString> GConfItem::listDirs() const
-{
- QList<QString> children;
-
- withClient(client) {
- QByteArray k = convertKey(priv->key);
- GSList *dirs = gconf_client_all_dirs(client, k.data(), NULL);
- for (GSList *d = dirs; d; d = d->next) {
- children.append(convertKey((char *)d->data));
- g_free (d->data);
- }
- g_slist_free (dirs);
- }
-
- return children;
-}
-
-QList<QString> GConfItem::listEntries() const
-{
- QList<QString> children;
-
- withClient(client) {
- QByteArray k = convertKey(priv->key);
- GSList *entries = gconf_client_all_entries(client, k.data(), NULL);
- for (GSList *e = entries; e; e = e->next) {
- children.append(convertKey(((GConfEntry *)e->data)->key));
- gconf_entry_free ((GConfEntry *)e->data);
- }
- g_slist_free (entries);
- }
-
- return children;
-}
-
-GConfItem::GConfItem(const QString &key, QObject *parent)
- : QObject (parent)
-{
- priv = new GConfItemPrivate;
- priv->key = key;
- priv->notify_id = 0;
- withClient(client) {
- update_value (false);
- QByteArray k = convertKey(priv->key);
- gconf_client_add_dir (client, k.data(), GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
- priv->notify_id = gconf_client_notify_add (client, k.data(),
- GConfItemPrivate::notify_trampoline, this,
- NULL, NULL);
- }
-}
-
-GConfItem::~GConfItem()
-{
- withClient(client) {
- QByteArray k = convertKey(priv->key);
- if (priv->notify_id)
- gconf_client_notify_remove (client, priv->notify_id);
- gconf_client_remove_dir (client, k.data(), NULL);
- }
- delete priv;
-}
diff --git a/src/3rdparty/libgq/gconf/gconfitem.h b/src/3rdparty/libgq/gconf/gconfitem.h
deleted file mode 100644
index 17ca04e74a..0000000000
--- a/src/3rdparty/libgq/gconf/gconfitem.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* * This file is part of libgq *
- *
- * Copyright (C) 2009 Nokia Corporation.
- *
- * Contact: Marius Vollmer <marius.vollmer@nokia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef GCONFITEM_H
-#define GCONFITEM_H
-
-#include <QVariant>
-#include <QStringList>
-#include <QObject>
-
-/*!
-
- \brief GConfItem is a simple C++ wrapper for GConf.
-
- Creating a GConfItem instance gives you access to a single GConf
- key. You can get and set its value, and connect to its
- valueChanged() signal to be notified about changes.
-
- The value of a GConf key is returned to you as a QVariant, and you
- pass in a QVariant when setting the value. GConfItem converts
- between a QVariant and GConf values as needed, and according to the
- following rules:
-
- - A QVariant of type QVariant::Invalid denotes an unset GConf key.
-
- - QVariant::Int, QVariant::Double, QVariant::Bool are converted to
- and from the obvious equivalents.
-
- - QVariant::String is converted to/from a GConf string and always
- uses the UTF-8 encoding. No other encoding is supported.
-
- - QVariant::StringList is converted to a list of UTF-8 strings.
-
- - QVariant::List (which denotes a QList<QVariant>) is converted
- to/from a GConf list. All elements of such a list must have the
- same type, and that type must be one of QVariant::Int,
- QVariant::Double, QVariant::Bool, or QVariant::String. (A list of
- strings is returned as a QVariant::StringList, however, when you
- get it back.)
-
- - Any other QVariant or GConf value is essentially ignored.
-
- \warning GConfItem is as thread-safe as GConf.
-
-*/
-
-class GConfItem : public QObject
-{
- Q_OBJECT
-
- public:
- /*! Initializes a GConfItem to access the GConf key denoted by
- \a key. Key names should follow the normal GConf conventions
- like "/myapp/settings/first".
-
- \param key The name of the key.
- \param parent Parent object
- */
- explicit GConfItem(const QString &key, QObject *parent = 0);
-
- /*! Finalizes a GConfItem.
- */
- virtual ~GConfItem();
-
- /*! Returns the key of this item, as given to the constructor.
- */
- QString key() const;
-
- /*! Returns the current value of this item, as a QVariant.
- */
- QVariant value() const;
-
- /*! Returns the current value of this item, as a QVariant. If
- * there is no value for this item, return \a def instead.
- */
- QVariant value(const QVariant &def) const;
-
- /*! Set the value of this item to \a val. If \a val can not be
- represented in GConf or GConf refuses to accept it for other
- reasons, the current value is not changed and nothing happens.
-
- When the new value is different from the old value, the
- changedValue() signal is emitted on this GConfItem as part
- of calling set(), but other GConfItem:s for the same key do
- only receive a notification once the main loop runs.
-
- \param val The new value.
- */
- void set(const QVariant &val);
-
- /*! Unset this item. This is equivalent to
-
- \code
- item.set(QVariant(QVariant::Invalid));
- \endcode
- */
- void unset();
-
- /*! Return a list of the directories below this item. The
- returned strings are absolute key names like
- "/myapp/settings".
-
- A directory is a key that has children. The same key might
- also have a value, but that is confusing and best avoided.
- */
- QList<QString> listDirs() const;
-
- /*! Return a list of entries below this item. The returned
- strings are absolute key names like "/myapp/settings/first".
-
- A entry is a key that has a value. The same key might also
- have children, but that is confusing and is best avoided.
- */
- QList<QString> listEntries() const;
-
- signals:
- /*! Emitted when the value of this item has changed.
- */
- void valueChanged();
-
- private:
- friend struct GConfItemPrivate;
- struct GConfItemPrivate *priv;
-
- void update_value(bool emit_signal);
-};
-
-#endif // GCONFITEM_H
diff --git a/src/3rdparty/libgq/gconf/gq-gconf.pc.in b/src/3rdparty/libgq/gconf/gq-gconf.pc.in
deleted file mode 100644
index bd76d65423..0000000000
--- a/src/3rdparty/libgq/gconf/gq-gconf.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: gq-gconf
-Description: Qt/GConf wrapper
-Version: @VERSION@
-Requires: QtCore
-Libs: -L${libdir} -lgq-gconf
-Cflags: -I${includedir}/gq
diff --git a/src/3rdparty/libgq/gconf/run-test-gconf b/src/3rdparty/libgq/gconf/run-test-gconf
deleted file mode 100755
index 67f90907c0..0000000000
--- a/src/3rdparty/libgq/gconf/run-test-gconf
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# please make sure that the en_US.UTF-8 locale is available!
-# - apt-get install locales
-# - make sure /etc/locale.gen contains the line "en_US.UTF-8 UTF-8"
-# - run /usr/sbin/locale-gen
-LC_ALL=en_US.UTF-8
-export LC_ALL
-
-gconftool-2 -s -t bool /Test/Bool true
-VALUE=$(gconftool-2 -g /Test/Bool)
-if [ "$VALUE" != "true" ]; then
- echo "GConf is not running, skipping all tests"
- exit 77
-fi
-
-# Setup values expected by the external_values() test.
-
-gconftool-2 -s -t int /Test/Int 123
-gconftool-2 -s -t string /Test/String "Hello GConf"
-gconftool-2 -s -t float /Test/Double 3.5
-gconftool-2 -s -t list --list-type string /Test/StringList "[Hello,GConf,ÄÖÜ]"
-gconftool-2 -s -t list --list-type int /Test/IntList "[1,2,3,4]"
-gconftool-2 -s -t list --list-type float /Test/DoubleList "[3.5,3.5,3.5]"
-gconftool-2 -s -t list --list-type bool /Test/BoolList "[false,true,true,false]"
-gconftool-2 -u /Test/UnsetBefore
-gconftool-2 -s -t int /Test/UnsetAfter 100
-gconftool-2 -s -t int /Test/Dir/Entry 200
-
-./test-gconf $* || exit 1
-
-# Check what set_external() has left behind.
-
-compare() {
- if [ "$1" != "$2" ]; then
- echo "FAIL: '$1' != '$2'"
- exit 1
- fi
-}
-
-compare "`gconftool-2 -g /Test/Bool`" false
-compare "`gconftool-2 -g /Test/Int`" 54321
-compare "`gconftool-2 -g /Test/String`" "Good bye GConf"
-compare "`gconftool-2 -g /Test/Double`" -2.5
-compare "`gconftool-2 -g /Test/StringList`" "[Good,bye,GConf,äöü]"
-compare "`gconftool-2 -g /Test/IntList`" "[5,4,3,2,1]"
-compare "`gconftool-2 -g /Test/DoubleList`" "[-2.5,-2.5]"
-compare "`gconftool-2 -g /Test/BoolList`" "[false,false,true,true]"
-compare "`gconftool-2 -g /Test/UnsetAfter 2>&1`" 'No value set for `/Test/UnsetAfter'"'"
diff --git a/src/3rdparty/libgq/gconf/test-gconf.cpp b/src/3rdparty/libgq/gconf/test-gconf.cpp
deleted file mode 100644
index 52eb28171a..0000000000
--- a/src/3rdparty/libgq/gconf/test-gconf.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-#include "test-gconf.h"
-
-#define MYLOGLEVEL 2
-void myMessageOutput(QtMsgType type, const char *msg)
-{
- switch (type) {
- case QtDebugMsg:
- if (MYLOGLEVEL <= 0)
- fprintf(stderr, "Debug: %s\n", msg);
- break;
- case QtWarningMsg:
- if (MYLOGLEVEL <= 1)
- fprintf(stderr, "Warning: %s\n", msg);
- break;
- case QtCriticalMsg:
- if (MYLOGLEVEL <= 2)
- fprintf(stderr, "Critical: %s\n", msg);
- break;
- case QtFatalMsg:
- if (MYLOGLEVEL <= 3)
- fprintf(stderr, "Fatal: %s\n", msg);
- abort();
- }
-}
-
-//
-// Definition of testcases: Normal tests
-//
-
-void GConfItemTests::timeout()
-{
- timed_out = true;
- timer.stop();
-}
-
-// Before all tests
-void GConfItemTests::initTestCase()
-{
- connect(&timer, SIGNAL(timeout()),
- this, SLOT(timeout()));
-}
-
-// After all tests
-void GConfItemTests::cleanupTestCase()
-{
-}
-
-// Before each test
-void GConfItemTests::init()
-{
- boolItem = new GConfItem("/Test/Bool");
- intItem = new GConfItem("/Test/Int");
- stringItem = new GConfItem("/Test/String");
- doubleItem = new GConfItem("/Test/Double");
- stringListItem = new GConfItem("/Test/StringList");
- intListItem = new GConfItem("/Test/IntList");
- doubleListItem = new GConfItem("/Test/DoubleList");
- boolListItem = new GConfItem("/Test/BoolList");
- unsetBeforeItem = new GConfItem("/Test/UnsetBefore");
- unsetAfterItem = new GConfItem("/Test/UnsetAfter");
- signalSpy = new SignalListener();
- QObject::connect(boolItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::connect(intItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::connect(stringItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::connect(doubleItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::connect(stringListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::connect(intListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::connect(doubleListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::connect(boolListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
-}
-
-// After each test
-void GConfItemTests::cleanup()
-{
- QObject::disconnect(boolItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::disconnect(intItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::disconnect(stringItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::disconnect(doubleItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::disconnect(stringListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::disconnect(intListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::disconnect(doubleListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- QObject::disconnect(boolListItem, SIGNAL(valueChanged()), signalSpy, SLOT(valueChanged()));
- delete signalSpy;
- delete boolItem;
- delete intItem;
- delete stringItem;
- delete doubleItem;
- delete stringListItem;
- delete intListItem;
- delete doubleListItem;
- delete boolListItem;
- delete unsetBeforeItem;
- delete unsetAfterItem;
-
- timer.stop();
-}
-
-void GConfItemTests::path()
-{
- QCOMPARE(boolItem->key(), QString("/Test/Bool"));
- QCOMPARE(intItem->key(), QString("/Test/Int"));
- QCOMPARE(stringItem->key(), QString("/Test/String"));
- QCOMPARE(doubleItem->key(), QString("/Test/Double"));
- QCOMPARE(stringListItem->key(), QString("/Test/StringList"));
- QCOMPARE(intListItem->key(), QString("/Test/IntList"));
- QCOMPARE(doubleListItem->key(), QString("/Test/DoubleList"));
- QCOMPARE(boolListItem->key(), QString("/Test/BoolList"));
- QCOMPARE(unsetBeforeItem->key(), QString("/Test/UnsetBefore"));
- QCOMPARE(unsetAfterItem->key(), QString("/Test/UnsetAfter"));
-}
-
-void GConfItemTests::external_values()
-{
- // These values are set before this program starts.
- QCOMPARE(boolItem->value().toBool(), true);
- QCOMPARE(intItem->value().toInt(), 123);
- QCOMPARE(stringItem->value().toString(), QString("Hello GConf"));
- QCOMPARE(doubleItem->value().toDouble(), 3.5);
- QCOMPARE(stringListItem->value().toStringList(), QStringList() << "Hello" << "GConf" << QString::fromUtf8("ÄÖÜ"));
- QCOMPARE(intListItem->value().toList(), QList<QVariant>() << 1 << 2 << 3 << 4);
- QCOMPARE(doubleListItem->value().toList(), QList<QVariant>() << 3.5 << 3.5 << 3.5);
- QCOMPARE(boolListItem->value().toList(), QList<QVariant>() << false << true << true << false);
- QCOMPARE(unsetBeforeItem->value().isValid(), false);
- QCOMPARE(unsetAfterItem->value().isValid(), true);
-}
-
-void GConfItemTests::set_bool()
-{
- signalSpy->numberOfCalls = 0;
-
- boolItem->set(false);
- QCOMPARE(boolItem->value().toBool(), false);
- boolItem->set(true);
- QCOMPARE(boolItem->value().toBool(), true);
-
- QCOMPARE(signalSpy->numberOfCalls, 2);
-}
-
-void GConfItemTests::set_int()
-{
- signalSpy->numberOfCalls = 0;
-
- intItem->set(12);
- QCOMPARE(intItem->value().toInt(), 12);
- intItem->set(-5);
- QCOMPARE(intItem->value().toInt(), -5);
-
- QCOMPARE(signalSpy->numberOfCalls, 2);
-}
-
-void GConfItemTests::set_string()
-{
- signalSpy->numberOfCalls = 0;
-
- stringItem->set("Hi");
- QCOMPARE(stringItem->value().toString(), QString("Hi"));
-
- QCOMPARE(signalSpy->numberOfCalls, 1);
-}
-
-void GConfItemTests::set_unicode_string()
-{
- signalSpy->numberOfCalls = 0;
-
- stringItem->set(QString::fromUtf8("Höäü"));
- QCOMPARE(stringItem->value().toString(), QString::fromUtf8("Höäü"));
-
- QCOMPARE(signalSpy->numberOfCalls, 1);
-}
-
-void GConfItemTests::set_double()
-{
- signalSpy->numberOfCalls = 0;
-
- doubleItem->set(1.2345);
- QCOMPARE(doubleItem->value().toDouble(), 1.2345);
-
- QCOMPARE(signalSpy->numberOfCalls, 1);
-}
-
-void GConfItemTests::set_string_list()
-{
- signalSpy->numberOfCalls = 0;
-
- stringListItem->set(QStringList() << "one" << "two" << "three");
- QCOMPARE(stringListItem->value().toStringList(), QStringList() << "one" << "two" << "three");
-
- QCOMPARE(signalSpy->numberOfCalls, 1);
-}
-
-void GConfItemTests::set_int_list()
-{
- signalSpy->numberOfCalls = 0;
-
- intListItem->set(QList<QVariant>() << 10 << 11 << 12);
- QCOMPARE(intListItem->value().toList(), QList<QVariant>() << 10 << 11 << 12);
-
- QCOMPARE(signalSpy->numberOfCalls, 1);
-}
-
-void GConfItemTests::set_double_list()
-{
- signalSpy->numberOfCalls = 0;
-
- doubleListItem->set(QList<QVariant>() << 1.1 << 2.2 << 3.3);
- QCOMPARE(doubleListItem->value().toList(), QList<QVariant>() << 1.1 << 2.2 << 3.3);
-
- QCOMPARE(signalSpy->numberOfCalls, 1);
-}
-
-void GConfItemTests::set_bool_list()
-{
- signalSpy->numberOfCalls = 0;
-
- boolListItem->set(QList<QVariant>() << true << true << false);
- QCOMPARE(boolListItem->value().toList(), QList<QVariant>() << true << true << false);
-
- QCOMPARE(signalSpy->numberOfCalls, 1);
-}
-
-void GConfItemTests::unset ()
-{
- signalSpy->numberOfCalls = 0;
-
- boolItem->unset();
- QCOMPARE(boolItem->value().isValid(), false);
-
- QCOMPARE(signalSpy->numberOfCalls, 1);
-}
-
-void GConfItemTests::list_dirs ()
-{
- GConfItem test("/Test");
- QStringList dirs = test.listDirs();
-
- QVERIFY (!dirs.contains("/Test/Bool"));
- QVERIFY (!dirs.contains("/Test/Int"));
- QVERIFY (!dirs.contains("/Test/String"));
- QVERIFY (!dirs.contains("/Test/Double"));
- QVERIFY (!dirs.contains("/Test/StringList"));
- QVERIFY (!dirs.contains("/Test/IntList"));
- QVERIFY (!dirs.contains("/Test/DoubleList"));
- QVERIFY (!dirs.contains("/Test/BoolList"));
- QVERIFY (!dirs.contains("/Test/UnsetBefore"));
- QVERIFY (!dirs.contains("/Test/UnsetAfter"));
- QVERIFY (dirs.contains("/Test/Dir"));
-}
-
-void GConfItemTests::list_entries ()
-{
- GConfItem test("/Test");
- QStringList entries = test.listEntries();
-
- QVERIFY (!entries.contains("/Test/Bool")); // has been unset above
- QVERIFY (entries.contains("/Test/Int"));
- QVERIFY (entries.contains("/Test/String"));
- QVERIFY (entries.contains("/Test/Double"));
- QVERIFY (entries.contains("/Test/StringList"));
- QVERIFY (entries.contains("/Test/IntList"));
- QVERIFY (entries.contains("/Test/DoubleList"));
- QVERIFY (entries.contains("/Test/BoolList"));
- QVERIFY (!entries.contains("/Test/UnsetBefore"));
- QVERIFY (entries.contains("/Test/UnsetAfter"));
- QVERIFY (!entries.contains("/Test/Dir"));
-}
-
-void GConfItemTests::get_default ()
-{
- intItem->unset();
- QCOMPARE(intItem->value(123).toInt(), 123);
- intItem->set(234);
- QCOMPARE(intItem->value(123).toInt(), 234);
-}
-
-void GConfItemTests::propagate ()
-{
- GConfItem secondIntItem("/Test/Int");
- secondIntItem.set(3000);
- QVERIFY_TIMEOUT(2000, intItem->value() == secondIntItem.value());
- QCOMPARE(signalSpy->numberOfCalls, 2);
-}
-
-void GConfItemTests::set_external()
-{
- // This must be the last test case. The values that are set here
- // are checked after this program exits.
-
- boolItem->set(false);
- intItem->set(54321);
- stringItem->set("Good bye GConf");
- doubleItem->set(-2.5);
- stringListItem->set(QStringList() << "Good" << "bye" << "GConf" << QString::fromUtf8("äöü"));
- intListItem->set(QList<QVariant>() << 5 << 4 << 3 << 2 << 1);
- doubleListItem->set(QList<QVariant>() << -2.5 << -2.5);
- boolListItem->set(QList<QVariant>() << false << false << true << true);
- unsetAfterItem->set(QVariant());
-}
-
-QTEST_MAIN(GConfItemTests);
diff --git a/src/3rdparty/libgq/gconf/test-gconf.h b/src/3rdparty/libgq/gconf/test-gconf.h
deleted file mode 100644
index 36eaeccca4..0000000000
--- a/src/3rdparty/libgq/gconf/test-gconf.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <QObject>
-#include <QtTest/QtTest>
-#include <QDebug>
-
-#include "GConfItem"
-
-// Helper class for listening to signals
-class SignalListener : public QObject
-{
- Q_OBJECT
-public:
- int numberOfCalls;
- SignalListener() : numberOfCalls(0) {
- }
-
-public slots:
- void valueChanged()
- {
- numberOfCalls++;
- }
-};
-
-// Tests for the public API
-class GConfItemTests : public QObject
-{
- Q_OBJECT
-
- // Stored pointers etc.
-private:
- GConfItem *boolItem;
- GConfItem *intItem;
- GConfItem *stringItem;
- GConfItem *doubleItem;
- GConfItem *stringListItem;
- GConfItem *intListItem;
- GConfItem *doubleListItem;
- GConfItem *boolListItem;
- GConfItem *unsetBeforeItem;
- GConfItem *unsetAfterItem;
-
- SignalListener *signalSpy;
-
- QTimer timer;
- bool timed_out;
-
- // Tests
-private slots:
- // Init and cleanup helper functions
- void initTestCase();
- void cleanupTestCase();
- void init();
- void cleanup();
- void timeout ();
-
- // Public API
- void path();
- void external_values();
- void set_bool();
- void set_int();
- void set_string();
- void set_unicode_string();
- void set_double();
- void set_string_list();
- void set_int_list();
- void set_double_list();
- void set_bool_list();
- void unset();
- void get_default();
- void list_dirs();
- void list_entries();
- void propagate();
- void set_external();
-};
-
-// Useful if you need to process some events until a condition becomes
-// true.
-
-#define QVERIFY_TIMEOUT(msecs, expr) \
- do { \
- timed_out = false; \
- timer.start(msecs); \
- while (!timed_out && !(expr)) { \
- QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents); \
- } \
- QVERIFY((expr)); \
- } while(0)
diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri
index 63f2aca5dc..5896a53942 100644
--- a/src/3rdparty/libjpeg.pri
+++ b/src/3rdparty/libjpeg.pri
@@ -5,10 +5,7 @@ wince*: {
}
#Disable warnings in 3rdparty code due to unused arguments
-symbian: {
- QMAKE_CXXFLAGS.CW += -W nounusedarg
- TARGET.UID3=0x2001E61B
-} else:contains(QMAKE_CC, gcc): {
+contains(QMAKE_CC, gcc): {
QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main
}
diff --git a/src/3rdparty/libmng.pri b/src/3rdparty/libmng.pri
deleted file mode 100644
index 7b682100ee..0000000000
--- a/src/3rdparty/libmng.pri
+++ /dev/null
@@ -1,25 +0,0 @@
-DEFINES += MNG_BUILD_SO
-DEFINES += MNG_NO_INCLUDE_JNG
-INCLUDEPATH += $$PWD/libmng
-SOURCES += \
- $$PWD/libmng/libmng_callback_xs.c \
- $$PWD/libmng/libmng_chunk_io.c \
- $$PWD/libmng/libmng_chunk_descr.c \
- $$PWD/libmng/libmng_chunk_prc.c \
- $$PWD/libmng/libmng_chunk_xs.c \
- $$PWD/libmng/libmng_cms.c \
- $$PWD/libmng/libmng_display.c \
- $$PWD/libmng/libmng_dither.c \
- $$PWD/libmng/libmng_error.c \
- $$PWD/libmng/libmng_filter.c \
- $$PWD/libmng/libmng_hlapi.c \
- $$PWD/libmng/libmng_jpeg.c \
- $$PWD/libmng/libmng_object_prc.c \
- $$PWD/libmng/libmng_pixels.c \
- $$PWD/libmng/libmng_prop_xs.c \
- $$PWD/libmng/libmng_read.c \
- $$PWD/libmng/libmng_trace.c \
- $$PWD/libmng/libmng_write.c \
- $$PWD/libmng/libmng_zlib.c
-
-include($$PWD/zlib_dependency.pri)
diff --git a/src/3rdparty/libmng/CHANGES b/src/3rdparty/libmng/CHANGES
deleted file mode 100644
index eeacf33246..0000000000
--- a/src/3rdparty/libmng/CHANGES
+++ /dev/null
@@ -1,1447 +0,0 @@
------------------------------------------------------------
-
-1.0.10 (Jul 13th 2007)
-----------------------
-
-in short:
-
-intermediate CVS
-
--------------------
-
-bugfixes:
-
-core:
-- fixed some compiler-warnings
-- fixed display routines called twice for FULL_MNG support in mozlibmngconf.h
-- standard windows dll upgraded to zlib 1.2.3
-- fixed problem with CLON object during readdisplay() (thanks Winfried!)
-- added typecast to appease the compiler (G R-P)
-- added more SKIPCHUNK conditionals (G R-P)
-- added MORE MNG_NO_1_2_4BIT_SUPPORT (G R-P)
-- added provisional support for anIM(mpNG) proposal
-- added provisional support for ANG proposal
-
-samples:
-- xmngview upgraded to 0.6 (thanks Winfried!)
-
-contrib:
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.9 (jan 30th 2005)
----------------------
-
-in short:
-
-New optimizations save over 20KB on footprint.
-Also a few bugfixes and several patches.
-
-Thanks to those sending in their additions and for testing!
-
-To turn on the optimizations do:
-
-#DEFINE MNG_OPTIMIZE_CHUNKINITFREE
-#DEFINE MNG_OPTIMIZE_OBJCLEANUP
-#DEFINE MNG_OPTIMIZE_CHUNKASSIGN
-#DEFINE MNG_OPTIMIZE_CHUNKREADER
-
-(eg. they're not on by default (yet) !)
-
--------------------
-
-bugfixes:
-- fixed chunk pushing mechanism
-- fixed bug in writing sBIT for indexed color
-- fixed PPLT getchunk/putchunk routines
-- fixed MNG_NO_1_2_4BIT_SUPPORT for TBBN1G04.PNG
-- cleaned up macro-invocations (thanks to D. Airlie)
-
-core:
-- added more SKIPCHUNK conditionals
-- replaced MNG_TWEAK_LARGE_FILES with permanent solution
-- improved handling of cheap transparency when 16-bit support is disabled
-- added some MNG_SUPPORT_WRITE conditionals
-- added function to retrieve current FRAM delay
-- added MNG_NO_1_2_4BIT_SUPPORT
-- added bgr565_a8 canvas-style (thanks to J. Elvander)
-- standard windows dll upgraded to zlib 1.2.2
-- added LITTLEENDIAN/BIGENDIAN fixtures (thanks J.Stiles)
-- inclusion of zlib/lcms/ijgsrc6b with <> instead of ""
-- added conditional MNG_OPTIMIZE_CHUNKINITFREE
-- added conditional MNG_OPTIMIZE_OBJCLEANUP
-- added conditional MNG_OPTIMIZE_CHUNKASSIGN
-- added conditional MNG_OPTIMIZE_CHUNKREADER
-- fixed problem with global PLTE/tRNS
-
-samples:
-
-contrib:
-
-doc:
-- patched jng & mng manual pages (Thanks Peter Breitenlohner)
-
-makefiles:
-
-autoconf:
-- patched makefile.am & configure.in (Thanks Peter Breitenlohner)
-
------------------------------------------------------------
-
-1.0.8 (aug 5th 2004)
---------------------
-
-in short:
-
-added special data-pushing mechanisms and a few other tid-bits
-
--------------------
-
-bugfixes:
-- fixed problem with PAST usage where source > dest
-
-core:
-- added missing get-/put-chunk-jdaa
-- added CRC existence & checking flags
-- added data-push mechanisms for specialized decoders
-- some speed optimizations (thanks to John Stiles)
-- defend against using undefined closestream function
-- defend against using undefined openstream function
-- added check for extreme chunk-lengths
-- change worst-case iAlphadepth to 1 for standalone PNGs
-- added support for 3+byte pixelsize for JPEG's
-- added conditional to allow easier writing of large MNG's
-
-samples:
-
-contrib:
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.7 (March 21st 2004)
------------------------
-
-in short:
-
-A bunch of new canvas-styles, some bug-fixes, upgraded to latest zlib/lcms
-and yet more work to please the Mozilla crowd.
-Releasing beta's doesn't seem very responsive, and this one's hardly changed
-much anyway. I just wanted to bump to a regular version for Mozilla
-re-integration.
-
--------------------
-
-bugfixes:
-- fixed inclusion of IJNG chunk for non-JNG use (J.S)
-- fixed bug in chunk-storage of SHOW chunk (where from == to)
-- fixed bug in promote_g8_g8 with 16bit support off
-
-core:
-- added CANVAS_RGB565 and CANVAS_BGR565 (big thanx to Raphael Assenat!!)
-- added CANVAS_RGBA565 and CANVAS_BGRA565 ( -- ditto -- )
-- upgraded to zlib 1.2.1
-- upgraded to lcms 1.11
-- added premultiplied alpha canvas' for RGBA, ARGB, ABGR (thx to John Stiles)
-- more optimizations with 16bit support off
-- put conditionals around openstream/closestream callbacks.
-- fixed typo (MNG_SKIPCHUNK_SAVE -> MNG_SKIPCHUNK_nEED)
-- fixed some 64-bit platform compiler warnings
-
-samples:
-
-contrib:
-- fixed mngtree sample (Raphael)
-- added 5-6-5 canvas to SDL sample (Raphael)
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.6 (oct 19th 2003)
----------------------
-
-in short:
-
-Final release from beta1. No feedback is good feedback I presume,
-so here's 1.0.6-final!
-
-
--------------------
-
-bugfixes:
-
-core:
-
-samples:
-
-contrib:
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.6-beta1 (sep 14th 2003)
----------------------------
-
-in short:
-
-further footprint-reductions
-removing email-addresses
-
-1.0.6 (final) will be out shortly
-
--------------------
-
-bugfixes:
-
-core:
-- added support for reducing the footprint of libmng by macros that optionally
- skip unused chunks, remove 16-bit sample support, remove Delta support, and
- remove JNG support, to accomodate Mozilla/Firebird.
-- further optional removal of unused functions
-- added MNG_NO_SUPPORT_FUNCQUERY conditional
-- added iPNGdepth member to pData structure
-- added conditionals around MAGN chunk support
-- added conditionals around non-VLC chunk support
-- added conditionals around "mng_display_go*" and other unused functions
-- added more conditionals around "promote" functions
-- removed email references as appropriate
-
-samples:
-
-contrib:
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.6-alpha1 (aug 2nd 2003)
----------------------------
-
-in short:
-
-This is mostly in the light of footprint-reduction to please the Mozilla
-crew with a leaner and meaner libmng. See bug 18574 if you're interested:
-http://bugzilla.mozilla.org/show_bug.cgi?id=18574
-
--------------------
-
-bugfixes:
-- B719420 - fixed several MNG_APP_CMS problems
-
-core:
-- removed some compiler-warnings
-- hiding 12-bit JPEG stuff
-- fixed problem with infinite loops during readdisplay()
-- added size-optimiation COMPOSE routine usage
-- added conditionals around canvas update routines
-- added MNG_SKIPCHUNK_cHNK footprint optimizations
-- added conditionals around some JNG-supporting code
-- added conditionals around 16-bit supporting code
-- combined init functions into one function
-- replaced nested switches with simple init setup function
-- added conditionals zlib and jpeg property accessors
-- added size-optimization DIV255B8 routine usage
-- added conditionals around 8-bit magn routines
-- removed conditionals around 8-bit magn routines
-- added MNG_NO_16BIT_SUPPORT and MNG_NO_DELTA_PNG conditionals
-- reversed many loops to use decrementing counter
-- converted some switches to array references
-- removed some redundant checks for iRawlen==0
-- optionally use zlib's crc32 function instead of local mng_update_crc
-- bugfix empty "if" statement when 16-bit code is enabled
-- restored two misplaced #else/#endif blocks
-- added conditionals around "mng_display_go*" and other unused functions
-- added MNG_NO_LOOP_SIGNALS_SUPPORTED conditional
-- fixed duplicate for-loop
-- fixed invalid test in promote_imageobject
-- added conditionals around PAST chunk support
-- fixed "FOOTPRINT_COMPOSEIV" typo (now "FOOTPRINT_DIV")
-
-samples:
-
-contrib:
-- updated xmngview
-- added MSVC project for creating delta-MNGs: makemng (thanks Alex!)
-- added MSVC lib-file for use with the standard libmng.dll (again thanks Alex)
-
-doc:
-- updated readme.contrib
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.5 (mar 1st 2003)
---------------------
-
-in short:
-
-Only a small fix for progressive jpeg suspension problem.
-
-This is the long-awaited final release containing the new 'dynamic MNG' feature
-and bringing MNG compliance to near 100%!
-
--------------------
-
-bugfixes:
-- B683152 - libjpeg suspension not always honored correctly
-
-core:
-
-samples:
-
-contrib:
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.5-rc3 (jan 20th 2003)
--------------------------
-
-in short:
-
-Third release-candidate for the upcoming 1.0.5 version.
-
-Minor bug-fixes and finalizing the accepted proposal (by official vote) for
-the TERM/frame_delay changes on mng-list (nov-dec/2002).
-
--------------------
-
-bugfixes:
-- B654627 - fixed SEGV when no gettickcount callback (thanks Adam!)
-- B664383 - fixed typo (thanks Dimitri)
-- B664911 - fixed buffer overflow during init (thanks Alex!)
-
-core:
-- finalized changes in TERM/final_delay to elected proposal (positive vote)
-
-samples:
-
-contrib:
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.5-rc2 (dec 9th 2002)
-------------------------
-
-in short:
-
-Second release-candidate for the upcoming 1.0.5 version.
-This contains fixes for a few minor details reported by the loyal testers.
-It fixes some issues with the goframe/golayer/gotime processing and related
-stuff. And it adds a way to disable playback-caching from within the MNG,
-which is very useful for streaming-MNG encoders (such as gserver!).
-
--------------------
-
-bugfixes:
-
-core:
-- fixed layer- & frame-counting during read()
-- changed FRAMECOUNT/LAYERCOUNT/PLAYTIME error to warning
-- fixed goframe/golayer/gotime processing
-- added support for nEED "MNG 1.1"
-- added support for nEED "CACHEOFF"; turn playback caching off for streaming MNG
-- fixed magnification bug with object 0
-- added support to get totals for frames/layers/playtime after mng_read()
-- fixed some issues in init_app_cms()
-- fixed goxxxxx() support for zero values
-
-samples:
-
-contrib:
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.5-rc1 (nov 1st 2002)
-------------------------
-
-in short:
-
-First release-candidate for the upcoming 1.0.5 version.
-This fixes a few small problems and brings the TERM/MEND processing, with
-respect to interframe_delay as per the current discussion on MNG-list,
-up-to-date with the latest proposal.
-
--------------------
-
-bugfixes:
-
-core:
-- fixed initialization of pIds in dISC read routine (Thanks Winfried!)
-- fixed issue in freeing evNT chunk (Thanks Winfried!)
-- fixed clipping-problem with BACK tiling (Thanks Sakura!)
-- fixed processing for multiple objects in MAGN (Thanks Sakura!)
-- fixed display of visible target of PAST operation (Thanks Sakura!)
-- modified TERM/MEND processing for max(1, TERM_delay, interframe_delay)
-
-samples:
-
-contrib:
-- fixed typo in Makefile for gtk-mng-view sample
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.5-b3 (oct 15th 2002)
-------------------------
-
-in short:
-
-Fairly quick after beta2, since that introduced a couple of unfortunate
-booboo's and wasn't very workable. It also changes the standard configure
-script to build a standard shared object similar to what I intended.
-
--------------------
-
-bugfixes:
-
-core:
-- fixed support for condition=2 in TERM chunk
-- fixed trace-constants for PAST chunk
-- added mng_status_dynamic to supports function
-
-samples:
-
-contrib:
-
-doc:
-- small cosmetic changes in man/libmng.3
-
-makefiles:
-
-autoconf:
-- fixed configure.in to build a 'standard' SO primarily
-
------------------------------------------------------------
-
-1.0.5-b2 (oct 9th 2002)
-------------------------
-
-in short:
-
-Second beta for next 1.0.5 release. This addresses some minor problems
-detected during testing. It adds the proposed change to the MNG spec as
-discussed on the "mng-list" recently; eg. Adam's option 4.
-And it adds a little function to check at run-time if the lib is a beta or not.
-
--------------------
-
-bugfixes:
-
-core:
-- fixed chunk-storage for evNT chunk
-- fixed dropping mix of frozen/unfrozen objects
-- fixed problem with cloned objects marked as invalid
-- fixed problem cloning frozen object_buffers
-- fixed DISC support
-- added proposed change in handling of TERM- & interframe-delay
-- added another fix for misplaced TERM chunk
-- added check for TERM placement during create/write
-- completed support for condition=2 in TERM chunk
-- added beta version function & constant
-
-samples:
-
-contrib:
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.5-b1 (sep 24th 2002)
-------------------------
-
-in short:
-
-First beta of a large maintenance release. This completes support of the MNG
-specification to nearly 100% (PAST, PROM, delta-images, BACK image+tile).
-It adds "dynamic" MNG and a few other neat routines as well as fixes several
-bugs reported through SourceForge or to me directly.
-
--------------------
-
-bugfixes:
-- B575832 - library has wrong patch version number
-- B578572 - remove in 1.0.0!
-- B578940 - some functions not implemented
-- B581625 - large chunks fail with suspension reads
-- B597134 - libmng pollutes the linker namespace
-
-core:
-- added sanity check for improbable chunklengths
-- removed eMNGma hack (thanks Dimitri!)
-- unimplemented functions return an errorcode now
-- added test-option for PNG filter method 192 (= levelling)
-- added test-option for PNG filter method 193 (= no filtering)
- (both are conditional and only for testing purposes!!!)
-- completed PROM support
-- completed delta-image support
-- completed MAGN support (16-bit functions)
-- added HLAPI function to copy a chunk from a read MNG to a newly created MNG
-- added option for soft-handling of errors (only for repair software!!!)
-- fixed some routine inclusion/exclusion for undefined conditionals
-- pre-fixed all internal routines with mng_
-- added symbol MNG_LOCAL (= static) to really local functions
-- fixed reading of FRAM with just frame_mode and name
-- fixed read/write of MAGN chunk
-- added event handling for dynamic MNG
-- added 'supports' call to check function availability
-- fixed copyright notice in the headers of all libmng modules
-- fixed LOOP iteration=0 special case
-- re-compiled standard Windows dll with lcms-1.0.9
-- added warning for too much IDAT data
-- warnings are ignored by default now
-- misplaced TERM is now treated as warning
-- fixed color-correction for restore-background handling
-- optimized restore-background for bKGD cases
-- cleaned up some old stuff
-- completed support for BACK image & tiling
-- completed support for PAST
-- added bgrx8 canvas (filler byte)
-- fixed reset_object_detail to clear old buffer
-- added in-memory color-correction of abstract images
-- added compose over/under routines for PAST processing
-- added flip & tile routines for PAST processing
-
-samples:
-- Added new BCB sample for fixing invalid JASC Animation Shop files
- (shows new copy_chunks function; use of MNG_SOFTERRORS & static linking)
-
-contrib:
-- added xmngview by Winfried Szukalski (Vielen dank!)
-- Updated the Delphi mngview sample to handle dynamic MNGs
-- Added Kylix example (simplified port of the Delphi mngview sample)
-
-doc:
-- added diff to add MNG&JNG to a systems 'magic' file (Thanks Winfried)
-- fixed docs about using mng_display_resume after display_reset
- (should read to use mng_display!)
-
-makefiles:
-- added makefile to build a libmng.dll for MingW
- (makefile.mingwdll - thanks to Frank Richter!)
-
-autoconf:
-- fixing libtool version-number to be in line with what it should be
-
------------------------------------------------------------
-
-1.0.4 (Jun 23rd 2002)
----------------------
-
-in short:
-
-Just some small fixes
-Standard dll now compiled with zlib 1.1.4 and lcms 1.0.8
-
--------------------
-
-bugfixes:
-- B495442 - invalid returnvalue in mng_get_suspensionmode
-- B495443 - incorrect suspend check in read_databuffer
-- B526138 - returned IJGSRC6B calling convention to default for MSVC
-- B558212 - off by one error
-- B557677 - can't find lcms.h
-
-core:
-- fixed possible compile-problem in cleanup_rowproc
-- MNG subimage alpha composite wrong for rgba8 images
-
-samples:
-
-contrib:
-
-doc:
-
-makefiles:
-- fixed check for lcms.h in configure.in
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.3 (Sep 18th 2001)
----------------------
-
-in short:
-
-Small cosmetic changes. Cleaning up the contributions.
-New makefile for mingw32, and new fbcon example.
-Major thanks to Greg for helping out with the *nix stuff!
-Note that there's also a separate download for ASM programmers now.
-Check http://www.libmng.com for details (download/ports&packages page).
-
-It may be a while for the next release. I'm "off duty" for the next 8 or
-so months...
-
-Gerard
-
--------------------
-
-bugfixes:
-- B459058 - wrong include for lcms headers
-
-core:
-- changed inclusion of lcms.h header for Linux platforms (suggested by Greg)
-- added get function for last processed BACK chunk
-
-samples:
-- replaced the gtk & sdl viewer apps with updates by Greg Roelofs
-
-contrib:
-
-doc:
-
-makefiles:
-- changed makefile.linux & makefile.unix as suggested by Greg Roelofs
- (makefile.linux now compiles with lcms by default)
-- added makefile.mingw for mingw32 by Benoit Blanchon (thanks Mate!)
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.2 (Jul 7th 2001)
---------------------
-
-in short:
-
-Another maintenance release with a few added extra's.
-
--------------------
-
-bugfixes:
-- B421427 - writes wrong format in bKGD and tRNS
-- B434583 - compiler-warning if MNG_STORE_CHUNKS undefined
-
-core:
-- added optimization option for MNG-video playback
-- added processterm callback
-- added late binding errorcode (not used internally)
-- fixed memory-leak with delta-images (Thanks Michael!)
-- added option to turn off progressive refresh for large images
-
-samples:
-
-contrib:
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.1 (May 2nd 2001)
---------------------
-
-in short:
-
-Maintenance release.
-Fixed several memory-leaks with the help of Gregg Kelly, added/fixed some CMS
-handling, exported JPEG functions from standard DLL, and some other minor fixes.
-
-The CMS fix now makes libmng automagically work in MNG_FULL_CMS mode as a
-sRGB compliant system. YOU WILL NEED TO CHANGE THIS IF YOU ARE NOT ON AN sRGB
-COMPLIANT SYSTEM AND WANT TO USE CMS!!!!
-(look in libmng.h for the proper function-calls)
-
--------------------
-
-bugfixes:
-
-core:
-- added MEND processing callback
-- fixed first FRAM_MODE=4 timing problem
-- added handle status-copy function (use with care)
-- exported JPEG functions from standard DLL
-- added BGRA8 canvas with premultiplied alpha (contrib by Gregg Kelly)
-- fixed problem with display_reset/display_resume (Thanks Gregg!)
-- fixed several memory-leaks (Thanks Gregg!)
-- fixed reset_rundata to drop all objects (Thanks again, Gregg!)
-- fixed problem with cms profile being created multiple times when both
- iCCP & cHRM/gAMA are present (And again... Gregg)
-- moved mng_clear_cms to libmng_cms
-- added "default" sRGB generation (Thanks Marti!)
-
-samples:
-
-contrib:
-
-doc:
-
-makefiles:
-
-autoconf:
-
------------------------------------------------------------
-
-1.0.0 (Feb 6th 2001)
---------------------
-
-in short:
-
-First public release. Finally(!)
-
-This is the 0.9.5 CVS version, which will never be released, because I feel it
-is now ready for a public release. So apart from the version-numbers here and
-there, all other changes are listed under 0.9.5.
-
-This library will work with every MNG/JNG known and available to me. Note that
-there are still parts that need to be coded, and that MNG support is around
-90-95% (JNG at 100%). It is however compliant with the latest and greatest
-MNG 1.0 specification.
-
-I hope to dedicate a bit more time this year to finish up full support and fill
-in the remaining blanks. But this is coming out of my spare time. And extra
-help is always appreciated.
-
-Please enjoy!
-
-Gerard
-
------------------------------------------------------------
-
-0.9.5 (no release)
-------------------
-
-in short:
-
-intermediate CVS
-
--------------------
-
-bugfixes:
-B129681 - fixed compiler warnings SGI/Irix (thanks Dimitri)
-
-core:
-- fixed compiler-warnings Mozilla (thanks Tim)
-- fixed timing-problem with switching framing_modes
-- fixed some small compiler warnings (thanks Nikki)
-
-samples:
-
-contrib:
-- fixed library-paths for MSVC DLL project (thanks Chad)
-
-doc:
-
-makefiles:
-- added makefile for DJGPP (thanks Silvio)
-
-autoconf:
-
------------------------------------------------------------
-
-0.9.4 (Jan 19th 2001)
-----------------------
-
-in short:
-
-Now that the MNG spec is at 1.0, this should be the last beta. There's a few
-small changes to make it inline with the spec, and a couple of bug-fixes.
-This is a serious release-candidate for libmng-1.0!!
-Please... test test test test!!
-
--------------------
-
-bugfixes:
-B123314 - fixed number of TERM related problems
-B123322 - fixed unwanted repetition in mng_readdisplay()
-B123443 - fixed by Ralph
-B124910 - fixed definition for WIN32_LEAN_AND_MEAN (thanks Chad)
-B125750 - fixed by Ralph
-B125756 - fixed mixup of data- & function-pointers (thanks Dimitri)
-B127517 - changed inclusion of the lcms header file for non-windows platforms
-
-core:
-- version numbers
-- fixed possible loop in display_resume() (Thanks Vova!)
-- fixed unwanted repetition in mng_readdisplay()
-- changed inclusion of the lcms header file for non-windows platforms
-- changed IHDR filter_method check for PNGs
-- moved restore of object 0 to libmng_display
-- added restore of object 0 to TERM processing (B123314)
-- fixed TERM delay processing (B123314)
-- fixed TERM end processing when count = 0 (B123314)
-- changed callback convention for MSVC (Thanks Chad)
-- fixed mixup of data- & function-pointers (thanks Dimitri)
-- added support for "nEED MNG-1.0"
-- added errorcode for MAGN methods
-- added errorchecking for MAGN methods
-- removed "old" MAGN methods 3 & 4
-- added "new" MAGN methods 3, 4 & 5
-- removed test filter-methods 1 & 65
-- set default level-set for filtertype=64 to all zeroes
-
-samples:
-
-contrib:
-- added GTK mng-view example by Vova Babin
-- added MSVC MNGview sample by Nikolaus Brennig
-- updated Jason Summer's mngplg to version 0.9.2
- (that's mngplg-0.9.2 based on libmng-0.9.3 !!!)
-- rearranged contrib directory slightly
-- added MSVC project to build libmng.dll by Chad Austin
-
-doc:
-- added README.dll
-- added README.config
-
-makefiles:
-- added a makefile for MS Visual C++ (Thanks to Atsushi Matsuda)
-
-autoconf:
-- fixed configure.in for lcms (FreeBSD port by Mikhail Teterin)
-- by default configure includes CMS support if lcms is present
-
------------------------------------------------------------
-
-0.9.3 (October 29th 2000)
--------------------------
-
-in short:
-
-Another beta release. The number of changes in the MNG specification have
-resulted in a lot of new code and some changed code. At the same time I saw
-no need to withhold some new functionality as it was pretty clear there was
-going to be another beta-round. If things go well, I'm going to try to release
-libmng 1.0.0 very shortly after this one.
-
-Many thanks to a lot of people for helping out, sending contributions, making
-suggestions and testing this little baby. This would get nowhere without YOU!!!
-
-- fixed bug 111300/117103
-- added workaround for faulty PhotoShop iCCP chunk
-- added MAGN/JDAA chunks
-- added support for new filter_types
-- added PNG/MNG spec version indicators
-- added BCB mngview contribution by Andy Protano
-- added BCB mngdump; a GUI-based MNG dumping utility (Andy Protano)
-- implemented support for nEED "draft nn"
-- implemented app-defined support for bKGD for PNG images
-- removed trace-options from default SO/DLL builds (!!!)
-- raised initial maximum canvas size to 10000x10000 (!!!)
- (an App that wants to protect from overly large images should call
- mng_set_maxcanvassize() with appropriate values)
-- fixed other assorted stuff
-
--------------------
-
-bugfixes:
-B111300 - fixup for improved portability
-B117103 - fixed compilation errors on *nix with lcms (thanks Ralph!)
-
-core:
-- fixed compiler-warnings from Mozilla
-- added check for simplicity-bits in MHDR
-- added workaround for faulty PhotoShop iCCP chunk
-- fixed app-supplied background restore
-- fixed TERM processing delay of 0 msecs
-- fixed write-code for zTXt & iTXt
-- fixed read-code for iTXt
-- added MAGN chunk
-- fixed sRGB precedence for gamma_only corection
-- added support for new filter_types
-- fixed problem with no refresh after TERM
-- fixed DEFI behavior
-- fixed inclusion parameters to make the external libs work together
-- added export of zlib functions from windows dll
-- fixed timing & refresh behavior for single PNG/JNG
-- removed trace-options from default SO/DLL builds (!!!)
-- fixed MAGN rounding errors (thanks Matthias!)
-- fixed small timing problem when FRAM delay = 0
-- fixed simplicity-check in compliance with draft 81/0.98a
-- fixed alpha-blending for all alpha-canvasstyles
-- added support for alpha-depth prediction
-- fixed processing of unknown critical chunks
-- removed test-MaGN
-- added PNG/MNG spec version indicators
-- implemented support for nEED
-- added support for JDAA
-- added functions to retrieve PNG/JNG specific header-info
-- added optional support for bKGD for PNG images
-- raised initial maximum canvas size to 10000x10000
-- added support for delta-JNG
-- added callback to process non-critical unknown chunks
-- fixed support for delta-images during read() / display()
-- added closestream() processing for mng_cleanup()
-- fixed delta-processing behavior
-- added storage for pixel-/alpha-sampledepth for delta's
-- implemented delayed delta-processing
-- fixed putchunk_plte() to set bEmpty parameter (thanks Ben!)
-- added errorcode for delayed delta-processing
-- added get/set for bKGD preference setting
-- added get function for interlace/progressive display
-- fixed bug in empty PLTE handling
-- fixed seperate read() & display() processing
-- fixed tRNS processing for gray-image < 8-bits
-
-samples:
-- added BCB mngview contribution by Andy Protano
-
-contrib:
-- added BCB mngdump; a GUI-based MNG dumping utility (Andy Protano)
-
-doc:
-- updated RPM spec-file by MATSUURA Takanori
-- updated README.contrib
-
-makefiles:
-- fixed some stuff in automake/autoconf/libtool
-- fixed auto* for bug B117103
-
------------------------------------------------------------
-
-0.9.2 (August 7th 2000)
------------------------
-
-in short:
-
-Third beta release! Last one???
-
-!!IMPORTANT!! All file-names are now prefixed with "libmng_" !!IMPORTANT!!
-
-Many thanks to Albert Chin-A-Young for his contribution of the
-autoconf/automake/libtool stuff and to Ralph Giles for helping me
-put it in the right places.
-
-There's a special README.autoconf so please read it!
-
-- fixed bug 110320/110546/110547/111096
-- added several status retrieval functions
-- fixed other small bugs in display processing
-- fixed number of small problems and documentation typos
-- added autoconf/automake/libtool
-- added latest MNG plugin (0.9.0) by Jason Summers
-
--------------------
-
-bugfixes:
-B110320 - fixed GCC warning about mix-sized pointer math
-B110546 - fixed for improperly returning UNEXPECTEDEOF
-B110547 - fixed bug in interlace code
-B111096 - fixed large-buffer read-suspension
-
-core:
-- version numbers
-- fixed small bugs in display processing
-- removed Nextbackxxx fields (no longer used)
-- fixed problem with trace-functions improperly wrapped
-- put specific code in add_chunk() inside MNG_SUPPORT_WRITE wrapper
-- fixed documentation typos
-- fixed wrapping of suspension parameters
-- added status_xxxx functions
-- added trace-codes/-strings for status_xxxxx functions
-- changed file-prefixes
-- added function to set simplicity field
-- added trace-code/-string for updatemngsimplicity
-- fixed putchunk_unknown() function
-
-samples:
-
-contrib:
-- added latest MNG plugin (0.9.0) by Jason Summers
-
-doc:
-- version numbers
-- added autoconf readme
-- version numbers in RPM stuff
-
-makefiles:
-- fixed for new file-prefix
-- added autoconf/automake/libtool
-
------------------------------------------------------------
-
-0.9.1 (July 26th 2000)
-----------------------
-
-in short:
-
-Second beta release.
-
-Given the enormous amount of bug-reports (not ;-), this will most likely
-be one of the last betas. If things remain upright, the first public release
-(1.0.0) is fairly eminent in the weeks to come...
-
-- added SDL mng player by Ralph Giles to contributions
-- fixed timing and added internal buffering for I/O-suspension scenarios
-- added get routines for internal display-state variables (frame/layer/playtime)
-- changed read-processing for improved I/O-suspension (internal buffering)
-- fixed several problems with create- & write-support
-- added a load of documentation
-- lots of small stuff
-
--------------------
-
-bugfixes:
-
-core:
-- fixed mandatory BACK color to be opaque
-- changed mng_display_resume to allow to be called after a suspension
- return with MNG_NEEDMOREDATA
-- changed comments to indicate modified behavior for timer & suspension breaks
-- added variables for go_xxxx processing
-- implemented support for freeze/reset/resume & go_xxxx
-- added trace-codes/-strings for special display processing
-- added variables for improved timing support
-- added support for improved timing
-- added get routines for internal display variables
-- added get/set routines for suspensionmode variable
-- added trace-code/-string for get/set suspensionmode
-- added trace-codes/-strings for get/set display variables
-- added support for improved I/O-suspension
-- changed read-processing for improved I/O-suspension
-- added trace-code/-string for read_databuffer (I/O-suspension)
-- added suspendbuffer constants
-- changed EOF processing behavior
-- fixed TERM delay processing
-- changed pre-draft48 frame_mode=3 to frame_mode=1
-- added callbacks for SAVE/SEEK processing
-- added trace-codes/-strings for SAVE/SEEK callbacks
-- added variable for NEEDSECTIONWAIT breaks
-- added trace-codes/-strings for get/set sectionbreaks
-- added NEEDSECTIONWAIT error-code/-string
-- added macro + routine to set returncode without calling error callback
-- added trace-code/-string for special error routine
-- changed default readbuffer size from 1024 to 4200
-- added variable for freeze & reset processing
-- fixed storage of images during mng_read()
-- fixed support for mng_display() after mng_read()
-- added error cleanup processing
-- fixed support for mng_display_reset()
-- fixed suspension-buffering for 32K+ chunks
-- added function to set frame-/layer-count & playtime
-- added trace-code/-string for updatemngheader
-- added error-code/-string for updatemngheader if not a MNG
-- fixed creation-code
-- fixed writing of signature
-- fixed several chunk-writing routines
-
-samples:
-- fixed the libmng.pas module in line with libmng.h
-
-contrib:
-- added the SDL based mngplay viewer by Ralph Giles
-
-doc:
-- extended the RPM contribution by MATSUURA Takanori
-- added libmng.txt, a full description of the library and its usage
-- added man-pages for mng(5), jng(5) and libmng(3)
-
-makefiles:
-
------------------------------------------------------------
-
-0.9.0 (June 30th 2000)
-----------------------
-
-in short:
-
-This is the first beta!!! Yippee!!!
-
-Thanks to all the people who helped to guide me in the right direction.
-You know who you are!
-
-A special thanks to the guys with early implementations, who stood by and
-put up with my whims :-)
-
-changes over 0.5.3:
-
-- updated mngplg to 0.4.1 (the latest & greatest)
-- changed refresh parameters to 'x,y,width,height'
-
------------------------------------------------------------
-
-0.5.3 (never released)
-----------------------
-
-in short:
-
-This is a working version only; the next release will be 0.9.0 (first Beta!)
-
-There are a few incompatible changes with previous versions. The userdata
-variable has been changed from mng_uint32 to mng_ptr to accomodate 64-bit
-systems. For the same reason memory allocation size parameters have been
-changed to a mng_size_t type which is a typedef of size_t.
-
-Thanks to Aleks Jakulin for helping to iron out some 64-bit platform issues!
-
-- implemented the update-region parameters of the refresh callback
-- added support for most common delta-image options
-- added an animation-speed modifier
-- added an image-level parameter for the processtext callback
-- updated mngplg to 0.4.0 (supports JNG, full CMS, and other enhancements!)
-- fixed a lot of small things
-- added support for PPLT chunk
-- fixed to support 64-bit platforms
-
--------------------
-
-bugfixes:
-
-core:
-- added processing of color-info on delta-image
-- fixed handling of empty SAVE chunk
-- fixed display of stored JNG images
-- fixed problem with BASI-IEND as object 0
-- changed the version parameters (obviously)
-- added update-region parms for refresh calback
-- added Needrefresh parameter
-- added initialization of update-region for refresh
-- added initialization of Needrefresh parameter
-- changed progressive-display processing
-- added tracecodes for tracing JPEG progression
-- added tracing of JPEG calls
-- added Deltaimmediate parm for faster delta-processing
-- added extra checks for delta-images
-- many changes to support delta-images
-- optimized some store_xxx routines
-- fixed some small things (as precaution)
-- fixed possible trouble if IEND display-processing got broken up
-- fixed nasty bug with embedded PNG after delta-image
-- added processing of PLTE & tRNS for delta-images
-- added processing of PLTE/tRNS & color-info for delta-images in the
- ani_objects chain
-- fixed problem with color-correction for stored images
-- added get/set for speedtype to facilitate testing
-- added trace-codes & -strings for get/set speedtype
-- added speed-modifier to timing routine
-- added get-routine of imagelevel for processtext callback
-- added trace-code & -string for get imagelevel
-- added administration of imagelevel parameter
-- added support for PPLT chunk
-- added trace-codes & -strings for PPLT chunk processing
-- fixed problem with incorrect gamma-correction
-- fixed inclusion of IJG read/write code
-- fixed problem with 16-bit GA format
-- fixed problem with cheap transparency for 4-bit gray
-- fixed display_xxxx routines for interlaced images
-- added precaution against faulty iCCP chunks from PS
-- changed userdata variable to mng_ptr
-- added typedef for mng_size_t
-- changed size parameter for memory allocation to mng_size_t
-- fixed compiler-warning for non-initialized iB variable
-- changed definition for 32-bit ints (64-bit platforms)
-- changed definition for mng_handle (64-bit platforms)
-- swapped refresh parameters
-- fixed initialization routine for new mng_handle type
-- added inclusion of stdlib.h for abs()
-- fixed some 64-bit warnings
-- fixed incompatible return-types
-
-samples:
-
-contrib:
-- updated mngplg to 0.3.0 (supports JNG & full color-correction!)
-- updated mngplg to 0.4.0 (Jason is picking up the pace ;-)
-
-doc:
-- added rpm directory with rpm spec-file (contributed by MATSUURA Takanori)
-
-makefiles:
-- changed makefile.linux to reflect versionnr for shared-lib
-- changed makefile.linux to depend on mng_conf.h & mng_types.h
-
------------------------------------------------------------
-
-0.5.2 (June 10th 2000)
-----------------------
-
-in short:
-
-This is the third release for developers
-Another milestone since JNG is now fully supported
-The next release will most likely be numbered 0.9.0 as the first Beta!!
-
-Fixed bug 106017 & 106019
-Added many constants regarding chunk-property values
-Implemented full JNG support
-Added all the error- & trace-strings
-Added get/set routines for default ZLIB/IJG parameters
-Added a generic makefile for Unix platforms (contributed by Tim Rowley)
-Added canvasstyle for separate RGB + A canvas (eg. mozilla-style)
-Separated configuration-options into a separate file: "mng_conf.h"
-Fixed stuff for generic Unix compilation (contributed by Tim Rowley)
-Upgraded to lcms1.0.6 (now supports 16-bit endian-peculiarities)
-Added a makefile for Linux ELF & fixed some code-issues to go along with gcc
-Added support for suspended input-buffer processing
-Implemented the display-routines for RGBA/ARGB/BGRA/ABGR canvasstyles
-Implemented the application background-restore functionality
-Fixed & tested the mngtree Unix-sample (runs on Linux-RH6.2 with libmng.so)
-Upgraded mngplg to v0.2.2 (based on the latest code including JNG)
-Fixed a lot of other assorted stuff
-
--------------------
-
-bugfixes:
-B003(106017) - fixed problem with <mem.h> being proprietary to BCB
-B004(106019) - fixed problem when MNG_SUPPORT_WRITE not defined
-
-core:
-- bumped version-numbers up to 0.5.2 (yeah, really)
-- fixed support for IJGSRC6B
-- cleaned up some code regarding mixed support-options
-- complemented constants for chunk-property values
-- fixed MNG_UINT_pHYg value
-- implemented JNG support
-- fixed problem with DEFI clipping
-- added error telltale strings & support
-- added trace telltale strings & support
-- added support for global color-chunks inside TERM/LOOP
-- added support for global PLTE,tRNS,bKGD inside TERM/LOOP
-- added default IJG compression parameters and such
-- moved init of default zlib parms to "mng_hlapi.c"
-- added init of default IJG parms
-- added support for get/set of zlib/IJG default parms
-- added tracestrings for global animation color-chunks
-- added tracestrings for get/set of default ZLIB/IJG parms
-- added tracestrings for global PLTE,tRNS,bKGD
-- added framenr/layernr/playtime to object header
-- added initialization of framenr/layernr/playtime
-- changed ani_create calls not returning object pointer
-- create ani objects always (not just inside TERM/LOOP)
-- fixed inconsistancy with freeing global iCCP profile
-- fixed minor bugs 16-bit pixel-handling
-- added object promotion routine (PROM handling)
-- added trace-codes & -strings for image-object promotion
-- added trace-codes & -strings for delta-image processing
-- added error-codes & -strings for delta-image processing
-- added support for delta-image processing
-- added ani-object routines for delta-image processing
-- added delta-image fields
-- added compression/filter/interlace fields to object-buffer for
- delta-image processing
-- added delta-image row-processing routines
-- fixed up punctuation in several files (contributed by Tim Rowley)
-- removed useless definition in "mng_chunks.h" (contributed by Tim Rowley)
-- fixed pointer confusion in "mng_display.c" (contributed by Tim Rowley)
-- fixed inclusion for memcpy (contributed by Tim Rowley)
-- added mng_int32p (contributed by Tim Rowley)
-- added internal delta-image processing callbacks
-- separated configuration-options into "mng_conf.h"
-- changed to most likely configuration
-- added RGB8_A8 canvasstyle
-- added getalphaline callback for RGB8_A8 canvasstyle
-- fixed some makeup for Linux gcc compile
-- implemented app bkgd restore routines
-- implemented RGBA8, ARGB8, BGRA8 & ABGR8 display routines
-- added support for RGB8_A8 canvasstyle
-- added support for suspended input-buffer processing
-- added mng_read_resume HLAPI function to support read-suspension
-- fixed timer-handling to run with Mozilla (Tim Rowley)
-- fixed alpha-handling for alpha canvasstyles
-- fixed some compilation-warnings (contrib Jason Morris)
-
-samples:
-- fixed mngview(delphi) to work with the new core
-- synchronized libmng.pas(delphi) with the new libmng.h header
-- removed the error- & trace-strings from libmng.pas(delphi)
-- fixed mngtree(Unix) to compile on Linux (runs with libmng.so)
-- added makefile.linux for mngtree(Unix) (tested on RedHat6.2)
-
-contrib:
-- updated mngplg to 0.2.2 (based on latest code; supports JNG!)
-
-doc:
-- this file obviously
-- added Tim Rowley as contributing author
-- changed the examples.readme doc
-- updated the design-schematics in line with the current code
-
-makefiles:
-- changed the directory to "makefiles" to avoid name-conflicts
-- added generic Unix makefile (thanks to Tim Rowley)
-- added Linux ELF makefile (tested on RedHat6.2)
-
------------------------------------------------------------
-
-0.5.1 May 16th 2000
--------------------
-
-in short:
-
-This is the second release for developers
-It's a bit of a milestone since all the chunk functionality is in place and
-functioning (read, examine, create & write)
-This version is incompatible with 0.5.0 since some of the callback prototypes
-have changed (should be the last time that happens!)
-There are a few more samples and even a real contribution!
-
-Fixed bug 105795 & 105797
-Fixed a mis-alignment in animation-timing
-Added chunk-access functions
-Finished all chunk-storage routine-bits
-Finished all chunk-write routines
-Changed the callback prototypes to allow error-reporting back to the library
-Fixed some routines to allow for callback error-reporting
-Added version-control functions & constants
-Added two functions to set display- & sRGB-profile from memory
-Moved CRC table to dynamic structure (for improved thread-safety)
-Added SAVE & SEEK save&restore functionality
-Finished the application-based CMS-callbacks
-Fixed a few BCB specifics
-Changed the Win32 DLL and samples to use __stdcall
-Did some more assorted little changes
-Added 2 BCB samples
-Added 1 Unix sample
-Added the MNG plugin by Jason Summers in the contrib section
-Changed some documents to reflect these changes
-
--------------------
-
-bugfixes:
-B001(105795) - fixed wrong lcms call & memory-leak for gammatables
-B002(105797) - fixed problem with missing sRGB profile
-
-core:
-- changed chunk iteration function
-- added chunk access functions
-- added version control constants & functions
-- changed strict-ANSI stuff
-- added set_outputprofile2 & set_srgbprofile2
-- added empty-chunk put-routines
-- added version_dll & VERSION_DLL (for consistency)
-- added version control explanatory text & samples
-- added iteratechunk callback definition
-- improved definitions for DLL support
-- added 8-bit palette definition
-- added general array definitions
-- added MNG_NULL definition
-- changed most callback prototypes to allow the app
- to report errors during callback processing
-- added CRC table to main structure (for thread-safety)
-- added iPLTEentries for checking hIST-length
-- changed palette definition to exported palette-type
-- removed frozen indicator
-- added create/write indicators
-- added eMNGma hack (will be removed in 1.0.0 !!!)
-- added TERM animation object pointer (easier reference)
-- added saved-data structure for SAVE/SEEK processing
-- added some errorcodes
-- added application errorcodes (used with callbacks)
-- moved chunk-access errorcodes to severity 5
-- added chunk-access function trace-codes
-- changed trace to macro for callback error-reporting
-- added save_state & restore_state trace-codes
-- put in some extra comments
-- fixed layout for sBIT, PPLT
-- changed write callback definition
-- fixed layout for PPLT again (missed deltatype ?!?)
-- cleaned up left-over teststuff in the BACK chunk routine
-- changed CRC initialization to use dynamic structure
- (wasn't thread-safe the old way !)
-- filled in many missing sequence&length checks
-- filled in many missing chunk-store snippets
-- added checks for running animations
-- filled remaining write routines
-- fixed read_pplt with regard to deltatype
-- added callback error-reporting support
-- added pre-draft48 support (short MHDR, frame_mode, LOOP)
-- fixed chunk-storage bit in several routines
-- supplemented the SAVE & SEEK display processing
-- added init of iPLTEcount
-- changed calling-convention definition
-- changed status-handling of display-routines
-- added versioning-control routines
-- filled the write routine
-- fixed frame_delay misalignment
-- added sanity check for frozen status
-- changed display_mend to reset state to initial or SAVE
-- added save_state and restore_state for SAVE/SEEK/TERM
- processing
-- added process_save & process_seek routines
-- changed and filled iterate-chunk function
-- added getchunk functions
-- added putchunk functions
-- added empty-chunk put-routines
-- filled application-based color-management routines
-- added creatememprofile
-- filled the deflatedata routine
-- added cleanup of saved-data (SAVE/SEEK processing)
-- moved the actual write_graphic functionality from mng_hlapi.c
- to it's appropriate function in the mng_write.c module
-- moved standard header includes into mng_types.h
- (stdlib/mem for mem-mngmt & math for fp gamma-calc)
-- added getimgdata & putimgdata functions
-
-samples:
-- fixed mngview(delphi) to work with the new core
-- synchronized libmng.pas(delphi) with the new libmng.h header
-- added mngtree(bcb) sample
-- added bogus(bcb) sample
-- added mngtree(unix) sample
-
-contrib:
-- added mngplg 0.1.0 / a MNG plugin for Win32 by Jason Summers
-
-doc:
-- added this changes.readme file
-- changed the samples.readme doc accordingly
-- changed the contrib.readme doc accordingly
-
------------------------------------------------------------
-
-0.5.0 May 1st 2000
-------------------
-
-in short:
-
-This is the first developers release.
-It's roughly about 60% done.
diff --git a/src/3rdparty/libmng/LICENSE b/src/3rdparty/libmng/LICENSE
deleted file mode 100644
index 2b624c00a7..0000000000
--- a/src/3rdparty/libmng/LICENSE
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ************************************************************************** */
-/* * * */
-/* * COPYRIGHT NOTICE: * */
-/* * * */
-/* * Copyright (c) 2000-2007 Gerard Juyn (gerard@libmng.com) * */
-/* * [You may insert additional notices after this sentence if you modify * */
-/* * this source] * */
-/* * * */
-/* * For the purposes of this copyright and license, "Contributing Authors" * */
-/* * is defined as the following set of individuals: * */
-/* * * */
-/* * Gerard Juyn * */
-/* * Glenn Randers-Pehrson * */
-/* * * */
-/* * The MNG Library is supplied "AS IS". The Contributing Authors * */
-/* * disclaim all warranties, expressed or implied, including, without * */
-/* * limitation, the warranties of merchantability and of fitness for any * */
-/* * purpose. The Contributing Authors assume no liability for direct, * */
-/* * indirect, incidental, special, exemplary, or consequential damages, * */
-/* * which may result from the use of the MNG Library, even if advised of * */
-/* * the possibility of such damage. * */
-/* * * */
-/* * Permission is hereby granted to use, copy, modify, and distribute this * */
-/* * source code, or portions hereof, for any purpose, without fee, subject * */
-/* * to the following restrictions: * */
-/* * * */
-/* * 1. The origin of this source code must not be misrepresented; * */
-/* * you must not claim that you wrote the original software. * */
-/* * * */
-/* * 2. Altered versions must be plainly marked as such and must not be * */
-/* * misrepresented as being the original source. * */
-/* * * */
-/* * 3. This Copyright notice may not be removed or altered from any source * */
-/* * or altered source distribution. * */
-/* * * */
-/* * The Contributing Authors specifically permit, without fee, and * */
-/* * encourage the use of this source code as a component to supporting * */
-/* * the MNG and JNG file format in commercial products. If you use this * */
-/* * source code in a product, acknowledgment would be highly appreciated. * */
-/* * * */
-/* ************************************************************************** */
-/* * * */
-/* * Parts of this software have been adapted from the libpng package. * */
-/* * Although this library supports all features from the PNG specification * */
-/* * (as MNG descends from it) it does not require the libpng package. * */
-/* * It does require the zlib library and optionally the IJG jpeg library, * */
-/* * and/or the "little-cms" library by Marti Maria (depending on the * */
-/* * inclusion of support for JNG and Full-Color-Management respectively. * */
-/* * * */
-/* * This library's function is primarily to read and display MNG * */
-/* * animations. It is not meant as a full-featured image-editing * */
-/* * component! It does however offer creation and editing functionality * */
-/* * at the chunk level. * */
-/* * (future modifications may include some more support for creation * */
-/* * and or editing) * */
-/* * * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/README b/src/3rdparty/libmng/README
deleted file mode 100644
index a8e67cad53..0000000000
--- a/src/3rdparty/libmng/README
+++ /dev/null
@@ -1,36 +0,0 @@
-libmng 1.0.10
--------------
-
-Added provisional ANG and anIM support, and made some minor bugfixes.
-
-libmng 1.0.9
-------------
-
-A number of optimizations in the chunk handling and reader/writer code.
-This saves over 20KB on binary footprint!
-
-Also several bugfixes and a couple of patches bring it another step
-closer to perfection.... :-)
-
-See CHANGELOG for details.
-
-
-Y.T.
-
-Gerard
-
-
-For more information please visit:
-
-The official libmng web-site:
- http://www.libmng.com/
-
-Libmng's community on SourceForge:
- https://sourceforge.net/project/?group_id=5635
-
-The official MNG homepage:
- http://www.libpng.org/pub/mng/
-
-The official PNG homepage:
- http://www.libpng.org/pub/png/
-
diff --git a/src/3rdparty/libmng/README.autoconf b/src/3rdparty/libmng/README.autoconf
deleted file mode 100644
index 753f7b4fde..0000000000
--- a/src/3rdparty/libmng/README.autoconf
+++ /dev/null
@@ -1,213 +0,0 @@
-**********************************************************************
-**********************************************************************
-
- ***** this is unmaintained *****
-
-If you happen to find problems with autoconfiguration and building,
-I simply cannot help you. I'm looking for a maintainer that doesn't mind
-spending a few minutes every now and then on the next release to make sure
-things are still in working order.
-
-For the moment all autoconf stuff ahs been moved into unmaintained!!
-
-**********************************************************************
-**********************************************************************
-
-
-
-
-Configuration from CVS
-======================
-
-If you're using source checked out from CVS, rather than a source
-distribution tarball, please be aware that you can use ./autogen.sh in
-place of ./configure below.
-
-Because this is a cross-platform project, the source templates for
-the autoconf scripts are sequestered in the 'makefiles' directory.
-Running './autogen.sh' will copy them into their conventional places at
-the lop level. If you already see the files there, you don't need to
-worry about this step.
-
-Basic Installation
-==================
-
- These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
- The file `configure.in' is used to create `configure' by a program
-called `autoconf'. You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. You can give `configure'
-initial values for variables by setting them in the environment. Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
- CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
- env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory. After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on. Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
- CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
- If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
- Use and save the results of the tests in FILE instead of
- `./config.cache'. Set FILE to `/dev/null' to disable caching, for
- debugging `configure'.
-
-`--help'
- Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--version'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
diff --git a/src/3rdparty/libmng/README.config b/src/3rdparty/libmng/README.config
deleted file mode 100644
index d5cd4541d0..0000000000
--- a/src/3rdparty/libmng/README.config
+++ /dev/null
@@ -1,104 +0,0 @@
-Configuration options in libmng
-===============================
-
-The library is fairly configurable through the use of a number of defines.
-Please note however that certain defines are for internal use only.
-The following list gives a summary of options that can be used externally to
-define the functionality of the library:
-
-========================================
-
-#define MNG_BUILD_DLL
-
-This is used to indicate that a "standard" DLL should result from compiling
-the library. Please note the remarks in README.dll if you intend to work
-with the library as a DLL. The purpose of this option is to ensure that
-DLL builds have the same set of functions.
-
-#define MNG_BUILD_SO
-
-This is used to indicate that a "standard" shared library (SO) should result
-from a compilation. The purpose of this option is to ensure that all
-shared libraries generated this way will have the same set of functions.
-
-#define MNG_USE_DLL / #define MNG_USE_SO
-
-These should be used when including the library header in the compilation
-of an application to indicate that the compiler/linker must take the
-necessary steps to make the binary executable to use the standard DLL
-or shared library (SO).
-
-#define MNG_SKIP_ZLIB / #define MNG_SKIP_LCMS / #define MNG_SKIP_IJG6B
-
-Use these in conjunction with MNG_USE_DLL / MNG_USE_SO. This is useful if
-you only need the external definitions of the MNG library and not the others,
-which will speed up the compilation process.
-
-#define MNG_SUPPORT_FULL / #define MNG_SUPPORT_LC / #define MNG_SUPPORT_VLC
-
-These can be used to indicate the level of MNG spec compliance required.
-Currently only full MNG compliance is supported.
-
-#define MNG_SUPPORT_IJG6B
-
-This can be used to indicate if JNG support is required. This option will
-include the IJG JPEG-library. Note that MNG_SUPPORT_FULL will automatically
-set this option. Use this only if you need JNG support with MNG-(V)LC.
-
-#define MNG_FULL_CMS / #define MNG_GAMMA_ONLY / #define MNG_NO_CMS /
-#define MNG_APP_CMS
-
-These indicate the color-correction support level of the library.
-If you are on a platform that supports lcms (Little CMS by Marti Maria Saguar)
-then it is highly recommended to define MNG_FULL_CMS.
-If your platform has it's own CMS then select MNG_APP_CMS and be sure to
-include the appropriate callbacks in your app.
-In all other cases it is recommended to define MNG_GAMMA_ONLY.
-
-#define MNG_SUPPORT_READ / #define MNG_SUPPORT_WRITE /
-#define MNG_SUPPORT_DISPLAY
-
-These indicate the high-level support for reading, writing and/or
-displaying files. Note that in order to display a file, you'll need to read
-it first. (yes, really!)
-
-#define MNG_STORE_CHUNKS
-
-This indicates that the library should store chunk-information when reading
-a file. This information can then be processed through the
-MNG_ITERATE_CHUNKS() function. Note that you must specify this option if
-you want to create and write a new file.
-
-#define MNG_ACCESS_CHUNKS
-
-This is used to indicate that the app may need access to internally stored
-chunk information. MNG_STORE_CHUNKS must be defined as well for this option
-to function properly.
-
-#define MNG_INTERNAL_MEMMNGMT
-
-You can use this to have the library handle it's own memory allocation and
-deallocation through the "standard" memory functions. This option is turned
-off by default, which means your app must define the memory callbacks.
-
-#define MNG_ERROR_TELLTALE
-
-Set this on to allow human-readable error-messages to be included in the
-library and the error function and callback.
-
-#define MNG_BIGENDIAN_SUPPORTED
-
-This option should be used to indicate the hardware is based on big endian
-integers.
-
-#define MNG_SUPPORT_TRACE / #define MNG_TRACE_TELLTALE
-
-These two can be used when debugging an app. You'll need to have the trace
-callback setup also. This allows for a rather thorough investigation of the
-libraries function paths.
-
-========================================
-
-Any other optional defines you may encounter are for internal use only.
-please do not specify them externally. In case of doubt, consult the
-support email lists. More info can be found on http://www.libmng.com
diff --git a/src/3rdparty/libmng/README.contrib b/src/3rdparty/libmng/README.contrib
deleted file mode 100644
index 9b287532a4..0000000000
--- a/src/3rdparty/libmng/README.contrib
+++ /dev/null
@@ -1,95 +0,0 @@
-The contrib directory contains contributions made by fellow
-enthousiasts. (Check respective web-sites for the latest version)
-
-----------------------------------------------------------------------
-
-mngplg - A Netscape plugin for MNG - by Jason Summers
-
-http://pobox.com/~jason1/imaging/mngplg/
-
-The very first contribution, and what a start!
-GIF look out, MNG is on the prowl and ready to swat you like a fly!
-
-----------------------------------------------------------------------
-
-mngplay - An SDL based MNG viewer - by Ralph Giles
-
-http://snow.ashlu.bc.ca/~giles/mng/
-
-Another nice contribution. View MNG files on practically any platform
-with this standalone viewer.
-Source-code only; Requires SDL library and libmng.so
-
-(Modified by Greg Roelofs)
-
-----------------------------------------------------------------------
-
-mngview - A BCB port of the Delphi sample - by Andy Protano
-
-I have added this nice little port to the BCB samples directory.
-It adds a nifty progressbar while reading a file. Excellent work!
-Requires libmng.dll
-(note: this is in the BCB samples directory)
-
-----------------------------------------------------------------------
-
-mngdump - A BCB GUI-based dump utility - by Andy Protano
-
-Andy has sent me this fully functional MNG dump utility, that gives
-detailed information of the contents of any MNG file.
-Requires libmng.dll
-
-----------------------------------------------------------------------
-
-mng-view - A GTK-based MNG viewer - by Vova Babin
-
-Vova has been hacking away with the libmng code and has come up with
-this nice little sample how to write a MNG viewer using GTK.
-Thanks mate!
-Source-code only
-Requires GTK+ (1.2 or higher) and libmng (0.9.2 or higher)
-
-(Modified by Greg Roelofs)
-
-----------------------------------------------------------------------
-
-mngview - Another MNG viewer; this one for MSVC - by Nicholaus Brennig
-
-A welcome contribution from Nicholaus. Author of SlowView. A very nice
-image-handling utility for Windows. A welcome contribution since there
-have been numerous questions about linking libmng with MSVC.
-Well, look no further. Here it is!
-
-----------------------------------------------------------------------
-
-MSVC libmng project - An MSVC project to build libmng.dll
- - by Chad Austin
-
-Chad has contributed some project-files that you could use to build
-libmng.dll with MSVC. Please be sure to read the README file included.
-
-----------------------------------------------------------------------
-
-fbmngplay - A simple fbcon based mng player - by Stefan Reinauer
-
-Stefan has contributed this little example, based on Ralph's
-SDL player. It uses the kernel framebuffer device to display mng
-animations through the libmng interface.
-(currently for 16-bit buffers only)
-
-----------------------------------------------------------------------
-
-xmngview - Lesstif/Motif standalone player for MNG files
- - by Winfried Szukalski
-
-Winfried contributed this MNG player for X-based systems.
-(recently updated)
-
-----------------------------------------------------------------------
-
-makemng - A delta-MNG creation utility for MSVC - by Alex Volkov
-
-Alex sent me this nice utility that will allow you to create highly
-optmized MNGs using the delta-PNG capabilities of MNG.
-
-----------------------------------------------------------------------
diff --git a/src/3rdparty/libmng/README.dll b/src/3rdparty/libmng/README.dll
deleted file mode 100644
index 2f779e81a4..0000000000
--- a/src/3rdparty/libmng/README.dll
+++ /dev/null
@@ -1,41 +0,0 @@
-Standard Windows DLL
-====================
-
-The DLL provided in the BCB/win32dll directory is meant as the sole candidate
-for distributions, based on libmng.dll, that install the DLL into the public
-Windows system-directory. The outline herein defines the requirements to
-which such a distribution must comply. If you cannot comply with these
-requirements please install the dll in the same directory as your application
-and NOT in the Windows system-directory!!!
-
-
-1) Only the DLL already assembled in the libmng distribution may be used for
- other distributions!
-
-2) Only stable public releases are eligible for distribution! A public release
- is one where the y-value of the x.y.z version-code is an even number.
- Eg. 1.0.0, 1.2.1, 2.4.7, etc.
-
-3) The installation program MUST store the DLL in the Windows system-directory!
- Eg. C:\WinNT\System32, C:\Windows98\System
- (Note: InstallShield users can use the <SYSDIR> variable)
-
-3) The installation program MUST flag the file as a shared library!
-
-4) The installation program MUST NOT install the DLL if a newer version
- already exists in the Windows system-directory! The standard DLL provided
- contains the Windows-default version-numbering system. PLEASE USE IT!!
- DO NOT rely on the date or size of the files.
-
-5) An uninstall procedure MAY NOT remove the DLL if other applications are
- still linked to it! Proper handling as a shared library is imperitive.
-
-6) TEST IT, TEST IT, TEST IT!!! (I just can't stress this enough)
- If you don't have enough time, let someone else test it BEFORE you
- distribute!
-
-
-The penalty for violating these rules is inclusion of your name in the list
-of endangered but useless species (just below the GIF entry!), and on my
-blacklist. YOU HAVE BEEN FOREWARNED!
-
diff --git a/src/3rdparty/libmng/README.examples b/src/3rdparty/libmng/README.examples
deleted file mode 100644
index 1ba94c1404..0000000000
--- a/src/3rdparty/libmng/README.examples
+++ /dev/null
@@ -1,48 +0,0 @@
-The samples are in platform-specific directories.
-
-!!! contributions are very welcome !!!
-
-
-bcb - Borland C++ Builder (3.0) (found under bcb/xxx)
------------------------------------------------------
-
-win32dll - sample project to create a Windows dll. Requires zlib1.2.1,
- IJG jpgsrc6b and lcms1.0.14. The directories containing these
- libraries must be at the same level as the libmng directory.
- So if you're in the directory with this file and the libmng
- sources, they should be in ..\zlib , ..\jpgsrc6b and ..\lcms
- respectively.
-
-!!! To run the other Win32 samples you need to copy the libmng.dll
- file from here into the sample's directory !!!
-
-mngtree - sample project to create a little command-line tool that dumps
- the chunk-structure of a given file onto stdout.
-
-bogus - a completely bogus example on how to create a perfectly valid
- (though slightly biased) MNG.
-
-mngview - port of the Delphi mngview sample. contributed by Andy Protano.
- see also README.contrib
-
-mngrepair- an example on how to fix invalid MNG files
- uses the new mng_copy_chunks() function and MNG_SOFTERRORS to
- 'ignore' certain input-errors. This conditional *MUST* only be used
- for exactly this kind of software; eg. repair utilities.
-
-
-delphi - Borland Delphi (3.0+) (found under contrib/delphi/xxx)
----------------------------------------------------------------
-
-mngview - sample project for a simple mng-viewer. The general unit in
- the delphi directory was translated from libmng.h It can be
- used in other projects to access libmng.dll created with the
- win32dll example above.
-
-
-unix - Unix (found under contrib/gcc/xxx)
------------------------------------------
-
-mngtree - basically a copy of the BCB sample. It includes a makefile for
- Linux and it's been tested on RedHat6.2
-
diff --git a/src/3rdparty/libmng/README.footprint b/src/3rdparty/libmng/README.footprint
deleted file mode 100644
index 34dba7f180..0000000000
--- a/src/3rdparty/libmng/README.footprint
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- You can use one or more of the following defines to
- reduce the size of the compiled library. Define the
- SKIPCANVAS macros for any canvas configurations that
- your application doesn't use. Define the SKIPCHUNK
- macros for any chunks that your application doesn't
- process. Define MNG_OPTIMIZE_FOOTPRINT to choose
- smaller code size over faster execution and less memory
- usage. These macros became available in version 1.0.6.
-*/
-
-/* eliminate unused features from libmng */
-#define MNG_OPTIMIZE_FOOTPRINT
-#define MNG_OPTIMIZE_OBJCLEANUP
-#define MNG_OPTIMIZE_CHUNKINITFREE
-#define MNG_OPTIMIZE_CHUNKASSIGN
-#define MNG_OPTIMIZE_CHUNKREADER
-
-#define MNG_SKIPCANVAS_ABGR8
-#define MNG_SKIPCANVAS_ARGB8
-#define MNG_SKIPCANVAS_BGR8
-#define MNG_SKIPCANVAS_BGRA8
-#define MNG_SKIPCANVAS_BGRA8_PM
-#define MNG_SKIPCANVAS_BGRX8
-#define MNG_SKIPCANVAS_RGBA8
-#define MNG_SKIPCANVAS_BGR565
-#define MNG_SKIPCANVAS_RGB565
-#define MNG_SKIPCANVAS_BGRA565
-#define MNG_SKIPCANVAS_RGBA565
-
-#define MNG_SKIPCHUNK_iCCP
-#define MNG_SKIPCHUNK_tEXt
-#define MNG_SKIPCHUNK_zTXt
-#define MNG_SKIPCHUNK_iTXt
-#define MNG_SKIPCHUNK_bKGD
-#define MNG_SKIPCHUNK_pHYs
-#define MNG_SKIPCHUNK_sBIT
-#define MNG_SKIPCHUNK_sPLT
-#define MNG_SKIPCHUNK_hIST
-#define MNG_SKIPCHUNK_tIME
-#define MNG_SKIPCHUNK_eXPI
-#define MNG_SKIPCHUNK_fPRI
-#define MNG_SKIPCHUNK_nEED
-#define MNG_SKIPCHUNK_pHYg
-
-
diff --git a/src/3rdparty/libmng/README.packaging b/src/3rdparty/libmng/README.packaging
deleted file mode 100644
index da0db3e7bb..0000000000
--- a/src/3rdparty/libmng/README.packaging
+++ /dev/null
@@ -1,24 +0,0 @@
-Packaging Libmng for distribution
----------------------------------
-
-These are some notes for those building binaries for distribution.
-
-We're interested to hear about anywhere libmng is helpful, so let us
-know if you're including it with your application or OS. Also, if your
-build is publicly accessible, we'd be happy to link to it from
-the libmng site.
-
-However, We respectfully request that you *not* distribute binaries as a
-shared library (DLL) with any of the major features disabled. While
-there is support for this in terms of #ifdef directives (in
-libmng_conf.h) and autoconf switches they are intended for embedded
-application and testing. The default compilation options support the
-full MNG specification, and we wish to avoid the confusion among
-general users that partial support would engender.
-
-
-Platform specific notes:
-
-We have a basic .spec file for generating rpms. Send us a note if you'd
-like to clean it up.
-
diff --git a/src/3rdparty/libmng/doc/Plan1.png b/src/3rdparty/libmng/doc/Plan1.png
deleted file mode 100644
index ced5517278..0000000000
--- a/src/3rdparty/libmng/doc/Plan1.png
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libmng/doc/Plan2.png b/src/3rdparty/libmng/doc/Plan2.png
deleted file mode 100644
index 3619ea6631..0000000000
--- a/src/3rdparty/libmng/doc/Plan2.png
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libmng/doc/doc.readme b/src/3rdparty/libmng/doc/doc.readme
deleted file mode 100644
index e92e93cb5a..0000000000
--- a/src/3rdparty/libmng/doc/doc.readme
+++ /dev/null
@@ -1,19 +0,0 @@
-This directory hosts the documentation for libmng.
-
-You will find a lot of useful info on the web-site:
-http://www.libmng.com
-
-Man-pages are in the man sub-directory
-
-RPM specification files are in the RPM sub-directory
-
-Files in this directory:
-
-- libmng.txt
-
-Description of the library proper and its usage
-
-- Plan1.png & Plan2.png
-
-Visual representation of the functional and technical
-design of the library (in PNG format of course!)
diff --git a/src/3rdparty/libmng/doc/libmng.txt b/src/3rdparty/libmng/doc/libmng.txt
deleted file mode 100644
index b9e9bc4b89..0000000000
--- a/src/3rdparty/libmng/doc/libmng.txt
+++ /dev/null
@@ -1,1107 +0,0 @@
-libmng - Multiple-image Network Graphics (MNG) Reference Library 1.0.9
-
-DESCRIPTION
-The libmng library supports decoding, displaying, encoding, and various
-other manipulations of the Multiple-image Network Graphics (MNG) format
-image files. It uses the zlib compression library, and optionally the
-JPEG library by the Independant JPEG Group (IJG) and/or
-lcms (little cms), a color-management library by Marti Maria Saguer.
-
-
-I. Introduction
-
-This file describes how to use and modify the MNG reference library
-(known as libmng) for your own use. There are seven sections to this
-file: introduction, callbacks, housekeeping, reading, displaying,
-writing, and modification and configuration notes for various special
-platforms. We assume that libmng is already installed; see the
-INSTALL.README file for instructions on how to install libmng.
-
-Libmng was written to support and promote the MNG specification.
-
-The latest MNG specification (currently 1.0) is available at
- http://www.libpng.org/pub/mng/
-
-Other information about MNG can be found at the MNG home page at
- http://www.libpng.org/pub/mng/
-
-The latest version of libmng can be found at its own homepage at
- http://www.libmng.com/
-
-In most cases the library will not need to be changed.
-For standardization purposes the library contains both a Windows DLL
-and a makefile for building a shared library (SO). The library is
-written in C, but an interface for Borland Delphi is also available.
-
-Libmng has been designed to handle multiple sessions at one time,
-to be easily modifiable, to be portable to the vast majority of
-machines (ANSI, K&R, 32-, and 64-bit) available, and to be easy
-to use.
-
-Libmng uses zlib for its compression and decompression of MNG files.
-Further information about zlib, and the latest version of zlib, can be
-found at the zlib home page, <http://www.zlib.org/>.
-The zlib compression utility is a general purpose utility that is
-useful for more than MNG/PNG files, and can be used without libmng.
-See the documentation delivered with zlib for more details.
-
-Libmng optionally uses the JPEG library by the Independant JPEG Group
-(IJG). This library is used for the JNG sub-format, which is part of
-the MNG specification, and allows for inclusion of JPEG decoded and
-thus highly compressed (photographic) images.
-Further information about the IJG JPEG library and the latest sources
-can be found at <http://www.ijg.org/>.
-
-Libmng can also optionally use the lcms (little CMS) library by
-Marti Maria Saguer. This library provides an excellent color-management
-system (CMS), which gives libmng the ability to provide full
-color-correction for images with the proper color-information encoded.
-Further information and the latest sources can be found at
-<http://www.littlecms.com/>.
-
-Libmng is thread safe, provided the threads are using different
-handles as returned by the initialization call.
-Each thread should have its own handle and thus its own image.
-Libmng does not protect itself against two threads using the
-same instance of a handle.
-
-The libmng.h header file is the single reference needed for programming
-with libmng:
-
-#include <libmng.h>
-
-
-II. Callbacks
-
-Libmng makes extensive use of callback functions. This is meant to
-keep the library as platform-independant and flexible as possible.
-Actually, the first call you will make to the library, already contains
-three parameters you can use to provide callback entry-points.
-
-Most functions must return a mng_bool (boolean). Returning MNG_FALSE
-indicates the library the callback failed in some way and the library
-will immediately return from whatever it was doing back to the
-application. Returning MNG_TRUE indicates there were no problems and
-processing can continue.
-
-Let's step through each of the possible callbacks. The sections on
-reading, displaying and writing will also explain which callbacks are
-needed when and where.
-
-- mng_ptr mng_memalloc (mng_size_t iLen)
-
-A very basic function which the library uses to allocate a memory-block
-with the given size. A typical implementation would be:
-
- mng_ptr my_alloc (mng_size_t iLen) {
- return calloc (1, iSize);
- }
-
-Note that the library requires you to zero-out the memory-block!!!
-
-- void mng_memfree (mng_ptr pPtr,
- mng_size_t iLen)
-
-Counterpart of the previous function. Typically:
-
- void my_free (mng_ptr pPtr, mng_size_t iLen) {
- free (pPtr);
- }
-
-- mng_bool mng_openstream (mng_handle hHandle)
-- mng_bool mng_closestream (mng_handle hHandle)
-
-These are called by the library just before it starts to process
-(either read or write) a file and just after the processing stops.
-This is the recommended place to do I/O initialization & finalization.
-Whether you do or not, is up to you. The library does not put any
-meaning into the calls. They are simply provided for your convenience.
-
-- mng_bool mng_readdata (mng_handle hHandle,
- mng_ptr pBuf,
- mng_uint32 iBuflen,
- mng_uint32p pRead)
-
-This function is called when the library needs some more input while
-reading an image. The reading process supports two modes:
-Suspension-mode (SMOD) and non-suspension-mode (NSMOD).
-See mng_set_suspensionmode() for a more detailed description.
-
-In NSMOD, the library requires you to return exactly the amount of bytes
-requested (= iBuflen). Any lesser amount indicates the input file
-is exhausted and the library will return a MNG_UNEXPECTEDEOF errorcode.
-
-In SMOD, you may return a smaller amount of bytes than requested.
-This tells the library it should temporarily wait for more input to
-arrive. The lib will return with MNG_NEEDMOREDATA, and will expect a
-call to mng_read_resume() or mng_display_resume() next, as soon as
-more input-data has arrived.
-
-For NSMOD this function could be as simple as:
-
- mng_bool my_read (mng_handle hHandle,
- mng_ptr pBuf,
- mng_uint32 iBuflen,
- mng_uint32p pRead) {
- *pRead = fread (pBuf, 1, iBuflen, myfile);
- return MNG_TRUE;
- }
-
-- mng_bool mng_writedata (mng_handle hHandle,
- mng_ptr pBuf,
- mng_uint32 iBuflen,
- mng_uint32p pWritten)
-
-This function is called during the mng_write() function to actually
-output data to the file. There is no suspension-mode during write,
-so the application must return the exact number of bytes the library
-requests to be written.
-
-A typical implementation could be:
-
- mng_bool my_write (mng_handle hHandle,
- mng_ptr pBuf,
- mng_uint32 iBuflen,
- mng_uint32p pWritten) {
- *pWritten = fwrite (pBuf, 1, iBuflen, myfile);
- return MNG_TRUE;
- }
-
-- mng_bool mng_errorproc (mng_handle hHandle,
- mng_int32 iErrorcode,
- mng_int8 iSeverity,
- mng_chunkid iChunkname,
- mng_uint32 iChunkseq,
- mng_int32 iExtra1,
- mng_int32 iExtra2,
- mng_pchar zErrortext)
-
-This function is called whenever an error is detected inside the
-library. This may be caused by invalid input, callbacks indicating
-failure, or wrongfully calling functions out of place.
-
-If you do not provide this callback the library will still return
-an errorcode from the called function, and the mng_getlasterror()
-function can be used to retrieve the other parameters.
-
-This function is currently only provided for convenience, but may
-at some point be used to indicate certain errors may be acceptable,
-and processing should continue.
-
-- mng_bool mng_traceproc (mng_handle hHandle,
- mng_int32 iFuncnr,
- mng_int32 iFuncseq,
- mng_pchar zFuncname)
-
-This function is provided to allow a functional analysis of the
-library. This may be useful if you encounter certain errors and
-cannot determine what the problem is.
-
-Almost all functions inside the library will activate this
-callback with an appropriate function-name at the start and end
-of the function. Please note that large images may generate an
-enormous amount of calls.
-
-- mng_bool mng_processheader (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight)
-
-This function is called once the header information of an input-
-image has been processed. At this point the image dimensions are
-available and also some other properties depending on the type
-of the image. Eg. for a MNG the frame-/layercount, playtime &
-simplicity fields are known.
-
-The primary purpose of this callback is to inform the application
-of the size of the image, and for the application to initialize
-the drawing canvas to be used by the library. This is also a good
-point to set the canvas-style. Eg. mng_set_canvasstyle().
-
-- mng_bool mng_processtext (mng_handle hHandle,
- mng_uint8 iType,
- mng_pchar zKeyword,
- mng_pchar zText,
- mng_pchar zLanguage,
- mng_pchar zTranslation)
-
-This callback is activated for each textual chunk in the input-
-image. These are tEXt, zTXt & iTXt. It may be used to retain
-specific comments for presentation to the user.
-
-- mng_bool mng_processsave (mng_handle hHandle)
-- mng_bool mng_processseek (mng_handle hHandle,
- mng_pchar zName)
-
-The purpose of these callbacks is to signal the processing of the
-SAVE & SEEK chunks in a MNG input-file. This may be used in the
-future to specify some special processing. At the moment these
-functions are only provided as a signal.
-
-- mng_ptr mng_getcanvasline (mng_handle hHandle,
- mng_uint32 iLinenr)
-- mng_ptr mng_getbkgdline (mng_handle hHandle,
- mng_uint32 iLinenr)
-- mng_ptr mng_getalphaline (mng_handle hHandle,
- mng_uint32 iLinenr)
-
-These callbacks are used to access the drawing canvas, background
-canvas and an optional separate alpha-channel canvas. The latter is
-used only with the MNG_CANVAS_RGB8_A8 canvas-style.
-
-If the getbkgdline() callback is not supplied the library will
-composite full or partially transparent pixels in the image against
-a specified background color. See mng_set_bgcolor() for more details.
-If a chosen canvas-style includes an alpha-channel, this callback
-is very likely not needed.
-
-The application is responsible for returning a pointer to a line of
-pixels, which should be in the exact format as defined by the call
-to mng_set_canvasstyle() and mng_set_bkgdstyle(), without gaps between
-the representation of each pixel.
-
-- mng_bool mng_refresh (mng_handle hHandle,
- mng_uint32 iX,
- mng_uint32 iY,
- mng_uint32 iWidth,
- mng_uint32 iHeight)
-
-This callback is called when the library has drawn a complete frame
-onto the drawing canvas, and it is ready to be displayed.
-The application is responsible for transferring the drawing canvas
-from memory onto the actual output device.
-
-- mng_uint32 mng_gettickcount (mng_handle hHandle)
-
-This function should return the number of milliseconds on some internal
-clock. The entire animation timing depends heavily on this function,
-1and the number returned should be as accurate as possible.
-
-- mng_bool mng_settimer (mng_handle hHandle,
- mng_uint32 iMsecs)
-
-This callback is activated every time the library requires a "pause".
-Note that the function itself should NOT execute the wait. It should
-simply store the time-field and allow the library to return. Libmng
-will return with the MNG_NEEDTIMERWAIT code, indicating the callback
-was called and it is now time to execute the pause.
-
-After the indicated number of milliseconds have elapsed, the application
-should call mng_display_resume(), to resume the animation as planned.
-
-This method allows for both a real timer or a simple wait command in the
-application. Whichever method you select, both the gettickcount() and
-settimer() callbacks are crucial for proper animation timing.
-
-- mng_bool mng_processgamma (mng_handle hHandle,
- mng_uint32 iGamma)
-- mng_bool mng_processchroma (mng_handle hHandle,
- mng_uint32 iWhitepointx,
- mng_uint32 iWhitepointy,
- mng_uint32 iRedx,
- mng_uint32 iRedy,
- mng_uint32 iGreenx,
- mng_uint32 iGreeny,
- mng_uint32 iBluex,
- mng_uint32 iBluey)
-- mng_bool mng_processsrgb (mng_handle hHandle,
- mng_uint8 iRenderingintent)
-- mng_bool mng_processiccp (mng_handle hHandle,
- mng_uint32 iProfilesize,
- mng_ptr pProfile)
-- mng_bool mng_processarow (mng_handle hHandle,
- mng_uint32 iRowsamples,
- mng_bool bIsRGBA16,
- mng_ptr pRow)
-
-These callbacks are only required when you selected the MNG_APP_CMS
-directive during compilation of the library. See the configuration
-section for more details.
-
-- mng_bool mng_iteratechunk (mng_handle hHandle,
- mng_handle hChunk,
- mng_chunkid iChunkid,
- mng_uint32 iChunkseq)
-
-This callback is only used for the mng_iterate_chunks() function.
-It is called exactly once for each chunk stored.
-
-
-III. Housekeeping
-
-
-> Memory management
-
-The library can use internal memory allocation/deallocation or use
-provided callbacks for its memory management. The choice is made at
-compilation time. See the section on customization for details.
-
-If internal management has been selected, the memory callback functions
-need not be supplied. Even if you do supply them they will not be used.
-The actual code used is similar to the code discussed in the callback
-section:
-
- pPtr = calloc (1, iSize);
-
- free (pPtr);
-
-If your compiler does not support these functions, or you wish to monitor
-the library's use of memory for certain reasons, you can choose to
-compile the library with external memory management. In this case the
-memory callback functions MUST be supplied, and should function as if the
-above code was used.
-
-
-> Initialization
-
-The basic initialization of the library is short and swift:
-
- myhandle = mng_initialize (myuserdata, my_alloc,
- my_free, MNG_NULL);
- if (myhandle == MNG_NULL)
- /* process error */;
-
-The first field is an application-only parameter. It is saved in
-libmng's internal structures and available at all times through the
-mng_get_userdata() function. This is especially handy in callback functions
-if your program may be handling multiple files at the same time.
-
-The second and third field supply the library with the memory callback
-1function entry-points. These are described in more detail in the callback
-section and the previous paragraph.
-
-The fourth and last field may be used to supply the library with the
-entry-point of a trace callback function. For regular use you will not
-need this!
-
-The function returns a handle which will be your ticket to MNG-heaven.
-All other functions rely on this handle. It is the single fixed unique
-reference-point between your application and the library.
-
-You should call the initialization function for each image you wish to
-process simultaneously. If you are processing images consecutively, you can
-reset the internal status of the library with the mng_reset() function.
-This function will clear all internal state variables, free any stored
-chunks and/or objects, etc, etc. Your callbacks and other external parameters
-will be retained.
-
-After you successfully received the handle it is time to set the required
-callbacks. The sections on reading, displaying & writing indicate which
-callbacks are required and which are optional.
-To set the callbacks simply do:
-
- myretcode = mng_setcb_xxxxxx (myhandle, my_xxxxxx);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-Naturally you'd replace the x's with the name of the callback.
-
-
-> Cleanup
-
-Once you've gotten hold of that precious mng_handle, you should always,
-and I mean always, call the cleanup function when you're done.
-Just do:
-
- mng_cleanup (myhandle);
-
-And you're done. There shouldn't be an ounce of memory spilled after
-that call.
-
-Note that if you would like to process multiple files consecutively
-you do not need to do mng_cleanup() / mng_initialize() between each file
-but simply
-
- myretcode = mng_reset (myhandle);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-will suffice. Saves some time and effort, that.
-
-
-> Error handling
-
-From the examples in the previous paragraphs you may have noticed a
-meticulous scheme for error handling. And yes, that's exactly what it is.
-Practically each call simply returns an errorcode, indicating success,
-eg. MNG_NOERROR or failure, anything else but MNG_NEEDMOREDATA and
-MNG_NEEDTIMERWAIT. These latter two will be discussed in more detail in
-their respective fields of interest: the reading section and displaying
-section respectively.
-
-It is the application's responsibility to check the returncode after
-each call. You can call mng_getlasterror() to receive the details of
-the last detected error. This even includes a discriptive error-message
-if you enabled that option during compilation of the library.
-
-Note that after receiving an error it is still possible to call the
-library, but it's also very likely that any following call will fail.
-The only functions deemed to work will be mng_reset() and mng_cleanup().
-Yes, if you abort your program after an error, you should still call
-mng_cleanup().
-
-
-IV. Reading
-
-Reading a MNG, JNG or PNG is fairly easy. It depends slightly on your
-ultimate goal how certain specifics are to be handled, but the basics
-are similar in all cases.
-
-For the read functioins to work you must have compiled the library with
-the MNG_READ_SUPPRT directive. The standard DLL and Shared Library
-have this on by default!
-
-
-> Setup
-
-Naturally you must have initialized the library and be the owner of
-a mng_handle. The following callbacks are essential:
-
- mng_openstream, mng_readdata, mng_closestream
-
-You may optionally define:
-
- mng_errorproc, mng_traceproc
- mng_processheader, mng_processtext
- mng_processsave, mng_processseek
-
-The reading bit will also fail if you are already creating or
-displaying a file. Seems a bit obvious, but I thought I'd mention it,
-just in case.
-
-
-> To suspend or not to suspend
-
-There is one choice you need to make before calling the read function.
-Are you in need of suspension-mode or not?
-
-If you're reading from a disk you most certainly do not need
-suspension-mode. Even the oldest and slowest of disks will be fast
-enough for straight reading.
-
-However, if your input comes from a really slow device, such as a
-dialup-line or the likes, you may opt for suspension-mode. This is done
-by calling
-
- myretcode = mng_set_suspensionmode (myhandle,
- MNG_TRUE);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-Suspension-mode will force the library to use special buffering on the
-input. This allows your application to receive data of arbitrarily length
-and return this in the mng_readdata() callback, without disturbing the
-chunk processing routines of the library.
-
-Suspension-mode does require a little extra care in the main logic of the
-1application. The read function may return with MNG_NEEDMOREDATA when the
-mng_readdata() callback returns less data then it needs to process the
-next chunk. This indicates the application to wait for more data to arrive
-and then resume processing by calling mng_read_resume().
-
-
-> The read HLAPI
-
-The actual reading is just plain simple. Since all I/O is done
-1outside the library through the callbacks, the library can focus on
-its real task. Understanding, checking and labelling the input data!
-
-All you really need to do is this:
-
- myretcode = mng_read (myhandle);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-Of course, if you're on suspension-mode the code is a little more
-complicated:
-
- myretcode = mng_read (myhandle);
-
- while (myretcode == MNG_NEEDMOREDATA) {
- /* wait for input-data to arrive */
- myretcode = mng_read_resume (myhandle);
- }
-
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-This is rather crude and more sophisticated programming methods may
-dictate another approach. Whatever method you decide on, it should
-act as if the above code was in its place.
-
-There is also the mng_readdisplay() function, but this is discussed
-in the displaying section. It functions pretty much as the mng_read()
-function, but also immediately starts displaying the image.
-mng_read_resume() should be replaced by mng_display_resume() in that
-case!
-
-
-> What happens inside
-
-What actually happens inside the library depends on the configuration
-options set during the compilation of the library.
-
-Basically the library will first read the 8-byte file header, to determine
-its validity and the type of image it is about to process. Then it will
-repeatedly read a 4-byte chunk-length and then the remainder of the chunk
-until it either reaches EOF (indicated by the mng_readdata() callback) or
-implicitly decides EOF as it processed the logically last chunk of the
-image.
-
-Applications that require strict conformity and do not allow superfluous
-data after the ending chunk, will need to perform this check in their
-mng_closestream() callback.
-
-Each chunk is then checked on CRC, after which it is handed over to the
-appropriate chunk processing routine. These routines will disect the
-chunk, check the validity of its contents, check its position with respect
-to other chunks, etc, etc.
-
-If everything checks out, the chunk is further processed as follows:
-
-If display support has been selected during compilation, certain pre-display
-initialization will take place.
-
-If chunk-storage support has been selected during compilation, the chunks
-data may be stored in a special internal structure and held for future
-reference.
-
-
-> Storing and accessing chunks
-
-One of the compilation options activates support for chunk storage.
-This option may be useful if you want to examine an image. The directive
-is MNG_STORE_CHUNKS. You must also turn on the MNG_ACCESS_CHUNKS
-directive.
-
-The actual storage facility can be turned on or off with the
-mng_set_storechunks() function. If set to MNG_TRUE, chunks will be
-stored as they are read.
-
-At any point you can then call the mng_iterate_chunks() function
-to iterate through the current list of chunks. This function requires
-a callback which is called for each chunk and receives a specific
-chunk-handle. This chunk-handle can be used to call the appropriate
-mng_getchunk_xxxx() function, to access the chunks properties.
-
-A typical implementation may look like this:
-
- mng_bool my_iteratechunk (mng_handle hHandle,
- mng_handle hChunk,
- mng_chunkid iChunkid,
- mng_uint32 iChunkseq) {
- switch (iChunkid) {
- case MNG_UINT_MHDR : { /* process MHDR */;
- break; }
- case MNG_UINT_FRAM : { /* process FRAM */;
- break; }
-
- ...etc...
-
- case MNG_UINT_HUH : { /* unknown chunk */;
- break; }
- default : { /* duh; forgot one */; }
- }
-
- return MNG_TRUE; /* keep'm coming */
- }
-
-To get to the actual chunk fields of lets say a SHOW chunk you would do:
-
- mng_bool isempty;
- mng_uint16 firstid, lastid;
- mng_uint8 showmode;
-
- myretcode mng_getchunk_show (hHandle, hChunk,
- isempty, firstid,
- lastid, showmode);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-
-V. Displaying
-
-
-> Setup
-
-Assuming you have initialized the library and are the owner of
-a mng_handle. The following callbacks are essential:
-
- mng_getcanvasline, mng_refresh
- mng_gettickcount, mng_settimer
-
-If you wish to use an application supplied background you must supply:
-
- mng_getbkgdline
-
-If you wish to use the MNG_CANVAS_RGB8_A8 canvas style you must supply:
-
- mng_getalphaline
-
-You may optionally define:
-
- mng_errorproc, mng_traceproc
- mng_processheader, mng_processtext
- mng_processsave, mng_processseek
-
-Note that the mng_processheader() callback is optional but will
-be quite significant for proper operation!
-
-Displaying an image will fail if you are creating a file or already
-displaying one. Yes, you can't display it twice!
-
-
-> A word on canvas styles
-
-The canvas style describes how your drawing canvas is made up.
-You must set this before the library actually starts drawing, so
-the mng_processheader() callback is a pretty good place for it.
-
-Currently only 8-bit RGB canvas styles are supported, either with
-or without an alpha channel.
-
-If you like to do alpha composition yourself you can select one of
-the canvas styles that include an alpha channel. You can even have
-a separate alpha canvas by selecting the MNG_CANVAS_RGB8_A8 style.
-
-All styles require a compact model. Eg. MNG_CANVAS_BGR8 requires
-your canvas lines in bgrbgrbgr... storage, where each letter
-represents an 8-bit value of the corresponding color, and each
-threesome makes up the values of one(1) pixel.
-
-The library processes a line at a time, so the canvas lines do not
-actually need to be consecutive in memory.
-
-
-> Alpha composition and application backgrounds
-
-All Network Graphics can be partially transparent. This requires
-special processing if you need to display an image against some
-background. Note that the MNG header (MHDR chunk) contains a
-simplicity field indicating whether transparency information in
-the file is critical or not. This only applies to embedded images,
-which means the full image-frame of the MNG may still contain fully
-transparent pixels!
-
-Depending on your needs you can supply a single background color,
-a background canvas or tell the library to return the alpha-channel
-and do alpha composition yourself.
-
-This is different from the BACK chunk in a MNG, or the bKGD chunk
-in an (embedded) PNG or JNG. The BACK chunk indicates an optional or
-mandatory background color and/or image. The bKGD chunk only indicates
-an optional background color. These chunks indicate the Authors
-preferences. They may be absent in which case you need to supply
-some sort of background yourself.
-
-> Composing against a background color
-
-This is the easiest method. Call the mng_set_bgcolor() function to
-set the values of the red, green and blue component of your preferred
-background color.
-
-Use one of the canvas styles that do not have an alpha-channel, and
-which matches your output requirements.
-
-> Composing against a background canvas
-
-This is somewhat more complicated. You will need to set the
-mng_getbkgdline() callback. This will be called whenever the library
-needs to compose a partially transparent line.
-
-This canvas must hold the background against which the image should
-be composed. Its size must match exactly with the image dimensions
-and thus the drawing canvas!
-
-Use one of the canvas styles that do not have an alpha-channel, and
-which matches your output requirements. The canvas style of the
-background canvas may even differ from the drawing canvas. The library's
-composing will still function properly.
-
-> Composing within the application
-
-If you have the option in your application to draw a (partially)
-transparent canvas to the output device, this option is preferred.
-
-Select one of the canvas styles that do have an alpha-channel.
-The library will now supply the appropriate alpha information,
-allowing the application to compose the image as it sees fit.
-
-
-> Color information and CMS
-
-Network Graphics may, and usually will, contain color-correction
-information. This information is intended to compensate for the
-difference in recording and display devices used.
-
-This document does not address the specifics of color-management.
-See the PNG specification for a more detailed description.
-
-> Using little cms by Marti Maria Saguer
-
-This is the easiest method, providing you can compile the lcms package.
-Select the MNG_FULL_CMS directive during compilation, and sit back and
-relax. The library will take care of all color-correction for you.
-
-> Using an OS- or application-supplied CMS
-
-If you are so lucky to have access to CMS functionality from within
-your application, you may instruct the library to leave color-correction
-to you.
-
-Select the MNG_APP_CMS directive during compilation of the library.
-You MUST also set the following callbacks:
-
- mng_processgamma, mng_processchroma,
- mng_processsrgb, mng_processiccp and
- mng_processarow
-
-The last callback is called when the library needs you to correct
-an arbitrary line of pixels. The other callbacks are called when
-the corresponding color-information is encountered in the file.
-You must store this information somewhere for use in the
-mng_processarow() callback.
-
-> Using gamma-only correction
-
-This isn't a preferred method, but it's better than no correction
-at all. Gamma-only correction will at least compensate for
-gamma-differences between the original recorder and your output device.
-
-Select the MNG_GAMMA_ONLY directive during compilation
-of the library. Your compiler MUST support fp operations.
-
-> No color correction
-
-Ouch. This is really bad. This is the least preferred method,
-but may be necessary if your system cannot use lcms, doesn't
-have its own CMS, and does not allow fp operations, ruling out
-the gamma-only option.
-
-Select the MNG_NO_CMS directive during compilation.
-Images will definitely not be displayed as seen by the Author!!!
-
-
-> Animations and timing
-
-Animations require some form of timing support. The library relies
-on two callbacks for this purpose. The mng_gettickcount() and
-mng_settimer() callbacks. mng_gettickcount() is used to determine
-the passing of time in milliseconds since the beginning of the
-animation. This is also used to compensate during suspension-mode
-if you are using the mng_readdisplay() function to read & display
-the file simultaneously.
-
-The callback may return an arbitrary number of milliseconds, but
-this number must increase proportionaly between calls. Most modern
-systems will have some tickcount() function which derives its
-input from an internal clock. The value returned from this function
-is more than adequate for libmng.
-
-The mng_settimer() callback is called when the library determines
-a little "pause" is required before rendering another frame of the
-animation. The pause interval is also expressed in milliseconds.
-Your application should store this value and return immediately.
-The library will then make appropriate arrangements to store its
-internal state and returns to your application with the
-MNG_NEEDTIMERWAIT code.
-
-At that point you should suspend processing and wait the given
-interval. Please use your OS features for this. Do not engage some
-sort of loop. That is real bad programming practice. Most modern
-systems will have some timing functions. A simple wait() function
-may suffice, but this may prevent your applications main-task from
-running, and possibly prevent the actual update of your output device.
-
-
-> The mng_refresh() callback
-
-The mng_refresh() callback is called whenever the library has
-"finished" drawing a new frame onto your canvas, and just before it
-will call the mng_settimer() callback.
-
-This allows you to perform some actions necessary to "refresh" the
-canvas onto your output device. Please do NOT suspend processing
-inside this callback. This must be handled after the mng_settimer()
-callback!
-
-
-> Displaying while reading
-
-This method is preferred if you are reading from a slow input device
-(such as a dialup-line) and you wish to start displaying something
-as quickly as possible. This functionality is provided mainly for
-browser-type applications but may be appropriate for other
-applications as well.
-
-The method is usually used in unison with the suspension-mode of
-the read module. A typical implementation would look like this:
-
- /* initiale library and set required callbacks */
-
- /* activate suspension-mode */
- myretcode = mng_set_suspensionmode (myhandle,
- MNG_TRUE);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
- myretcode = mng_readdisplay (myhandle);
-
- while ((myretcode == MNG_NEEDMOREDATA) ||
- (myretcode == MNG_NEEDTIMERWAIT)) {
- if (myretcode == MNG_NEEDMOREDATA)
- /* wait for more input-data */;
- else
- /* wait for timer interval */;
-
- myretcode = mng_display_resume (myhandle);
- }
-
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-More advanced programming methods may require a different approach,
-but the final result should function as in the code above.
-
-
-> Displaying after reading
-
-This method is used to display a file that was previously read.
-It is primarily meant for viewers with direct file access, such as
-1a local harddisk.
-
-Once you have successfully read the file, all you need to do is:
-
- myretcode = mng_display (myhandle);
-
- while (myretcode == MNG_NEEDTIMERWAIT) {
- /* wait for timer interval */;
- myretcode = mng_display_resume (myhandle);
- }
-
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-Again, more advanced programming methods may require a different
-approach, but the final result should function as in the code above.
-
-
-> Display manipulation
-
-Several HLAPI functions are provided to allow a user to manipulate
-the normal flow of an animation.
-
-- mng_display_freeze (mng_handle hHandle)
-
-This will "freeze" the animation in place.
-
-- mng_display_resume (mng_handle hHandle)
-
-This function can be used to resume a frozen animation, or to force
-the library to advance the animation to the next frame.
-
-- mng_display_reset (mng_handle hHandle)
-
-This function will "reset" the animation into its pristine state.
-Calling mng_display() afterwards will re-display the animation
-from the first frame.
-
-- mng_display_golayer (mng_handle hHandle,
- mng_uint32 iLayer)
-- mng_display_goframe (mng_handle hHandle,
- mng_uint32 iFrame)
-- mng_display_goplaytime (mng_handle hHandle,
- mng_uint32 iPlaytime)
-
-These three functions can be used to "jump" to a specific layer, frame
-or timeslot in the animation. You must "freeze" the animation before
-using any of these functions.
-
-All above functions may only be called during a timer interval!
-It is the applications responsibility to cleanup any resources with
-respect to the timer wait.
-
-
-VI. Writing
-
-The main focus of the library lies in its displaying capabilites.
-But it does offer writing support as well.
-You can create and write a file, or you can write a file you
-have previously read, providing the storage of chunks was enabled
-and active.
-
-For this to work you must have compiled the library with the
-MNG_WRITE_SUPPO1RT and MNG_ACCESS_CHUNKS directives. The standard DLL and
-Shared Library have this on by default!
-
-
-> Setup
-
-As always you must have initialized the library and be the owner of
-a mng_handle. The following callbacks are essential:
-
- mng_openstream, mng_writedata, mng_closestream
-
-You can optionally define:
-
- mng_errorproc, mng_traceproc
-
-The creation and writing functions will fail if you are in the middle
-of reading, creating or writing a file.
-
-
-> Creating a new file
-
-To start a new file the library must be in its initial state.
-First you need to tell the library your intentions:
-
- myretcode = mng_create (myhandle);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-After that you start adding the appropriate chunks:
-
- myretcode = mng_putchunk_mhdr (myhandle, ...);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-And so on, and so forth. Note that the library will automatically signal
-the logical end of the file by the ending chunk. Also the first chunk
-will indicate the library the filetype (eg. PNG, JNG or MNG) and force
-the proper signature when writing the file.
-
-The code above can be simplified, as you can always get the last errorcode
-by using the mng_getlasterror() function:
-
- if ( (mng_putchunk_xxxx (myhandle, ...)) or
- (mng_putchunk_xxxx (myhandle, ...)) or
- ...etc... )
- /* process error */;
-
-Please note that you must have a pretty good understanding of the chunk
-specification. Unlike the read functions, there are virtually no checks,
-so it is quite possible to write completely wrong files.
-It is a good practice to read back your file into the library to verify
-its integrity.
-
-Once you've got all the chunks added, all you do is:
-
- myretcode mng_write (myhandle);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-And presto. You're done. The real work is of course carried out in
-your callbacks. Note that this is a single operation as opposed to
-the read & display functions that may return with MNG_NEEDMOREDATA
-and/or MNG_NEEDTIMERWAIT. The write function just does the job, and
-only returns after it's finished or if it encounters some
-unrecoverable error.
-
-
-> Writing a previously read file
-
-If you have already successfully read a file, you can use the library to
-write it out as a copy or something. You MUST have compiled the library
-with the MNG_STORE_CHUNKS directive, and you must have done
-mng_set_storechunks (myhandle, MNG_TRUE).
-
-This doesn't require the MNG_ACCESS_CHUNKS directive, unless you want
-to fiddle with the chunks as well.
-
-Again all you need to do is:
-
- myretcode mng_write (myhandle);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-
-VII. Modifying/Customizing libmng:
-
-to do
-
-> Compilation directives
-
-to do
-
-> Platform dependant modification
-
-to do
-
-
-References :
-
-libmng :
- http://www.libmng.com/
-
-zlib :
- http://www.info-zip.org/pub/infozip/zlib/
-
-IJG JPEG library :
- http://www.ijg.org/
-
-lcms (little CMS) by Marti Maria Saguer :
- http://www.littlecms.com/
-
-MNG specification:
- http://www.libpng.org/pub/mng
-
-
-In the case of any inconsistency between the MNG specification
-and this library, the specification takes precedence.
-
-
-The contributing authors would like to thank all those who helped
-with testing, bug fixes, and patience. This wouldn't have been
-possible without all of you!!!
-
-
-COPYRIGHT NOTICE:
-
-Copyright (c) 2000,2001 Gerard Juyn
-
-For the purposes of this copyright and license, "Contributing Authors"
-is defined as the following set of individuals:
-
- Gerard Juyn
-
-The MNG Library is supplied "AS IS". The Contributing Authors
-disclaim all warranties, expressed or implied, including, without
-limitation, the warranties of merchantability and of fitness for any
-purpose. The Contributing Authors assume no liability for direct,
-indirect, incidental, special, exemplary, or consequential damages,
-which may result from the use of the MNG Library, even if advised of
-the possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-source code, or portions hereof, for any purpose, without fee, subject
-to the following restrictions:
-
-1. The origin of this source code must not be misrepresented;
-you must not claim that you wrote the original software.
-
-2. Altered versions must be plainly marked as such and must not be
-misrepresented as being the original source.
-
-3. This Copyright notice may not be removed or altered from any source
-or altered source distribution.
-
-The Contributing Authors specifically permit, without fee, and
-encourage the use of this source code as a component to supporting
-the MNG and JNG file format in commercial products. If you use this
-source code in a product, acknowledgment would be highly appreciated.
-
-
-Remarks :
-
-Parts of this software have been adapted from the libpng library.
-Although this library supports all features from the PNG specification
-(as MNG descends from it) it does not require the libpng library.
-It does require the zlib library and optionally the IJG JPEG library,
-and/or the "little-cms" library by Marti Maria Saguer (depending on the
-inclusion of support for JNG and Full-Color-Management respectively.
-
-This library's function is primarily to read and display MNG
-animations. It is not meant as a full-featured image-editing
-component! It does however offer creation and editing functionality
-at the chunk level. (future modifications may include some more
-support for creation and or editing)
-
diff --git a/src/3rdparty/libmng/doc/man/jng.5 b/src/3rdparty/libmng/doc/man/jng.5
deleted file mode 100644
index 0e371ad0eb..0000000000
--- a/src/3rdparty/libmng/doc/man/jng.5
+++ /dev/null
@@ -1,37 +0,0 @@
-.TH JNG 5 "July 26, 2000"
-.SH NAME
-jng \- JPEG Network Graphics (JNG) sub-format
-.SH DESCRIPTION
-JNG (JPEG Network Graphics) is a sub-format of the MNG (Multiple-image
-Network Graphics) format. As with MNG it extends on the features of the
-popular PNG (Portable Network Graphics) image-format.
-.br
-
-This sub-format was designed to support a lossy compression-method.
-It is based completely on the JPEG specification. It adds the high-compression
-ratios of JPEG for photographic images.
-
-As a member of the Network Graphics family, JNG was deemed adequate as a
-stand-alone format as it extends the JPEG format with color-correction and
-transparency features.
-
-.SH "SEE ALSO"
-.IR png(5) ", " mng(5) ", " libmng(3)
-.LP
-MNG 1.00, February 9, 2001:
-.IP
-http://www.libpng.org/pub/mng
-
-.SH AUTHORS
-This man page: Gerard Juyn
-.LP
-Multiple-image Network Graphics (MNG) Specification Version 1.00 (Februari 9, 2001):
-Glenn Randers-Pehrson and others (png-list@ccrc.wustl.edu).
-.LP
-
-.SH COPYRIGHT NOTICE
-The MNG-1.00 specification is copyright (c) 1998-2001 Glenn Randers-Pehrson.
-See the specification for conditions of use and distribution.
-.LP
-.\" end of man page
-
diff --git a/src/3rdparty/libmng/doc/man/libmng.3 b/src/3rdparty/libmng/doc/man/libmng.3
deleted file mode 100644
index 5321faaa17..0000000000
--- a/src/3rdparty/libmng/doc/man/libmng.3
+++ /dev/null
@@ -1,1146 +0,0 @@
-.TH LIBMNG 3 "January 30th, 2005"
-.SH NAME
-libmng \- Multiple-image Network Graphics (MNG) Reference Library 1.0.9
-.SH SYNOPSIS
-\fI\fB
-
-\fB#include <libmng.h>\fP
-
-
-.SH DESCRIPTION
-The
-.I libmng
-library supports decoding, displaying, encoding, and various other
-manipulations of the Multiple-image Network Graphics (MNG) format
-image files. It uses the
-.IR zlib(3)
-compression library, and optionally the JPEG library by the Independant
-JPEG Group (IJG) and/or lcms (little cms), a color-management library
-by Marti Maria Saguer.
-
-
-.SH I. Introduction
-
-This file describes how to use and modify the MNG reference library
-(known as libmng) for your own use. There are seven sections to this
-file: introduction, callbacks, housekeeping, reading, displaying,
-writing, and modification and configuration notes for various special
-platforms. We assume that libmng is already installed; see the
-INSTALL.README file for instructions on how to install libmng.
-
-Libmng was written to support and promote the MNG specification.
-
-The MNG-1.0 specification is available at
-<http://www.libpng.org/pub/mng/spec/>.
-
-Other information about MNG can be found at the MNG home page,
-<http://www.libpng.org/pub/mng/>.
-The latest version of libmng can be found at its own homepage at
-<http://www.libmng.com/>.
-
-In most cases the library will not need to be changed.
-For standardization purposes the library contains both a Windows DLL
-and a makefile for building a shared library (SO). The library is
-written in C, but an interface for Borland Delphi is also available.
-
-Libmng has been designed to handle multiple sessions at one time,
-to be easily modifiable, to be portable to the vast majority of
-machines (ANSI, K&R, 32-, and 64-bit) available, and to be easy
-to use.
-
-Libmng uses zlib for its compression and decompression of MNG files.
-Further information about zlib, and the latest version of zlib, can be
-found at the zlib home page, <http://www.zlib.org/>.
-The zlib compression utility is a general purpose utility that is
-useful for more than MNG/PNG files, and can be used without libmng.
-See the documentation delivered with zlib for more details.
-
-Libmng optionally uses the JPEG library by the Independant JPEG Group
-(IJG). This library is used for the JNG sub-format, which is part of
-the MNG specification, and allows for inclusion of JPEG decoded and
-thus highly compressed (photographic) images.
-Further information about the IJG JPEG library and the latest sources
-can be found at <http://www.ijg.org/>.
-
-Libmng can also optionally use the lcms (little CMS) library by
-Marti Maria Saguer. This library provides an excellent color-management
-system (CMS), which gives libmng the ability to provide full
-color-correction for images with the proper color-information encoded.
-Further information and the latest sources can be found at
-<http://www.littlecms.com/>.
-
-Libmng is thread safe, provided the threads are using different
-handles as returned by the initialization call.
-Each thread should have its own handle and thus its own image.
-Libmng does not protect itself against two threads using the
-same instance of a handle.
-
-The libmng.h header file is the single reference needed for programming
-with libmng:
-
-#include <libmng.h>
-
-
-.SH II. Callbacks
-
-Libmng makes extensive use of callback functions. This is meant to
-keep the library as platform-independant and flexible as possible.
-Actually, the first call you will make to the library, already contains
-three parameters you can use to provide callback entry-points.
-
-Most functions must return a mng_bool (boolean). Returning MNG_FALSE
-indicates the library the callback failed in some way and the library
-will immediately return from whatever it was doing back to the
-application. Returning MNG_TRUE indicates there were no problems and
-processing can continue.
-
-Let's step through each of the possible callbacks. The sections on
-reading, displaying and writing will also explain which callbacks are
-needed when and where.
-
-\- mng_ptr mng_memalloc (mng_size_t iLen)
-
-A very basic function which the library uses to allocate a memory-block
-with the given size. A typical implementation would be:
-
- mng_ptr my_alloc (mng_size_t iLen) {
- return calloc (1, iLen);
- }
-
-Note that the library requires you to zero-out the memory-block!!!
-
-\- void mng_memfree (mng_ptr pPtr,
- mng_size_t iLen)
-
-Counterpart of the previous function. Typically:
-
- void my_free (mng_ptr pPtr, mng_size_t iLen) {
- free (pPtr);
- }
-
-\- mng_bool mng_openstream (mng_handle hHandle)
-
-\- mng_bool mng_closestream (mng_handle hHandle)
-
-These are called by the library just before it starts to process
-(either read or write) a file and just after the processing stops.
-This is the recommended place to do I/O initialization & finalization.
-Whether you do or not, is up to you. The library does not put any
-meaning into the calls. They are simply provided for your convenience.
-
-\- mng_bool mng_readdata (mng_handle hHandle,
- mng_ptr pBuf,
- mng_uint32 iBuflen,
- mng_uint32p pRead)
-
-This function is called when the library needs some more input while
-reading an image. The reading process supports two modes:
-Suspension-mode (SMOD) and non-suspension-mode (NSMOD).
-See mng_set_suspensionmode() for a more detailed description.
-
-In NSMOD, the library requires you to return exactly the amount of bytes
-requested (= iBuflen). Any lesser amount indicates the input file
-is exhausted and the library will return a MNG_UNEXPECTEDEOF errorcode.
-
-In SMOD, you may return a smaller amount of bytes than requested.
-This tells the library it should temporarily wait for more input to
-arrive. The lib will return with MNG_NEEDMOREDATA, and will expect a
-call to mng_read_resume() or mng_display_resume() next, as soon as
-more input-data has arrived.
-
-For NSMOD this function could be as simple as:
-
- mng_bool my_read (mng_handle hHandle,
- mng_ptr pBuf,
- mng_uint32 iBuflen,
- mng_uint32p pRead) {
- *pRead = fread (pBuf, 1, iBuflen, myfile);
- return MNG_TRUE;
- }
-
-\- mng_bool mng_writedata (mng_handle hHandle,
- mng_ptr pBuf,
- mng_uint32 iBuflen,
- mng_uint32p pWritten)
-
-This function is called during the mng_write() function to actually
-output data to the file. There is no suspension-mode during write,
-so the application must return the exact number of bytes the library
-requests to be written.
-
-A typical implementation could be:
-
- mng_bool my_write (mng_handle hHandle,
- mng_ptr pBuf,
- mng_uint32 iBuflen,
- mng_uint32p pWritten) {
- *pWritten = fwrite (pBuf, 1, iBuflen, myfile);
- return MNG_TRUE;
- }
-
-\- mng_bool mng_errorproc (mng_handle hHandle,
- mng_int32 iErrorcode,
- mng_int8 iSeverity,
- mng_chunkid iChunkname,
- mng_uint32 iChunkseq,
- mng_int32 iExtra1,
- mng_int32 iExtra2,
- mng_pchar zErrortext)
-
-This function is called whenever an error is detected inside the
-library. This may be caused by invalid input, callbacks indicating
-failure, or wrongfully calling functions out of place.
-
-If you do not provide this callback the library will still return
-an errorcode from the called function, and the mng_getlasterror()
-function can be used to retrieve the other parameters.
-
-This function is currently only provided for convenience, but may
-at some point be used to indicate certain errors may be acceptable,
-and processing should continue.
-
-\- mng_bool mng_traceproc (mng_handle hHandle,
- mng_int32 iFuncnr,
- mng_int32 iFuncseq,
- mng_pchar zFuncname)
-
-This function is provided to allow a functional analysis of the
-library. This may be useful if you encounter certain errors and
-cannot determine what the problem is.
-
-Almost all functions inside the library will activate this
-callback with an appropriate function-name at the start and end
-of the function. Please note that large images may generate an
-enormous amount of calls.
-
-\- mng_bool mng_processheader (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight)
-
-This function is called once the header information of an input-
-image has been processed. At this point the image dimensions are
-available and also some other properties depending on the type
-of the image. Eg. for a MNG the frame-/layercount, playtime &
-simplicity fields are known.
-
-The primary purpose of this callback is to inform the application
-of the size of the image, and for the application to initialize
-the drawing canvas to be used by the library. This is also a good
-point to set the canvas-style. Eg. mng_set_canvasstyle().
-
-\- mng_bool mng_processtext (mng_handle hHandle,
- mng_uint8 iType,
- mng_pchar zKeyword,
- mng_pchar zText,
- mng_pchar zLanguage,
- mng_pchar zTranslation)
-
-This callback is activated for each textual chunk in the input-
-image. These are tEXt, zTXt & iTXt. It may be used to retain
-specific comments for presentation to the user.
-
-\- mng_bool mng_processsave (mng_handle hHandle)
-
-\- mng_bool mng_processseek (mng_handle hHandle,
- mng_pchar zName)
-
-The purpose of these callbacks is to signal the processing of the
-SAVE & SEEK chunks in a MNG input-file. This may be used in the
-future to specify some special processing. At the moment these
-functions are only provided as a signal.
-
-\- mng_ptr mng_getcanvasline (mng_handle hHandle,
- mng_uint32 iLinenr)
-
-\- mng_ptr mng_getbkgdline (mng_handle hHandle,
- mng_uint32 iLinenr)
-
-\- mng_ptr mng_getalphaline (mng_handle hHandle,
- mng_uint32 iLinenr)
-
-These callbacks are used to access the drawing canvas, background
-canvas and an optional separate alpha-channel canvas. The latter is
-used only with the MNG_CANVAS_RGB8_A8 canvas-style.
-
-If the getbkgdline() callback is not supplied the library will
-composite fully or partially transparent pixels in the image against
-a specified background color. See mng_set_bgcolor() for more details.
-If a chosen canvas-style includes an alpha-channel, this callback
-is very likely not needed.
-
-The application is responsible for returning a pointer to a line of
-pixels, which should be in the exact format as defined by the call
-to mng_set_canvasstyle() and mng_set_bkgdstyle(), without gaps between
-the representation of each pixel, unless specified by the canvas-style.
-
-\- mng_bool mng_refresh (mng_handle hHandle,
- mng_uint32 iX,
- mng_uint32 iY,
- mng_uint32 iWidth,
- mng_uint32 iHeight)
-
-This callback is called when the library has drawn a complete frame
-onto the drawing canvas, and it is ready to be displayed.
-The application is responsible for transferring the drawing canvas
-from memory onto the actual output device.
-
-\- mng_uint32 mng_gettickcount (mng_handle hHandle)
-
-This function should return the number of milliseconds on some internal
-clock. The entire animation timing depends heavily on this function,
-and the number returned should be as accurate as possible.
-
-\- mng_bool mng_settimer (mng_handle hHandle,
- mng_uint32 iMsecs)
-
-This callback is activated every time the library requires a "pause".
-Note that the function itself should NOT execute the wait. It should
-simply store the time-field and allow the library to return. Libmng
-will return with the MNG_NEEDTIMERWAIT code, indicating the callback
-was called and it is now time to execute the pause.
-
-After the indicated number of milliseconds have elapsed, the application
-should call mng_display_resume(), to resume the animation as planned.
-
-This method allows for both a real timer or a simple wait command in the
-application. Whichever method you select, both the gettickcount() and
-settimer() callbacks are crucial for proper animation timing.
-
-\- mng_bool mng_processgamma (mng_handle hHandle,
- mng_uint32 iGamma)
-
-\- mng_bool mng_processchroma (mng_handle hHandle,
- mng_uint32 iWhitepointx,
- mng_uint32 iWhitepointy,
- mng_uint32 iRedx,
- mng_uint32 iRedy,
- mng_uint32 iGreenx,
- mng_uint32 iGreeny,
- mng_uint32 iBluex,
- mng_uint32 iBluey)
-
-\- mng_bool mng_processsrgb (mng_handle hHandle,
- mng_uint8 iRenderingintent)
-
-\- mng_bool mng_processiccp (mng_handle hHandle,
- mng_uint32 iProfilesize,
- mng_ptr pProfile)
-
-\- mng_bool mng_processarow (mng_handle hHandle,
- mng_uint32 iRowsamples,
- mng_bool bIsRGBA16,
- mng_ptr pRow)
-
-These callbacks are only required when you selected the MNG_APP_CMS
-directive during compilation of the library. See the configuration
-section for more details.
-
-\- mng_bool mng_iteratechunk (mng_handle hHandle,
- mng_handle hChunk,
- mng_chunkid iChunkid,
- mng_uint32 iChunkseq)
-
-This callback is only used for the mng_iterate_chunks() function.
-It is called exactly once for each chunk stored.
-
-
-.SH III. Housekeeping
-
-
-.SS Memory management
-
-The library can use internal memory allocation/deallocation or use
-provided callbacks for its memory management. The choice is made at
-compilation time. See the section on customization for details.
-
-If internal management has been selected, the memory callback functions
-need not be supplied. Even if you do supply them they will not be used.
-The actual code used is similar to the code discussed in the callback
-section:
-
- pPtr = calloc (1, iLen);
-
- free (pPtr);
-
-If your compiler does not support these functions, or you wish to monitor
-the library's use of memory for certain reasons, you can choose to
-compile the library with external memory management. In this case the
-memory callback functions MUST be supplied, and should function as if the
-above code was used.
-
-
-.SS Initialization
-
-The basic initialization of the library is short and swift:
-
- myhandle = mng_initialize (myuserdata, my_alloc,
- my_free, MNG_NULL);
- if (myhandle == MNG_NULL)
- /* process error */;
-
-The first field is an application-only parameter. It is saved in
-libmng's internal structures and available at all times through the
-mng_get_userdata() function. This is especially handy in callback functions
-if your program may be handling multiple files at the same time.
-
-The second and third field supply the library with the memory callback
-function entry-points. These are described in more detail in the callback
-section and the previous paragraph.
-
-The fourth and last field may be used to supply the library with the
-entry-point of a trace callback function. For regular use you will not
-need this!
-
-The function returns a handle which will be your ticket to MNG-heaven.
-All other functions rely on this handle. It is the single fixed unique
-reference-point between your application and the library.
-
-You should call the initialization function for each image you wish to
-process simultaneously. If you are processing images consecutively, you can
-reset the internal status of the library with the mng_reset() function.
-This function will clear all internal state variables, free any stored
-chunks and/or objects, etc, etc. Your callbacks and other external parameters
-will be retained.
-
-After you successfully received the handle it is time to set the required
-callbacks. The sections on reading, displaying & writing indicate which
-callbacks are required and which are optional.
-To set the callbacks simply do:
-
- myretcode = mng_setcb_xxxxxx (myhandle, my_xxxxxx);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-Naturally you'd replace the x's with the name of the callback.
-
-
-.SS Cleanup
-
-Once you've gotten hold of that precious mng_handle, you should always,
-and I mean always, call the cleanup function when you're done.
-Just do:
-
- mng_cleanup (myhandle);
-
-And you're done. There shouldn't be an ounce of memory spilled after
-that call.
-
-Note that if you would like to process multiple files consecutively
-you do not need to do mng_cleanup() / mng_initialize() between each file
-but simply
-
- myretcode = mng_reset (myhandle);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-will suffice. Saves some time and effort, that.
-
-
-.SS Error handling
-
-From the examples in the previous paragraphs you may have noticed a
-meticulous scheme for error handling. And yes, that's exactly what it is.
-Practically each call simply returns an errorcode, indicating success,
-eg. MNG_NOERROR or failure, anything else but MNG_NEEDMOREDATA and
-MNG_NEEDTIMERWAIT. These latter two will be discussed in more detail in
-their respective fields of interest: the reading section and displaying
-section respectively.
-
-It is the application's responsibility to check the returncode after
-each call. You can call mng_getlasterror() to receive the details of
-the last detected error. This even includes a discriptive error-message
-if you enabled that option during compilation of the library.
-
-Note that after receiving an error it is still possible to call the
-library, but it's also very likely that any following call will fail.
-The only functions deemed to work will be mng_reset() and mng_cleanup().
-Yes, if you abort your program after an error, you should still call
-mng_cleanup().
-
-
-.SH IV. Reading
-
-Reading a MNG, JNG or PNG is fairly easy. It depends slightly on your
-ultimate goal how certain specifics are to be handled, but the basics
-are similar in all cases.
-
-For the read functioins to work you must have compiled the library with
-the MNG_READ_SUPPRT directive. The standard DLL and Shared Library
-have this on by default!
-
-
-.SS Setup
-
-Naturally you must have initialized the library and be the owner of
-a mng_handle. The following callbacks are essential:
-
- mng_openstream, mng_readdata, mng_closestream
-
-You may optionally define:
-
- mng_errorproc, mng_traceproc
- mng_processheader, mng_processtext
- mng_processsave, mng_processseek
-
-The reading bit will also fail if you are already creating or
-displaying a file. Seems a bit obvious, but I thought I'd mention it,
-just in case.
-
-
-.SS To suspend or not to suspend
-
-There is one choice you need to make before calling the read function.
-Are you in need of suspension-mode or not?
-
-If you're reading from a disk you most certainly do not need
-suspension-mode. Even the oldest and slowest of disks will be fast
-enough for straight reading.
-
-However, if your input comes from a really slow device, such as a
-dialup-line or the likes, you may opt for suspension-mode. This is done
-by calling
-
- myretcode = mng_set_suspensionmode (myhandle,
- MNG_TRUE);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-Suspension-mode will force the library to use special buffering on the
-input. This allows your application to receive data of arbitrarily length
-and return this in the mng_readdata() callback, without disturbing the
-chunk processing routines of the library.
-
-Suspension-mode does require a little extra care in the main logic of the
-application. The read function may return with MNG_NEEDMOREDATA when the
-mng_readdata() callback returns less data then it needs to process the
-next chunk. This indicates the application to wait for more data to arrive
-and then resume processing by calling mng_read_resume().
-
-
-.SS The read HLAPI
-
-The actual reading is just plain simple. Since all I/O is done
-outside the library through the callbacks, the library can focus on
-its real task. Understanding, checking and labelling the input data!
-
-All you really need to do is this:
-
- myretcode = mng_read (myhandle);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-Of course, if you're on suspension-mode the code is a little more
-complicated:
-
- myretcode = mng_read (myhandle);
-
- while (myretcode == MNG_NEEDMOREDATA) {
- /* wait for input-data to arrive */
- myretcode = mng_read_resume (myhandle);
- }
-
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-This is rather crude and more sophisticated programming methods may
-dictate another approach. Whatever method you decide on, it should
-act as if the above code was in its place.
-
-There is also the mng_readdisplay() function, but this is discussed
-in the displaying section. It functions pretty much as the mng_read()
-function, but also immediately starts displaying the image.
-mng_read_resume() should be replaced by mng_display_resume() in that
-case!
-
-
-.SS What happens inside
-
-What actually happens inside the library depends on the configuration
-options set during the compilation of the library.
-
-Basically the library will first read the 8-byte file header, to determine
-its validity and the type of image it is about to process. Then it will
-repeatedly read a 4-byte chunk-length and then the remainder of the chunk
-until it either reaches EOF (indicated by the mng_readdata() callback) or
-implicitly decides EOF as it processed the logically last chunk of the
-image.
-
-Applications that require strict conformity and do not allow superfluous
-data after the ending chunk, will need to perform this check in their
-mng_closestream() callback.
-
-Each chunk is then checked on CRC, after which it is handed over to the
-appropriate chunk processing routine. These routines will disect the
-chunk, check the validity of its contents, check its position with respect
-to other chunks, etc, etc.
-
-If everything checks out, the chunk is further processed as follows:
-
-If display support has been selected during compilation, certain pre-display
-initialization will take place.
-
-If chunk-storage support has been selected during compilation, the chunks
-data may be stored in a special internal structure and held for future
-reference.
-
-
-.SS Storing and accessing chunks
-
-One of the compilation options activates support for chunk storage.
-This option may be useful if you want to examine an image. The directive
-is MNG_STORE_CHUNKS. You must also turn on the MNG_ACCESS_CHUNKS
-directive.
-
-The actual storage facility can be turned on or off with the
-mng_set_storechunks() function. If set to MNG_TRUE, chunks will be
-stored as they are read.
-
-At any point you can then call the mng_iterate_chunks() function
-to iterate through the current list of chunks. This function requires
-a callback which is called for each chunk and receives a specific
-chunk-handle. This chunk-handle can be used to call the appropriate
-mng_getchunk_xxxx() function, to access the chunks properties.
-
-A typical implementation may look like this:
-
- mng_bool my_iteratechunk (mng_handle hHandle,
- mng_handle hChunk,
- mng_chunkid iChunkid,
- mng_uint32 iChunkseq) {
- switch (iChunkid) {
- case MNG_UINT_MHDR : { /* process MHDR */;
- break; }
- case MNG_UINT_FRAM : { /* process FRAM */;
- break; }
-
- ...etc...
-
- case MNG_UINT_HUH : { /* unknown chunk */;
- break; }
- default : { /* duh; forgot one */; }
- }
-
- return MNG_TRUE; /* keep'm coming */
- }
-
-To get to the actual chunk fields of lets say a SHOW chunk you would do:
-
- mng_bool isempty;
- mng_uint16 firstid, lastid;
- mng_uint8 showmode;
-
- myretcode mng_getchunk_show (hHandle, hChunk,
- isempty, firstid,
- lastid, showmode);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-
-.SH V. Displaying
-
-
-.SS Setup
-
-Assuming you have initialized the library and are the owner of
-a mng_handle. The following callbacks are essential:
-
- mng_getcanvasline, mng_refresh
- mng_gettickcount, mng_settimer
-
-If you wish to use an application supplied background you must supply:
-
- mng_getbkgdline
-
-If you wish to use the MNG_CANVAS_RGB8_A8 canvas style you must supply:
-
- mng_getalphaline
-
-You may optionally define:
-
- mng_errorproc, mng_traceproc
- mng_processheader, mng_processtext
- mng_processsave, mng_processseek
-
-Note that the mng_processheader() callback is optional but will
-be quite significant for proper operation!
-
-Displaying an image will fail if you are creating a file or already
-displaying one. Yes, you can't display it twice!
-
-
-.SS A word on canvas styles
-
-The canvas style describes how your drawing canvas is made up.
-You must set this before the library actually starts drawing, so
-the mng_processheader() callback is a pretty good place for it.
-
-Currently only 8-bit RGB canvas styles are supported, either with
-or without an alpha channel.
-
-If you like to do alpha composition yourself you can select one of
-the canvas styles that include an alpha channel. You can even have
-a separate alpha canvas by selecting the MNG_CANVAS_RGB8_A8 style.
-
-All styles require a compact model. Eg. MNG_CANVAS_BGR8 requires
-your canvas lines in bgrbgrbgr... storage, where each letter
-represents an 8-bit value of the corresponding color, and each
-threesome makes up the values of one(1) pixel.
-
-The library processes a line at a time, so the canvas lines do not
-actually need to be consecutive in memory.
-
-
-.SS Alpha composition and application backgrounds
-
-All Network Graphics can be partially transparent. This requires
-special processing if you need to display an image against some
-background. Note that the MNG header (MHDR chunk) contains a
-simplicity field indicating whether transparency information in
-the file is critical or not. This only applies to embedded images,
-which means the full image-frame of the MNG may still contain fully
-transparent pixels!
-
-Depending on your needs you can supply a single background color,
-a background canvas or tell the library to return the alpha-channel
-and do alpha composition yourself.
-
-This is different from the BACK chunk in a MNG, or the bKGD chunk
-in an (embedded) PNG or JNG. The BACK chunk indicates an optional or
-mandatory background color and/or image. The bKGD chunk only indicates
-an optional background color. These chunks indicate the Authors
-preferences. They may be absent in which case you need to supply
-some sort of background yourself.
-
-.SS Composing against a background color
-
-This is the easiest method. Call the mng_set_bgcolor() function to
-set the values of the red, green and blue component of your preferred
-background color.
-
-Use one of the canvas styles that do not have an alpha-channel, and
-which matches your output requirements.
-
-.SS Composing against a background canvas
-
-This is somewhat more complicated. You will need to set the
-mng_getbkgdline() callback. This will be called whenever the library
-needs to compose a partially transparent line.
-
-This canvas must hold the background against which the image should
-be composed. Its size must match exactly with the image dimensions
-and thus the drawing canvas!
-
-Use one of the canvas styles that do not have an alpha-channel, and
-which matches your output requirements. The canvas style of the
-background canvas may even differ from the drawing canvas. The library's
-composing will still function properly.
-
-.SS Composing within the application
-
-If you have the option in your application to draw a (partially)
-transparent canvas to the output device, this option is preferred.
-
-Select one of the canvas styles that do have an alpha-channel.
-The library will now supply the appropriate alpha information,
-allowing the application to compose the image as it sees fit.
-
-
-.SS Color information and CMS
-
-Network Graphics may, and usually will, contain color-correction
-information. This information is intended to compensate for the
-difference in recording and display devices used.
-
-This document does not address the specifics of color-management.
-See the PNG specification for a more detailed description.
-
-.SS Using little cms by Marti Maria Saguer
-
-This is the easiest method, providing you can compile the lcms package.
-Select the MNG_FULL_CMS directive during compilation, and sit back and
-relax. The library will take care of all color-correction for you.
-
-.SS Using an OS- or application-supplied CMS
-
-If you are so lucky to have access to CMS functionality from within
-your application, you may instruct the library to leave color-correction
-to you.
-
-Select the MNG_APP_CMS directive during compilation of the library.
-You MUST also set the following callbacks:
-
- mng_processgamma, mng_processchroma,
- mng_processsrgb, mng_processiccp and
- mng_processarow
-
-The last callback is called when the library needs you to correct
-an arbitrary line of pixels. The other callbacks are called when
-the corresponding color-information is encountered in the file.
-You must store this information somewhere for use in the
-mng_processarow() callback.
-
-.SS Using gamma-only correction
-
-This isn't a preferred method, but it's better than no correction
-at all. Gamma-only correction will at least compensate for
-gamma-differences between the original recorder and your output device.
-
-Select the MNG_GAMMA_ONLY directive during compilation
-of the library. Your compiler MUST support fp operations.
-
-.SS No color correction
-
-Ouch. This is really bad. This is the least preferred method,
-but may be necessary if your system cannot use lcms, doesn't
-have its own CMS, and does not allow fp operations, ruling out
-the gamma-only option.
-
-Select the MNG_NO_CMS directive during compilation.
-Images will definitely not be displayed as seen by the Author!!!
-
-
-.SS Animations and timing
-
-Animations require some form of timing support. The library relies
-on two callbacks for this purpose. The mng_gettickcount() and
-mng_settimer() callbacks. mng_gettickcount() is used to determine
-the passing of time in milliseconds since the beginning of the
-animation. This is also used to compensate during suspension-mode
-if you are using the mng_readdisplay() function to read & display
-the file simultaneously.
-
-The callback may return an arbitrary number of milliseconds, but
-this number must increase proportionaly between calls. Most modern
-systems will have some tickcount() function which derives its
-input from an internal clock. The value returned from this function
-is more than adequate for libmng.
-
-The mng_settimer() callback is called when the library determines
-a little "pause" is required before rendering another frame of the
-animation. The pause interval is also expressed in milliseconds.
-Your application should store this value and return immediately.
-The library will then make appropriate arrangements to store its
-internal state and returns to your application with the
-MNG_NEEDTIMERWAIT code.
-
-At that point you should suspend processing and wait the given
-interval. Please use your OS features for this. Do not engage some
-sort of loop. That is real bad programming practice. Most modern
-systems will have some timing functions. A simple wait() function
-may suffice, but this may prevent your applications main-task from
-running, and possibly prevent the actual update of your output device.
-
-
-.SS The mng_refresh() callback
-
-The mng_refresh() callback is called whenever the library has
-"finished" drawing a new frame onto your canvas, and just before it
-will call the mng_settimer() callback.
-
-This allows you to perform some actions necessary to "refresh" the
-canvas onto your output device. Please do NOT suspend processing
-inside this callback. This must be handled after the mng_settimer()
-callback!
-
-
-.SS Displaying while reading
-
-This method is preferred if you are reading from a slow input device
-(such as a dialup-line) and you wish to start displaying something
-as quickly as possible. This functionality is provided mainly for
-browser-type applications but may be appropriate for other
-applications as well.
-
-The method is usually used in unison with the suspension-mode of
-the read module. A typical implementation would look like this:
-
- /* initiale library and set required callbacks */
-
- /* activate suspension-mode */
- myretcode = mng_set_suspensionmode (myhandle,
- MNG_TRUE);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
- myretcode = mng_readdisplay (myhandle);
-
- while ((myretcode == MNG_NEEDMOREDATA) ||
- (myretcode == MNG_NEEDTIMERWAIT)) {
- if (myretcode == MNG_NEEDMOREDATA)
- /* wait for more input-data */;
- else
- /* wait for timer interval */;
-
- myretcode = mng_display_resume (myhandle);
- }
-
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-More advanced programming methods may require a different approach,
-but the final result should function as in the code above.
-
-
-.SS Displaying after reading
-
-This method is used to display a file that was previously read.
-It is primarily meant for viewers with direct file access, such as
-1a local harddisk.
-
-Once you have successfully read the file, all you need to do is:
-
- myretcode = mng_display (myhandle);
-
- while (myretcode == MNG_NEEDTIMERWAIT) {
- /* wait for timer interval */;
- myretcode = mng_display_resume (myhandle);
- }
-
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-Again, more advanced programming methods may require a different
-approach, but the final result should function as in the code above.
-
-
-.SS Display manipulation
-
-Several HLAPI functions are provided to allow a user to manipulate
-the normal flow of an animation.
-
-\- mng_display_freeze (mng_handle hHandle)
-
-This will "freeze" the animation in place.
-
-\- mng_display_resume (mng_handle hHandle)
-
-This function can be used to resume a frozen animation, or to force
-the library to advance the animation to the next frame.
-
-\- mng_display_reset (mng_handle hHandle)
-
-This function will "reset" the animation into its pristine state.
-Calling mng_display() afterwards will re-display the animation
-from the first frame.
-
-\- mng_display_golayer (mng_handle hHandle,
- mng_uint32 iLayer)
-
-\- mng_display_goframe (mng_handle hHandle,
- mng_uint32 iFrame)
-
-\- mng_display_gotime (mng_handle hHandle,
- mng_uint32 iPlaytime)
-
-These three functions can be used to "jump" to a specific layer, frame
-or timeslot in the animation. You must "freeze" the animation before
-using any of these functions.
-
-All above functions may only be called during a timer interval!
-It is the applications responsibility to cleanup any resources with
-respect to the timer wait.
-
-
-.SH VI. Writing
-
-The main focus of the library lies in its displaying capabilites.
-But it does offer writing support as well.
-You can create and write a file, or you can write a file you
-have previously read, providing the storage of chunks was enabled
-and active.
-
-For this to work you must have compiled the library with the
-MNG_WRITE_SUPPO1RT and MNG_ACCESS_CHUNKS directives. The standard DLL and
-Shared Library have this on by default!
-
-
-.SS Setup
-
-As always you must have initialized the library and be the owner of
-a mng_handle. The following callbacks are essential:
-
- mng_openstream, mng_writedata, mng_closestream
-
-You can optionally define:
-
- mng_errorproc, mng_traceproc
-
-The creation and writing functions will fail if you are in the middle
-of reading, creating or writing a file.
-
-
-.SS Creating a new file
-
-To start a new file the library must be in its initial state.
-First you need to tell the library your intentions:
-
- myretcode = mng_create (myhandle);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-After that you start adding the appropriate chunks:
-
- myretcode = mng_put1chunk_mhdr (myhandle, ...);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-And so on, and so forth. Note that the library will automatically signal
-the logical end of the file by the ending chunk. Also the first chunk
-will indicate the library the filetype (eg. PNG, JNG or MNG) and force
-the proper signature when writing the file.
-
-The code above can be simplified, as you can always get the last errorcode
-by using the mng_getlasterror() function:
-
- if ( (mng_putchunk_xxxx (myhandle, ...)) or
- (mng_putchunk_xxxx (myhandle, ...)) or
- ...etc... )
- /* process error */;
-
-Please note that you must have a pretty good understanding of the chunk
-specification. Unlike the read functions, there are virtually no checks,
-so it is quite possible to write completely wrong files.
-It is a good practice to read back your file into the library to verify
-its integrity.
-
-Once you've got all the chunks added, all you do is:
-
- myretcode mng_write (myhandle);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-And presto. You're done. The real work is of course carried out in
-your callbacks. Note that this is a single operation as opposed to
-the read & display functions that may return with MNG_NEEDMOREDATA
-and/or MNG_NEEDTIMERWAIT. The write function just does the job, and
-only returns after it's finished or if it encounters some
-unrecoverable error.
-
-
-.SS Writing a previously read file
-
-If you have already successfully read a file, you can use the library to
-write it out as a copy or something. You MUST have compiled the library
-with the MNG_STORE_CHUNKS directive, and you must have done
-mng_set_storechunks (myhandle, MNG_TRUE).
-
-This doesn't require the MNG_ACCESS_CHUNKS directive, unless you want
-to fiddle with the chunks as well.
-
-Again all you need to do is:
-
- myretcode mng_write (myhandle);
- if (myretcode != MNG_NOERROR)
- /* process error */;
-
-
-.SH VII. Modifying/Customizing libmng:
-
-not finished yet
-
-.SS Compilation directives
-
-not finished yet
-
-.SS Platform dependant modification
-
-not finished yet
-
-.SH "SEE ALSO"
-.IR mng(5), jng(5), png(5), libpng(3)
-
-.LP
-libmng :
-.IP
-.br
-http://www.libmng.com
-
-.LP
-zlib :
-.IP
-.br
-http://www.info-zip.org/pub/infozip/zlib/
-
-.LP
-IJG JPEG library :
-.IP
-.br
-http://www.ijg.org
-
-.LP
-lcms (little CMS) by Marti Maria Saguer :
-.IP
-.br
-http://www.littlecms.com/
-
-.LP
-MNG specification:
-.IP
-.br
-http://www.libpng.org/pub/mng
-
-.LP
-In the case of any inconsistency between the MNG specification
-and this library, the specification takes precedence.
-
-
-.SH AUTHORS
-This man page: Gerard Juyn
-<gerard at libmng.com>
-
-The contributing authors would like to thank all those who helped
-with testing, bug fixes, and patience. This wouldn't have been
-possible without all of you!!!
-
-
-.SH COPYRIGHT NOTICE:
-
-Copyright (c) 2000-2002 Gerard Juyn
-
-For the purposes of this copyright and license, "Contributing Authors"
-is defined as the following set of individuals:
-
- Gerard Juyn
-
-The MNG Library is supplied "AS IS". The Contributing Authors
-disclaim all warranties, expressed or implied, including, without
-limitation, the warranties of merchantability and of fitness for any
-purpose. The Contributing Authors assume no liability for direct,
-indirect, incidental, special, exemplary, or consequential damages,
-which may result from the use of the MNG Library, even if advised of
-the possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-source code, or portions hereof, for any purpose, without fee, subject
-to the following restrictions:
-
-1. The origin of this source code must not be misrepresented;
-you must not claim that you wrote the original software.
-
-2. Altered versions must be plainly marked as such and must not be
-misrepresented as being the original source.
-
-3. This Copyright notice may not be removed or altered from any source
-or altered source distribution.
-
-The Contributing Authors specifically permit, without fee, and
-encourage the use of this source code as a component to supporting
-the MNG and JNG file format in commercial products. If you use this
-source code in a product, acknowledgment would be highly appreciated.
-
-.SH Remarks
-
-Parts of this software have been adapted from the libpng library.
-Although this library supports all features from the PNG specification
-(as MNG descends from it) it does not require the libpng library.
-It does require the zlib library and optionally the IJG JPEG library,
-and/or the "little-cms" library by Marti Maria Saguer (depending on the
-inclusion of support for JNG and Full-Color-Management respectively.
-
-This library's function is primarily to read and display MNG
-animations. It is not meant as a full-featured image-editing
-component! It does however offer creation and editing functionality
-at the chunk level. (future modifications may include some more
-support for creation and or editing)
-
-.\" end of man page
diff --git a/src/3rdparty/libmng/doc/man/mng.5 b/src/3rdparty/libmng/doc/man/mng.5
deleted file mode 100644
index e40c249100..0000000000
--- a/src/3rdparty/libmng/doc/man/mng.5
+++ /dev/null
@@ -1,42 +0,0 @@
-.TH MNG 5 "July 25, 2000"
-.SH NAME
-mng \- Multiple-image Network Graphics (MNG) format
-.SH DESCRIPTION
-MNG (Multiple-image Network Graphics) is the animation extension of the
-popular PNG image-format. PNG (Portable Network Graphics) is an
-extensible file format for the lossless, portable, well-compressed
-storage of raster images.
-.br
-
-MNG has advanced animation features which make it very useful as a full
-replacement for GIF animations. These features allow animations that
-are impossible with GIF or result in much smaller files as GIF.
-
-As MNG builds on the same structure as PNG, it is robust, extensible and
-free of patents. It retains the same clever file integrity checks as in PNG.
-
-MNG also embraces the lossy JPEG image-format in a sub-format named JNG,
-which allows for alpha-transparency and color-correction on highly
-compressed (photographic) images.
-
-.SH "SEE ALSO"
-.IR png(5) ", " jng(5) ", " libmng(3) ", " libpng(3) ", " zlib(3) ", "
-deflate(5) ", " zlib(5) ", " jpeg(5)
-.LP
-MNG 1.00, Februari 9, 2001:
-.IP
-.br
-http://www.libpng.org/pub/mng
-.SH AUTHORS
-This man page: Gerard Juyn
-.LP
-Multiple-image Network Graphics (MNG) Specification Version 1.00 (Februari 9, 2001):
-Glenn Randers-Pehrson and others (png-list@ccrc.wustl.edu).
-.LP
-
-.SH COPYRIGHT NOTICE
-The MNG-1.00 specification is copyright (c) 1998-2001 Glenn Randers-Pehrson.
-See the specification for conditions of use and distribution.
-.LP
-.\" end of man page
-
diff --git a/src/3rdparty/libmng/doc/misc/magic.dif b/src/3rdparty/libmng/doc/misc/magic.dif
deleted file mode 100644
index 005ad5a746..0000000000
--- a/src/3rdparty/libmng/doc/misc/magic.dif
+++ /dev/null
@@ -1,30 +0,0 @@
---- magic.orig Wed Aug 14 16:48:56 2002
-+++ magic Wed Aug 14 16:50:09 2002
-@@ -2544,6 +2544,27 @@
- >>28 byte 1 interlaced
- 1 string PNG PNG image data, CORRUPTED
-
-+#MNG
-+# 0x8a M N G 0x0d 0x0a 0x1a 0x0a [4-byte pad]
-+# M H D R [4-byte width][4-byte height][4-byte ticks][4-byte layers]
-+# [4-byte frame][4-byte time]
-+#
-+0 string \x8aMNG MNG image data,
-+>4 belong !0x0d0a1a0a CORRUPTED
-+>4 belong 0x0d0a1a0a
-+>>16 belong x %ld x
-+>>20 belong x %ld
-+
-+#JNG
-+# 0x8b J N G 0x0d 0x0a 0x1a 0x0a [4-byte pad]
-+# J H D R [4-byte width][4-byte height]
-+#
-+0 string \x8bJNG JNG image data,
-+>4 belong !0x0d0a1a0a CORRUPTED
-+>4 belong 0x0d0a1a0a
-+>>16 belong x %ld x
-+>>20 belong x %ld
-+
- # GIF
- 0 string GIF8 GIF image data
- >4 string 7a \b, version 8%s,
diff --git a/src/3rdparty/libmng/doc/rpm/libmng-1.0.10-rhconf.patch b/src/3rdparty/libmng/doc/rpm/libmng-1.0.10-rhconf.patch
deleted file mode 100644
index a73b79dbe5..0000000000
--- a/src/3rdparty/libmng/doc/rpm/libmng-1.0.10-rhconf.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- libmng/makefiles/makefile.linux.orig Sat Jul 1 15:10:35 2000
-+++ libmng/makefiles/makefile.linux Sat Jul 1 15:14:52 2000
-@@ -13,19 +13,19 @@
- OPTIONS = -DMNG_BUILD_SO
-
- # where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h
--prefix=/usr/local
-+prefix=/usr
-
- # Where the zlib library and include files are located
--ZLIBLIB=../zlib
--ZLIBINC=../zlib
-+ZLIBLIB=/usr/lib
-+ZLIBINC=/usr/include
-
- # Where the jpeg library and include files are located
--JPEGLIB=../jpgsrc
--JPEGINC=../jpgsrc
-+JPEGLIB=/usr/lib
-+JPEGINC=/usr/include
-
- # Where the lcms library and include files are located
--LCMSLIB=../lcms/lib
--LCMSINC=../lcms/source
-+LCMSLIB=/usr/lib
-+LCMSINC=/usr/include
-
- ALIGN=
- # for i386:
-@@ -37,7 +37,7 @@
-
- # for pgcc version 2.95.1, -O3 is buggy; don't use it.
-
--CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -funroll-loops \
-+CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall $(RPM_OPT_FLAGS) \
- $(OPTIONS) $(ALIGN) # $(WARNMORE) -g
- LDFLAGS=-L. -Wl,-rpath,. \
- -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
diff --git a/src/3rdparty/libmng/doc/rpm/libmng.spec b/src/3rdparty/libmng/doc/rpm/libmng.spec
deleted file mode 100644
index 89908d7a97..0000000000
--- a/src/3rdparty/libmng/doc/rpm/libmng.spec
+++ /dev/null
@@ -1,116 +0,0 @@
-Summary: A library of functions for manipulating MNG format files.
-Name: libmng
-Version: 1.0.10
-Release: 2.1
-Copyright: AS IS
-Group: System Environment/Libraries
-Source0: libmng-%{PACKAGE_VERSION}.tar.gz
-Patch: libmng-%{PACKAGE_VERSION}-rhconf.patch
-URL: http://www.libmng.com/
-BuildRoot: /var/tmp/libmng-root
-BuildPrereq: libjpeg-devel, zlib-devel, lcms-devel
-
-%description
-libmng - library for reading, writing, displaying and examing
-Multiple-Image Network Graphics. MNG is the animation extension to the
-popular PNG image-format.
-
-%package devel
-Summary: Development tools for programs to manipulate MNG format files.
-Group: Development/Libraries
-Requires: libmng = %{PACKAGE_VERSION}
-%description devel
-The libmng-devel package contains the header files and static
-libraries necessary for developing programs using the MNG
-(Multiple-Image Network Graphics) library.
-
-If you want to develop programs which will manipulate MNG image format
-files, you should install libmng-devel. You'll also need to install
-the libmng package.
-
-%changelog
-* Fri Jul 13 2007 Glenn Randers-Pehrson <glennrp at users.sf.net>
-- updated to 1.0.10
-
-* Thu Aug 5 2004 Gerard Juyn <gerard at libmng.com>
-* Sun Jan 30 2005 Gerard Juyn <gerard at libmng.com>
-- updated to 1.0.9
-
-* Thu Aug 5 2004 Gerard Juyn <gerard at libmng.com>
-- updated to 1.0.8
-
-* Sun Mar 21 2004 Gerard Juyn <gerard at libmng.com>
-- updated to 1.0.7
-
-* Sun Oct 19 2003 Gerard Juyn <gerard at libmng.com>
-- updated to 1.0.6
-
-* Tue Sep 24 2002 Gerard Juyn <gerard at libmng.com>
-- updated to 1.0.5
-
-* Sun Jun 23 2002 Gerard Juyn <gerard at libmng.com>
-- updated to 1.0.4
-
-* Mon Sep 18 2001 Gerard Juyn <gerard at libmng.com>
-- updated to 1.0.3
-
-* Sat Jul 7 2001 Gerard Juyn <gerard at libmng.com>
-- updated to 1.0.2
-
-* Wed May 2 2001 Gerard Juyn <gerard at libmng.com>
-- updated to 1.0.1
-
-* Mon Feb 5 2001 Gerard Juyn <gerard at libmng.com>
-- updated to 1.0.0
-
-* Fri Jan 19 2001 Gerard Juyn <gerard at libmng.com>
-- updated to 0.9.4
-
-* Sat Oct 28 2000 Gerard Juyn <gerard at libmng.com>
-- updated to 0.9.3
-
-* Tue Aug 15 2000 MATSUURA Takanori <t-matsuu at protein.osaka-u.ac.jp>
-- based on libmng-0.9.2/doc/rpm/libmng.spec
-- use %%configure and %%makeinstall
-
-* Sat Aug 5 2000 Gerard Juyn <gerard at libmng.com>
-- updated to 0.9.2
-
-* Wed Jul 26 2000 Gerard Juyn <gerard at libmng.com>
-- updated to 0.9.1
-
-* Sat Jul 1 2000 MATSUURA Takanori <t-matsuu at protein.osaka-u.ac.jp>
-- updated to 0.9.0
-
-* Sat Jun 24 2000 MATSUURA Takanori <t-matsuu at protein.osaka-u.ac.jp>
-- 1st release for RPM
-
-%prep
-%setup
-%configure
-
-%build
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%doc CHANGES LICENSE README doc
-/usr/lib/libmng.so.*
-
-%files devel
-%defattr(-,root,root)
-/usr/include/*
-/usr/lib/libmng.a
-/usr/lib/libmng.so
-
diff --git a/src/3rdparty/libmng/libmng.h b/src/3rdparty/libmng/libmng.h
deleted file mode 100644
index b3b1ab1418..0000000000
--- a/src/3rdparty/libmng/libmng.h
+++ /dev/null
@@ -1,2932 +0,0 @@
-/* ************************************************************************** */
-/* * * */
-/* * COPYRIGHT NOTICE: * */
-/* * * */
-/* * Copyright (c) 2000-2007 Gerard Juyn * */
-/* * [You may insert additional notices after this sentence if you modify * */
-/* * this source] * */
-/* * * */
-/* * For the purposes of this copyright and license, "Contributing Authors" * */
-/* * is defined as the following set of individuals: * */
-/* * * */
-/* * Gerard Juyn - gjuyn :at: users.sourceforge.net * */
-/* * Glenn Randers-Pehrson - glennrp :at: users.sourceforge.net * */
-/* * Raphael Assenat - raph :at: raphnet.net * */
-/* * John Stiles - * */
-/* * * */
-/* * The MNG Library is supplied "AS IS". The Contributing Authors * */
-/* * disclaim all warranties, expressed or implied, including, without * */
-/* * limitation, the warranties of merchantability and of fitness for any * */
-/* * purpose. The Contributing Authors assume no liability for direct, * */
-/* * indirect, incidental, special, exemplary, or consequential damages, * */
-/* * which may result from the use of the MNG Library, even if advised of * */
-/* * the possibility of such damage. * */
-/* * * */
-/* * Permission is hereby granted to use, copy, modify, and distribute this * */
-/* * source code, or portions hereof, for any purpose, without fee, subject * */
-/* * to the following restrictions: * */
-/* * * */
-/* * 1. The origin of this source code must not be misrepresented; * */
-/* * you must not claim that you wrote the original software. * */
-/* * * */
-/* * 2. Altered versions must be plainly marked as such and must not be * */
-/* * misrepresented as being the original source. * */
-/* * * */
-/* * 3. This Copyright notice may not be removed or altered from any source * */
-/* * or altered source distribution. * */
-/* * * */
-/* * The Contributing Authors specifically permit, without fee, and * */
-/* * encourage the use of this source code as a component to supporting * */
-/* * the MNG and JNG file format in commercial products. If you use this * */
-/* * source code in a product, acknowledgment would be highly appreciated. * */
-/* * * */
-/* ************************************************************************** */
-/* * * */
-/* * Parts of this software have been adapted from the libpng package. * */
-/* * Although this library supports all features from the PNG specification * */
-/* * (as MNG descends from it) it does not require the libpng package. * */
-/* * It does require the zlib library and optionally the IJG jpeg library, * */
-/* * and/or the "little-cms" library by Marti Maria (depending on the * */
-/* * inclusion of support for JNG and Full-Color-Management respectively. * */
-/* * * */
-/* * This library's function is primarily to read and display MNG * */
-/* * animations. It is not meant as a full-featured image-editing * */
-/* * component! It does however offer creation and editing functionality * */
-/* * at the chunk level. * */
-/* * (future modifications may include some more support for creation * */
-/* * and or editing) * */
-/* * * */
-/* ************************************************************************** */
-
-/* ************************************************************************** */
-/* * * */
-/* * Version numbering * */
-/* * * */
-/* * X.Y.Z : X = release (0 = initial build) * */
-/* * Y = major version (uneven = test; even = production) * */
-/* * Z = minor version (bugfixes; 2 is older than 10) * */
-/* * * */
-/* * production versions only appear when a test-version is extensively * */
-/* * tested and found stable or for intermediate bug-fixes (recognized by * */
-/* * a change in the Z number) * */
-/* * * */
-/* * x.1.x = test version * */
-/* * x.2.x = production version * */
-/* * x.3.x = test version * */
-/* * x.4.x = production version * */
-/* * etc. * */
-/* * * */
-/* ************************************************************************** */
-/* * * */
-/* * Identifier naming conventions throughout this library * */
-/* * * */
-/* * iXxxx = an integer * */
-/* * dXxxx = a float * */
-/* * pXxxx = a pointer * */
-/* * bXxxx = a boolean * */
-/* * eXxxx = an enumeration * */
-/* * hXxxx = a handle * */
-/* * zXxxx = a zero-terminated string (pchar) * */
-/* * fXxxx = a pointer to a function (callback) * */
-/* * aXxxx = an array * */
-/* * sXxxx = a structure * */
-/* * * */
-/* * Macros & defines are in all uppercase. * */
-/* * Functions & typedefs in all lowercase. * */
-/* * Exported stuff is prefixed with MNG_ or mng_ respectively. * */
-/* * * */
-/* * (I may have missed a couple; don't hesitate to let me know!) * */
-/* * * */
-/* ************************************************************************** */
-
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng.h copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : main application interface * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : The main application interface. An application should not * */
-/* * need access to any of the other modules! * */
-/* * * */
-/* * changes : 0.5.1 - 05/06/2000 - G.Juyn * */
-/* * - changed chunk iteration function * */
-/* * 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - added chunk access functions * */
-/* * - added version control constants & functions * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - added set_outputprofile2 & set_srgbprofile2 * */
-/* * - added empty-chunk put-routines * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - added version_dll & VERSION_DLL (for consistency) * */
-/* * - added version control explanatory text & samples * */
-/* * 0.5.1 - 05/15/2000 - G.Juyn * */
-/* * - added getimgdata & putimgdata functions * */
-/* * * */
-/* * 0.5.2 - 05/16/2000 - G.Juyn * */
-/* * - changed the version parameters (obviously) * */
-/* * 0.5.2 - 05/18/2000 - G.Juyn * */
-/* * - complimented constants for chunk-property values * */
-/* * 0.5.2 - 05/23/2000 - G.Juyn * */
-/* * - fixed MNG_UINT_pHYg value * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - added support for get/set default zlib/IJG parms * */
-/* * 0.5.2 - 06/02/2000 - G.Juyn * */
-/* * - added MNG_BIGENDIAN_SUPPORT (contributed by Tim Rowley) * */
-/* * - separated configuration-options into "mng_conf.h" * */
-/* * - added RGB8_A8 canvasstyle * */
-/* * - added getalphaline callback for RGB8_A8 canvasstyle * */
-/* * 0.5.2 - 06/06/2000 - G.Juyn * */
-/* * - moved errorcodes from "mng_error.h" * */
-/* * - added mng_read_resume function to support * */
-/* * read-suspension * */
-/* * * */
-/* * 0.5.3 - 06/16/2000 - G.Juyn * */
-/* * - changed the version parameters (obviously) * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - added get/set for speedtype to facilitate testing * */
-/* * - added get for imagelevel during processtext callback * */
-/* * 0.5.3 - 06/24/2000 - G.Juyn * */
-/* * - fixed inclusion of IJG read/write code * */
-/* * 0.5.3 - 06/26/2000 - G.Juyn * */
-/* * - changed userdata variable to mng_ptr * */
-/* * * */
-/* * 0.9.0 - 06/30/2000 - G.Juyn * */
-/* * - changed refresh parameters to 'x,y,width,height' * */
-/* * * */
-/* * 0.9.1 - 07/06/2000 - G.Juyn * */
-/* * - added MNG_NEEDTIMERWAIT errorcode * */
-/* * - changed comments to indicate modified behavior for * */
-/* * timer & suspension breaks * */
-/* * 0.9.1 - 07/08/2000 - G.Juyn * */
-/* * - added get routines for internal display variables * */
-/* * - added get/set routines for suspensionmode variable * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - added callbacks for SAVE/SEEK processing * */
-/* * - added get/set routines for sectionbreak variable * */
-/* * - added NEEDSECTIONWAIT errorcode * */
-/* * 0.9.1 - 07/19/2000 - G.Juyn * */
-/* * - added function to set frame-/layer-count & playtime * */
-/* * - added errorcode for updatemngheader if not a MNG * */
-/* * * */
-/* * 0.9.2 - 07/31/2000 - G.Juyn * */
-/* * - fixed problem with trace-functions improperly wrapped * */
-/* * - added status_xxxx functions * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * - added function to set simplicity field * */
-/* * * */
-/* * 0.9.3 - 08/09/2000 - G.Juyn * */
-/* * - added check for simplicity-bits in MHDR * */
-/* * 0.9.3 - 08/12/2000 - G.Juyn * */
-/* * - added workaround for faulty PhotoShop iCCP chunk * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * 0.9.3 - 10/10/2000 - G.Juyn * */
-/* * - added support for alpha-depth prediction * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - fixed processing of unknown critical chunks * */
-/* * - removed test-MaGN * */
-/* * - added PNG/MNG spec version indicators * */
-/* * - added support for nEED * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added functions to retrieve PNG/JNG specific header-info * */
-/* * - added JDAA chunk * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - added callback to process non-critical unknown chunks * */
-/* * 0.9.3 - 10/20/2000 - G.Juyn * */
-/* * - added errocode for delayed delta-processing * */
-/* * - added get/set for bKGD preference setting * */
-/* * 0.9.3 - 10/21/2000 - G.Juyn * */
-/* * - added get function for interlace/progressive display * */
-/* * * */
-/* * 0.9.4 - 01/18/2001 - G.Juyn * */
-/* * - added errorcode for MAGN methods * */
-/* * - removed test filter-methods 1 & 65 * */
-/* * * */
-/* * 1.0.0 - 02/05/2001 - G.Juyn * */
-/* * - version numbers (obviously) * */
-/* * * */
-/* * 1.0.1 - 02/08/2001 - G.Juyn * */
-/* * - added MEND processing callback * */
-/* * 1.0.1 - 04/21/2001 - G.Juyn (code by G.Kelly) * */
-/* * - added BGRA8 canvas with premultiplied alpha * */
-/* * 1.0.1 - 05/02/2001 - G.Juyn * */
-/* * - added "default" sRGB generation (Thanks Marti!) * */
-/* * * */
-/* * 1.0.2 - 06/23/2001 - G.Juyn * */
-/* * - added optimization option for MNG-video playback * */
-/* * - added processterm callback * */
-/* * 1.0.2 - 06/25/2001 - G.Juyn * */
-/* * - added late binding errorcode (not used internally) * */
-/* * - added option to turn off progressive refresh * */
-/* * * */
-/* * 1.0.3 - 08/06/2001 - G.Juyn * */
-/* * - added get function for last processed BACK chunk * */
-/* * * */
-/* * 1.0.5 - 07/04/2002 - G.Juyn * */
-/* * - added errorcode for extreme chunk-sizes * */
-/* * 1.0.5 - 08/07/2002 - G.Juyn * */
-/* * - added test-option for PNG filter method 193 (=no filter) * */
-/* * 1.0.5 - 08/15/2002 - G.Juyn * */
-/* * - completed PROM support * */
-/* * - completed delta-image support * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - added HLAPI function to copy chunks * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * - added 'supports' call to check function availability * */
-/* * 1.0.5 - 09/15/2002 - G.Juyn * */
-/* * - fixed LOOP iteration=0 special case * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - added support for PAST * */
-/* * 1.0.5 - 09/22/2002 - G.Juyn * */
-/* * - added bgrx8 canvas (filler byte) * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - added check for TERM placement during create/write * */
-/* * - added beta version function & constant * */
-/* * 1.0.5 - 11/07/2002 - G.Juyn * */
-/* * - added support to get totals after mng_read() * */
-/* * * */
-/* * 1.0.6 - 07/07/2003 - G. Randers-Pehrson * */
-/* * - added support for reducing the footprint of libmng * */
-/* * by macros that optionally skip unused chunks, remove * */
-/* * 16-bit sample support, remove Delta support, and * */
-/* * remove JNG support, to accomodate Mozilla/Firebird. * */
-/* * 1.0.6 - 07/14/2003 - G. Randers-Pehrson * */
-/* * - further optional removal of unused functions * */
-/* * * */
-/* * 1.0.7 - 11/27/2003 - R.A * */
-/* * - added CANVAS_RGB565 and CANVAS_BGR565 * */
-/* * 1.0.7 - 12/06/2003 - R.A * */
-/* * - added CANVAS_RGBA565 and CANVAS_BGRA565 * */
-/* * 1.0.7 - 01/25/2004 - J.S * */
-/* * - added premultiplied alpha canvas' for RGBA, ARGB, ABGR * */
-/* * 1.0.7 - 03/07/2004 - G. Randers-Pehrson * */
-/* * - put gamma, cms-related declarations inside #ifdef * */
-/* * 1.0.7 - 03/10/2004 - G.R-P * */
-/* * - added conditionals around openstream/closestream * */
-/* * * */
-/* * 1.0.8 - 04/02/2004 - G.Juyn * */
-/* * - added CRC existence & checking flags * */
-/* * 1.0.8 - 04/12/2004 - G.Juyn * */
-/* * - added data-push mechanisms for specialized decoders * */
-/* * 1.0.8 - 06/05/2004 - G.R-P * */
-/* * - define MNG_INCLUDE_ZLIB when MNG_USE_ZLIB_CRC is defined * */
-/* * * */
-/* * 1.0.9 - 10/03/2004 - G.Juyn * */
-/* * - added function to retrieve current FRAM delay * */
-/* * 1.0.9 - 10/14/2004 - G.Juyn * */
-/* * - added bgr565_a8 canvas-style (thanks to J. Elvander) * */
-/* * 1.0.9 - 10/17/2004 - G.Juyn * */
-/* * - fixed PPLT getchunk/putchunk routines * */
-/* * * */
-/* * 1.0.10 - 03/07/2006 - (thanks to W. Manthey) * */
-/* * - added CANVAS_RGB555 and CANVAS_BGR555 * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_h_
-#define _libmng_h_
-
-/* ************************************************************************** */
-
-#include "libmng_conf.h" /* user-specific configuration options */
-
-/* ************************************************************************** */
-
-#define MNG_CHECK_BAD_ICCP /* let's catch that sucker !!! */
-
-#ifdef MNG_SUPPORT_READ /* dependencies based on user-configuration */
-#define MNG_INCLUDE_READ_PROCS
-#endif
-
-#ifdef MNG_SUPPORT_WRITE
-#define MNG_INCLUDE_WRITE_PROCS
-#endif
-
-#ifdef MNG_USE_ZLIB_CRC
-#define MNG_INCLUDE_ZLIB
-#endif
-
-#ifdef MNG_SUPPORT_DISPLAY
-#define MNG_INCLUDE_FILTERS
-#define MNG_INCLUDE_INTERLACE
-#define MNG_INCLUDE_OBJECTS
-#define MNG_INCLUDE_DISPLAY_PROCS
-#define MNG_INCLUDE_TIMING_PROCS
-#define MNG_INCLUDE_ZLIB
-#endif
-
-#ifdef MNG_STORE_CHUNKS
-#define MNG_INCLUDE_ZLIB
-#endif
-
-#ifdef MNG_SUPPORT_IJG6B
-#define MNG_INCLUDE_JNG
-#define MNG_INCLUDE_IJG6B
-#define MNG_USE_SETJMP
-#endif
-
-#ifdef MNG_INCLUDE_JNG
-#if defined(MNG_SUPPORT_DISPLAY) || defined(MNG_ACCESS_CHUNKS)
-#define MNG_INCLUDE_JNG_READ
-#endif
-#if defined(MNG_SUPPORT_WRITE) || defined(MNG_ACCESS_CHUNKS)
-#define MNG_INCLUDE_JNG_WRITE
-#endif
-#endif
-
-#ifdef MNG_FULL_CMS
-#define MNG_INCLUDE_LCMS
-#endif
-
-#ifdef MNG_AUTO_DITHER
-#define MNG_INCLUDE_DITHERING
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
-#define MNG_INCLUDE_TRACE_PROCS
-#ifdef MNG_TRACE_TELLTALE
-#define MNG_INCLUDE_TRACE_STRINGS
-#endif
-#endif
-
-#ifdef MNG_ERROR_TELLTALE
-#define MNG_INCLUDE_ERROR_STRINGS
-#endif
-
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_OPTIMIZE_CHUNKACCESS
-#define MNG_OPTIMIZE_CHUNKACCESS
-#endif
-#else
-#ifdef MNG_OPTIMIZE_CHUNKACCESS
-#undef MNG_OPTIMIZE_CHUNKACCESS
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#include "libmng_types.h" /* platform-specific definitions
- and other assorted stuff */
-
-/* ************************************************************************** */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Versioning control * */
-/* * * */
-/* * version_so and version_dll will NOT reflect version_major; * */
-/* * these will only change for binary incompatible changes (which will * */
-/* * hopefully never occur) * */
-/* * note: they will be set to 1 on the first public release !!! * */
-/* * * */
-/* * first public release: * */
-/* * #define MNG_VERSION_TEXT "1.0.0" * */
-/* * #define MNG_VERSION_SO 1 eg. libmng.so.1 * */
-/* * #define MNG_VERSION_DLL 1 eg. libmng.dll * */
-/* * #define MNG_VERSION_MAJOR 1 * */
-/* * #define MNG_VERSION_MINOR 0 * */
-/* * #define MNG_VERSION_RELEASE 0 * */
-/* * * */
-/* * bug fix & cosmetics : * */
-/* * #define MNG_VERSION_TEXT "1.0.1" * */
-/* * #define MNG_VERSION_SO 1 eg. libmng.so.1 * */
-/* * #define MNG_VERSION_DLL 1 eg. libmng.dll * */
-/* * #define MNG_VERSION_MAJOR 1 * */
-/* * #define MNG_VERSION_MINOR 0 * */
-/* * #define MNG_VERSION_RELEASE 1 * */
-/* * * */
-/* * feature change : * */
-/* * #define MNG_VERSION_TEXT "1.2.0" * */
-/* * #define MNG_VERSION_SO 1 eg. libmng.so.1 * */
-/* * #define MNG_VERSION_DLL 1 eg. libmng.dll * */
-/* * #define MNG_VERSION_MAJOR 1 * */
-/* * #define MNG_VERSION_MINOR 2 * */
-/* * #define MNG_VERSION_RELEASE 0 * */
-/* * * */
-/* * major rewrite (still binary compatible) : * */
-/* * #define MNG_VERSION_TEXT "2.0.0" * */
-/* * #define MNG_VERSION_SO 1 eg. libmng.so.1 * */
-/* * #define MNG_VERSION_DLL 1 eg. libmng.dll * */
-/* * #define MNG_VERSION_MAJOR 2 * */
-/* * #define MNG_VERSION_MINOR 0 * */
-/* * #define MNG_VERSION_RELEASE 0 * */
-/* * * */
-/* * binary incompatible change: * */
-/* * #define MNG_VERSION_TEXT "13.0.0" * */
-/* * #define MNG_VERSION_SO 2 eg. libmng.so.2 * */
-/* * #define MNG_VERSION_DLL 2 eg. libmng2.dll * */
-/* * #define MNG_VERSION_MAJOR 13 * */
-/* * #define MNG_VERSION_MINOR 0 * */
-/* * #define MNG_VERSION_RELEASE 0 * */
-/* * * */
-/* * note that version_so & version_dll will always remain equal so it * */
-/* * doesn't matter which one is called to do version-checking; they are * */
-/* * just provided for their target platform * */
-/* * * */
-/* ************************************************************************** */
-
-#define MNG_VERSION_TEXT "1.0.10"
-#define MNG_VERSION_SO 1 /* eg. libmng.so.1 */
-#define MNG_VERSION_DLL 1 /* but: libmng.dll (!) */
-#define MNG_VERSION_MAJOR 1
-#define MNG_VERSION_MINOR 0
-#define MNG_VERSION_RELEASE 10
-#define MNG_VERSION_BETA MNG_FALSE
-
-MNG_EXT mng_pchar MNG_DECL mng_version_text (void);
-MNG_EXT mng_uint8 MNG_DECL mng_version_so (void);
-MNG_EXT mng_uint8 MNG_DECL mng_version_dll (void);
-MNG_EXT mng_uint8 MNG_DECL mng_version_major (void);
-MNG_EXT mng_uint8 MNG_DECL mng_version_minor (void);
-MNG_EXT mng_uint8 MNG_DECL mng_version_release (void);
-MNG_EXT mng_bool MNG_DECL mng_version_beta (void);
-
-/* use the following call to check wether the version of libmng your app
- is using supports the given function; this is useful in apps that dynamically
- load the library to make sure a certain function will work; the result will
- be MNG_TRUE if the given function is implemented in this version of the library;
- Major/Minor/Version indicate the version the function became available;
- (if these fields are zero the function is not yet implemented!) */
-#ifdef MNG_SUPPORT_FUNCQUERY
-MNG_EXT mng_bool MNG_DECL mng_supports_func (mng_pchar zFunction,
- mng_uint8* iMajor,
- mng_uint8* iMinor,
- mng_uint8* iRelease);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * MNG/PNG specification level conformance * */
-/* * * */
-/* ************************************************************************** */
-
-#define MNG_PNG_VERSION "1.2"
-#define MNG_PNG_VERSION_MAJ 1
-#define MNG_PNG_VERSION_MIN 2
-
-#define MNG_MNG_VERSION "1.1"
-#define MNG_MNG_VERSION_MAJ 1
-#define MNG_MNG_VERSION_MIN 1
-#define MNG_MNG_DRAFT 99 /* deprecated;
- only used for nEED "MNG DRAFT nn" */
-
-/* ************************************************************************** */
-/* * * */
-/* * High-level application functions * */
-/* * * */
-/* ************************************************************************** */
-
-/* library initialization function */
-/* must be the first called before anything can be done at all */
-/* initializes internal datastructure(s) */
-MNG_EXT mng_handle MNG_DECL mng_initialize (mng_ptr pUserdata,
- mng_memalloc fMemalloc,
- mng_memfree fMemfree,
- mng_traceproc fTraceproc);
-
-/* library reset function */
-/* can be used to re-initialize the library, so another image can be
- processed. there's absolutely no harm in calling it, even when it's not
- really necessary */
-MNG_EXT mng_retcode MNG_DECL mng_reset (mng_handle hHandle);
-
-/* library cleanup function */
-/* must be the last called to clean up internal datastructure(s) */
-MNG_EXT mng_retcode MNG_DECL mng_cleanup (mng_handle* hHandle);
-
-/* high-level read functions */
-/* use mng_read if you simply want to read a Network Graphic */
-/* mng_read_resume is used in I/O-read-suspension scenarios, where the
- "readdata" callback may return FALSE & length=0 indicating its buffer is
- depleted or too short to supply the required bytes, and the buffer needs
- to be refilled; libmng will return the errorcode MNG_NEEDMOREDATA telling
- the app to refill its read-buffer after which it must call mng_read_resume
- (or mng_display_resume if it also displaying the image simultaneously) */
-#ifdef MNG_SUPPORT_READ
-MNG_EXT mng_retcode MNG_DECL mng_read (mng_handle hHandle);
-MNG_EXT mng_retcode MNG_DECL mng_read_resume (mng_handle hHandle);
-#endif
-
-/* high-level "data push" functions */
-/* these functions can be used in situations where data is streaming into the
- application and needs to be buffered by libmng before it is actually
- requested by libmng itself. the pushing complements the normal reading
- mechanism, but applications can decide to always return "0 bytes read" to
- make libmng go into suspension mode with the returncode MNG_NEEDMOREDATA */
-/* mng_read_pushdata can be used to push blobs of data of arbitrary size;
- mng_read_pushsig and mng_read_pushchunk can be used if the application
- has already done some low-level decoding (eg. at the chunk level) */
-/* the data being pushed into libmng with mng_read_pushdata *must* contain
- the regular 4-byte chunklength, but *must not* contain it with
- mng_read_pushchunk!!! */
-/* mng_read_pushsig is used to prevent libmng from trying to parse the regular
- PNG/JNG/MNG signature bytes; the application must have done this itself
- and *must* indicate the proper type in the function call or things will
- go amiss!!
- also you *must* call this first, so pretty much right after mng_initialize
- and certainly before any call to mng_read or mng_readdisplay !!!! */
-/* IMPORTANT!!! data can only be safely pushed when libmng is in a
- "wait" state; eg. during MNG_NEEDTIMERWAIT, MNG_NEEDSECTIONWAIT or
- MNG_NEEDMOREDATA !!! this just means you can't have one thread displaying
- and another thread pushing data !!! */
-/* if bOwnership = MNG_TRUE, libmng will retain the supplied pointer and
- *will* expect the buffer to remain available until libmng is finished
- with it; what happens then depends on whether or not you have set the
- releasedata() callback; if this is set than the supplied buffer will
- be returned through this callback and your application can take care of
- cleaning it up, otherwise libmng will use its internal freeing mechanism
- (which, depending on compile-options, will be the standard C free() call,
- or the memfree() callback */
-/* if bOwnership = MNG_FALSE, libmng will just copy the data into its own
- buffers and dispose of it in the normal way */
-#ifdef MNG_SUPPORT_READ
-MNG_EXT mng_retcode MNG_DECL mng_read_pushdata (mng_handle hHandle,
- mng_ptr pData,
- mng_size_t iLength,
- mng_bool bTakeownership);
-MNG_EXT mng_retcode MNG_DECL mng_read_pushsig (mng_handle hHandle,
- mng_imgtype eSigtype);
-MNG_EXT mng_retcode MNG_DECL mng_read_pushchunk (mng_handle hHandle,
- mng_ptr pChunk,
- mng_size_t iLength,
- mng_bool bTakeownership);
-#endif
-
-/* high-level write & create functions */
-/* use this if you want to write a previously read Network Graphic or
- if you want to create a new graphic and write it */
-/* to write a previously read graphic you must have defined MNG_STORE_CHUNKS */
-/* to create a new graphic you'll also need access to the chunks
- (eg. #define MNG_ACCESS_CHUNKS !) */
-#ifdef MNG_SUPPORT_WRITE
-MNG_EXT mng_retcode MNG_DECL mng_write (mng_handle hHandle);
-MNG_EXT mng_retcode MNG_DECL mng_create (mng_handle hHandle);
-#endif
-
-/* high-level display functions */
-/* use these to display a previously read or created graphic or
- to read & display a graphic simultaneously */
-/* mng_display_resume should be called after a timer-interval
- expires that was set through the settimer-callback, after a
- read suspension-break, or, to resume an animation after a call
- to mng_display_freeze/mng_display_reset */
-/* mng_display_freeze thru mng_display_gotime can be used to influence
- the display of an image, BUT ONLY if it has been completely read! */
-#ifdef MNG_SUPPORT_DISPLAY
-#ifdef MNG_SUPPORT_READ
-MNG_EXT mng_retcode MNG_DECL mng_readdisplay (mng_handle hHandle);
-#endif
-MNG_EXT mng_retcode MNG_DECL mng_display (mng_handle hHandle);
-MNG_EXT mng_retcode MNG_DECL mng_display_resume (mng_handle hHandle);
-MNG_EXT mng_retcode MNG_DECL mng_display_freeze (mng_handle hHandle);
-MNG_EXT mng_retcode MNG_DECL mng_display_reset (mng_handle hHandle);
-#ifndef MNG_NO_DISPLAY_GO_SUPPORTED
-MNG_EXT mng_retcode MNG_DECL mng_display_goframe (mng_handle hHandle,
- mng_uint32 iFramenr);
-MNG_EXT mng_retcode MNG_DECL mng_display_golayer (mng_handle hHandle,
- mng_uint32 iLayernr);
-MNG_EXT mng_retcode MNG_DECL mng_display_gotime (mng_handle hHandle,
- mng_uint32 iPlaytime);
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* event processing function */
-/* this needs to be called by the app when dynamic MNG is enabled and
- a specific event occurs in the user-interface */
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_SUPPORT_DYNAMICMNG)
-MNG_EXT mng_retcode MNG_DECL mng_trapevent (mng_handle hHandle,
- mng_uint8 iEventtype,
- mng_int32 iX,
- mng_int32 iY);
-#endif
-
-/* error reporting function */
-/* use this if you need more detailed info on the last error */
-/* iExtra1 & iExtra2 may contain errorcodes from zlib, jpeg, etc... */
-/* zErrortext will only be filled if you #define MNG_ERROR_TELLTALE */
-MNG_EXT mng_retcode MNG_DECL mng_getlasterror (mng_handle hHandle,
- mng_int8* iSeverity,
- mng_chunkid* iChunkname,
- mng_uint32* iChunkseq,
- mng_int32* iExtra1,
- mng_int32* iExtra2,
- mng_pchar* zErrortext);
-
-/* ************************************************************************** */
-/* * * */
-/* * Callback set functions * */
-/* * * */
-/* ************************************************************************** */
-
-/* memory callbacks */
-/* called to allocate and release internal datastructures */
-#ifndef MNG_INTERNAL_MEMMNGMT
-MNG_EXT mng_retcode MNG_DECL mng_setcb_memalloc (mng_handle hHandle,
- mng_memalloc fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_memfree (mng_handle hHandle,
- mng_memfree fProc);
-#endif /* MNG_INTERNAL_MEMMNGMT */
-
-/* open- & close-stream callbacks */
-/* called to open & close streams for input or output */
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
-MNG_EXT mng_retcode MNG_DECL mng_setcb_openstream (mng_handle hHandle,
- mng_openstream fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_closestream (mng_handle hHandle,
- mng_closestream fProc);
-#endif
-#endif
-
-/* read callback */
-/* called to get data from the inputstream */
-#ifdef MNG_SUPPORT_READ
-MNG_EXT mng_retcode MNG_DECL mng_setcb_readdata (mng_handle hHandle,
- mng_readdata fProc);
-#endif
-
-/* write callback */
-/* called to put data into the outputstream */
-#ifdef MNG_SUPPORT_WRITE
-MNG_EXT mng_retcode MNG_DECL mng_setcb_writedata (mng_handle hHandle,
- mng_writedata fProc);
-#endif
-
-/* error callback */
-/* called when an error occurs */
-/* the application can determine if the error is recoverable,
- and may inform the library by setting specific returncodes */
-MNG_EXT mng_retcode MNG_DECL mng_setcb_errorproc (mng_handle hHandle,
- mng_errorproc fProc);
-
-/* trace callback */
-/* called to show the currently executing function */
-#ifdef MNG_SUPPORT_TRACE
-MNG_EXT mng_retcode MNG_DECL mng_setcb_traceproc (mng_handle hHandle,
- mng_traceproc fProc);
-#endif
-
-/* callbacks for read processing */
-/* processheader is called when all header information has been gathered
- from the inputstream */
-/* processtext is called for every tEXt, zTXt and iTXt chunk in the
- inputstream (iType=0 for tEXt, 1 for zTXt and 2 for iTXt);
- you can call get_imagelevel to check at what nesting-level the chunk is
- encountered (eg. tEXt inside an embedded image inside a MNG -> level == 2;
- in most other case -> level == 1) */
-/* processsave & processseek are called for SAVE/SEEK chunks */
-/* processneed is called for the nEED chunk; you should specify a callback
- for this as the default behavior will be to abort processing, unless
- the requirement is one of:
- - a supported chunk
- - the text "draft nn" where nn is a numeric value
- - the text "MNG-1.0" or "MNG-1.1"
- - the text "CACHEOFF" */
-/* processmend is called at the very end of the animation-stream;
- note that this may not be the end of the animation though! */
-/* processterm is called when a TERM chunk is encountered; there can be only
- 1 in the stream (or none) */
-/* processunknown is called after reading each non-critical unknown chunk */
-#ifdef MNG_SUPPORT_READ
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processheader (mng_handle hHandle,
- mng_processheader fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processtext (mng_handle hHandle,
- mng_processtext fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processsave (mng_handle hHandle,
- mng_processsave fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processseek (mng_handle hHandle,
- mng_processseek fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processneed (mng_handle hHandle,
- mng_processneed fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processmend (mng_handle hHandle,
- mng_processmend fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processterm (mng_handle hHandle,
- mng_processterm fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processunknown(mng_handle hHandle,
- mng_processunknown fProc);
-#endif
-
-/* callbacks for display processing */
-/* getcanvasline is called to get an access-pointer to a line on the
- drawing-canvas */
-/* getbkgdline is called to get an access-pointer to a line from the
- background-canvas */
-/* refresh is called to inform the GUI to redraw the current canvas onto
- its output device (eg. in Win32 this would mean sending an
- invalidate message for the specified region */
-/* NOTE that the update-region is specified as x,y,width,height; eg. the
- invalidate message for Windows requires left,top,right,bottom parameters
- where the bottom-right is exclusive of the region!!
- to get these correctly is as simple as:
- left = x;
- top = y;
- right = x + width;
- bottom = y + height;
- if your implementation requires inclusive points, simply subtract 1 from
- both the right & bottom values calculated above.
- */
-#ifdef MNG_SUPPORT_DISPLAY
-MNG_EXT mng_retcode MNG_DECL mng_setcb_getcanvasline (mng_handle hHandle,
- mng_getcanvasline fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_getbkgdline (mng_handle hHandle,
- mng_getbkgdline fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_getalphaline (mng_handle hHandle,
- mng_getalphaline fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_refresh (mng_handle hHandle,
- mng_refresh fProc);
-
-/* timing callbacks */
-/* gettickcount is called to get the system tickcount (milliseconds);
- this is used to determine the remaining interval between frames */
-/* settimer is called to inform the application that it should set a timer;
- when the timer is triggered the app must call mng_display_resume */
-MNG_EXT mng_retcode MNG_DECL mng_setcb_gettickcount (mng_handle hHandle,
- mng_gettickcount fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_settimer (mng_handle hHandle,
- mng_settimer fProc);
-
-/* color management callbacks */
-/* called to transmit color management information to the application */
-/* these are only used when you #define MNG_APP_CMS */
-#ifdef MNG_APP_CMS
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processgamma (mng_handle hHandle,
- mng_processgamma fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processchroma (mng_handle hHandle,
- mng_processchroma fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processsrgb (mng_handle hHandle,
- mng_processsrgb fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processiccp (mng_handle hHandle,
- mng_processiccp fProc);
-MNG_EXT mng_retcode MNG_DECL mng_setcb_processarow (mng_handle hHandle,
- mng_processarow fProc);
-#endif /* MNG_APP_CMS */
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* release push data callback */
-/* used when the app pushes data into libmng (as opposed to libmng pulling it)
- and relinquishes ownership of the pushed data-buffer, but *does* want to
- release (free) the buffer itself once libmng has finished processing it */
-#ifdef MNG_SUPPORT_READ
-MNG_EXT mng_retcode MNG_DECL mng_setcb_releasedata (mng_handle hHandle,
- mng_releasedata fProc);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Callback get functions * */
-/* * * */
-/* ************************************************************************** */
-
-/* see _setcb_ */
-#ifndef MNG_INTERNAL_MEMMNGMT
-MNG_EXT mng_memalloc MNG_DECL mng_getcb_memalloc (mng_handle hHandle);
-MNG_EXT mng_memfree MNG_DECL mng_getcb_memfree (mng_handle hHandle);
-#endif
-
-/* see _setcb_ */
-#ifdef MNG_SUPPORT_READ
-MNG_EXT mng_releasedata MNG_DECL mng_getcb_releasedata (mng_handle hHandle);
-#endif
-
-/* see _setcb_ */
-#if defined(MNG_SUPPORT_READ) || defined(MNG_WRITE_SUPPORT)
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
-MNG_EXT mng_openstream MNG_DECL mng_getcb_openstream (mng_handle hHandle);
-MNG_EXT mng_closestream MNG_DECL mng_getcb_closestream (mng_handle hHandle);
-#endif
-#endif
-
-/* see _setcb_ */
-#ifdef MNG_SUPPORT_READ
-MNG_EXT mng_readdata MNG_DECL mng_getcb_readdata (mng_handle hHandle);
-#endif
-
-/* see _setcb_ */
-#ifdef MNG_SUPPORT_WRITE
-MNG_EXT mng_writedata MNG_DECL mng_getcb_writedata (mng_handle hHandle);
-#endif
-
-/* see _setcb_ */
-MNG_EXT mng_errorproc MNG_DECL mng_getcb_errorproc (mng_handle hHandle);
-
-/* see _setcb_ */
-#ifdef MNG_SUPPORT_TRACE
-MNG_EXT mng_traceproc MNG_DECL mng_getcb_traceproc (mng_handle hHandle);
-#endif
-
-/* see _setcb_ */
-#ifdef MNG_SUPPORT_READ
-MNG_EXT mng_processheader MNG_DECL mng_getcb_processheader (mng_handle hHandle);
-MNG_EXT mng_processtext MNG_DECL mng_getcb_processtext (mng_handle hHandle);
-MNG_EXT mng_processsave MNG_DECL mng_getcb_processsave (mng_handle hHandle);
-MNG_EXT mng_processseek MNG_DECL mng_getcb_processseek (mng_handle hHandle);
-MNG_EXT mng_processneed MNG_DECL mng_getcb_processneed (mng_handle hHandle);
-MNG_EXT mng_processunknown MNG_DECL mng_getcb_processunknown (mng_handle hHandle);
-MNG_EXT mng_processterm MNG_DECL mng_getcb_processterm (mng_handle hHandle);
-#endif
-
-/* see _setcb_ */
-#ifdef MNG_SUPPORT_DISPLAY
-MNG_EXT mng_getcanvasline MNG_DECL mng_getcb_getcanvasline (mng_handle hHandle);
-MNG_EXT mng_getbkgdline MNG_DECL mng_getcb_getbkgdline (mng_handle hHandle);
-MNG_EXT mng_getalphaline MNG_DECL mng_getcb_getalphaline (mng_handle hHandle);
-MNG_EXT mng_refresh MNG_DECL mng_getcb_refresh (mng_handle hHandle);
-
-/* see _setcb_ */
-MNG_EXT mng_gettickcount MNG_DECL mng_getcb_gettickcount (mng_handle hHandle);
-MNG_EXT mng_settimer MNG_DECL mng_getcb_settimer (mng_handle hHandle);
-
-/* see _setcb_ */
-#ifdef MNG_APP_CMS
-MNG_EXT mng_processgamma MNG_DECL mng_getcb_processgamma (mng_handle hHandle);
-MNG_EXT mng_processchroma MNG_DECL mng_getcb_processchroma (mng_handle hHandle);
-MNG_EXT mng_processsrgb MNG_DECL mng_getcb_processsrgb (mng_handle hHandle);
-MNG_EXT mng_processiccp MNG_DECL mng_getcb_processiccp (mng_handle hHandle);
-MNG_EXT mng_processarow MNG_DECL mng_getcb_processarow (mng_handle hHandle);
-#endif /* MNG_APP_CMS */
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-/* * * */
-/* * Property set functions * */
-/* * * */
-/* ************************************************************************** */
-
-/* Application data pointer */
-/* provided for application use; not used by the library */
-MNG_EXT mng_retcode MNG_DECL mng_set_userdata (mng_handle hHandle,
- mng_ptr pUserdata);
-
-/* The style of the drawing- & background-canvas */
-/* only used for displaying images */
-/* both are initially set to 24-bit RGB (eg. 8-bit per channel) */
-MNG_EXT mng_retcode MNG_DECL mng_set_canvasstyle (mng_handle hHandle,
- mng_uint32 iStyle);
-MNG_EXT mng_retcode MNG_DECL mng_set_bkgdstyle (mng_handle hHandle,
- mng_uint32 iStyle);
-
-/* The default background color */
-/* only used if the getbkgdline callback is not defined */
-/* for initially painting the canvas and restoring (part of) the background */
-MNG_EXT mng_retcode MNG_DECL mng_set_bgcolor (mng_handle hHandle,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue);
-
-/* Indicates preferred use of the bKGD chunk for PNG images */
-MNG_EXT mng_retcode MNG_DECL mng_set_usebkgd (mng_handle hHandle,
- mng_bool bUseBKGD);
-
-/* Indicates storage of read chunks */
-/* only useful if you #define mng_store_chunks */
-/* can be used to dynamically change storage management */
-MNG_EXT mng_retcode MNG_DECL mng_set_storechunks (mng_handle hHandle,
- mng_bool bStorechunks);
-
-/* Indicates breaks requested when processing SAVE/SEEK */
-/* set this to let the app handle section breaks; the library will return
- MNG_NEEDSECTIONWAIT return-codes for each SEEK chunk */
-MNG_EXT mng_retcode MNG_DECL mng_set_sectionbreaks (mng_handle hHandle,
- mng_bool bSectionbreaks);
-
-/* Indicates storage of playback info (ON by default!) */
-/* can be used to turn off caching of playback info; this is useful to
- specifically optimize MNG-video playback; note that if caching is turned off
- LOOP chunks will be flagged as errors! TERM chunks will be ignored and only
- passed to the processterm() callback if it is defined by the app; also, this
- feature can only be used with mng_readdisplay(); mng_read(),
- mng_display_reset() and mng_display_goxxxx() will return an error;
- once this option is turned off it can't be turned on for the same stream!!! */
-MNG_EXT mng_retcode MNG_DECL mng_set_cacheplayback (mng_handle hHandle,
- mng_bool bCacheplayback);
-
-/* Indicates automatic progressive refreshes for large images (ON by default!) */
-/* turn this off if you do not want intermittent painting while a large image
- is being read. useful if the input-stream comes from a fast medium, such
- as a local harddisk */
-MNG_EXT mng_retcode MNG_DECL mng_set_doprogressive (mng_handle hHandle,
- mng_bool bDoProgressive);
-
-/* Indicates existence and required checking of the CRC in input streams,
- and generation in output streams */
-/* !!!! Use this ONLY if you know what you are doing !!!! */
-/* The value is a combination of the following flags:
- 0x0000001 = CRC is present in the input stream
- 0x0000002 = CRC must be generated in the output stream
- 0x0000010 = CRC should be checked for ancillary chunks
- 0x0000020 = a faulty CRC for ancillary chunks generates a warning only
- 0x0000040 = a faulty CRC for ancillary chunks generates an error
- 0x0000100 = CRC should be checked for critical chunks
- 0x0000200 = a faulty CRC for critical chunks generates a warning only
- 0x0000400 = a faulty CRC for critical chunks generates an error
-
- The default is 0x00000533 = CRC present in input streams; should be checked;
- warning for ancillary chunks; error for critical
- chunks; generate CRC for output streams
-
- Note that some combinations are meaningless; eg. if the CRC is not present
- it won't do any good to turn the checking flags on; if a checking flag
- is off, it doesn't do any good to ask for generation of warnings or errors.
- Also libmng will generate either an error or a warning, not both,
- so if you specify both the default will be to generate an error!
- The only useful combinations for input are 331, 551, 351, 531, 0, 301, 501
- and optionally 031 and 051, but only checking ancillary chunks and not
- critical chunks is generally not a very good idea!!!
- If you've also writing these values should be combined with 0x02 if
- CRC's are required in the output stream
- */
-MNG_EXT mng_retcode MNG_DECL mng_set_crcmode (mng_handle hHandle,
- mng_uint32 iCrcmode);
-
-/* Color-management necessaries */
-/*
- *************************************************************************
- !!!!!!!! THIS NEXT BIT IS IMPORTANT !!!!!!!!!
- *************************************************************************
-
- If you have defined MNG_FULL_CMS (and are using lcms), you will have to
- think hard about the following routines.
-
- lcms requires 2 profiles to work off the differences in the input-image
- and the output-device. The ICC profile for the input-image will be
- embedded within it to reflect its color-characteristics, but the output
- profile depends on the output-device, which is something only *YOU* know
- about. sRGB (standard RGB) is common for x86 compatible environments
- (eg. Windows, Linux and some others)
-
- If you are compiling for a sRGB compliant system you probably won't have
- to do anything special. (unless you want to of course)
-
- If you are compiling for a non-sRGB compliant system
- (eg. SGI, Mac, Next, others...)
- you *MUST* define a proper ICC profile for the generic output-device
- associated with that platform.
-
- In either event, you may also want to offer an option to your users to
- set the profile manually, or, if you know how, set it from a
- system-defined default.
-
- TO RECAP: for sRGB systems (Windows, Linux) no action required!
- for non-sRGB systems (SGI, Mac, Next) ACTION REQUIRED!
-
- Please visit http://www.srgb.com, http://www.color.org and
- http://www.littlecms.com for more info.
-
- *************************************************************************
- !!!!!!!! THE BIT ABOVE IS IMPORTANT !!!!!!!!!
- *************************************************************************
-*/
-/* mng_set_srgb tells libmng if it's running on a sRGB compliant system or not
- the default is already set to MNG_TRUE */
-/* mng_set_outputprofile, mng_set_outputprofile2, mng_set_outputsrgb
- are used to set the default profile describing the output-device
- by default it is already initialized with an sRGB profile */
-/* mng_set_srgbprofile, mng_set_srgbprofile2, mng_set_srgbimplicit
- are used to set the default profile describing a standard sRGB device
- this is used when the input-image is tagged only as being sRGB, but the
- output-device is defined as not being sRGB compliant
- by default it is already initialized with a standard sRGB profile */
-#if defined(MNG_SUPPORT_DISPLAY)
-MNG_EXT mng_retcode MNG_DECL mng_set_srgb (mng_handle hHandle,
- mng_bool bIssRGB);
-MNG_EXT mng_retcode MNG_DECL mng_set_outputprofile (mng_handle hHandle,
- mng_pchar zFilename);
-MNG_EXT mng_retcode MNG_DECL mng_set_outputprofile2 (mng_handle hHandle,
- mng_uint32 iProfilesize,
- mng_ptr pProfile);
-MNG_EXT mng_retcode MNG_DECL mng_set_outputsrgb (mng_handle hHandle);
-MNG_EXT mng_retcode MNG_DECL mng_set_srgbprofile (mng_handle hHandle,
- mng_pchar zFilename);
-MNG_EXT mng_retcode MNG_DECL mng_set_srgbprofile2 (mng_handle hHandle,
- mng_uint32 iProfilesize,
- mng_ptr pProfile);
-MNG_EXT mng_retcode MNG_DECL mng_set_srgbimplicit (mng_handle hHandle);
-#endif
-
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-/* Gamma settings */
-/* ... blabla (explain gamma processing a little; eg. formula & stuff) ... */
-MNG_EXT mng_retcode MNG_DECL mng_set_viewgamma (mng_handle hHandle,
- mng_float dGamma);
-MNG_EXT mng_retcode MNG_DECL mng_set_displaygamma (mng_handle hHandle,
- mng_float dGamma);
-MNG_EXT mng_retcode MNG_DECL mng_set_dfltimggamma (mng_handle hHandle,
- mng_float dGamma);
-MNG_EXT mng_retcode MNG_DECL mng_set_viewgammaint (mng_handle hHandle,
- mng_uint32 iGamma);
-MNG_EXT mng_retcode MNG_DECL mng_set_displaygammaint (mng_handle hHandle,
- mng_uint32 iGamma);
-MNG_EXT mng_retcode MNG_DECL mng_set_dfltimggammaint (mng_handle hHandle,
- mng_uint32 iGamma);
-#endif
-
-#ifndef MNG_SKIP_MAXCANVAS
-/* Ultimate clipping size */
-/* used to limit extreme graphics from overloading the system */
-/* if a graphic exceeds these limits a warning is issued, which can
- be ignored by the app (using the errorproc callback). in that case
- the library will use these settings to clip the input graphic, and
- the app's canvas must account for this */
-MNG_EXT mng_retcode MNG_DECL mng_set_maxcanvaswidth (mng_handle hHandle,
- mng_uint32 iMaxwidth);
-MNG_EXT mng_retcode MNG_DECL mng_set_maxcanvasheight (mng_handle hHandle,
- mng_uint32 iMaxheight);
-MNG_EXT mng_retcode MNG_DECL mng_set_maxcanvassize (mng_handle hHandle,
- mng_uint32 iMaxwidth,
- mng_uint32 iMaxheight);
-#endif
-
-/* ZLIB default compression parameters */
-/* these are used when writing out chunks */
-/* they are also used when compressing PNG image-data or JNG alpha-data;
- in this case you can set them just before calling mng_putimgdata_ihdr */
-/* set to your liking; usually the defaults will suffice though! */
-/* check the documentation for ZLIB for details on these parameters */
-#ifdef MNG_INCLUDE_ZLIB
-MNG_EXT mng_retcode MNG_DECL mng_set_zlib_level (mng_handle hHandle,
- mng_int32 iZlevel);
-MNG_EXT mng_retcode MNG_DECL mng_set_zlib_method (mng_handle hHandle,
- mng_int32 iZmethod);
-MNG_EXT mng_retcode MNG_DECL mng_set_zlib_windowbits (mng_handle hHandle,
- mng_int32 iZwindowbits);
-MNG_EXT mng_retcode MNG_DECL mng_set_zlib_memlevel (mng_handle hHandle,
- mng_int32 iZmemlevel);
-MNG_EXT mng_retcode MNG_DECL mng_set_zlib_strategy (mng_handle hHandle,
- mng_int32 iZstrategy);
-
-MNG_EXT mng_retcode MNG_DECL mng_set_zlib_maxidat (mng_handle hHandle,
- mng_uint32 iMaxIDAT);
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* JNG default compression parameters (based on IJG code) */
-/* these are used when compressing JNG image-data; so you can set them
- just before calling mng_putimgdata_jhdr */
-/* set to your liking; usually the defaults will suffice though! */
-/* check the documentation for IJGSRC6B for details on these parameters */
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_INCLUDE_IJG6B
-MNG_EXT mng_retcode MNG_DECL mng_set_jpeg_dctmethod (mng_handle hHandle,
- mngjpeg_dctmethod eJPEGdctmethod);
-#endif
-MNG_EXT mng_retcode MNG_DECL mng_set_jpeg_quality (mng_handle hHandle,
- mng_int32 iJPEGquality);
-MNG_EXT mng_retcode MNG_DECL mng_set_jpeg_smoothing (mng_handle hHandle,
- mng_int32 iJPEGsmoothing);
-MNG_EXT mng_retcode MNG_DECL mng_set_jpeg_progressive(mng_handle hHandle,
- mng_bool bJPEGprogressive);
-MNG_EXT mng_retcode MNG_DECL mng_set_jpeg_optimized (mng_handle hHandle,
- mng_bool bJPEGoptimized);
-
-MNG_EXT mng_retcode MNG_DECL mng_set_jpeg_maxjdat (mng_handle hHandle,
- mng_uint32 iMaxJDAT);
-#endif /* MNG_INCLUDE_JNG */
-
-/* Suspension-mode setting */
-/* use this to activate the internal suspension-buffer to improve
- read-suspension processing */
-/* TODO: write-suspension ??? */
-#if defined(MNG_SUPPORT_READ)
-MNG_EXT mng_retcode MNG_DECL mng_set_suspensionmode (mng_handle hHandle,
- mng_bool bSuspensionmode);
-#endif
-
-/* Speed setting */
-/* use this to influence the display-speed of animations */
-#if defined(MNG_SUPPORT_DISPLAY)
-MNG_EXT mng_retcode MNG_DECL mng_set_speed (mng_handle hHandle,
- mng_speedtype iSpeed);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Property get functions * */
-/* * * */
-/* ************************************************************************** */
-
-/* see _set_ */
-MNG_EXT mng_ptr MNG_DECL mng_get_userdata (mng_handle hHandle);
-
-/* Network Graphic header details */
-/* these get filled once the graphics header is processed,
- so they are available in the processheader callback; before that
- they are zeroed out and imagetype is set to it_unknown */
-/* this might be a good point for the app to initialize the drawing-canvas! */
-/* note that some fields are only set for the first(!) header-chunk:
- MNG/MHDR (imagetype = mng_it_mng) - ticks thru simplicity
- PNG/IHDR (imagetype = mng_it_png) - bitdepth thru interlace
- JNG/JHDR (imagetype = mng_it_jng) - bitdepth thru compression &
- interlace thru alphainterlace */
-MNG_EXT mng_imgtype MNG_DECL mng_get_sigtype (mng_handle hHandle);
-MNG_EXT mng_imgtype MNG_DECL mng_get_imagetype (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_imagewidth (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_imageheight (mng_handle hHandle);
-
-MNG_EXT mng_uint32 MNG_DECL mng_get_ticks (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_framecount (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_layercount (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_playtime (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_simplicity (mng_handle hHandle);
-
-MNG_EXT mng_uint8 MNG_DECL mng_get_bitdepth (mng_handle hHandle);
-MNG_EXT mng_uint8 MNG_DECL mng_get_colortype (mng_handle hHandle);
-MNG_EXT mng_uint8 MNG_DECL mng_get_compression (mng_handle hHandle);
-MNG_EXT mng_uint8 MNG_DECL mng_get_filter (mng_handle hHandle);
-MNG_EXT mng_uint8 MNG_DECL mng_get_interlace (mng_handle hHandle);
-MNG_EXT mng_uint8 MNG_DECL mng_get_alphabitdepth (mng_handle hHandle);
-MNG_EXT mng_uint8 MNG_DECL mng_get_alphacompression(mng_handle hHandle);
-MNG_EXT mng_uint8 MNG_DECL mng_get_alphafilter (mng_handle hHandle);
-MNG_EXT mng_uint8 MNG_DECL mng_get_alphainterlace (mng_handle hHandle);
-
-/* indicates the predicted alpha-depth required to properly display the image */
-/* gets set once the graphics header is processed and is available in the
- processheader callback for any type of input-image (PNG, JNG or MNG) */
-/* possible values are 0,1,2,4,8,16
- 0 = no transparency required
- 1 = on/off transparency required (alpha-values are 0 or 2^bit_depth-1)
- 2+ = semi-transparency required (values will be scaled to the bitdepth of the
- canvasstyle supplied by the application) */
-MNG_EXT mng_uint8 MNG_DECL mng_get_alphadepth (mng_handle hHandle);
-
-/* defines whether a refresh() callback is called for an interlace pass (PNG)
- or progressive scan (JNG) */
-/* returns the interlace pass number for PNG or a fabricated pass number for JNG;
- returns 0 in all other cases */
-/* only useful if the image_type = mng_it_png or mng_it_jng and if the image
- is actually interlaced (PNG) or progressive (JNG) */
-#ifdef MNG_SUPPORT_DISPLAY
-MNG_EXT mng_uint8 MNG_DECL mng_get_refreshpass (mng_handle hHandle);
-#endif
-
-/* see _set_ */
-MNG_EXT mng_uint32 MNG_DECL mng_get_canvasstyle (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_bkgdstyle (mng_handle hHandle);
-
-/* see _set_ */
-MNG_EXT mng_retcode MNG_DECL mng_get_bgcolor (mng_handle hHandle,
- mng_uint16* iRed,
- mng_uint16* iGreen,
- mng_uint16* iBlue);
-
-/* see _set_ */
-MNG_EXT mng_bool MNG_DECL mng_get_usebkgd (mng_handle hHandle);
-
-/* see _set_ */
-MNG_EXT mng_bool MNG_DECL mng_get_storechunks (mng_handle hHandle);
-
-/* see _set_ */
-MNG_EXT mng_bool MNG_DECL mng_get_sectionbreaks (mng_handle hHandle);
-
-/* see _set_ */
-MNG_EXT mng_bool MNG_DECL mng_get_cacheplayback (mng_handle hHandle);
-
-/* see _set_ */
-MNG_EXT mng_bool MNG_DECL mng_get_doprogressive (mng_handle hHandle);
-
-/* see _set_ */
-MNG_EXT mng_uint32 MNG_DECL mng_get_crcmode (mng_handle hHandle);
-
-/* see _set_ */
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_FULL_CMS)
-MNG_EXT mng_bool MNG_DECL mng_get_srgb (mng_handle hHandle);
-#endif
-
-/* see _set_ */
-MNG_EXT mng_float MNG_DECL mng_get_viewgamma (mng_handle hHandle);
-MNG_EXT mng_float MNG_DECL mng_get_displaygamma (mng_handle hHandle);
-MNG_EXT mng_float MNG_DECL mng_get_dfltimggamma (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_viewgammaint (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_displaygammaint (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_dfltimggammaint (mng_handle hHandle);
-
-#ifndef MNG_SKIP_MAXCANVAS
-/* see _set_ */
-MNG_EXT mng_uint32 MNG_DECL mng_get_maxcanvaswidth (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_maxcanvasheight (mng_handle hHandle);
-#endif
-
-/* see _set_ */
-#ifdef MNG_INCLUDE_ZLIB
-MNG_EXT mng_int32 MNG_DECL mng_get_zlib_level (mng_handle hHandle);
-MNG_EXT mng_int32 MNG_DECL mng_get_zlib_method (mng_handle hHandle);
-MNG_EXT mng_int32 MNG_DECL mng_get_zlib_windowbits (mng_handle hHandle);
-MNG_EXT mng_int32 MNG_DECL mng_get_zlib_memlevel (mng_handle hHandle);
-MNG_EXT mng_int32 MNG_DECL mng_get_zlib_strategy (mng_handle hHandle);
-
-MNG_EXT mng_uint32 MNG_DECL mng_get_zlib_maxidat (mng_handle hHandle);
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* see _set_ */
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_INCLUDE_IJG6B
-MNG_EXT mngjpeg_dctmethod
- MNG_DECL mng_get_jpeg_dctmethod (mng_handle hHandle);
-#endif
-MNG_EXT mng_int32 MNG_DECL mng_get_jpeg_quality (mng_handle hHandle);
-MNG_EXT mng_int32 MNG_DECL mng_get_jpeg_smoothing (mng_handle hHandle);
-MNG_EXT mng_bool MNG_DECL mng_get_jpeg_progressive(mng_handle hHandle);
-MNG_EXT mng_bool MNG_DECL mng_get_jpeg_optimized (mng_handle hHandle);
-
-MNG_EXT mng_uint32 MNG_DECL mng_get_jpeg_maxjdat (mng_handle hHandle);
-#endif /* MNG_INCLUDE_JNG */
-
-/* see _set_ */
-#if defined(MNG_SUPPORT_READ)
-MNG_EXT mng_bool MNG_DECL mng_get_suspensionmode (mng_handle hHandle);
-#endif
-
-/* see _set_ */
-#if defined(MNG_SUPPORT_DISPLAY)
-MNG_EXT mng_speedtype
- MNG_DECL mng_get_speed (mng_handle hHandle);
-#endif
-
-/* Image-level */
-/* this can be used inside the processtext callback to determine the level of
- text of the image being processed; the value 1 is returned for top-level
- texts, and the value 2 for a text inside an embedded image inside a MNG */
-MNG_EXT mng_uint32 MNG_DECL mng_get_imagelevel (mng_handle hHandle);
-
-/* BACK info */
-/* can be used to retrieve the color & mandatory values for the last processed
- BACK chunk of a MNG (will fail for other image-types);
- if no BACK chunk was processed yet, it will return all zeroes */
-#ifdef MNG_SUPPORT_DISPLAY
-MNG_EXT mng_retcode MNG_DECL mng_get_lastbackchunk (mng_handle hHandle,
- mng_uint16* iRed,
- mng_uint16* iGreen,
- mng_uint16* iBlue,
- mng_uint8* iMandatory);
-#endif
-
-/* SEEK info */
-/* can be used to retrieve the segmentname of the last processed SEEK chunk;
- if no SEEK chunk was processed or its segmentname was empty, the function
- will return an empty string; the provided buffer must be at least 80 bytes!! */
-#ifdef MNG_SUPPORT_DISPLAY
-MNG_EXT mng_retcode MNG_DECL mng_get_lastseekname (mng_handle hHandle,
- mng_pchar zSegmentname);
-#endif
-
-/* FRAM info */
-/* can be used to retrieve the current FRAM delay; this may be useful when
- retrieving a stream of frames with their corresponding delays by "fake"
- reading and displaying the file */
-#ifdef MNG_SUPPORT_DISPLAY
-MNG_EXT mng_uint32 MNG_DECL mng_get_currframdelay (mng_handle hHandle);
-#endif
-
-/* Display status variables */
-/* these get filled & updated during display processing */
-/* starttime is the tickcount at the start of displaying the animation */
-/* runtime is the actual number of millisecs since the start of the animation */
-/* currentframe, currentlayer & currentplaytime indicate the current
- frame/layer/playtime(msecs) in the animation (these keep increasing;
- even after the animation loops back to the TERM chunk) */
-/* totalframes, totallayers & totalplaytime are filled after a complete run
- of an animation (eg. at MEND); they are also valid after just reading the MNG */
-#ifdef MNG_SUPPORT_DISPLAY
-MNG_EXT mng_uint32 MNG_DECL mng_get_starttime (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_runtime (mng_handle hHandle);
-#ifndef MNG_NO_CURRENT_INFO
-MNG_EXT mng_uint32 MNG_DECL mng_get_currentframe (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_currentlayer (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_currentplaytime (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_totalframes (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_totallayers (mng_handle hHandle);
-MNG_EXT mng_uint32 MNG_DECL mng_get_totalplaytime (mng_handle hHandle);
-#endif
-#endif
-
-/* Status variables */
-/* these indicate the internal state of the library */
-/* most indicate exactly what you would expect -
- status_error: true if the last function call returned an errorcode
- status_reading: true if the library is (still) reading an image
- status_suspendbreak: true if the library has suspended for "I/O"
- status_creating: true if the library is in the middle of creating an image
- status_writing: true if the library is in the middle of writing an image
- status_displaying: true if the library is displaying an image
- status_running: true if display processing is active (eg. not frozen or reset)
- status_timerbreak: true if the library has suspended for a "timer-break"
- status_dynamic: true if the library encountered an evNT chunk in the MNG
- status_runningevent: true if the library is processing an external event */
-/* eg. mng_readdisplay() will turn the reading, displaying and running status on;
- when EOF is reached the reading status will be turned off */
-MNG_EXT mng_bool MNG_DECL mng_status_error (mng_handle hHandle);
-#ifdef MNG_SUPPORT_READ
-MNG_EXT mng_bool MNG_DECL mng_status_reading (mng_handle hHandle);
-MNG_EXT mng_bool MNG_DECL mng_status_suspendbreak (mng_handle hHandle);
-#endif
-#ifdef MNG_SUPPORT_WRITE
-MNG_EXT mng_bool MNG_DECL mng_status_creating (mng_handle hHandle);
-MNG_EXT mng_bool MNG_DECL mng_status_writing (mng_handle hHandle);
-#endif
-#ifdef MNG_SUPPORT_DISPLAY
-MNG_EXT mng_bool MNG_DECL mng_status_displaying (mng_handle hHandle);
-MNG_EXT mng_bool MNG_DECL mng_status_running (mng_handle hHandle);
-MNG_EXT mng_bool MNG_DECL mng_status_timerbreak (mng_handle hHandle);
-#endif
-#ifdef MNG_SUPPORT_DYNAMICMNG
-MNG_EXT mng_bool MNG_DECL mng_status_dynamic (mng_handle hHandle);
-MNG_EXT mng_bool MNG_DECL mng_status_runningevent (mng_handle hHandle);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Chunk access functions * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_ACCESS_CHUNKS
-
-/* ************************************************************************** */
-
-/* use this to iterate the stored chunks */
-/* requires MNG_ACCESS_CHUNKS & MNG_STORE_CHUNKS */
-/* starts from the supplied chunk-index-nr; the first chunk has index 0!! */
-MNG_EXT mng_retcode MNG_DECL mng_iterate_chunks (mng_handle hHandle,
- mng_uint32 iChunkseq,
- mng_iteratechunk fProc);
-
-/* use the next function inside your 'iteratechunk' callback to copy
- the given chunk to a new mng you are creating */
-/* the 'out' handle should be in 'create' status! */
-#ifdef MNG_SUPPORT_WRITE
-MNG_EXT mng_retcode MNG_DECL mng_copy_chunk (mng_handle hHandle,
- mng_handle hChunk,
- mng_handle hHandleOut);
-#endif
-
-/* ************************************************************************** */
-
-/* use these to get chunk data from within the callback in iterate_chunks */
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_ihdr (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iWidth,
- mng_uint32 *iHeight,
- mng_uint8 *iBitdepth,
- mng_uint8 *iColortype,
- mng_uint8 *iCompression,
- mng_uint8 *iFilter,
- mng_uint8 *iInterlace);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_plte (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iCount,
- mng_palette8 *aPalette);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_idat (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iRawlen,
- mng_ptr *pRawdata);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_trns (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_bool *bGlobal,
- mng_uint8 *iType,
- mng_uint32 *iCount,
- mng_uint8arr *aAlphas,
- mng_uint16 *iGray,
- mng_uint16 *iRed,
- mng_uint16 *iGreen,
- mng_uint16 *iBlue,
- mng_uint32 *iRawlen,
- mng_uint8arr *aRawdata);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_gama (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iGamma);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_chrm (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iWhitepointx,
- mng_uint32 *iWhitepointy,
- mng_uint32 *iRedx,
- mng_uint32 *iRedy,
- mng_uint32 *iGreenx,
- mng_uint32 *iGreeny,
- mng_uint32 *iBluex,
- mng_uint32 *iBluey);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_srgb (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint8 *iRenderingintent);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_iccp (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iNamesize,
- mng_pchar *zName,
- mng_uint8 *iCompression,
- mng_uint32 *iProfilesize,
- mng_ptr *pProfile);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_text (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iKeywordsize,
- mng_pchar *zKeyword,
- mng_uint32 *iTextsize,
- mng_pchar *zText);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_ztxt (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iKeywordsize,
- mng_pchar *zKeyword,
- mng_uint8 *iCompression,
- mng_uint32 *iTextsize,
- mng_pchar *zText);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_itxt (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iKeywordsize,
- mng_pchar *zKeyword,
- mng_uint8 *iCompressionflag,
- mng_uint8 *iCompressionmethod,
- mng_uint32 *iLanguagesize,
- mng_pchar *zLanguage,
- mng_uint32 *iTranslationsize,
- mng_pchar *zTranslation,
- mng_uint32 *iTextsize,
- mng_pchar *zText);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_bkgd (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint8 *iType,
- mng_uint8 *iIndex,
- mng_uint16 *iGray,
- mng_uint16 *iRed,
- mng_uint16 *iGreen,
- mng_uint16 *iBlue);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_phys (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iSizex,
- mng_uint32 *iSizey,
- mng_uint8 *iUnit);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_sbit (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint8 *iType,
- mng_uint8arr4 *aBits);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_splt (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iNamesize,
- mng_pchar *zName,
- mng_uint8 *iSampledepth,
- mng_uint32 *iEntrycount,
- mng_ptr *pEntries);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_hist (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iEntrycount,
- mng_uint16arr *aEntries);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_time (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iYear,
- mng_uint8 *iMonth,
- mng_uint8 *iDay,
- mng_uint8 *iHour,
- mng_uint8 *iMinute,
- mng_uint8 *iSecond);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_mhdr (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iWidth,
- mng_uint32 *iHeight,
- mng_uint32 *iTicks,
- mng_uint32 *iLayercount,
- mng_uint32 *iFramecount,
- mng_uint32 *iPlaytime,
- mng_uint32 *iSimplicity);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_loop (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iLevel,
- mng_uint32 *iRepeat,
- mng_uint8 *iTermination,
- mng_uint32 *iItermin,
- mng_uint32 *iItermax,
- mng_uint32 *iCount,
- mng_uint32p *pSignals);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_endl (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iLevel);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_defi (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iObjectid,
- mng_uint8 *iDonotshow,
- mng_uint8 *iConcrete,
- mng_bool *bHasloca,
- mng_int32 *iXlocation,
- mng_int32 *iYlocation,
- mng_bool *bHasclip,
- mng_int32 *iLeftcb,
- mng_int32 *iRightcb,
- mng_int32 *iTopcb,
- mng_int32 *iBottomcb);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_basi (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iWidth,
- mng_uint32 *iHeight,
- mng_uint8 *iBitdepth,
- mng_uint8 *iColortype,
- mng_uint8 *iCompression,
- mng_uint8 *iFilter,
- mng_uint8 *iInterlace,
- mng_uint16 *iRed,
- mng_uint16 *iGreen,
- mng_uint16 *iBlue,
- mng_uint16 *iAlpha,
- mng_uint8 *iViewable);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_clon (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iSourceid,
- mng_uint16 *iCloneid,
- mng_uint8 *iClonetype,
- mng_uint8 *iDonotshow,
- mng_uint8 *iConcrete,
- mng_bool *bHasloca,
- mng_uint8 *iLocationtype,
- mng_int32 *iLocationx,
- mng_int32 *iLocationy);
-
-#ifndef MNG_SKIPCHUNK_PAST
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_past (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iDestid,
- mng_uint8 *iTargettype,
- mng_int32 *iTargetx,
- mng_int32 *iTargety,
- mng_uint32 *iCount);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_past_src (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_uint16 *iSourceid,
- mng_uint8 *iComposition,
- mng_uint8 *iOrientation,
- mng_uint8 *iOffsettype,
- mng_int32 *iOffsetx,
- mng_int32 *iOffsety,
- mng_uint8 *iBoundarytype,
- mng_int32 *iBoundaryl,
- mng_int32 *iBoundaryr,
- mng_int32 *iBoundaryt,
- mng_int32 *iBoundaryb);
-#endif
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_disc (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iCount,
- mng_uint16p *pObjectids);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_back (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iRed,
- mng_uint16 *iGreen,
- mng_uint16 *iBlue,
- mng_uint8 *iMandatory,
- mng_uint16 *iImageid,
- mng_uint8 *iTile);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_fram (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint8 *iMode,
- mng_uint32 *iNamesize,
- mng_pchar *zName,
- mng_uint8 *iChangedelay,
- mng_uint8 *iChangetimeout,
- mng_uint8 *iChangeclipping,
- mng_uint8 *iChangesyncid,
- mng_uint32 *iDelay,
- mng_uint32 *iTimeout,
- mng_uint8 *iBoundarytype,
- mng_int32 *iBoundaryl,
- mng_int32 *iBoundaryr,
- mng_int32 *iBoundaryt,
- mng_int32 *iBoundaryb,
- mng_uint32 *iCount,
- mng_uint32p *pSyncids);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_move (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iFirstid,
- mng_uint16 *iLastid,
- mng_uint8 *iMovetype,
- mng_int32 *iMovex,
- mng_int32 *iMovey);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_clip (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iFirstid,
- mng_uint16 *iLastid,
- mng_uint8 *iCliptype,
- mng_int32 *iClipl,
- mng_int32 *iClipr,
- mng_int32 *iClipt,
- mng_int32 *iClipb);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_show (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint16 *iFirstid,
- mng_uint16 *iLastid,
- mng_uint8 *iMode);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_term (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iTermaction,
- mng_uint8 *iIteraction,
- mng_uint32 *iDelay,
- mng_uint32 *iItermax);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_save (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint8 *iOffsettype,
- mng_uint32 *iCount);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_save_entry (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_uint8 *iEntrytype,
- mng_uint32arr2 *iOffset,
- mng_uint32arr2 *iStarttime,
- mng_uint32 *iLayernr,
- mng_uint32 *iFramenr,
- mng_uint32 *iNamesize,
- mng_pchar *zName);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_seek (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iNamesize,
- mng_pchar *zName);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_expi (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iSnapshotid,
- mng_uint32 *iNamesize,
- mng_pchar *zName);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_fpri (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iDeltatype,
- mng_uint8 *iPriority);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_need (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iKeywordssize,
- mng_pchar *zKeywords);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_phyg (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iSizex,
- mng_uint32 *iSizey,
- mng_uint8 *iUnit);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_jhdr (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iWidth,
- mng_uint32 *iHeight,
- mng_uint8 *iColortype,
- mng_uint8 *iImagesampledepth,
- mng_uint8 *iImagecompression,
- mng_uint8 *iImageinterlace,
- mng_uint8 *iAlphasampledepth,
- mng_uint8 *iAlphacompression,
- mng_uint8 *iAlphafilter,
- mng_uint8 *iAlphainterlace);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_jdat (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iRawlen,
- mng_ptr *pRawdata);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_jdaa (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iRawlen,
- mng_ptr *pRawdata);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_dhdr (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iObjectid,
- mng_uint8 *iImagetype,
- mng_uint8 *iDeltatype,
- mng_uint32 *iBlockwidth,
- mng_uint32 *iBlockheight,
- mng_uint32 *iBlockx,
- mng_uint32 *iBlocky);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_prom (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iColortype,
- mng_uint8 *iSampledepth,
- mng_uint8 *iFilltype);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_pplt (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iDeltatype,
- mng_uint32 *iCount);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_pplt_entry (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_uint16 *iRed,
- mng_uint16 *iGreen,
- mng_uint16 *iBlue,
- mng_uint16 *iAlpha,
- mng_bool *bUsed);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_drop (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iCount,
- mng_chunkidp *pChunknames);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_dbyk (mng_handle hHandle,
- mng_handle hChunk,
- mng_chunkid *iChunkname,
- mng_uint8 *iPolarity,
- mng_uint32 *iKeywordssize,
- mng_pchar *zKeywords);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_ordr (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iCount);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_ordr_entry (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_chunkid *iChunkname,
- mng_uint8 *iOrdertype);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_magn (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iFirstid,
- mng_uint16 *iLastid,
- mng_uint16 *iMethodX,
- mng_uint16 *iMX,
- mng_uint16 *iMY,
- mng_uint16 *iML,
- mng_uint16 *iMR,
- mng_uint16 *iMT,
- mng_uint16 *iMB,
- mng_uint16 *iMethodY);
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_mpng (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iFramewidth,
- mng_uint32 *iFrameheight,
- mng_uint16 *iNumplays,
- mng_uint16 *iTickspersec,
- mng_uint8 *iCompressionmethod,
- mng_uint32 *iCount);
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_mpng_frame (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_uint32 *iX,
- mng_uint32 *iY,
- mng_uint32 *iWidth,
- mng_uint32 *iHeight,
- mng_int32 *iXoffset,
- mng_int32 *iYoffset,
- mng_uint16 *iTicks);
-#endif
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_evnt (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iCount);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_evnt_entry (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_uint8 *iEventtype,
- mng_uint8 *iMasktype,
- mng_int32 *iLeft,
- mng_int32 *iRight,
- mng_int32 *iTop,
- mng_int32 *iBottom,
- mng_uint16 *iObjectid,
- mng_uint8 *iIndex,
- mng_uint32 *iSegmentnamesize,
- mng_pchar *zSegmentname);
-
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_unknown (mng_handle hHandle,
- mng_handle hChunk,
- mng_chunkid *iChunkname,
- mng_uint32 *iRawlen,
- mng_ptr *pRawdata);
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_WRITE_PROCS
-
-/* use these to create new chunks at the end of the chunk-list */
-/* requires at least MNG_ACCESS_CHUNKS (MNG_SUPPORT_WRITE may be nice too) */
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_ihdr (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_plte (mng_handle hHandle,
- mng_uint32 iCount,
- mng_palette8 aPalette);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_idat (mng_handle hHandle,
- mng_uint32 iRawlen,
- mng_ptr pRawdata);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_iend (mng_handle hHandle);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_trns (mng_handle hHandle,
- mng_bool bEmpty,
- mng_bool bGlobal,
- mng_uint8 iType,
- mng_uint32 iCount,
- mng_uint8arr aAlphas,
- mng_uint16 iGray,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_uint32 iRawlen,
- mng_uint8arr aRawdata);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_gama (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iGamma);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_chrm (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iWhitepointx,
- mng_uint32 iWhitepointy,
- mng_uint32 iRedx,
- mng_uint32 iRedy,
- mng_uint32 iGreenx,
- mng_uint32 iGreeny,
- mng_uint32 iBluex,
- mng_uint32 iBluey);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_srgb (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint8 iRenderingintent);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_iccp (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iNamesize,
- mng_pchar zName,
- mng_uint8 iCompression,
- mng_uint32 iProfilesize,
- mng_ptr pProfile);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_text (mng_handle hHandle,
- mng_uint32 iKeywordsize,
- mng_pchar zKeyword,
- mng_uint32 iTextsize,
- mng_pchar zText);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_ztxt (mng_handle hHandle,
- mng_uint32 iKeywordsize,
- mng_pchar zKeyword,
- mng_uint8 iCompression,
- mng_uint32 iTextsize,
- mng_pchar zText);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_itxt (mng_handle hHandle,
- mng_uint32 iKeywordsize,
- mng_pchar zKeyword,
- mng_uint8 iCompressionflag,
- mng_uint8 iCompressionmethod,
- mng_uint32 iLanguagesize,
- mng_pchar zLanguage,
- mng_uint32 iTranslationsize,
- mng_pchar zTranslation,
- mng_uint32 iTextsize,
- mng_pchar zText);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_bkgd (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint8 iType,
- mng_uint8 iIndex,
- mng_uint16 iGray,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_phys (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iSizex,
- mng_uint32 iSizey,
- mng_uint8 iUnit);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_sbit (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint8 iType,
- mng_uint8arr4 aBits);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_splt (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iNamesize,
- mng_pchar zName,
- mng_uint8 iSampledepth,
- mng_uint32 iEntrycount,
- mng_ptr pEntries);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_hist (mng_handle hHandle,
- mng_uint32 iEntrycount,
- mng_uint16arr aEntries);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_time (mng_handle hHandle,
- mng_uint16 iYear,
- mng_uint8 iMonth,
- mng_uint8 iDay,
- mng_uint8 iHour,
- mng_uint8 iMinute,
- mng_uint8 iSecond);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_mhdr (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint32 iTicks,
- mng_uint32 iLayercount,
- mng_uint32 iFramecount,
- mng_uint32 iPlaytime,
- mng_uint32 iSimplicity);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_mend (mng_handle hHandle);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_loop (mng_handle hHandle,
- mng_uint8 iLevel,
- mng_uint32 iRepeat,
- mng_uint8 iTermination,
- mng_uint32 iItermin,
- mng_uint32 iItermax,
- mng_uint32 iCount,
- mng_uint32p pSignals);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_endl (mng_handle hHandle,
- mng_uint8 iLevel);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_defi (mng_handle hHandle,
- mng_uint16 iObjectid,
- mng_uint8 iDonotshow,
- mng_uint8 iConcrete,
- mng_bool bHasloca,
- mng_int32 iXlocation,
- mng_int32 iYlocation,
- mng_bool bHasclip,
- mng_int32 iLeftcb,
- mng_int32 iRightcb,
- mng_int32 iTopcb,
- mng_int32 iBottomcb);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_basi (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_uint16 iAlpha,
- mng_uint8 iViewable);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_clon (mng_handle hHandle,
- mng_uint16 iSourceid,
- mng_uint16 iCloneid,
- mng_uint8 iClonetype,
- mng_uint8 iDonotshow,
- mng_uint8 iConcrete,
- mng_bool bHasloca,
- mng_uint8 iLocationtype,
- mng_int32 iLocationx,
- mng_int32 iLocationy);
-
-#ifndef MNG_SKIPCHUNK_PAST
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_past (mng_handle hHandle,
- mng_uint16 iDestid,
- mng_uint8 iTargettype,
- mng_int32 iTargetx,
- mng_int32 iTargety,
- mng_uint32 iCount);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_past_src (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_uint16 iSourceid,
- mng_uint8 iComposition,
- mng_uint8 iOrientation,
- mng_uint8 iOffsettype,
- mng_int32 iOffsetx,
- mng_int32 iOffsety,
- mng_uint8 iBoundarytype,
- mng_int32 iBoundaryl,
- mng_int32 iBoundaryr,
- mng_int32 iBoundaryt,
- mng_int32 iBoundaryb);
-#endif
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_disc (mng_handle hHandle,
- mng_uint32 iCount,
- mng_uint16p pObjectids);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_back (mng_handle hHandle,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_uint8 iMandatory,
- mng_uint16 iImageid,
- mng_uint8 iTile);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_fram (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint8 iMode,
- mng_uint32 iNamesize,
- mng_pchar zName,
- mng_uint8 iChangedelay,
- mng_uint8 iChangetimeout,
- mng_uint8 iChangeclipping,
- mng_uint8 iChangesyncid,
- mng_uint32 iDelay,
- mng_uint32 iTimeout,
- mng_uint8 iBoundarytype,
- mng_int32 iBoundaryl,
- mng_int32 iBoundaryr,
- mng_int32 iBoundaryt,
- mng_int32 iBoundaryb,
- mng_uint32 iCount,
- mng_uint32p pSyncids);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_move (mng_handle hHandle,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iMovetype,
- mng_int32 iMovex,
- mng_int32 iMovey);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_clip (mng_handle hHandle,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iCliptype,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_show (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iMode);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_term (mng_handle hHandle,
- mng_uint8 iTermaction,
- mng_uint8 iIteraction,
- mng_uint32 iDelay,
- mng_uint32 iItermax);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_save (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint8 iOffsettype,
- mng_uint32 iCount);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_save_entry (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_uint8 iEntrytype,
- mng_uint32arr2 iOffset,
- mng_uint32arr2 iStarttime,
- mng_uint32 iLayernr,
- mng_uint32 iFramenr,
- mng_uint32 iNamesize,
- mng_pchar zName);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_seek (mng_handle hHandle,
- mng_uint32 iNamesize,
- mng_pchar zName);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_expi (mng_handle hHandle,
- mng_uint16 iSnapshotid,
- mng_uint32 iNamesize,
- mng_pchar zName);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_fpri (mng_handle hHandle,
- mng_uint8 iDeltatype,
- mng_uint8 iPriority);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_need (mng_handle hHandle,
- mng_uint32 iKeywordssize,
- mng_pchar zKeywords);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_phyg (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iSizex,
- mng_uint32 iSizey,
- mng_uint8 iUnit);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_jhdr (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iColortype,
- mng_uint8 iImagesampledepth,
- mng_uint8 iImagecompression,
- mng_uint8 iImageinterlace,
- mng_uint8 iAlphasampledepth,
- mng_uint8 iAlphacompression,
- mng_uint8 iAlphafilter,
- mng_uint8 iAlphainterlace);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_jdat (mng_handle hHandle,
- mng_uint32 iRawlen,
- mng_ptr pRawdata);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_jdaa (mng_handle hHandle,
- mng_uint32 iRawlen,
- mng_ptr pRawdata);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_jsep (mng_handle hHandle);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_dhdr (mng_handle hHandle,
- mng_uint16 iObjectid,
- mng_uint8 iImagetype,
- mng_uint8 iDeltatype,
- mng_uint32 iBlockwidth,
- mng_uint32 iBlockheight,
- mng_uint32 iBlockx,
- mng_uint32 iBlocky);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_prom (mng_handle hHandle,
- mng_uint8 iColortype,
- mng_uint8 iSampledepth,
- mng_uint8 iFilltype);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_ipng (mng_handle hHandle);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_pplt (mng_handle hHandle,
- mng_uint8 iDeltatype,
- mng_uint32 iCount);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_pplt_entry (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_uint16 iAlpha);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_jpng (mng_handle hHandle);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_drop (mng_handle hHandle,
- mng_uint32 iCount,
- mng_chunkidp pChunknames);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_dbyk (mng_handle hHandle,
- mng_chunkid iChunkname,
- mng_uint8 iPolarity,
- mng_uint32 iKeywordssize,
- mng_pchar zKeywords);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_ordr (mng_handle hHandle,
- mng_uint32 iCount);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_ordr_entry (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_chunkid iChunkname,
- mng_uint8 iOrdertype);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_magn (mng_handle hHandle,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint16 iMethodX,
- mng_uint16 iMX,
- mng_uint16 iMY,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint16 iMT,
- mng_uint16 iMB,
- mng_uint16 iMethodY);
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_mpng (mng_handle hHandle,
- mng_uint32 iFramewidth,
- mng_uint32 iFrameheight,
- mng_uint16 iNumplays,
- mng_uint16 iTickspersec,
- mng_uint8 iCompressionmethod,
- mng_uint32 iCount);
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_mpng_frame (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_uint32 iX,
- mng_uint32 iY,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_int32 iXoffset,
- mng_int32 iYoffset,
- mng_uint16 iTicks);
-#endif
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_evnt (mng_handle hHandle,
- mng_uint32 iCount);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_evnt_entry (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_uint8 iEventtype,
- mng_uint8 iMasktype,
- mng_int32 iLeft,
- mng_int32 iRight,
- mng_int32 iTop,
- mng_int32 iBottom,
- mng_uint16 iObjectid,
- mng_uint8 iIndex,
- mng_uint32 iSegmentnamesize,
- mng_pchar zSegmentname);
-
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_unknown (mng_handle hHandle,
- mng_chunkid iChunkname,
- mng_uint32 iRawlen,
- mng_ptr pRawdata);
-
-#endif /* MNG_INCLUDE_WRITE_PROCS */
-
-/* ************************************************************************** */
-
-/* use these functions to access the actual image-data in stored chunks,
- as opposed to the IDAT/JDAT data */
-/* to get accurate pixel-data the canvasstyle should seriously reflect the
- bitdepth/colortype combination of the preceding IHDR/JHDR/BASI/DHDR;
- all input can be converted to rgb(a)8 (rgb(a)16 for 16-bit images), but
- there are only limited conversions back (see below for putimgdata) */
-
-/* call this function if you want to extract the nth image from the list;
- the first image is designated seqnr 0! */
-/* this function finds the IHDR/JHDR/BASI/DHDR with the appropriate seqnr,
- starting from the beginning of the chunk-list; this may tend to get a little
- slow for animations with a large number of chunks for images near the end */
-/* supplying a seqnr past the last image in the animation will return with
- an errorcode */
-MNG_EXT mng_retcode MNG_DECL mng_getimgdata_seq (mng_handle hHandle,
- mng_uint32 iSeqnr,
- mng_uint32 iCanvasstyle,
- mng_getcanvasline fGetcanvasline);
-
-/* both the following functions will search forward to find the first IDAT/JDAT,
- and then traverse back to find the start of the image (IHDR,JHDR,DHDR,BASI);
- note that this is very fast compared to decoding the IDAT/JDAT, so there's
- not really a need for optimization; either can be called from the
- iterate_chunks callback when a IHDR/JHDR is encountered; for BASI/DHDR there
- may not be real image-data so it's wisest to keep iterating till the IEND,
- and then call either of these functions if necessary (remember the correct seqnr!) */
-
-/* call this function if you want to extract the image starting at or after the nth
- position in the chunk-list; this number is returned in the iterate_chunks callback */
-MNG_EXT mng_retcode MNG_DECL mng_getimgdata_chunkseq (mng_handle hHandle,
- mng_uint32 iSeqnr,
- mng_uint32 iCanvasstyle,
- mng_getcanvasline fGetcanvasline);
-
-/* call this function if you want to extract the image starting at or after the
- indicated chunk; the handle of a chunk is returned in the iterate_chunks callback */
-MNG_EXT mng_retcode MNG_DECL mng_getimgdata_chunk (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iCanvasstyle,
- mng_getcanvasline fGetcanvasline);
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_WRITE_PROCS
-
-/* use the following functions to add image-data to the list of stored chunks */
-/* note that this only adds the IDAT or JDAT chunks and no others; you must call
- one of these functions after you 'put' the initial chunks of the image and
- before you 'put' the closing chunks */
-/* the canvasstyle should seriously reflect the bitdepth/colortype combination;
- eg. bitdepth=16 would expect a 16-bit canvasstyle,
- colortype=g or ga would expect a gray or gray+alpha style respectively
- and so on, and so forth ...
- (nb. the number of conversions will be extremely limited for the moment!) */
-
-MNG_EXT mng_retcode MNG_DECL mng_putimgdata_ihdr (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iColortype,
- mng_uint8 iBitdepth,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace,
- mng_uint32 iCanvasstyle,
- mng_getcanvasline fGetcanvasline);
-
-MNG_EXT mng_retcode MNG_DECL mng_putimgdata_jhdr (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iColortype,
- mng_uint8 iBitdepth,
- mng_uint8 iCompression,
- mng_uint8 iInterlace,
- mng_uint8 iAlphaBitdepth,
- mng_uint8 iAlphaCompression,
- mng_uint8 iAlphaFilter,
- mng_uint8 iAlphaInterlace,
- mng_uint32 iCanvasstyle,
- mng_getcanvasline fGetcanvasline);
-
-/* ************************************************************************** */
-
-/* use the following functions to set the framecount/layercount/playtime or
- simplicity of an animation you are creating; this may be useful if these
- variables are calculated during the creation-process */
-
-MNG_EXT mng_retcode MNG_DECL mng_updatemngheader (mng_handle hHandle,
- mng_uint32 iFramecount,
- mng_uint32 iLayercount,
- mng_uint32 iPlaytime);
-
-MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle,
- mng_uint32 iSimplicity);
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_WRITE_PROCS */
-
-#endif /* MNG_ACCESS_CHUNKS */
-
-/* ************************************************************************** */
-/* * * */
-/* * Error-code structure * */
-/* * * */
-/* * 0b0000 00xx xxxx xxxx - basic errors; severity 9 (environment) * */
-/* * 0b0000 01xx xxxx xxxx - chunk errors; severity 9 (image induced) * */
-/* * 0b0000 10xx xxxx xxxx - severity 5 errors (application induced) * */
-/* * 0b0001 00xx xxxx xxxx - severity 2 warnings (recoverable) * */
-/* * 0b0010 00xx xxxx xxxx - severity 1 warnings (recoverable) * */
-/* * * */
-/* ************************************************************************** */
-
-#define MNG_NOERROR (mng_retcode)0 /* er.. indicates all's well */
-
-#define MNG_OUTOFMEMORY (mng_retcode)1 /* oops, buy some megabytes! */
-#define MNG_INVALIDHANDLE (mng_retcode)2 /* call mng_initialize first */
-#define MNG_NOCALLBACK (mng_retcode)3 /* set the callbacks please */
-#define MNG_UNEXPECTEDEOF (mng_retcode)4 /* what'd ya do with the data? */
-#define MNG_ZLIBERROR (mng_retcode)5 /* zlib burped */
-#define MNG_JPEGERROR (mng_retcode)6 /* jpglib complained */
-#define MNG_LCMSERROR (mng_retcode)7 /* little cms stressed out */
-#define MNG_NOOUTPUTPROFILE (mng_retcode)8 /* no output-profile defined */
-#define MNG_NOSRGBPROFILE (mng_retcode)9 /* no sRGB-profile defined */
-#define MNG_BUFOVERFLOW (mng_retcode)10 /* zlib output-buffer overflow */
-#define MNG_FUNCTIONINVALID (mng_retcode)11 /* ay, totally inappropriate */
-#define MNG_OUTPUTERROR (mng_retcode)12 /* disk full ? */
-#define MNG_JPEGBUFTOOSMALL (mng_retcode)13 /* can't handle buffer overflow*/
-#define MNG_NEEDMOREDATA (mng_retcode)14 /* I'm hungry, give me more */
-#define MNG_NEEDTIMERWAIT (mng_retcode)15 /* Sleep a while then wake me */
-#define MNG_NEEDSECTIONWAIT (mng_retcode)16 /* just processed a SEEK */
-#define MNG_LOOPWITHCACHEOFF (mng_retcode)17 /* LOOP when playback info off */
-
-#define MNG_DLLNOTLOADED (mng_retcode)99 /* late binding failed */
-
-#define MNG_APPIOERROR (mng_retcode)901 /* application I/O error */
-#define MNG_APPTIMERERROR (mng_retcode)902 /* application timing error */
-#define MNG_APPCMSERROR (mng_retcode)903 /* application CMS error */
-#define MNG_APPMISCERROR (mng_retcode)904 /* application other error */
-#define MNG_APPTRACEABORT (mng_retcode)905 /* application aborts on trace */
-
-#define MNG_INTERNALERROR (mng_retcode)999 /* internal inconsistancy */
-
-#define MNG_INVALIDSIG (mng_retcode)1025 /* invalid graphics file */
-#define MNG_INVALIDCRC (mng_retcode)1027 /* crc check failed */
-#define MNG_INVALIDLENGTH (mng_retcode)1028 /* chunklength mystifies me */
-#define MNG_SEQUENCEERROR (mng_retcode)1029 /* invalid chunk sequence */
-#define MNG_CHUNKNOTALLOWED (mng_retcode)1030 /* completely out-of-place */
-#define MNG_MULTIPLEERROR (mng_retcode)1031 /* only one occurence allowed */
-#define MNG_PLTEMISSING (mng_retcode)1032 /* indexed-color requires PLTE */
-#define MNG_IDATMISSING (mng_retcode)1033 /* IHDR-block requires IDAT */
-#define MNG_CANNOTBEEMPTY (mng_retcode)1034 /* must contain some data */
-#define MNG_GLOBALLENGTHERR (mng_retcode)1035 /* global data incorrect */
-#define MNG_INVALIDBITDEPTH (mng_retcode)1036 /* bitdepth out-of-range */
-#define MNG_INVALIDCOLORTYPE (mng_retcode)1037 /* colortype out-of-range */
-#define MNG_INVALIDCOMPRESS (mng_retcode)1038 /* compression method invalid */
-#define MNG_INVALIDFILTER (mng_retcode)1039 /* filter method invalid */
-#define MNG_INVALIDINTERLACE (mng_retcode)1040 /* interlace method invalid */
-#define MNG_NOTENOUGHIDAT (mng_retcode)1041 /* ran out of compressed data */
-#define MNG_PLTEINDEXERROR (mng_retcode)1042 /* palette-index out-of-range */
-#define MNG_NULLNOTFOUND (mng_retcode)1043 /* couldn't find null-separator*/
-#define MNG_KEYWORDNULL (mng_retcode)1044 /* keyword cannot be empty */
-#define MNG_OBJECTUNKNOWN (mng_retcode)1045 /* the object can't be found */
-#define MNG_OBJECTEXISTS (mng_retcode)1046 /* the object already exists */
-#define MNG_TOOMUCHIDAT (mng_retcode)1047 /* got too much compressed data*/
-#define MNG_INVSAMPLEDEPTH (mng_retcode)1048 /* sampledepth out-of-range */
-#define MNG_INVOFFSETSIZE (mng_retcode)1049 /* invalid offset-size */
-#define MNG_INVENTRYTYPE (mng_retcode)1050 /* invalid entry-type */
-#define MNG_ENDWITHNULL (mng_retcode)1051 /* may not end with NULL */
-#define MNG_INVIMAGETYPE (mng_retcode)1052 /* invalid image_type */
-#define MNG_INVDELTATYPE (mng_retcode)1053 /* invalid delta_type */
-#define MNG_INVALIDINDEX (mng_retcode)1054 /* index-value invalid */
-#define MNG_TOOMUCHJDAT (mng_retcode)1055 /* got too much compressed data*/
-#define MNG_JPEGPARMSERR (mng_retcode)1056 /* JHDR/JPEG parms do not match*/
-#define MNG_INVFILLMETHOD (mng_retcode)1057 /* invalid fill_method */
-#define MNG_OBJNOTCONCRETE (mng_retcode)1058 /* object must be concrete */
-#define MNG_TARGETNOALPHA (mng_retcode)1059 /* object has no alpha-channel */
-#define MNG_MNGTOOCOMPLEX (mng_retcode)1060 /* can't handle complexity */
-#define MNG_UNKNOWNCRITICAL (mng_retcode)1061 /* unknown critical chunk found*/
-#define MNG_UNSUPPORTEDNEED (mng_retcode)1062 /* nEED requirement unsupported*/
-#define MNG_INVALIDDELTA (mng_retcode)1063 /* Delta operation illegal */
-#define MNG_INVALIDMETHOD (mng_retcode)1064 /* invalid MAGN method */
-#define MNG_IMPROBABLELENGTH (mng_retcode)1065 /* impropable chunk length */
-#define MNG_INVALIDBLOCK (mng_retcode)1066 /* invalid delta block */
-#define MNG_INVALIDEVENT (mng_retcode)1067 /* invalid event_type */
-#define MNG_INVALIDMASK (mng_retcode)1068 /* invalid mask_type */
-#define MNG_NOMATCHINGLOOP (mng_retcode)1069 /* ENDL without matching LOOP */
-#define MNG_SEEKNOTFOUND (mng_retcode)1070 /* EvNT points to unknown SEEK */
-#define MNG_OBJNOTABSTRACT (mng_retcode)1071 /* object must be abstract */
-#define MNG_TERMSEQERROR (mng_retcode)1072 /* TERM in wrong place */
-#define MNG_INVALIDFIELDVAL (mng_retcode)1073 /* invalid fieldvalue (generic)*/
-#define MNG_INVALIDWIDTH (mng_retcode)1074 /* invalid frame/image width */
-#define MNG_INVALIDHEIGHT (mng_retcode)1075 /* invalid frame/image height */
-
-#define MNG_INVALIDCNVSTYLE (mng_retcode)2049 /* can't make anything of this */
-#define MNG_WRONGCHUNK (mng_retcode)2050 /* accessing the wrong chunk */
-#define MNG_INVALIDENTRYIX (mng_retcode)2051 /* accessing the wrong entry */
-#define MNG_NOHEADER (mng_retcode)2052 /* must have had header first */
-#define MNG_NOCORRCHUNK (mng_retcode)2053 /* can't find parent chunk */
-#define MNG_NOMHDR (mng_retcode)2054 /* no MNG header available */
-
-#define MNG_IMAGETOOLARGE (mng_retcode)4097 /* input-image way too big */
-#define MNG_NOTANANIMATION (mng_retcode)4098 /* file not a MNG */
-#define MNG_FRAMENRTOOHIGH (mng_retcode)4099 /* frame-nr out-of-range */
-#define MNG_LAYERNRTOOHIGH (mng_retcode)4100 /* layer-nr out-of-range */
-#define MNG_PLAYTIMETOOHIGH (mng_retcode)4101 /* playtime out-of-range */
-#define MNG_FNNOTIMPLEMENTED (mng_retcode)4102 /* function not yet available */
-
-#define MNG_IMAGEFROZEN (mng_retcode)8193 /* stopped displaying */
-
-#define MNG_LCMS_NOHANDLE 1 /* LCMS returned NULL handle */
-#define MNG_LCMS_NOMEM 2 /* LCMS returned NULL gammatab */
-#define MNG_LCMS_NOTRANS 3 /* LCMS returned NULL transform*/
-
-/* ************************************************************************** */
-/* * * */
-/* * Canvas styles * */
-/* * * */
-/* * Note that the intentions are pretty darn good, but that the focus * */
-/* * is currently on 8-bit color support * */
-/* * * */
-/* * The RGB8_A8 style is defined for apps that require a separate * */
-/* * canvas for the color-planes and the alpha-plane (eg. mozilla) * */
-/* * This requires for the app to supply the "getalphaline" callback!!! * */
-/* * * */
-/* ************************************************************************** */
-
-#define MNG_CANVAS_RGB8 0x00000000L
-#define MNG_CANVAS_RGBA8 0x00001000L
-#define MNG_CANVAS_RGBA8_PM 0x00009000L
-#define MNG_CANVAS_ARGB8 0x00003000L
-#define MNG_CANVAS_ARGB8_PM 0x0000B000L
-#define MNG_CANVAS_RGB8_A8 0x00005000L
-#define MNG_CANVAS_BGR8 0x00000001L
-#define MNG_CANVAS_BGRX8 0x00010001L
-#define MNG_CANVAS_BGRA8 0x00001001L
-#define MNG_CANVAS_BGRA8PM 0x00009001L /* backward compatibility */
-#define MNG_CANVAS_BGRA8_PM 0x00009001L
-#define MNG_CANVAS_ABGR8 0x00003001L
-#define MNG_CANVAS_ABGR8_PM 0x0000B001L
-#define MNG_CANVAS_RGB16 0x00000100L /* not supported yet */
-#define MNG_CANVAS_RGBA16 0x00001100L /* not supported yet */
-#define MNG_CANVAS_ARGB16 0x00003100L /* not supported yet */
-#define MNG_CANVAS_BGR16 0x00000101L /* not supported yet */
-#define MNG_CANVAS_BGRA16 0x00001101L /* not supported yet */
-#define MNG_CANVAS_ABGR16 0x00003101L /* not supported yet */
-#define MNG_CANVAS_GRAY8 0x00000002L /* not supported yet */
-#define MNG_CANVAS_GRAY16 0x00000102L /* not supported yet */
-#define MNG_CANVAS_GRAYA8 0x00001002L /* not supported yet */
-#define MNG_CANVAS_GRAYA16 0x00001102L /* not supported yet */
-#define MNG_CANVAS_AGRAY8 0x00003002L /* not supported yet */
-#define MNG_CANVAS_AGRAY16 0x00003102L /* not supported yet */
-#define MNG_CANVAS_DX15 0x00000003L /* not supported yet */
-#define MNG_CANVAS_DX16 0x00000004L /* not supported yet */
-
-#define MNG_CANVAS_RGB565 0x00000005L
-#define MNG_CANVAS_RGBA565 0x00001005L
-#define MNG_CANVAS_BGR565 0x00000006L
-#define MNG_CANVAS_BGRA565 0x00001006L
-#define MNG_CANVAS_BGR565_A8 0x00004006L
-
-#define MNG_CANVAS_RGB555 0x00000007L
-#define MNG_CANVAS_BGR555 0x00000008L
-
-#define MNG_CANVAS_PIXELTYPE(C) (C & 0x000000FFL)
-#define MNG_CANVAS_BITDEPTH(C) (C & 0x00000100L)
-#define MNG_CANVAS_HASALPHA(C) (C & 0x00001000L)
-#define MNG_CANVAS_ALPHAFIRST(C) (C & 0x00002000L)
-#define MNG_CANVAS_ALPHASEPD(C) (C & 0x00004000L)
-#define MNG_CANVAS_ALPHAPM(C) (C & 0x00008000L)
-#define MNG_CANVAS_HASFILLER(C) (C & 0x00010000L)
-
-#define MNG_CANVAS_RGB(C) (MNG_CANVAS_PIXELTYPE (C) == 0)
-#define MNG_CANVAS_BGR(C) (MNG_CANVAS_PIXELTYPE (C) == 1)
-#define MNG_CANVAS_GRAY(C) (MNG_CANVAS_PIXELTYPE (C) == 2)
-#define MNG_CANVAS_DIRECTX15(C) (MNG_CANVAS_PIXELTYPE (C) == 3)
-#define MNG_CANVAS_DIRECTX16(C) (MNG_CANVAS_PIXELTYPE (C) == 4)
-#define MNG_CANVAS_RGB_565(C) (MNG_CANVAS_PIXELTYPE (C) == 5)
-#define MNG_CANVAS_BGR_565(C) (MNG_CANVAS_PIXELTYPE (C) == 6)
-#define MNG_CANVAS_8BIT(C) (!MNG_CANVAS_BITDEPTH (C))
-#define MNG_CANVAS_16BIT(C) (MNG_CANVAS_BITDEPTH (C))
-#define MNG_CANVAS_PIXELFIRST(C) (!MNG_CANVAS_ALPHAFIRST (C))
-
-/* ************************************************************************** */
-/* * * */
-/* * Chunk names (idea adapted from libpng 1.1.0 - png.h) * */
-/* * * */
-/* ************************************************************************** */
-
-#define MNG_UINT_HUH 0x40404040L
-
-#define MNG_UINT_BACK 0x4241434bL
-#define MNG_UINT_BASI 0x42415349L
-#define MNG_UINT_CLIP 0x434c4950L
-#define MNG_UINT_CLON 0x434c4f4eL
-#define MNG_UINT_DBYK 0x4442594bL
-#define MNG_UINT_DEFI 0x44454649L
-#define MNG_UINT_DHDR 0x44484452L
-#define MNG_UINT_DISC 0x44495343L
-#define MNG_UINT_DROP 0x44524f50L
-#define MNG_UINT_ENDL 0x454e444cL
-#define MNG_UINT_FRAM 0x4652414dL
-#define MNG_UINT_IDAT 0x49444154L
-#define MNG_UINT_IEND 0x49454e44L
-#define MNG_UINT_IHDR 0x49484452L
-#define MNG_UINT_IJNG 0x494a4e47L
-#define MNG_UINT_IPNG 0x49504e47L
-#define MNG_UINT_JDAA 0x4a444141L
-#define MNG_UINT_JDAT 0x4a444154L
-#define MNG_UINT_JHDR 0x4a484452L
-#define MNG_UINT_JSEP 0x4a534550L
-#define MNG_UINT_JdAA 0x4a644141L
-#define MNG_UINT_LOOP 0x4c4f4f50L
-#define MNG_UINT_MAGN 0x4d41474eL
-#define MNG_UINT_MEND 0x4d454e44L
-#define MNG_UINT_MHDR 0x4d484452L
-#define MNG_UINT_MOVE 0x4d4f5645L
-#define MNG_UINT_ORDR 0x4f524452L
-#define MNG_UINT_PAST 0x50415354L
-#define MNG_UINT_PLTE 0x504c5445L
-#define MNG_UINT_PPLT 0x50504c54L
-#define MNG_UINT_PROM 0x50524f4dL
-#define MNG_UINT_SAVE 0x53415645L
-#define MNG_UINT_SEEK 0x5345454bL
-#define MNG_UINT_SHOW 0x53484f57L
-#define MNG_UINT_TERM 0x5445524dL
-#define MNG_UINT_adAT 0x61644154L
-#define MNG_UINT_ahDR 0x61684452L
-#define MNG_UINT_bKGD 0x624b4744L
-#define MNG_UINT_cHRM 0x6348524dL
-#define MNG_UINT_eXPI 0x65585049L
-#define MNG_UINT_evNT 0x65764e54L
-#define MNG_UINT_fPRI 0x66505249L
-#define MNG_UINT_gAMA 0x67414d41L
-#define MNG_UINT_hIST 0x68495354L
-#define MNG_UINT_iCCP 0x69434350L
-#define MNG_UINT_iTXt 0x69545874L
-#define MNG_UINT_mpNG 0x6d704e47L
-#define MNG_UINT_nEED 0x6e454544L
-#define MNG_UINT_oFFs 0x6f464673L
-#define MNG_UINT_pCAL 0x7043414cL
-#define MNG_UINT_pHYg 0x70444167L
-#define MNG_UINT_pHYs 0x70485973L
-#define MNG_UINT_sBIT 0x73424954L
-#define MNG_UINT_sCAL 0x7343414cL
-#define MNG_UINT_sPLT 0x73504c54L
-#define MNG_UINT_sRGB 0x73524742L
-#define MNG_UINT_tEXt 0x74455874L
-#define MNG_UINT_tIME 0x74494d45L
-#define MNG_UINT_tRNS 0x74524e53L
-#define MNG_UINT_zTXt 0x7a545874L
-
-/* ************************************************************************** */
-/* * * */
-/* * Chunk property values * */
-/* * * */
-/* ************************************************************************** */
-
-#define MNG_BITDEPTH_1 1 /* IHDR, BASI, JHDR, PROM */
-#define MNG_BITDEPTH_2 2
-#define MNG_BITDEPTH_4 4
-#define MNG_BITDEPTH_8 8 /* sPLT */
-#define MNG_BITDEPTH_16 16
-
-#define MNG_COLORTYPE_GRAY 0 /* IHDR, BASI, PROM */
-#define MNG_COLORTYPE_RGB 2
-#define MNG_COLORTYPE_INDEXED 3
-#define MNG_COLORTYPE_GRAYA 4
-#define MNG_COLORTYPE_RGBA 6
-
-#define MNG_COMPRESSION_DEFLATE 0 /* IHDR, zTXt, iTXt, iCCP,
- BASI, JHDR */
-
-#define MNG_FILTER_ADAPTIVE 0 /* IHDR, BASI, JHDR */
-/* #define MNG_FILTER_NO_ADAPTIVE 1
-#define MNG_FILTER_NO_DIFFERING 0
-#define MNG_FILTER_DIFFERING 0x40
-#define MNG_FILTER_MASK (MNG_FILTER_NO_ADAPTIVE | MNG_FILTER_DIFFERING) */
-#ifdef FILTER192
-#define MNG_FILTER_DIFFERING 0xC0
-#endif
-#ifdef FILTER193
-#define MNG_FILTER_NOFILTER 0xC1
-#endif
-
-#define MNG_INTERLACE_NONE 0 /* IHDR, BASI, JHDR */
-#define MNG_INTERLACE_ADAM7 1
-
-#define MNG_FILTER_NONE 0 /* IDAT */
-#define MNG_FILTER_SUB 1
-#define MNG_FILTER_UP 2
-#define MNG_FILTER_AVERAGE 3
-#define MNG_FILTER_PAETH 4
-
-#define MNG_INTENT_PERCEPTUAL 0 /* sRGB */
-#define MNG_INTENT_RELATIVECOLORIMETRIC 1
-#define MNG_INTENT_SATURATION 2
-#define MNG_INTENT_ABSOLUTECOLORIMETRIC 3
- /* tEXt, zTXt, iTXt */
-#define MNG_TEXT_TITLE "Title"
-#define MNG_TEXT_AUTHOR "Author"
-#define MNG_TEXT_DESCRIPTION "Description"
-#define MNG_TEXT_COPYRIGHT "Copyright"
-#define MNG_TEXT_CREATIONTIME "Creation Time"
-#define MNG_TEXT_SOFTWARE "Software"
-#define MNG_TEXT_DISCLAIMER "Disclaimer"
-#define MNG_TEXT_WARNING "Warning"
-#define MNG_TEXT_SOURCE "Source"
-#define MNG_TEXT_COMMENT "Comment"
-
-#define MNG_FLAG_UNCOMPRESSED 0 /* iTXt */
-#define MNG_FLAG_COMPRESSED 1
-
-#define MNG_UNIT_UNKNOWN 0 /* pHYs, pHYg */
-#define MNG_UNIT_METER 1
- /* MHDR */
-#define MNG_SIMPLICITY_VALID 0x00000001
-#define MNG_SIMPLICITY_SIMPLEFEATURES 0x00000002
-#define MNG_SIMPLICITY_COMPLEXFEATURES 0x00000004
-#define MNG_SIMPLICITY_TRANSPARENCY 0x00000008
-#define MNG_SIMPLICITY_JNG 0x00000010
-#define MNG_SIMPLICITY_DELTAPNG 0x00000020
-
-#define MNG_TERMINATION_DECODER_NC 0 /* LOOP */
-#define MNG_TERMINATION_USER_NC 1
-#define MNG_TERMINATION_EXTERNAL_NC 2
-#define MNG_TERMINATION_DETERMINISTIC_NC 3
-#define MNG_TERMINATION_DECODER_C 4
-#define MNG_TERMINATION_USER_C 5
-#define MNG_TERMINATION_EXTERNAL_C 6
-#define MNG_TERMINATION_DETERMINISTIC_C 7
-
-#define MNG_DONOTSHOW_VISIBLE 0 /* DEFI */
-#define MNG_DONOTSHOW_NOTVISIBLE 1
-
-#define MNG_ABSTRACT 0 /* DEFI */
-#define MNG_CONCRETE 1
-
-#define MNG_NOTVIEWABLE 0 /* BASI */
-#define MNG_VIEWABLE 1
-
-#define MNG_FULL_CLONE 0 /* CLON */
-#define MNG_PARTIAL_CLONE 1
-#define MNG_RENUMBER 2
-
-#define MNG_CONCRETE_ASPARENT 0 /* CLON */
-#define MNG_CONCRETE_MAKEABSTRACT 1
-
-#define MNG_LOCATION_ABSOLUTE 0 /* CLON, MOVE */
-#define MNG_LOCATION_RELATIVE 1
-
-#ifndef MNG_SKIPCHUNK_PAST
-#define MNG_TARGET_ABSOLUTE 0 /* PAST */
-#define MNG_TARGET_RELATIVE_SAMEPAST 1
-#define MNG_TARGET_RELATIVE_PREVPAST 2
-
-#define MNG_COMPOSITE_OVER 0 /* PAST */
-#define MNG_COMPOSITE_REPLACE 1
-#define MNG_COMPOSITE_UNDER 2
-
-#define MNG_ORIENTATION_SAME 0 /* PAST */
-#define MNG_ORIENTATION_180DEG 2
-#define MNG_ORIENTATION_FLIPHORZ 4
-#define MNG_ORIENTATION_FLIPVERT 6
-#define MNG_ORIENTATION_TILED 8
-
-#define MNG_OFFSET_ABSOLUTE 0 /* PAST */
-#define MNG_OFFSET_RELATIVE 1
-#endif
-
-#define MNG_BOUNDARY_ABSOLUTE 0 /* PAST, FRAM */
-#define MNG_BOUNDARY_RELATIVE 1
-
-#define MNG_BACKGROUNDCOLOR_MANDATORY 0x01 /* BACK */
-#define MNG_BACKGROUNDIMAGE_MANDATORY 0x02 /* BACK */
-
-#define MNG_BACKGROUNDIMAGE_NOTILE 0 /* BACK */
-#define MNG_BACKGROUNDIMAGE_TILE 1
-
-#define MNG_FRAMINGMODE_NOCHANGE 0 /* FRAM */
-#define MNG_FRAMINGMODE_1 1
-#define MNG_FRAMINGMODE_2 2
-#define MNG_FRAMINGMODE_3 3
-#define MNG_FRAMINGMODE_4 4
-
-#define MNG_CHANGEDELAY_NO 0 /* FRAM */
-#define MNG_CHANGEDELAY_NEXTSUBFRAME 1
-#define MNG_CHANGEDELAY_DEFAULT 2
-
-#define MNG_CHANGETIMOUT_NO 0 /* FRAM */
-#define MNG_CHANGETIMOUT_DETERMINISTIC_1 1
-#define MNG_CHANGETIMOUT_DETERMINISTIC_2 2
-#define MNG_CHANGETIMOUT_DECODER_1 3
-#define MNG_CHANGETIMOUT_DECODER_2 4
-#define MNG_CHANGETIMOUT_USER_1 5
-#define MNG_CHANGETIMOUT_USER_2 6
-#define MNG_CHANGETIMOUT_EXTERNAL_1 7
-#define MNG_CHANGETIMOUT_EXTERNAL_2 8
-
-#define MNG_CHANGECLIPPING_NO 0 /* FRAM */
-#define MNG_CHANGECLIPPING_NEXTSUBFRAME 1
-#define MNG_CHANGECLIPPING_DEFAULT 2
-
-#define MNG_CHANGESYNCID_NO 0 /* FRAM */
-#define MNG_CHANGESYNCID_NEXTSUBFRAME 1
-#define MNG_CHANGESYNCID_DEFAULT 2
-
-#define MNG_CLIPPING_ABSOLUTE 0 /* CLIP */
-#define MNG_CLIPPING_RELATIVE 1
-
-#define MNG_SHOWMODE_0 0 /* SHOW */
-#define MNG_SHOWMODE_1 1
-#define MNG_SHOWMODE_2 2
-#define MNG_SHOWMODE_3 3
-#define MNG_SHOWMODE_4 4
-#define MNG_SHOWMODE_5 5
-#define MNG_SHOWMODE_6 6
-#define MNG_SHOWMODE_7 7
-
-#define MNG_TERMACTION_LASTFRAME 0 /* TERM */
-#define MNG_TERMACTION_CLEAR 1
-#define MNG_TERMACTION_FIRSTFRAME 2
-#define MNG_TERMACTION_REPEAT 3
-
-#define MNG_ITERACTION_LASTFRAME 0 /* TERM */
-#define MNG_ITERACTION_CLEAR 1
-#define MNG_ITERACTION_FIRSTFRAME 2
-
-#define MNG_SAVEOFFSET_4BYTE 4 /* SAVE */
-#define MNG_SAVEOFFSET_8BYTE 8
-
-#define MNG_SAVEENTRY_SEGMENTFULL 0 /* SAVE */
-#define MNG_SAVEENTRY_SEGMENT 1
-#define MNG_SAVEENTRY_SUBFRAME 2
-#define MNG_SAVEENTRY_EXPORTEDIMAGE 3
-
-#define MNG_PRIORITY_ABSOLUTE 0 /* fPRI */
-#define MNG_PRIORITY_RELATIVE 1
-
-#ifdef MNG_INCLUDE_JNG
-#define MNG_COLORTYPE_JPEGGRAY 8 /* JHDR */
-#define MNG_COLORTYPE_JPEGCOLOR 10
-#define MNG_COLORTYPE_JPEGGRAYA 12
-#define MNG_COLORTYPE_JPEGCOLORA 14
-
-#define MNG_BITDEPTH_JPEG8 8 /* JHDR */
-#define MNG_BITDEPTH_JPEG12 12
-#define MNG_BITDEPTH_JPEG8AND12 20
-
-#define MNG_COMPRESSION_BASELINEJPEG 8 /* JHDR */
-
-#define MNG_INTERLACE_SEQUENTIAL 0 /* JHDR */
-#define MNG_INTERLACE_PROGRESSIVE 8
-#endif /* MNG_INCLUDE_JNG */
-
-#define MNG_IMAGETYPE_UNKNOWN 0 /* DHDR */
-#define MNG_IMAGETYPE_PNG 1
-#define MNG_IMAGETYPE_JNG 2
-
-#define MNG_DELTATYPE_REPLACE 0 /* DHDR */
-#define MNG_DELTATYPE_BLOCKPIXELADD 1
-#define MNG_DELTATYPE_BLOCKALPHAADD 2
-#define MNG_DELTATYPE_BLOCKCOLORADD 3
-#define MNG_DELTATYPE_BLOCKPIXELREPLACE 4
-#define MNG_DELTATYPE_BLOCKALPHAREPLACE 5
-#define MNG_DELTATYPE_BLOCKCOLORREPLACE 6
-#define MNG_DELTATYPE_NOCHANGE 7
-
-#define MNG_FILLMETHOD_LEFTBITREPLICATE 0 /* PROM */
-#define MNG_FILLMETHOD_ZEROFILL 1
-
-#define MNG_DELTATYPE_REPLACERGB 0 /* PPLT */
-#define MNG_DELTATYPE_DELTARGB 1
-#define MNG_DELTATYPE_REPLACEALPHA 2
-#define MNG_DELTATYPE_DELTAALPHA 3
-#define MNG_DELTATYPE_REPLACERGBA 4
-#define MNG_DELTATYPE_DELTARGBA 5
-
-#define MNG_POLARITY_ONLY 0 /* DBYK */
-#define MNG_POLARITY_ALLBUT 1
-
-#define MNG_EVENT_NONE 0 /* evNT */
-#define MNG_EVENT_MOUSEENTER 1
-#define MNG_EVENT_MOUSEMOVE 2
-#define MNG_EVENT_MOUSEEXIT 3
-#define MNG_EVENT_MOUSEDOWN 4
-#define MNG_EVENT_MOUSEUP 5
-
-#define MNG_MASK_NONE 0 /* evNT */
-#define MNG_MASK_BOX 1
-#define MNG_MASK_OBJECT 2
-#define MNG_MASK_OBJECTIX 3
-#define MNG_MASK_BOXOBJECT 4
-#define MNG_MASK_BOXOBJECTIX 5
-
-/* ************************************************************************** */
-/* * * */
-/* * Processtext callback types * */
-/* * * */
-/* ************************************************************************** */
-
-#define MNG_TYPE_TEXT 0
-#define MNG_TYPE_ZTXT 1
-#define MNG_TYPE_ITXT 2
-
-/* ************************************************************************** */
-/* * * */
-/* * CRC processing masks * */
-/* * * */
-/* ************************************************************************** */
-
-#define MNG_CRC_INPUT 0x0000000f
-#define MNG_CRC_INPUT_NONE 0x00000000
-#define MNG_CRC_INPUT_PRESENT 0x00000001
-#define MNG_CRC_OUTPUT 0x000000f0
-#define MNG_CRC_OUTPUT_NONE 0x00000000
-#define MNG_CRC_OUTPUT_GENERATE 0x00000020
-#define MNG_CRC_OUTPUT_DUMMY 0x00000040
-#define MNG_CRC_ANCILLARY 0x00000f00
-#define MNG_CRC_ANCILLARY_IGNORE 0x00000000
-#define MNG_CRC_ANCILLARY_DISCARD 0x00000100
-#define MNG_CRC_ANCILLARY_WARNING 0x00000200
-#define MNG_CRC_ANCILLARY_ERROR 0x00000300
-#define MNG_CRC_CRITICAL 0x0000f000
-#define MNG_CRC_CRITICAL_IGNORE 0x00000000
-#define MNG_CRC_CRITICAL_WARNING 0x00002000
-#define MNG_CRC_CRITICAL_ERROR 0x00003000
-#define MNG_CRC_DEFAULT 0x00002121
-
-/* ************************************************************************** */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _libmng_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_callback_xs.c b/src/3rdparty/libmng/libmng_callback_xs.c
deleted file mode 100644
index ff1a22a70b..0000000000
--- a/src/3rdparty/libmng/libmng_callback_xs.c
+++ /dev/null
@@ -1,1239 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_callback_xs.c copyright (c) 2000-2004 G.Juyn * */
-/* * version : 1.0.9 * */
-/* * * */
-/* * purpose : callback get/set interface (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the callback get/set functions * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - fixed calling convention * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * * */
-/* * 0.5.2 - 05/31/2000 - G.Juyn * */
-/* * - fixed up punctuation (contribution by Tim Rowley) * */
-/* * 0.5.2 - 06/02/2000 - G.Juyn * */
-/* * - added getalphaline callback for RGB8_A8 canvasstyle * */
-/* * * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - added callbacks for SAVE/SEEK processing * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - added support for nEED * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - added callback to process non-critical unknown chunks * */
-/* * * */
-/* * 1.0.1 - 02/08/2001 - G.Juyn * */
-/* * - added MEND processing callback * */
-/* * * */
-/* * 1.0.2 - 06/23/2001 - G.Juyn * */
-/* * - added processterm callback * */
-/* * * */
-/* * 1.0.6 - 07/07/2003 - G. R-P * */
-/* * - added SKIPCHUNK feature * */
-/* * * */
-/* * 1.0.7 - 03/10/2004 - G.R-P * */
-/* * - added conditionals around openstream/closestream * */
-/* * 1.0.7 - 03/19/2004 - G.R-P * */
-/* * - fixed typo (MNG_SKIPCHUNK_SAVE -> MNG_SKIPCHUNK_nEED * */
-/* * * */
-/* * 1.0.8 - 04/10/2004 - G.Juyn * */
-/* * - added data-push mechanisms for specialized decoders * */
-/* * * */
-/* * 1.0.9 - 09/18/2004 - G.R-P. * */
-/* * - added two SKIPCHUNK_TERM conditionals * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Callback set functions * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_INTERNAL_MEMMNGMT
-mng_retcode MNG_DECL mng_setcb_memalloc (mng_handle hHandle,
- mng_memalloc fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_MEMALLOC, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fMemalloc = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_MEMALLOC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INTERNAL_MEMMNGMT */
-
-/* ************************************************************************** */
-
-#ifndef MNG_INTERNAL_MEMMNGMT
-mng_retcode MNG_DECL mng_setcb_memfree (mng_handle hHandle,
- mng_memfree fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_MEMFREE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fMemfree = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_MEMFREE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INTERNAL_MEMMNGMT */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_setcb_releasedata (mng_handle hHandle,
- mng_releasedata fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_RELEASEDATA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fReleasedata = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_RELEASEDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
-mng_retcode MNG_DECL mng_setcb_openstream (mng_handle hHandle,
- mng_openstream fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_OPENSTREAM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fOpenstream = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_OPENSTREAM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
-mng_retcode MNG_DECL mng_setcb_closestream (mng_handle hHandle,
- mng_closestream fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_CLOSESTREAM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fClosestream = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_CLOSESTREAM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_setcb_readdata (mng_handle hHandle,
- mng_readdata fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_READDATA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fReaddata = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_READDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_setcb_writedata (mng_handle hHandle,
- mng_writedata fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_WRITEDATA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fWritedata = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_WRITEDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_setcb_errorproc (mng_handle hHandle,
- mng_errorproc fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_ERRORPROC, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fErrorproc = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_ERRORPROC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_TRACE
-mng_retcode MNG_DECL mng_setcb_traceproc (mng_handle hHandle,
- mng_traceproc fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_TRACEPROC, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fTraceproc = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_TRACEPROC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_TRACE */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_setcb_processheader (mng_handle hHandle,
- mng_processheader fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSHEADER, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcessheader = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSHEADER, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-#ifndef MNG_SKIPCHUNK_tEXt
-mng_retcode MNG_DECL mng_setcb_processtext (mng_handle hHandle,
- mng_processtext fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSTEXT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcesstext = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSTEXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode MNG_DECL mng_setcb_processsave (mng_handle hHandle,
- mng_processsave fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSSAVE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcesssave = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSSAVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-#ifndef MNG_SKIPCHUNK_SEEK
-mng_retcode MNG_DECL mng_setcb_processseek (mng_handle hHandle,
- mng_processseek fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSSEEK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcessseek = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSSEEK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-#ifndef MNG_SKIPCHUNK_nEED
-mng_retcode MNG_DECL mng_setcb_processneed (mng_handle hHandle,
- mng_processneed fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSNEED, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcessneed = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSNEED, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_setcb_processmend (mng_handle hHandle,
- mng_processmend fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSMEND, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcessmend = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSMEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_setcb_processunknown (mng_handle hHandle,
- mng_processunknown fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSUNKNOWN, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcessunknown = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSUNKNOWN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-#ifndef MNG_SKIPCHUNK_TERM
-mng_retcode MNG_DECL mng_setcb_processterm (mng_handle hHandle,
- mng_processterm fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSTERM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcessterm = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSTERM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_setcb_getcanvasline (mng_handle hHandle,
- mng_getcanvasline fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_GETCANVASLINE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fGetcanvasline = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_GETCANVASLINE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_setcb_getbkgdline (mng_handle hHandle,
- mng_getbkgdline fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_GETBKGDLINE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fGetbkgdline = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_GETBKGDLINE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_setcb_getalphaline (mng_handle hHandle,
- mng_getalphaline fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_GETALPHALINE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fGetalphaline = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_GETALPHALINE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_setcb_refresh (mng_handle hHandle,
- mng_refresh fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_REFRESH, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fRefresh = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_REFRESH, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_setcb_gettickcount (mng_handle hHandle,
- mng_gettickcount fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_GETTICKCOUNT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fGettickcount = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_GETTICKCOUNT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_setcb_settimer (mng_handle hHandle,
- mng_settimer fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_SETTIMER, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fSettimer = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_SETTIMER, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_APP_CMS)
-mng_retcode MNG_DECL mng_setcb_processgamma (mng_handle hHandle,
- mng_processgamma fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSGAMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcessgamma = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSGAMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY && MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_APP_CMS)
-#ifndef MNG_SKIPCHUNK_cHRM
-mng_retcode MNG_DECL mng_setcb_processchroma (mng_handle hHandle,
- mng_processchroma fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSCHROMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcesschroma = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSCHROMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY && MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_APP_CMS)
-mng_retcode MNG_DECL mng_setcb_processsrgb (mng_handle hHandle,
- mng_processsrgb fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSSRGB, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcesssrgb = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSSRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY && MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_APP_CMS)
-#ifndef MNG_SKIPCHUNK_iCCP
-mng_retcode MNG_DECL mng_setcb_processiccp (mng_handle hHandle,
- mng_processiccp fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSICCP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcessiccp = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSICCP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY && MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_APP_CMS)
-mng_retcode MNG_DECL mng_setcb_processarow (mng_handle hHandle,
- mng_processarow fProc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSAROW, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->fProcessarow = fProc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SETCB_PROCESSAROW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY && MNG_APP_CMS */
-
-/* ************************************************************************** */
-/* * * */
-/* * Callback get functions * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_INTERNAL_MEMMNGMT
-mng_memalloc MNG_DECL mng_getcb_memalloc (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_MEMALLOC, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_MEMALLOC, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fMemalloc;
-}
-#endif /* MNG_INTERNAL_MEMMNGMT */
-
-/* ************************************************************************** */
-
-#ifndef MNG_INTERNAL_MEMMNGMT
-mng_memfree MNG_DECL mng_getcb_memfree (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_MEMFREE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_MEMFREE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fMemfree;
-}
-#endif /* MNG_INTERNAL_MEMMNGMT */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_releasedata MNG_DECL mng_getcb_releasedata (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_RELEASEDATA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_RELEASEDATA, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fReleasedata;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_readdata MNG_DECL mng_getcb_readdata (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_READDATA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_READDATA, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fReaddata;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
-mng_openstream MNG_DECL mng_getcb_openstream (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_OPENSTREAM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_OPENSTREAM, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fOpenstream;
-}
-#endif
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
-mng_closestream MNG_DECL mng_getcb_closestream (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_CLOSESTREAM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_CLOSESTREAM, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fClosestream;
-}
-#endif
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_WRITE
-mng_writedata MNG_DECL mng_getcb_writedata (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_WRITEDATA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_WRITEDATA, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fWritedata;
-}
-#endif /* MNG_SUPPORT_WRITE */
-
-/* ************************************************************************** */
-
-mng_errorproc MNG_DECL mng_getcb_errorproc (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_ERRORPROC, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_ERRORPROC, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fErrorproc;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_TRACE
-mng_traceproc MNG_DECL mng_getcb_traceproc (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_TRACEPROC, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_TRACEPROC, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fTraceproc;
-}
-#endif /* MNG_SUPPORT_TRACE */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_processheader MNG_DECL mng_getcb_processheader (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSHEADER, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSHEADER, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcessheader;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-#ifndef MNG_SKIPCHUNK_tEXt
-mng_processtext MNG_DECL mng_getcb_processtext (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSTEXT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSTEXT, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcesstext;
-}
-#endif
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_processsave MNG_DECL mng_getcb_processsave (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSSAVE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSSAVE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcesssave;
-}
-#endif
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-#ifndef MNG_SKIPCHUNK_SEEK
-mng_processseek MNG_DECL mng_getcb_processseek (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSSEEK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSSEEK, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcessseek;
-}
-#endif
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-#ifndef MNG_SKIPCHUNK_nEED
-mng_processneed MNG_DECL mng_getcb_processneed (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSNEED, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSNEED, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcessneed;
-}
-#endif
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_processmend MNG_DECL mng_getcb_processmend (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSMEND, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSMEND, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcessmend;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_processunknown MNG_DECL mng_getcb_processunknown (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSUNKNOWN, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSUNKNOWN, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcessunknown;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-#ifndef MNG_SKIPCHUNK_TERM
-mng_processterm MNG_DECL mng_getcb_processterm (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSTERM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSTERM, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcessterm;
-}
-#endif
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_getcanvasline MNG_DECL mng_getcb_getcanvasline (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_GETCANVASLINE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_GETCANVASLINE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fGetcanvasline;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_getbkgdline MNG_DECL mng_getcb_getbkgdline (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_GETBKGDLINE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_GETBKGDLINE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fGetbkgdline;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_getalphaline MNG_DECL mng_getcb_getalphaline (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_GETALPHALINE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_GETALPHALINE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fGetalphaline;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_refresh MNG_DECL mng_getcb_refresh (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_REFRESH, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_REFRESH, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fRefresh;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_gettickcount MNG_DECL mng_getcb_gettickcount (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_GETTICKCOUNT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_GETTICKCOUNT, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fGettickcount;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_settimer MNG_DECL mng_getcb_settimer (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_SETTIMER, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_SETTIMER, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fSettimer;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_APP_CMS)
-mng_processgamma MNG_DECL mng_getcb_processgamma (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSGAMMA, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcessgamma;
-}
-#endif /* MNG_SUPPORT_DISPLAY && MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_APP_CMS)
-#ifndef MNG_SKIPCHUNK_cHRM
-mng_processchroma MNG_DECL mng_getcb_processchroma (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSCHROMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSCHROMA, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcesschroma;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY && MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_APP_CMS)
-mng_processsrgb MNG_DECL mng_getcb_processsrgb (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSSRGB, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSSRGB, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcesssrgb;
-}
-#endif /* MNG_SUPPORT_DISPLAY && MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_APP_CMS)
-#ifndef MNG_SKIPCHUNK_iCCP
-mng_processiccp MNG_DECL mng_getcb_processiccp (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSICCP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSICCP, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcessiccp;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY && MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_APP_CMS)
-mng_processarow MNG_DECL mng_getcb_processarow (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSAROW, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GETCB_PROCESSAROW, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->fProcessarow;
-}
-#endif /* MNG_SUPPORT_DISPLAY && MNG_APP_CMS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
-
-
diff --git a/src/3rdparty/libmng/libmng_chunk_descr.c b/src/3rdparty/libmng/libmng_chunk_descr.c
deleted file mode 100644
index e1004a5404..0000000000
--- a/src/3rdparty/libmng/libmng_chunk_descr.c
+++ /dev/null
@@ -1,6090 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_chunk_descr.c copyright (c) 2005-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Chunk descriptor functions (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the chunk- anf field-descriptor * */
-/* * routines * */
-/* * * */
-/* * changes : 1.0.9 - 12/06/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKREADER * */
-/* * 1.0.9 - 12/11/2004 - G.Juyn * */
-/* * - made all constants 'static' * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * 1.0.9 - 01/17/2005 - G.Juyn * */
-/* * - fixed problem with global PLTE/tRNS * */
-/* * * */
-/* * 1.0.10 - 01/17/2005 - G.R-P. * */
-/* * - added typecast to appease the compiler * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#include <stddef.h> /* needed for offsetof() */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_memory.h"
-#include "libmng_objects.h"
-#include "libmng_chunks.h"
-#include "libmng_chunk_descr.h"
-#include "libmng_object_prc.h"
-#include "libmng_chunk_prc.h"
-#include "libmng_chunk_io.h"
-#include "libmng_display.h"
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-#include "libmng_pixels.h"
-#include "libmng_filter.h"
-#endif
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_OPTIMIZE_CHUNKREADER
-#if defined(MNG_INCLUDE_READ_PROCS) || defined(MNG_INCLUDE_WRITE_PROCS)
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-/* PNG chunks */
-
-MNG_LOCAL mng_field_descriptor mng_fields_ihdr [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_NOHIGHBIT,
- 1, 0, 4, 4,
- offsetof(mng_ihdr, iWidth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_NOHIGHBIT,
- 1, 0, 4, 4,
- offsetof(mng_ihdr, iHeight), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 16, 1, 1,
- offsetof(mng_ihdr, iBitdepth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 6, 1, 1,
- offsetof(mng_ihdr, iColortype), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 1, 1,
- offsetof(mng_ihdr, iCompression), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 1, 1,
- offsetof(mng_ihdr, iFilter), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_ihdr, iInterlace), MNG_NULL, MNG_NULL}
- };
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_field_descriptor mng_fields_plte [] =
- {
- {mng_debunk_plte,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_field_descriptor mng_fields_idat [] =
- {
- {MNG_NULL,
- MNG_NULL,
- 0, 0, 0, 0,
- offsetof(mng_idat, pData), MNG_NULL, offsetof(mng_idat, iDatasize)}
- };
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_field_descriptor mng_fields_trns [] =
- {
- {mng_debunk_trns,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_gAMA
-MNG_LOCAL mng_field_descriptor mng_fields_gama [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_gama, iGamma), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_cHRM
-MNG_LOCAL mng_field_descriptor mng_fields_chrm [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_chrm, iWhitepointx), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_chrm, iWhitepointy), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_chrm, iRedx), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_chrm, iRedy), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_chrm, iGreeny), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_chrm, iGreeny), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_chrm, iBluex), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_chrm, iBluey), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sRGB
-MNG_LOCAL mng_field_descriptor mng_fields_srgb [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 4, 1, 1,
- offsetof(mng_srgb, iRenderingintent), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-MNG_LOCAL mng_field_descriptor mng_fields_iccp [] =
- {
- {MNG_NULL,
- MNG_FIELD_TERMINATOR,
- 0, 0, 1, 79,
- offsetof(mng_iccp, zName), MNG_NULL, offsetof(mng_iccp, iNamesize)},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 1, 1,
- offsetof(mng_iccp, iCompression), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_DEFLATED,
- 0, 0, 0, 0,
- offsetof(mng_iccp, pProfile), MNG_NULL, offsetof(mng_iccp, iProfilesize)}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tEXt
-MNG_LOCAL mng_field_descriptor mng_fields_text [] =
- {
- {MNG_NULL,
- MNG_FIELD_TERMINATOR,
- 0, 0, 1, 79,
- offsetof(mng_text, zKeyword), MNG_NULL, offsetof(mng_text, iKeywordsize)},
- {MNG_NULL,
- MNG_NULL,
- 0, 0, 0, 0,
- offsetof(mng_text, zText), MNG_NULL, offsetof(mng_text, iTextsize)}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_zTXt
-MNG_LOCAL mng_field_descriptor mng_fields_ztxt [] =
- {
- {MNG_NULL,
- MNG_FIELD_TERMINATOR,
- 0, 0, 1, 79,
- offsetof(mng_ztxt, zKeyword), MNG_NULL, offsetof(mng_ztxt, iKeywordsize)},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 1, 1,
- offsetof(mng_ztxt, iCompression), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_DEFLATED,
- 0, 0, 0, 0,
- offsetof(mng_ztxt, zText), MNG_NULL, offsetof(mng_ztxt, iTextsize)}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iTXt
-MNG_LOCAL mng_field_descriptor mng_fields_itxt [] =
- {
- {MNG_NULL,
- MNG_FIELD_TERMINATOR,
- 0, 0, 1, 79,
- offsetof(mng_itxt, zKeyword), MNG_NULL, offsetof(mng_itxt, iKeywordsize)},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_itxt, iCompressionflag), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 1, 1,
- offsetof(mng_itxt, iCompressionmethod), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_TERMINATOR,
- 0, 0, 0, 0,
- offsetof(mng_itxt, zLanguage), MNG_NULL, offsetof(mng_itxt, iLanguagesize)},
- {MNG_NULL,
- MNG_FIELD_TERMINATOR,
- 0, 0, 0, 0,
- offsetof(mng_itxt, zTranslation), MNG_NULL, offsetof(mng_itxt, iTranslationsize)},
- {mng_deflate_itxt,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_bKGD
-MNG_LOCAL mng_field_descriptor mng_fields_bkgd [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_PUTIMGTYPE,
- 0, 0, 0, 0,
- offsetof(mng_bkgd, iType), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_IFIMGTYPE3,
- 0, 0xFF, 1, 1,
- offsetof(mng_bkgd, iIndex), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_IFIMGTYPE0 | MNG_FIELD_IFIMGTYPE4,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_bkgd, iGray), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_IFIMGTYPE2 | MNG_FIELD_IFIMGTYPE6,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_bkgd, iRed), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_IFIMGTYPE2 | MNG_FIELD_IFIMGTYPE6,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_bkgd, iGreen), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_IFIMGTYPE2 | MNG_FIELD_IFIMGTYPE6,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_bkgd, iBlue), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYs
-MNG_LOCAL mng_field_descriptor mng_fields_phys [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_phys, iSizex), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_phys, iSizey), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_phys, iUnit), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sBIT
-MNG_LOCAL mng_field_descriptor mng_fields_sbit [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_PUTIMGTYPE,
- 0, 0, 0, 0,
- offsetof(mng_sbit, iType), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_IFIMGTYPES,
- 0, 0xFF, 1, 1,
- offsetof(mng_sbit, aBits[0]), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_IFIMGTYPE2 | MNG_FIELD_IFIMGTYPE3 | MNG_FIELD_IFIMGTYPE4 | MNG_FIELD_IFIMGTYPE6,
- 0, 0xFF, 1, 1,
- offsetof(mng_sbit, aBits[1]), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_IFIMGTYPE2 | MNG_FIELD_IFIMGTYPE3 | MNG_FIELD_IFIMGTYPE6,
- 0, 0xFF, 1, 1,
- offsetof(mng_sbit, aBits[2]), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_IFIMGTYPE6,
- 0, 0xFF, 1, 1,
- offsetof(mng_sbit, aBits[3]), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sPLT
-MNG_LOCAL mng_field_descriptor mng_fields_splt [] =
- {
- {MNG_NULL,
- MNG_NULL,
- 0, 0, 1, 79,
- offsetof(mng_splt, zName), MNG_NULL, offsetof(mng_splt, iNamesize)},
- {MNG_NULL,
- MNG_FIELD_INT,
- 8, 16, 1, 1,
- offsetof(mng_splt, iSampledepth), MNG_NULL, MNG_NULL},
- {mng_splt_entries,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_hIST
-MNG_LOCAL mng_field_descriptor mng_fields_hist [] =
- {
- {mng_hist_entries,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tIME
-MNG_LOCAL mng_field_descriptor mng_fields_time [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_time, iYear), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 12, 1, 1,
- offsetof(mng_time, iMonth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 31, 1, 1,
- offsetof(mng_time, iDay), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 24, 1, 1,
- offsetof(mng_time, iHour), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 60, 1, 1,
- offsetof(mng_time, iMinute), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 60, 1, 1,
- offsetof(mng_time, iSecond), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-/* JNG chunks */
-
-#ifdef MNG_INCLUDE_JNG
-MNG_LOCAL mng_field_descriptor mng_fields_jhdr [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_NOHIGHBIT,
- 1, 0, 4, 4,
- offsetof(mng_jhdr, iWidth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_NOHIGHBIT,
- 1, 0, 4, 4,
- offsetof(mng_jhdr, iHeight), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 8, 16, 1, 1,
- offsetof(mng_jhdr, iColortype), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 8, 20, 1, 1,
- offsetof(mng_jhdr, iImagesampledepth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 8, 8, 1, 1,
- offsetof(mng_jhdr, iImagecompression), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 8, 1, 1,
- offsetof(mng_jhdr, iImageinterlace), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 16, 1, 1,
- offsetof(mng_jhdr, iAlphasampledepth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 8, 1, 1,
- offsetof(mng_jhdr, iAlphacompression), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 1, 1,
- offsetof(mng_jhdr, iAlphafilter), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_jhdr, iAlphainterlace), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#define mng_fields_jdaa mng_fields_idat
-#define mng_fields_jdat mng_fields_idat
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-/* MNG chunks */
-
-MNG_LOCAL mng_field_descriptor mng_fields_mhdr [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_mhdr, iWidth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_mhdr, iHeight), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_mhdr, iTicks), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_mhdr, iLayercount), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_mhdr, iFramecount), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_mhdr, iPlaytime), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_mhdr, iSimplicity), MNG_NULL, MNG_NULL}
- };
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-MNG_LOCAL mng_field_descriptor mng_fields_loop [] =
- {
- {mng_debunk_loop,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-MNG_LOCAL mng_field_descriptor mng_fields_endl [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFF, 1, 1,
- offsetof(mng_endl, iLevel), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DEFI
-MNG_LOCAL mng_field_descriptor mng_fields_defi [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_defi, iObjectid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 0xFF, 1, 1,
- offsetof(mng_defi, iDonotshow), offsetof(mng_defi, bHasdonotshow), MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 0xFF, 1, 1,
- offsetof(mng_defi, iConcrete), offsetof(mng_defi, bHasconcrete), MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0, 4, 4,
- offsetof(mng_defi, iXlocation), offsetof(mng_defi, bHasloca), MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0, 4, 4,
- offsetof(mng_defi, iYlocation), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP2,
- 0, 0, 4, 4,
- offsetof(mng_defi, iLeftcb), offsetof(mng_defi, bHasclip), MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP2,
- 0, 0, 4, 4,
- offsetof(mng_defi, iRightcb), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP2,
- 0, 0, 4, 4,
- offsetof(mng_defi, iTopcb), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP2,
- 0, 0, 4, 4,
- offsetof(mng_defi, iBottomcb), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BASI
-MNG_LOCAL mng_field_descriptor mng_fields_basi [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_basi, iWidth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_basi, iHeight), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 16, 1, 1,
- offsetof(mng_basi, iBitdepth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 6, 1, 1,
- offsetof(mng_basi, iColortype), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 1, 1,
- offsetof(mng_basi, iCompression), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 1, 1,
- offsetof(mng_basi, iFilter), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_basi, iInterlace), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_basi, iRed), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_basi, iGreen), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_basi, iBlue), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_basi, iAlpha), offsetof(mng_basi, bHasalpha), MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 1, 1, 1,
- offsetof(mng_basi, iViewable), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLON
-MNG_LOCAL mng_field_descriptor mng_fields_clon [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_clon, iSourceid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_clon, iCloneid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 2, 1, 1,
- offsetof(mng_clon, iClonetype), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 1, 1, 1,
- offsetof(mng_clon, iDonotshow), offsetof(mng_clon, bHasdonotshow), MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 1, 1, 1,
- offsetof(mng_clon, iConcrete), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 2, 1, 1,
- offsetof(mng_clon, iLocationtype), offsetof(mng_clon, bHasloca), MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0, 4, 4,
- offsetof(mng_clon, iLocationx), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0, 4, 4,
- offsetof(mng_clon, iLocationy), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-MNG_LOCAL mng_field_descriptor mng_fields_past [] =
- {
- {mng_debunk_past,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-MNG_LOCAL mng_field_descriptor mng_fields_disc [] =
- {
- {mng_disc_entries,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BACK
-MNG_LOCAL mng_field_descriptor mng_fields_back [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_back, iRed), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_back, iGreen), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_back, iBlue), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 3, 1, 1,
- offsetof(mng_back, iMandatory), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_back, iImageid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 1, 1, 1,
- offsetof(mng_back, iTile), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_FRAM
-MNG_LOCAL mng_field_descriptor mng_fields_fram [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 4, 1, 1,
- offsetof(mng_fram, iMode), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_TERMINATOR | MNG_FIELD_OPTIONAL,
- 0, 0, 1, 79,
- offsetof(mng_fram, zName), MNG_NULL, offsetof(mng_fram, iNamesize)},
- {mng_fram_remainder,
- MNG_FIELD_OPTIONAL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MOVE
-MNG_LOCAL mng_field_descriptor mng_fields_move [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_move, iFirstid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_move, iLastid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_move, iMovetype), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_move, iMovex), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_move, iMovey), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLIP
-MNG_LOCAL mng_field_descriptor mng_fields_clip [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_clip, iFirstid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_clip, iLastid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_clip, iCliptype), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_clip, iClipl), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_clip, iClipr), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_clip, iClipt), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_clip, iClipb), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SHOW
-MNG_LOCAL mng_field_descriptor mng_fields_show [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 0xFFFF, 2, 2,
- offsetof(mng_show, iFirstid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 1, 0xFFFF, 2, 2,
- offsetof(mng_show, iLastid), offsetof(mng_show, bHaslastid), MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL,
- 0, 7, 1, 1,
- offsetof(mng_show, iMode), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_TERM
-MNG_LOCAL mng_field_descriptor mng_fields_term [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 3, 1, 1,
- offsetof(mng_term, iTermaction), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 2, 1, 1,
- offsetof(mng_term, iIteraction), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0, 4, 4,
- offsetof(mng_term, iDelay), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0, 4, 4,
- offsetof(mng_term, iItermax), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-MNG_LOCAL mng_field_descriptor mng_fields_save [] =
- {
- {mng_save_entries,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-MNG_LOCAL mng_field_descriptor mng_fields_seek [] =
- {
- {MNG_NULL,
- MNG_NULL,
- 0, 0, 1, 79,
- offsetof(mng_seek, zName), MNG_NULL, offsetof(mng_seek, iNamesize)}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_eXPI
-MNG_LOCAL mng_field_descriptor mng_fields_expi [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_expi, iSnapshotid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_NULL,
- 0, 0, 1, 79,
- offsetof(mng_expi, zName), MNG_NULL, offsetof(mng_expi, iNamesize)}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_fPRI
-MNG_LOCAL mng_field_descriptor mng_fields_fpri [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_fpri, iDeltatype), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFF, 1, 1,
- offsetof(mng_fpri, iPriority), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_nEED
-MNG_LOCAL mng_field_descriptor mng_fields_need [] =
- {
- {MNG_NULL,
- MNG_NULL,
- 0, 0, 1, 0,
- offsetof(mng_need, zKeywords), MNG_NULL, offsetof(mng_need, iKeywordssize)}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYg
-#define mng_fields_phyg mng_fields_phys
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_LOCAL mng_field_descriptor mng_fields_dhdr [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_dhdr, iObjectid), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 2, 1, 1,
- offsetof(mng_dhdr, iImagetype), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 7, 1, 1,
- offsetof(mng_dhdr, iDeltatype), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0, 4, 4,
- offsetof(mng_dhdr, iBlockwidth), offsetof(mng_dhdr, bHasblocksize), MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP1,
- 0, 0, 4, 4,
- offsetof(mng_dhdr, iBlockheight), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP2,
- 0, 0, 4, 4,
- offsetof(mng_dhdr, iBlockx), offsetof(mng_dhdr, bHasblockloc), MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT | MNG_FIELD_OPTIONAL | MNG_FIELD_GROUP2,
- 0, 0, 4, 4,
- offsetof(mng_dhdr, iBlocky), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_LOCAL mng_field_descriptor mng_fields_prom [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 14, 1, 1,
- offsetof(mng_prom, iColortype), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 16, 1, 1,
- offsetof(mng_prom, iSampledepth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_prom, iFilltype), MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_LOCAL mng_field_descriptor mng_fields_pplt [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 5, 1, 1,
- offsetof(mng_pplt, iDeltatype), MNG_NULL, MNG_NULL},
- {mng_pplt_entries,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_LOCAL mng_field_descriptor mng_fields_drop [] =
- {
- {mng_drop_entries,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
-MNG_LOCAL mng_field_descriptor mng_fields_dbyk [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_dbyk, iChunkname), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_dbyk, iPolarity), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_NULL,
- 0, 0, 1, 0,
- offsetof(mng_dbyk, zKeywords), MNG_NULL, offsetof(mng_dbyk, iKeywordssize)}
- };
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-MNG_LOCAL mng_field_descriptor mng_fields_ordr [] =
- {
- {mng_drop_entries,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-MNG_LOCAL mng_field_descriptor mng_fields_magn [] =
- {
- {mng_debunk_magn,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-MNG_LOCAL mng_field_descriptor mng_fields_mpng [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 0, 4, 4,
- offsetof(mng_mpng, iFramewidth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 0, 4, 4,
- offsetof(mng_mpng, iFrameheight), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0xFFFF, 2, 2,
- offsetof(mng_mpng, iNumplays), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 0xFFFF, 2, 2,
- offsetof(mng_mpng, iTickspersec), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 1, 1,
- offsetof(mng_mpng, iCompressionmethod), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_DEFLATED,
- 0, 0, 1, 0,
- offsetof(mng_mpng, pFrames), MNG_NULL, offsetof(mng_mpng, iFramessize)}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-MNG_LOCAL mng_field_descriptor mng_fields_ahdr [] =
- {
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 0, 4, 4,
- offsetof(mng_ahdr, iNumframes), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_ahdr, iTickspersec), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 0, 4, 4,
- offsetof(mng_ahdr, iNumplays), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 0, 4, 4,
- offsetof(mng_ahdr, iTilewidth), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 1, 0, 4, 4,
- offsetof(mng_ahdr, iTileheight), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_ahdr, iInterlace), MNG_NULL, MNG_NULL},
- {MNG_NULL,
- MNG_FIELD_INT,
- 0, 1, 1, 1,
- offsetof(mng_ahdr, iStillused), MNG_NULL, MNG_NULL}
- };
-
-MNG_LOCAL mng_field_descriptor mng_fields_adat [] =
- {
- {mng_adat_tiles,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_evNT
-MNG_LOCAL mng_field_descriptor mng_fields_evnt [] =
- {
- {mng_evnt_entries,
- MNG_NULL,
- 0, 0, 0, 0,
- MNG_NULL, MNG_NULL, MNG_NULL}
- };
-#endif
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_field_descriptor mng_fields_unknown [] =
- {
- {MNG_NULL,
- MNG_NULL,
- 0, 0, 1, 0,
- offsetof(mng_unknown_chunk, pData), MNG_NULL, offsetof(mng_unknown_chunk, iDatasize)}
- };
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-/* PNG chunks */
-
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_ihdr =
- {mng_it_png, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_ihdr,
- mng_fields_ihdr, (sizeof(mng_fields_ihdr) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL,
- MNG_NULL,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOJHDR | MNG_DESCR_NOBASI | MNG_DESCR_NOIDAT | MNG_DESCR_NOPLTE};
-
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_plte =
- {mng_it_png, mng_create_none, 0, offsetof(mng_plte, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_plte,
- mng_fields_plte, (sizeof(mng_fields_plte) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL | MNG_DESCR_EMPTYEMBED,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_idat =
- {mng_it_png, mng_create_none, 0, offsetof(mng_idat, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_idat,
- mng_fields_idat, (sizeof(mng_fields_idat) / sizeof(mng_field_descriptor)),
- MNG_DESCR_EMPTYEMBED,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOJSEP};
-
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_iend =
- {mng_it_png, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_iend,
- MNG_NULL, 0,
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYEMBED,
- MNG_DESCR_GenHDR,
- MNG_NULL};
-
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_trns =
- {mng_it_png, mng_create_none, 0, offsetof(mng_trns, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_trns,
- mng_fields_trns, (sizeof(mng_fields_trns) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL | MNG_DESCR_EMPTYEMBED,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-
-#ifndef MNG_SKIPCHUNK_gAMA
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_gama =
- {mng_it_png, mng_create_none, 0, offsetof(mng_gama, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_gama,
- mng_fields_gama, (sizeof(mng_fields_gama) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL | MNG_DESCR_EMPTYEMBED | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOPLTE | MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-#endif
-
-#ifndef MNG_SKIPCHUNK_cHRM
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_chrm =
- {mng_it_png, mng_create_none, 0, offsetof(mng_chrm, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_chrm,
- mng_fields_chrm, (sizeof(mng_fields_chrm) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL | MNG_DESCR_EMPTYEMBED | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOPLTE | MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-#endif
-
-#ifndef MNG_SKIPCHUNK_sRGB
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_srgb =
- {mng_it_png, mng_create_none, 0, offsetof(mng_srgb, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_srgb,
- mng_fields_srgb, (sizeof(mng_fields_srgb) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL | MNG_DESCR_EMPTYEMBED | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOPLTE | MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-#endif
-
-#ifndef MNG_SKIPCHUNK_iCCP
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_iccp =
- {mng_it_png, mng_create_none, 0, offsetof(mng_iccp, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_iccp,
- mng_fields_iccp, (sizeof(mng_fields_iccp) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL | MNG_DESCR_EMPTYEMBED | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOPLTE | MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-#endif
-
-#ifndef MNG_SKIPCHUNK_tEXt
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_text =
- {mng_it_png, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_text,
- mng_fields_text, (sizeof(mng_fields_text) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL,
- MNG_DESCR_GenHDR,
- MNG_NULL};
-#endif
-
-#ifndef MNG_SKIPCHUNK_zTXt
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_ztxt =
- {mng_it_png, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_ztxt,
- mng_fields_ztxt, (sizeof(mng_fields_ztxt) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL,
- MNG_DESCR_GenHDR,
- MNG_NULL};
-#endif
-
-#ifndef MNG_SKIPCHUNK_iTXt
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_itxt =
- {mng_it_png, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_itxt,
- mng_fields_itxt, (sizeof(mng_fields_itxt) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL,
- MNG_DESCR_GenHDR,
- MNG_NULL};
-#endif
-
-#ifndef MNG_SKIPCHUNK_bKGD
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_bkgd =
- {mng_it_png, mng_create_none, 0, offsetof(mng_bkgd, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_bkgd,
- mng_fields_bkgd, (sizeof(mng_fields_bkgd) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL | MNG_DESCR_EMPTYEMBED | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-#endif
-
-#ifndef MNG_SKIPCHUNK_pHYs
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_phys =
- {mng_it_png, mng_create_none, 0, offsetof(mng_phys, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_phys,
- mng_fields_phys, (sizeof(mng_fields_phys) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL | MNG_DESCR_EMPTYEMBED | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-#endif
-
-#ifndef MNG_SKIPCHUNK_sBIT
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_sbit =
- {mng_it_png, mng_create_none, 0, offsetof(mng_sbit, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_sbit,
- mng_fields_sbit, (sizeof(mng_fields_sbit) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL | MNG_DESCR_EMPTYEMBED | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-#endif
-
-#ifndef MNG_SKIPCHUNK_sPLT
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_splt =
- {mng_it_png, mng_create_none, 0, offsetof(mng_splt, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_splt,
- mng_fields_splt, (sizeof(mng_fields_splt) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL | MNG_DESCR_EMPTYEMBED | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_GenHDR,
- MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-#endif
-
-#ifndef MNG_SKIPCHUNK_hIST
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_hist =
- {mng_it_png, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_hist,
- mng_fields_hist, (sizeof(mng_fields_hist) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_GenHDR | MNG_DESCR_PLTE,
- MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT | MNG_DESCR_NOJDAA};
-#endif
-
-#ifndef MNG_SKIPCHUNK_tIME
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_time =
- {mng_it_png, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_time,
- mng_fields_time, (sizeof(mng_fields_time) / sizeof(mng_field_descriptor)),
- MNG_DESCR_GLOBAL,
- MNG_DESCR_GenHDR,
- MNG_NULL};
-#endif
-
-/* ************************************************************************** */
-/* JNG chunks */
-
-#ifdef MNG_INCLUDE_JNG
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_jhdr =
- {mng_it_jng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_jhdr,
- mng_fields_jhdr, (sizeof(mng_fields_jhdr) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_NULL,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifdef MNG_INCLUDE_JNG
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_jdaa =
- {mng_it_jng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_jdaa,
- mng_fields_jdaa, (sizeof(mng_fields_jdaa) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_JngHDR,
- MNG_DESCR_NOJSEP};
-#endif
-
-#ifdef MNG_INCLUDE_JNG
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_jdat =
- {mng_it_jng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_jdat,
- mng_fields_jdat, (sizeof(mng_fields_jdat) / sizeof(mng_field_descriptor)),
- MNG_DESCR_EMPTYEMBED,
- MNG_DESCR_JngHDR,
- MNG_NULL};
-#endif
-
-#ifdef MNG_INCLUDE_JNG
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_jsep =
- {mng_it_jng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_jsep,
- MNG_NULL, 0,
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYEMBED,
- MNG_DESCR_JngHDR,
- MNG_DESCR_NOJSEP};
-#endif
-
-/* ************************************************************************** */
-/* MNG chunks */
-
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_mhdr =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_mhdr,
- mng_fields_mhdr, (sizeof(mng_fields_mhdr) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_NULL,
- MNG_DESCR_NOMHDR | MNG_DESCR_NOIHDR | MNG_DESCR_NOJHDR};
-
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_mend =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_mend,
- MNG_NULL, 0,
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_MHDR,
- MNG_NULL};
-
-#ifndef MNG_SKIPCHUNK_LOOP
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_loop =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_loop,
- mng_fields_loop, (sizeof(mng_fields_loop) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_endl =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_endl,
- mng_fields_endl, (sizeof(mng_fields_endl) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_DEFI
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_defi =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_defi,
- mng_fields_defi, (sizeof(mng_fields_defi) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_BASI
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_basi =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_basi,
- mng_fields_basi, (sizeof(mng_fields_basi) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_CLON
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_clon =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_clon,
- mng_fields_clon, (sizeof(mng_fields_clon) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_PAST
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_past =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_past,
- mng_fields_past, (sizeof(mng_fields_past) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_DISC
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_disc =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_disc,
- mng_fields_disc, (sizeof(mng_fields_disc) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_BACK
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_back =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_back,
- mng_fields_back, (sizeof(mng_fields_back) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_FRAM
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_fram =
- {mng_it_mng, mng_create_none, 0, offsetof(mng_fram, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_fram,
- mng_fields_fram, (sizeof(mng_fields_fram) / sizeof(mng_field_descriptor)),
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_MOVE
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_move =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_move,
- mng_fields_move, (sizeof(mng_fields_move) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_CLIP
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_clip =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_clip,
- mng_fields_clip, (sizeof(mng_fields_clip) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_SHOW
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_show =
- {mng_it_mng, mng_create_none, 0, offsetof(mng_show, bEmpty),
- MNG_NULL, MNG_NULL, mng_special_show,
- mng_fields_show, (sizeof(mng_fields_show) / sizeof(mng_field_descriptor)),
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_TERM
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_term =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_term,
- mng_fields_term, (sizeof(mng_fields_term) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR | MNG_DESCR_NOTERM | MNG_DESCR_NOLOOP};
-#endif
-
-#ifndef MNG_SKIPCHUNK_SAVE
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_save =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_save,
- mng_fields_save, (sizeof(mng_fields_save) / sizeof(mng_field_descriptor)),
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOSAVE | MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_SEEK
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_seek =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_seek,
- mng_fields_seek, (sizeof(mng_fields_seek) / sizeof(mng_field_descriptor)),
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYGLOBAL,
- MNG_DESCR_MHDR | MNG_DESCR_SAVE,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_eXPI
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_expi =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_expi,
- mng_fields_expi, (sizeof(mng_fields_expi) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_fPRI
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_fpri =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_fpri,
- mng_fields_fpri, (sizeof(mng_fields_fpri) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_nEED
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_need =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_need,
- mng_fields_need, (sizeof(mng_fields_need) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_pHYg
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_phyg =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_phyg,
- mng_fields_phyg, (sizeof(mng_fields_phyg) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_dhdr =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_dhdr,
- mng_fields_dhdr, (sizeof(mng_fields_dhdr) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_prom =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_prom,
- mng_fields_prom, (sizeof(mng_fields_prom) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR | MNG_DESCR_DHDR,
- MNG_NULL};
-#endif
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_ipng =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_ipng,
- MNG_NULL, 0,
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYEMBED,
- MNG_DESCR_MHDR | MNG_DESCR_DHDR,
- MNG_NULL};
-#endif
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_pplt =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_pplt,
- mng_fields_pplt, (sizeof(mng_fields_pplt) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR | MNG_DESCR_DHDR,
- MNG_NULL};
-#endif
-
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_ijng =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_ijng,
- MNG_NULL, 0,
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYEMBED,
- MNG_DESCR_MHDR | MNG_DESCR_DHDR,
- MNG_NULL};
-#endif
-#endif
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_drop =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_drop,
- mng_fields_drop, (sizeof(mng_fields_drop) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR | MNG_DESCR_DHDR,
- MNG_NULL};
-#endif
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_dbyk =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_dbyk,
- mng_fields_dbyk, (sizeof(mng_fields_dbyk) / sizeof(mng_field_descriptor)),
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYEMBED,
- MNG_DESCR_MHDR | MNG_DESCR_DHDR,
- MNG_NULL};
-#endif
-#endif
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_ordr =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_ordr,
- mng_fields_ordr, (sizeof(mng_fields_ordr) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR | MNG_DESCR_DHDR,
- MNG_NULL};
-#endif
-#endif
-
-#ifndef MNG_SKIPCHUNK_MAGN
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_magn =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_magn,
- mng_fields_magn, (sizeof(mng_fields_magn) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOIHDR | MNG_DESCR_NOBASI | MNG_DESCR_NODHDR | MNG_DESCR_NOJHDR};
-#endif
-
-#ifndef MNG_SKIPCHUNK_evNT
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_evnt =
- {mng_it_mng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_evnt,
- mng_fields_evnt, (sizeof(mng_fields_evnt) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_MHDR,
- MNG_DESCR_NOSAVE};
-#endif
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_mpng =
- {mng_it_mpng, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_mpng,
- mng_fields_mpng, (sizeof(mng_fields_mpng) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_NULL,
- MNG_DESCR_NOMHDR | MNG_DESCR_NOIDAT | MNG_DESCR_NOJDAT};
-#endif
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_ahdr =
- {mng_it_ang, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_ahdr,
- mng_fields_ahdr, (sizeof(mng_fields_ahdr) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_IHDR,
- MNG_DESCR_NOMHDR | MNG_DESCR_NOJHDR | MNG_DESCR_NOIDAT};
-
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_adat =
- {mng_it_ang, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_adat,
- mng_fields_adat, (sizeof(mng_fields_adat) / sizeof(mng_field_descriptor)),
- MNG_NULL,
- MNG_DESCR_IHDR,
- MNG_DESCR_NOMHDR | MNG_DESCR_NOJHDR};
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-/* the good ol' unknown babe */
-
-MNG_LOCAL mng_chunk_descriptor mng_chunk_descr_unknown =
- {mng_it_png, mng_create_none, 0, 0,
- MNG_NULL, MNG_NULL, mng_special_unknown,
- mng_fields_unknown, (sizeof(mng_fields_unknown) / sizeof(mng_field_descriptor)),
- MNG_DESCR_EMPTY | MNG_DESCR_EMPTYEMBED,
- MNG_NULL,
- MNG_NULL};
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-MNG_LOCAL mng_chunk_header mng_chunk_unknown =
- {MNG_UINT_HUH, mng_init_general, mng_free_unknown,
- mng_read_general, mng_write_unknown, mng_assign_unknown,
- 0, 0, sizeof(mng_unknown_chunk), &mng_chunk_descr_unknown};
-
-/* ************************************************************************** */
-
- /* the table-idea & binary search code was adapted from
- libpng 1.1.0 (pngread.c) */
- /* NOTE1: the table must remain sorted by chunkname, otherwise the binary
- search will break !!! (ps. watch upper-/lower-case chunknames !!) */
- /* NOTE2: the layout must remain equal to the header part of all the
- chunk-structures (yes, that means even the pNext and pPrev fields;
- it's wasting a bit of space, but hey, the code is a lot easier) */
-
-MNG_LOCAL mng_chunk_header mng_chunk_table [] =
- {
-#ifndef MNG_SKIPCHUNK_BACK
- {MNG_UINT_BACK, mng_init_general, mng_free_general, mng_read_general, mng_write_back, mng_assign_general, 0, 0, sizeof(mng_back), &mng_chunk_descr_back},
-#endif
-#ifndef MNG_SKIPCHUNK_BASI
- {MNG_UINT_BASI, mng_init_general, mng_free_general, mng_read_general, mng_write_basi, mng_assign_general, 0, 0, sizeof(mng_basi), &mng_chunk_descr_basi},
-#endif
-#ifndef MNG_SKIPCHUNK_CLIP
- {MNG_UINT_CLIP, mng_init_general, mng_free_general, mng_read_general, mng_write_clip, mng_assign_general, 0, 0, sizeof(mng_clip), &mng_chunk_descr_clip},
-#endif
-#ifndef MNG_SKIPCHUNK_CLON
- {MNG_UINT_CLON, mng_init_general, mng_free_general, mng_read_general, mng_write_clon, mng_assign_general, 0, 0, sizeof(mng_clon), &mng_chunk_descr_clon},
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
- {MNG_UINT_DBYK, mng_init_general, mng_free_dbyk, mng_read_general, mng_write_dbyk, mng_assign_dbyk, 0, 0, sizeof(mng_dbyk), &mng_chunk_descr_dbyk},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_DEFI
- {MNG_UINT_DEFI, mng_init_general, mng_free_general, mng_read_general, mng_write_defi, mng_assign_general, 0, 0, sizeof(mng_defi), &mng_chunk_descr_defi},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_UINT_DHDR, mng_init_general, mng_free_general, mng_read_general, mng_write_dhdr, mng_assign_general, 0, 0, sizeof(mng_dhdr), &mng_chunk_descr_dhdr},
-#endif
-#ifndef MNG_SKIPCHUNK_DISC
- {MNG_UINT_DISC, mng_init_general, mng_free_disc, mng_read_general, mng_write_disc, mng_assign_disc, 0, 0, sizeof(mng_disc), &mng_chunk_descr_disc},
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DROP
- {MNG_UINT_DROP, mng_init_general, mng_free_drop, mng_read_general, mng_write_drop, mng_assign_drop, 0, 0, sizeof(mng_drop), &mng_chunk_descr_drop},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_LOOP
- {MNG_UINT_ENDL, mng_init_general, mng_free_general, mng_read_general, mng_write_endl, mng_assign_general, 0, 0, sizeof(mng_endl), &mng_chunk_descr_endl},
-#endif
-#ifndef MNG_SKIPCHUNK_FRAM
- {MNG_UINT_FRAM, mng_init_general, mng_free_fram, mng_read_general, mng_write_fram, mng_assign_fram, 0, 0, sizeof(mng_fram), &mng_chunk_descr_fram},
-#endif
- {MNG_UINT_IDAT, mng_init_general, mng_free_idat, mng_read_general, mng_write_idat, mng_assign_idat, 0, 0, sizeof(mng_idat), &mng_chunk_descr_idat}, /* 12-th element! */
- {MNG_UINT_IEND, mng_init_general, mng_free_general, mng_read_general, mng_write_iend, mng_assign_general, 0, 0, sizeof(mng_iend), &mng_chunk_descr_iend},
- {MNG_UINT_IHDR, mng_init_general, mng_free_general, mng_read_general, mng_write_ihdr, mng_assign_general, 0, 0, sizeof(mng_ihdr), &mng_chunk_descr_ihdr},
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
- {MNG_UINT_IJNG, mng_init_general, mng_free_general, mng_read_general, mng_write_ijng, mng_assign_general, 0, 0, sizeof(mng_ijng), &mng_chunk_descr_ijng},
-#endif
- {MNG_UINT_IPNG, mng_init_general, mng_free_general, mng_read_general, mng_write_ipng, mng_assign_general, 0, 0, sizeof(mng_ipng), &mng_chunk_descr_ipng},
-#endif
-#ifdef MNG_INCLUDE_JNG
- {MNG_UINT_JDAA, mng_init_general, mng_free_jdaa, mng_read_general, mng_write_jdaa, mng_assign_jdaa, 0, 0, sizeof(mng_jdaa), &mng_chunk_descr_jdaa},
- {MNG_UINT_JDAT, mng_init_general, mng_free_jdat, mng_read_general, mng_write_jdat, mng_assign_jdat, 0, 0, sizeof(mng_jdat), &mng_chunk_descr_jdat},
- {MNG_UINT_JHDR, mng_init_general, mng_free_general, mng_read_general, mng_write_jhdr, mng_assign_general, 0, 0, sizeof(mng_jhdr), &mng_chunk_descr_jhdr},
- {MNG_UINT_JSEP, mng_init_general, mng_free_general, mng_read_general, mng_write_jsep, mng_assign_general, 0, 0, sizeof(mng_jsep), &mng_chunk_descr_jsep},
- {MNG_UINT_JdAA, mng_init_general, mng_free_jdaa, mng_read_general, mng_write_jdaa, mng_assign_jdaa, 0, 0, sizeof(mng_jdaa), &mng_chunk_descr_jdaa},
-#endif
-#ifndef MNG_SKIPCHUNK_LOOP
- {MNG_UINT_LOOP, mng_init_general, mng_free_loop, mng_read_general, mng_write_loop, mng_assign_loop, 0, 0, sizeof(mng_loop), &mng_chunk_descr_loop},
-#endif
-#ifndef MNG_SKIPCHUNK_MAGN
- {MNG_UINT_MAGN, mng_init_general, mng_free_general, mng_read_general, mng_write_magn, mng_assign_general, 0, 0, sizeof(mng_magn), &mng_chunk_descr_magn},
-#endif
- {MNG_UINT_MEND, mng_init_general, mng_free_general, mng_read_general, mng_write_mend, mng_assign_general, 0, 0, sizeof(mng_mend), &mng_chunk_descr_mend},
- {MNG_UINT_MHDR, mng_init_general, mng_free_general, mng_read_general, mng_write_mhdr, mng_assign_general, 0, 0, sizeof(mng_mhdr), &mng_chunk_descr_mhdr},
-#ifndef MNG_SKIPCHUNK_MOVE
- {MNG_UINT_MOVE, mng_init_general, mng_free_general, mng_read_general, mng_write_move, mng_assign_general, 0, 0, sizeof(mng_move), &mng_chunk_descr_move},
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
- {MNG_UINT_ORDR, mng_init_general, mng_free_ordr, mng_read_general, mng_write_ordr, mng_assign_ordr, 0, 0, sizeof(mng_ordr), &mng_chunk_descr_ordr},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_UINT_PAST, mng_init_general, mng_free_past, mng_read_general, mng_write_past, mng_assign_past, 0, 0, sizeof(mng_past), &mng_chunk_descr_past},
-#endif
- {MNG_UINT_PLTE, mng_init_general, mng_free_general, mng_read_general, mng_write_plte, mng_assign_general, 0, 0, sizeof(mng_plte), &mng_chunk_descr_plte},
-#ifndef MNG_NO_DELTA_PNG
- {MNG_UINT_PPLT, mng_init_general, mng_free_general, mng_read_general, mng_write_pplt, mng_assign_general, 0, 0, sizeof(mng_pplt), &mng_chunk_descr_pplt},
- {MNG_UINT_PROM, mng_init_general, mng_free_general, mng_read_general, mng_write_prom, mng_assign_general, 0, 0, sizeof(mng_prom), &mng_chunk_descr_prom},
-#endif
-#ifndef MNG_SKIPCHUNK_SAVE
- {MNG_UINT_SAVE, mng_init_general, mng_free_save, mng_read_general, mng_write_save, mng_assign_save, 0, 0, sizeof(mng_save), &mng_chunk_descr_save},
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
- {MNG_UINT_SEEK, mng_init_general, mng_free_seek, mng_read_general, mng_write_seek, mng_assign_seek, 0, 0, sizeof(mng_seek), &mng_chunk_descr_seek},
-#endif
-#ifndef MNG_SKIPCHUNK_SHOW
- {MNG_UINT_SHOW, mng_init_general, mng_free_general, mng_read_general, mng_write_show, mng_assign_general, 0, 0, sizeof(mng_show), &mng_chunk_descr_show},
-#endif
-#ifndef MNG_SKIPCHUNK_TERM
- {MNG_UINT_TERM, mng_init_general, mng_free_general, mng_read_general, mng_write_term, mng_assign_general, 0, 0, sizeof(mng_term), &mng_chunk_descr_term},
-#endif
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
- {MNG_UINT_adAT, mng_init_general, mng_free_adat, mng_read_general, mng_write_adat, mng_assign_adat, 0, 0, sizeof(mng_adat), &mng_chunk_descr_adat},
- {MNG_UINT_ahDR, mng_init_general, mng_free_general, mng_read_general, mng_write_ahdr, mng_assign_ahdr, 0, 0, sizeof(mng_ahdr), &mng_chunk_descr_ahdr},
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
- {MNG_UINT_bKGD, mng_init_general, mng_free_general, mng_read_general, mng_write_bkgd, mng_assign_general, 0, 0, sizeof(mng_bkgd), &mng_chunk_descr_bkgd},
-#endif
-#ifndef MNG_SKIPCHUNK_cHRM
- {MNG_UINT_cHRM, mng_init_general, mng_free_general, mng_read_general, mng_write_chrm, mng_assign_general, 0, 0, sizeof(mng_chrm), &mng_chunk_descr_chrm},
-#endif
-#ifndef MNG_SKIPCHUNK_eXPI
- {MNG_UINT_eXPI, mng_init_general, mng_free_expi, mng_read_general, mng_write_expi, mng_assign_expi, 0, 0, sizeof(mng_expi), &mng_chunk_descr_expi},
-#endif
-#ifndef MNG_SKIPCHUNK_evNT
- {MNG_UINT_evNT, mng_init_general, mng_free_evnt, mng_read_general, mng_write_evnt, mng_assign_evnt, 0, 0, sizeof(mng_evnt), &mng_chunk_descr_evnt},
-#endif
-#ifndef MNG_SKIPCHUNK_fPRI
- {MNG_UINT_fPRI, mng_init_general, mng_free_general, mng_read_general, mng_write_fpri, mng_assign_general, 0, 0, sizeof(mng_fpri), &mng_chunk_descr_fpri},
-#endif
-#ifndef MNG_SKIPCHUNK_gAMA
- {MNG_UINT_gAMA, mng_init_general, mng_free_general, mng_read_general, mng_write_gama, mng_assign_general, 0, 0, sizeof(mng_gama), &mng_chunk_descr_gama},
-#endif
-#ifndef MNG_SKIPCHUNK_hIST
- {MNG_UINT_hIST, mng_init_general, mng_free_general, mng_read_general, mng_write_hist, mng_assign_general, 0, 0, sizeof(mng_hist), &mng_chunk_descr_hist},
-#endif
-#ifndef MNG_SKIPCHUNK_iCCP
- {MNG_UINT_iCCP, mng_init_general, mng_free_iccp, mng_read_general, mng_write_iccp, mng_assign_iccp, 0, 0, sizeof(mng_iccp), &mng_chunk_descr_iccp},
-#endif
-#ifndef MNG_SKIPCHUNK_iTXt
- {MNG_UINT_iTXt, mng_init_general, mng_free_itxt, mng_read_general, mng_write_itxt, mng_assign_itxt, 0, 0, sizeof(mng_itxt), &mng_chunk_descr_itxt},
-#endif
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_UINT_mpNG, mng_init_general, mng_free_mpng, mng_read_general, mng_write_mpng, mng_assign_mpng, 0, 0, sizeof(mng_mpng), &mng_chunk_descr_mpng},
-#endif
-#ifndef MNG_SKIPCHUNK_nEED
- {MNG_UINT_nEED, mng_init_general, mng_free_need, mng_read_general, mng_write_need, mng_assign_need, 0, 0, sizeof(mng_need), &mng_chunk_descr_need},
-#endif
-/* TODO: {MNG_UINT_oFFs, 0, 0, 0, 0, 0, 0}, */
-/* TODO: {MNG_UINT_pCAL, 0, 0, 0, 0, 0, 0}, */
-#ifndef MNG_SKIPCHUNK_pHYg
- {MNG_UINT_pHYg, mng_init_general, mng_free_general, mng_read_general, mng_write_phyg, mng_assign_general, 0, 0, sizeof(mng_phyg), &mng_chunk_descr_phyg},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYs
- {MNG_UINT_pHYs, mng_init_general, mng_free_general, mng_read_general, mng_write_phys, mng_assign_general, 0, 0, sizeof(mng_phys), &mng_chunk_descr_phys},
-#endif
-#ifndef MNG_SKIPCHUNK_sBIT
- {MNG_UINT_sBIT, mng_init_general, mng_free_general, mng_read_general, mng_write_sbit, mng_assign_general, 0, 0, sizeof(mng_sbit), &mng_chunk_descr_sbit},
-#endif
-/* TODO: {MNG_UINT_sCAL, 0, 0, 0, 0, 0, 0}, */
-#ifndef MNG_SKIPCHUNK_sPLT
- {MNG_UINT_sPLT, mng_init_general, mng_free_splt, mng_read_general, mng_write_splt, mng_assign_splt, 0, 0, sizeof(mng_splt), &mng_chunk_descr_splt},
-#endif
- {MNG_UINT_sRGB, mng_init_general, mng_free_general, mng_read_general, mng_write_srgb, mng_assign_general, 0, 0, sizeof(mng_srgb), &mng_chunk_descr_srgb},
-#ifndef MNG_SKIPCHUNK_tEXt
- {MNG_UINT_tEXt, mng_init_general, mng_free_text, mng_read_general, mng_write_text, mng_assign_text, 0, 0, sizeof(mng_text), &mng_chunk_descr_text},
-#endif
-#ifndef MNG_SKIPCHUNK_tIME
- {MNG_UINT_tIME, mng_init_general, mng_free_general, mng_read_general, mng_write_time, mng_assign_general, 0, 0, sizeof(mng_time), &mng_chunk_descr_time},
-#endif
- {MNG_UINT_tRNS, mng_init_general, mng_free_general, mng_read_general, mng_write_trns, mng_assign_general, 0, 0, sizeof(mng_trns), &mng_chunk_descr_trns},
-#ifndef MNG_SKIPCHUNK_zTXt
- {MNG_UINT_zTXt, mng_init_general, mng_free_ztxt, mng_read_general, mng_write_ztxt, mng_assign_ztxt, 0, 0, sizeof(mng_ztxt), &mng_chunk_descr_ztxt},
-#endif
- };
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-void mng_get_chunkheader (mng_chunkid iChunkname,
- mng_chunk_headerp pResult)
-{
- /* binary search variables */
- mng_int32 iTop, iLower, iUpper, iMiddle;
- mng_chunk_headerp pEntry; /* pointer to found entry */
- /* determine max index of table */
- iTop = (sizeof (mng_chunk_table) / sizeof (mng_chunk_table [0])) - 1;
-
- /* binary search; with 54 chunks, worst-case is 7 comparisons */
- iLower = 0;
-#ifndef MNG_NO_DELTA_PNG
- iMiddle = 11; /* start with the IDAT entry */
-#else
- iMiddle = 8;
-#endif
- iUpper = iTop;
- pEntry = 0; /* no goods yet! */
-
- do /* the binary search itself */
- {
- if (mng_chunk_table [iMiddle].iChunkname < iChunkname)
- iLower = iMiddle + 1;
- else if (mng_chunk_table [iMiddle].iChunkname > iChunkname)
- iUpper = iMiddle - 1;
- else
- {
- pEntry = &mng_chunk_table [iMiddle];
- break;
- }
- iMiddle = (iLower + iUpper) >> 1;
- }
- while (iLower <= iUpper);
-
- if (!pEntry) /* unknown chunk ? */
- pEntry = &mng_chunk_unknown; /* make it so! */
-
- MNG_COPY (pResult, pEntry, sizeof(mng_chunk_header));
-
- return;
-}
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-/* PNG chunks */
-
-MNG_C_SPECIALFUNC (mng_special_ihdr)
-{
- pData->bHasIHDR = MNG_TRUE; /* indicate IHDR is present */
- /* and store interesting fields */
- if ((!pData->bHasDHDR) || (pData->iDeltatype == MNG_DELTATYPE_NOCHANGE))
- {
- pData->iDatawidth = ((mng_ihdrp)pChunk)->iWidth;
- pData->iDataheight = ((mng_ihdrp)pChunk)->iHeight;
- }
-
- pData->iBitdepth = ((mng_ihdrp)pChunk)->iBitdepth;
- pData->iColortype = ((mng_ihdrp)pChunk)->iColortype;
- pData->iCompression = ((mng_ihdrp)pChunk)->iCompression;
- pData->iFilter = ((mng_ihdrp)pChunk)->iFilter;
- pData->iInterlace = ((mng_ihdrp)pChunk)->iInterlace;
-
-#if defined(MNG_NO_1_2_4BIT_SUPPORT) || defined(MNG_NO_16BIT_SUPPORT)
- pData->iPNGmult = 1;
- pData->iPNGdepth = pData->iBitdepth;
-#endif
-
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iBitdepth < 8)
- pData->iBitdepth = 8;
-#endif
-
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth > 8)
- {
- pData->iBitdepth = 8;
- pData->iPNGmult = 2;
- }
-#endif
-
- if ((pData->iBitdepth != 8) /* parameter validity checks */
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- && (pData->iBitdepth != 1) &&
- (pData->iBitdepth != 2) &&
- (pData->iBitdepth != 4)
-#endif
-#ifndef MNG_NO_16BIT_SUPPORT
- && (pData->iBitdepth != 16)
-#endif
- )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if ((pData->iColortype != MNG_COLORTYPE_GRAY ) &&
- (pData->iColortype != MNG_COLORTYPE_RGB ) &&
- (pData->iColortype != MNG_COLORTYPE_INDEXED) &&
- (pData->iColortype != MNG_COLORTYPE_GRAYA ) &&
- (pData->iColortype != MNG_COLORTYPE_RGBA ) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
- if ((pData->iColortype == MNG_COLORTYPE_INDEXED) && (pData->iBitdepth > 8))
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if (((pData->iColortype == MNG_COLORTYPE_RGB ) ||
- (pData->iColortype == MNG_COLORTYPE_GRAYA ) ||
- (pData->iColortype == MNG_COLORTYPE_RGBA ) ) &&
- (pData->iBitdepth < 8 ) )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if (pData->iCompression != MNG_COMPRESSION_DEFLATE)
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
-#if defined(FILTER192) || defined(FILTER193)
- if ((pData->iFilter != MNG_FILTER_ADAPTIVE ) &&
-#if defined(FILTER192) && defined(FILTER193)
- (pData->iFilter != MNG_FILTER_DIFFERING) &&
- (pData->iFilter != MNG_FILTER_NOFILTER ) )
-#else
-#ifdef FILTER192
- (pData->iFilter != MNG_FILTER_DIFFERING) )
-#else
- (pData->iFilter != MNG_FILTER_NOFILTER ) )
-#endif
-#endif
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#else
- if (pData->iFilter)
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#endif
-
- if ((pData->iInterlace != MNG_INTERLACE_NONE ) &&
- (pData->iInterlace != MNG_INTERLACE_ADAM7) )
- MNG_ERROR (pData, MNG_INVALIDINTERLACE);
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* check the colortype for delta-images ! */
- {
- mng_imagedatap pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
-
- if (pData->iColortype != pBuf->iColortype)
- {
- if ( ( (pData->iColortype != MNG_COLORTYPE_INDEXED) ||
- (pBuf->iColortype == MNG_COLORTYPE_GRAY ) ) &&
- ( (pData->iColortype != MNG_COLORTYPE_GRAY ) ||
- (pBuf->iColortype == MNG_COLORTYPE_INDEXED) ) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
- }
- }
-#endif
-#endif
-
- if (!pData->bHasheader) /* first chunk ? */
- {
- pData->bHasheader = MNG_TRUE; /* we've got a header */
- pData->eImagetype = mng_it_png; /* then this must be a PNG */
- pData->iWidth = pData->iDatawidth;
- pData->iHeight = pData->iDataheight;
- /* predict alpha-depth ! */
- if ((pData->iColortype == MNG_COLORTYPE_GRAYA ) ||
- (pData->iColortype == MNG_COLORTYPE_RGBA ) )
- pData->iAlphadepth = pData->iBitdepth;
- else
- if (pData->iColortype == MNG_COLORTYPE_INDEXED)
- pData->iAlphadepth = 8; /* worst case scenario */
- else
- pData->iAlphadepth = 1; /* Possible tRNS cheap binary transparency */
- /* fits on maximum canvas ? */
- if ((pData->iWidth > pData->iMaxwidth) || (pData->iHeight > pData->iMaxheight))
- MNG_WARNING (pData, MNG_IMAGETOOLARGE);
-
-#if !defined(MNG_INCLUDE_MPNG_PROPOSAL) || !defined(MNG_SUPPORT_DISPLAY)
- if (pData->fProcessheader) /* inform the app ? */
- if (!pData->fProcessheader (((mng_handle)pData), pData->iWidth, pData->iHeight))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-#endif
- }
-
- if (!pData->bHasDHDR)
- pData->iImagelevel++; /* one level deeper */
-
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_process_display_ihdr (pData);
-#else
- return MNG_NOERROR;
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-
-/* ************************************************************************** */
-
-MNG_F_SPECIALFUNC (mng_debunk_plte)
-{
- mng_pltep pPLTE = (mng_pltep)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
- /* length must be multiple of 3 */
- if (((iRawlen % 3) != 0) || (iRawlen > 768))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- /* this is the exact length */
- pPLTE->iEntrycount = iRawlen / 3;
-
- MNG_COPY (pPLTE->aEntries, pRawdata, iRawlen);
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_C_SPECIALFUNC (mng_special_plte)
-{ /* multiple PLTE only inside BASI */
- if ((pData->bHasPLTE) && (!pData->bHasBASI))
- MNG_ERROR (pData, MNG_MULTIPLEERROR);
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- { /* only allowed for indexed-color or
- rgb(a)-color! */
- if ((pData->iColortype != MNG_COLORTYPE_RGB ) &&
- (pData->iColortype != MNG_COLORTYPE_INDEXED) &&
- (pData->iColortype != MNG_COLORTYPE_RGBA ) )
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
- /* empty only allowed if global present */
- if ((((mng_pltep)pChunk)->bEmpty) && (!pData->bHasglobalPLTE))
- MNG_ERROR (pData, MNG_CANNOTBEEMPTY);
- }
- else
- {
- if (((mng_pltep)pChunk)->bEmpty) /* cannot be empty as global! */
- MNG_ERROR (pData, MNG_CANNOTBEEMPTY);
- }
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- pData->bHasPLTE = MNG_TRUE; /* got it! */
- else
- pData->bHasglobalPLTE = MNG_TRUE;
-
- pData->iPLTEcount = ((mng_pltep)pChunk)->iEntrycount;
-
-#ifdef MNG_SUPPORT_DISPLAY
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- {
- mng_imagep pImage;
- mng_imagedatap pBuf;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* processing delta-image ? */
- { /* store in object 0 !!! */
- pImage = (mng_imagep)pData->pObjzero;
- pBuf = pImage->pImgbuf;
- pBuf->bHasPLTE = MNG_TRUE; /* it's definitely got a PLTE now */
- pBuf->iPLTEcount = ((mng_pltep)pChunk)->iEntrycount;
- MNG_COPY (pBuf->aPLTEentries, ((mng_pltep)pChunk)->aEntries,
- sizeof (pBuf->aPLTEentries));
- }
- else
-#endif
- { /* get the current object */
- pImage = (mng_imagep)pData->pCurrentobj;
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
-
- pBuf = pImage->pImgbuf; /* address the object buffer */
- pBuf->bHasPLTE = MNG_TRUE; /* and tell it it's got a PLTE now */
-
- if (((mng_pltep)pChunk)->bEmpty) /* if empty, inherit from global */
- {
- pBuf->iPLTEcount = pData->iGlobalPLTEcount;
- MNG_COPY (pBuf->aPLTEentries, pData->aGlobalPLTEentries,
- sizeof (pBuf->aPLTEentries));
-
- if (pData->bHasglobalTRNS) /* also copy global tRNS ? */
- {
- mng_uint32 iRawlen2 = pData->iGlobalTRNSrawlen;
- mng_uint8p pRawdata2 = (mng_uint8p)(pData->aGlobalTRNSrawdata);
- /* indicate tRNS available */
- pBuf->bHasTRNS = MNG_TRUE;
- /* global length oke ? */
- if ((iRawlen2 == 0) || (iRawlen2 > pBuf->iPLTEcount))
- MNG_ERROR (pData, MNG_GLOBALLENGTHERR);
- /* copy it */
- pBuf->iTRNScount = iRawlen2;
- MNG_COPY (pBuf->aTRNSentries, pRawdata2, iRawlen2);
- }
- }
- else
- { /* store fields for future reference */
- pBuf->iPLTEcount = ((mng_pltep)pChunk)->iEntrycount;
- MNG_COPY (pBuf->aPLTEentries, ((mng_pltep)pChunk)->aEntries,
- sizeof (pBuf->aPLTEentries));
- }
- }
- }
- else /* store as global */
- {
- pData->iGlobalPLTEcount = ((mng_pltep)pChunk)->iEntrycount;
- MNG_COPY (pData->aGlobalPLTEentries, ((mng_pltep)pChunk)->aEntries,
- sizeof (pData->aGlobalPLTEentries));
- /* create an animation object */
- return mng_create_ani_plte (pData);
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-MNG_C_SPECIALFUNC (mng_special_idat)
-{
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasJHDR) &&
- (pData->iJHDRalphacompression != MNG_COMPRESSION_DEFLATE))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-#endif
- /* not allowed for deltatype NO_CHANGE */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && ((pData->iDeltatype == MNG_DELTATYPE_NOCHANGE)))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
-#endif
- /* can only be empty in BASI-block! */
- if ((((mng_idatp)pChunk)->bEmpty) && (!pData->bHasBASI))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- /* indexed-color requires PLTE */
- if ((pData->bHasIHDR) && (pData->iColortype == 3) && (!pData->bHasPLTE))
- MNG_ERROR (pData, MNG_PLTEMISSING);
-
- pData->bHasIDAT = MNG_TRUE; /* got some IDAT now, don't we */
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-MNG_C_SPECIALFUNC (mng_special_iend)
-{ /* IHDR-block requires IDAT */
- if ((pData->bHasIHDR) && (!pData->bHasIDAT))
- MNG_ERROR (pData, MNG_IDATMISSING);
-
- pData->iImagelevel--; /* one level up */
-
-#ifdef MNG_SUPPORT_DISPLAY
- { /* create an animation object */
- mng_retcode iRetcode = mng_create_ani_image (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* display processing */
- iRetcode = mng_process_display_iend (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_SUPPORT_DISPLAY
- if (!pData->bTimerset) /* reset only if not broken !!! */
- {
-#endif
- /* IEND signals the end for most ... */
- pData->bHasIHDR = MNG_FALSE;
- pData->bHasBASI = MNG_FALSE;
- pData->bHasDHDR = MNG_FALSE;
-#ifdef MNG_INCLUDE_JNG
- pData->bHasJHDR = MNG_FALSE;
- pData->bHasJSEP = MNG_FALSE;
- pData->bHasJDAA = MNG_FALSE;
- pData->bHasJDAT = MNG_FALSE;
-#endif
- pData->bHasPLTE = MNG_FALSE;
- pData->bHasTRNS = MNG_FALSE;
- pData->bHasGAMA = MNG_FALSE;
- pData->bHasCHRM = MNG_FALSE;
- pData->bHasSRGB = MNG_FALSE;
- pData->bHasICCP = MNG_FALSE;
- pData->bHasBKGD = MNG_FALSE;
- pData->bHasIDAT = MNG_FALSE;
-#ifdef MNG_SUPPORT_DISPLAY
- }
-#endif
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-MNG_F_SPECIALFUNC (mng_debunk_trns)
-{
- mng_trnsp pTRNS = (mng_trnsp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- { /* not global! */
- pTRNS->bGlobal = MNG_FALSE;
- pTRNS->iType = pData->iColortype;
-
- if (iRawlen != 0)
- {
- switch (pData->iColortype) /* store fields */
- {
- case 0: { /* gray */
- if (iRawlen != 2)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- pTRNS->iGray = mng_get_uint16 (pRawdata);
- break;
- }
- case 2: { /* rgb */
- if (iRawlen != 6)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- pTRNS->iRed = mng_get_uint16 (pRawdata);
- pTRNS->iGreen = mng_get_uint16 (pRawdata+2);
- pTRNS->iBlue = mng_get_uint16 (pRawdata+4);
- break;
- }
- case 3: { /* indexed */
- if (iRawlen > 256)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- pTRNS->iCount = iRawlen;
- MNG_COPY (pTRNS->aEntries, pRawdata, iRawlen);
- break;
- }
- }
- }
- }
- else /* it's global! */
- {
- if (iRawlen == 0)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- pTRNS->bGlobal = MNG_TRUE;
- pTRNS->iType = 0;
- pTRNS->iRawlen = iRawlen;
- MNG_COPY (pTRNS->aRawdata, pRawdata, iRawlen);
-
- pData->iGlobalTRNSrawlen = iRawlen;
- MNG_COPY (pData->aGlobalTRNSrawdata, pRawdata, iRawlen);
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_C_SPECIALFUNC (mng_special_trns)
-{ /* multiple tRNS only inside BASI */
- if ((pData->bHasTRNS) && (!pData->bHasBASI))
- MNG_ERROR (pData, MNG_MULTIPLEERROR);
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- { /* not allowed with full alpha-channel */
- if ((pData->iColortype == 4) || (pData->iColortype == 6))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
-
- if (!((mng_trnsp)pChunk)->bEmpty) /* filled ? */
- {
-#ifdef MNG_SUPPORT_DISPLAY
- if (pData->iColortype == 3)
- {
- mng_imagep pImage = (mng_imagep)pData->pCurrentobj;
- mng_imagedatap pBuf;
-
- if (!pImage) /* no object then check obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
-
- pBuf = pImage->pImgbuf; /* address object buffer */
-
- if (((mng_trnsp)pChunk)->iCount > pBuf->iPLTEcount)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-#endif
- }
- else /* if empty there must be global stuff! */
- {
- if (!pData->bHasglobalTRNS)
- MNG_ERROR (pData, MNG_CANNOTBEEMPTY);
- }
- }
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- pData->bHasTRNS = MNG_TRUE; /* indicate tRNS available */
- else
- pData->bHasglobalTRNS = MNG_TRUE;
-
-#ifdef MNG_SUPPORT_DISPLAY
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- {
- mng_imagep pImage;
- mng_imagedatap pBuf;
- mng_uint8p pRawdata2;
- mng_uint32 iRawlen2;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* processing delta-image ? */
- { /* store in object 0 !!! */
-#if defined(MNG_NO_1_2_4BIT_SUPPORT)
- mng_uint8 multiplier[]={0,255,85,0,17,0,0,0,1,0,0,0,0,0,0,0,1};
-#endif
- pImage = (mng_imagep)pData->pObjzero;
- pBuf = pImage->pImgbuf; /* address object buffer */
- pBuf->bHasTRNS = MNG_TRUE; /* tell it it's got a tRNS now */
- pBuf->iTRNSgray = 0;
- pBuf->iTRNSred = 0;
- pBuf->iTRNSgreen = 0;
- pBuf->iTRNSblue = 0;
- pBuf->iTRNScount = 0;
-
- switch (pData->iColortype) /* store fields for future reference */
- {
- case 0: { /* gray */
- pBuf->iTRNSgray = ((mng_trnsp)pChunk)->iGray;
-#if defined(MNG_NO_1_2_4BIT_SUPPORT)
- pBuf->iTRNSgray *= multiplier[pData->iPNGdepth];
-#endif
-#if defined(MNG_NO_16BIT_SUPPORT)
- if (pData->iPNGmult == 2)
- pBuf->iTRNSgray >>= 8;
-#endif
- break;
- }
- case 2: { /* rgb */
- pBuf->iTRNSred = ((mng_trnsp)pChunk)->iRed;
- pBuf->iTRNSgreen = ((mng_trnsp)pChunk)->iGreen;
- pBuf->iTRNSblue = ((mng_trnsp)pChunk)->iBlue;
-#if defined(MNG_NO_16BIT_SUPPORT)
- if (pData->iPNGmult == 2)
- {
- pBuf->iTRNSred >>= 8;
- pBuf->iTRNSgreen >>= 8;
- pBuf->iTRNSblue >>= 8;
- }
-#endif
- break;
- }
- case 3: { /* indexed */
- pBuf->iTRNScount = ((mng_trnsp)pChunk)->iCount;
- MNG_COPY (pBuf->aTRNSentries,
- ((mng_trnsp)pChunk)->aEntries,
- ((mng_trnsp)pChunk)->iCount);
- break;
- }
- }
- }
- else
-#endif
- { /* address current object */
- pImage = (mng_imagep)pData->pCurrentobj;
-
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
-
- pBuf = pImage->pImgbuf; /* address object buffer */
- pBuf->bHasTRNS = MNG_TRUE; /* and tell it it's got a tRNS now */
- pBuf->iTRNSgray = 0;
- pBuf->iTRNSred = 0;
- pBuf->iTRNSgreen = 0;
- pBuf->iTRNSblue = 0;
- pBuf->iTRNScount = 0;
-
- if (((mng_trnsp)pChunk)->bEmpty) /* if empty, inherit from global */
- {
- iRawlen2 = pData->iGlobalTRNSrawlen;
- pRawdata2 = (mng_ptr)(pData->aGlobalTRNSrawdata);
- /* global length oke ? */
- if ((pData->iColortype == 0) && (iRawlen2 != 2))
- MNG_ERROR (pData, MNG_GLOBALLENGTHERR);
-
- if ((pData->iColortype == 2) && (iRawlen2 != 6))
- MNG_ERROR (pData, MNG_GLOBALLENGTHERR);
-
- if ((pData->iColortype == 3) && ((iRawlen2 == 0) || (iRawlen2 > pBuf->iPLTEcount)))
- MNG_ERROR (pData, MNG_GLOBALLENGTHERR);
-
- switch (pData->iColortype) /* store fields for future reference */
- {
- case 0: { /* gray */
- pBuf->iTRNSgray = mng_get_uint16 (pRawdata2);
-#if defined(MNG_NO_16BIT_SUPPORT)
- if (pData->iPNGmult == 2)
- pBuf->iTRNSgray >>= 8;
-#endif
- break;
- }
- case 2: { /* rgb */
- pBuf->iTRNSred = mng_get_uint16 (pRawdata2);
- pBuf->iTRNSgreen = mng_get_uint16 (pRawdata2+2);
- pBuf->iTRNSblue = mng_get_uint16 (pRawdata2+4);
-#if defined(MNG_NO_16BIT_SUPPORT)
- if (pData->iPNGmult == 2)
- {
- pBuf->iTRNSred >>= 8;
- pBuf->iTRNSgreen >>= 8;
- pBuf->iTRNSblue >>= 8;
- }
-#endif
- break;
- }
- case 3: { /* indexed */
- pBuf->iTRNScount = iRawlen2;
- MNG_COPY (pBuf->aTRNSentries, pRawdata2, iRawlen2);
- break;
- }
- }
- }
- else
- {
- switch (pData->iColortype) /* store fields for future reference */
- {
- case 0: { /* gray */
- pBuf->iTRNSgray = ((mng_trnsp)pChunk)->iGray;
-#if defined(MNG_NO_16BIT_SUPPORT)
- if (pData->iPNGmult == 2)
- pBuf->iTRNSgray >>= 8;
-#endif
- break;
- }
- case 2: { /* rgb */
- pBuf->iTRNSred = ((mng_trnsp)pChunk)->iRed;
- pBuf->iTRNSgreen = ((mng_trnsp)pChunk)->iGreen;
- pBuf->iTRNSblue = ((mng_trnsp)pChunk)->iBlue;
-#if defined(MNG_NO_16BIT_SUPPORT)
- if (pData->iPNGmult == 2)
- {
- pBuf->iTRNSred >>= 8;
- pBuf->iTRNSgreen >>= 8;
- pBuf->iTRNSblue >>= 8;
- }
-#endif
- break;
- }
- case 3: { /* indexed */
- pBuf->iTRNScount = ((mng_trnsp)pChunk)->iCount;
- MNG_COPY (pBuf->aTRNSentries,
- ((mng_trnsp)pChunk)->aEntries,
- ((mng_trnsp)pChunk)->iCount);
- break;
- }
- }
- }
- }
- }
- else
- { /* create an animation object */
- return mng_create_ani_trns (pData);
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-MNG_C_SPECIALFUNC (mng_special_gama)
-{
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- pData->bHasGAMA = MNG_TRUE; /* indicate we've got it */
- else
- pData->bHasglobalGAMA = (mng_bool)!((mng_gamap)pChunk)->bEmpty;
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- {
- mng_imagep pImage;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* update delta image ? */
- pImage = (mng_imagep)pData->pObjzero;
- else
-#endif
- {
- pImage = (mng_imagep)pData->pCurrentobj;
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
- }
- /* store for color-processing routines */
- pImage->pImgbuf->iGamma = ((mng_gamap)pChunk)->iGamma;
- pImage->pImgbuf->bHasGAMA = MNG_TRUE;
- }
- else
- { /* store as global */
- if (!((mng_gamap)pChunk)->bEmpty)
- pData->iGlobalGamma = ((mng_gamap)pChunk)->iGamma;
- /* create an animation object */
- return mng_create_ani_gama (pData, pChunk);
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_cHRM
-MNG_C_SPECIALFUNC (mng_special_chrm)
-{
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- pData->bHasCHRM = MNG_TRUE; /* indicate we've got it */
- else
- pData->bHasglobalCHRM = (mng_bool)!((mng_chrmp)pChunk)->bEmpty;
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- {
- mng_imagep pImage;
- mng_imagedatap pBuf;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* update delta image ? */
- pImage = (mng_imagep)pData->pObjzero;
- else
-#endif
- {
- pImage = (mng_imagep)pData->pCurrentobj;
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
- }
-
- pBuf = pImage->pImgbuf; /* address object buffer */
- pBuf->bHasCHRM = MNG_TRUE; /* and tell it it's got a CHRM now */
- /* store for color-processing routines */
- pBuf->iWhitepointx = ((mng_chrmp)pChunk)->iWhitepointx;
- pBuf->iWhitepointy = ((mng_chrmp)pChunk)->iWhitepointy;
- pBuf->iPrimaryredx = ((mng_chrmp)pChunk)->iRedx;
- pBuf->iPrimaryredy = ((mng_chrmp)pChunk)->iRedy;
- pBuf->iPrimarygreenx = ((mng_chrmp)pChunk)->iGreenx;
- pBuf->iPrimarygreeny = ((mng_chrmp)pChunk)->iGreeny;
- pBuf->iPrimarybluex = ((mng_chrmp)pChunk)->iBluex;
- pBuf->iPrimarybluey = ((mng_chrmp)pChunk)->iBluey;
- }
- else
- { /* store as global */
- if (!((mng_chrmp)pChunk)->bEmpty)
- {
- pData->iGlobalWhitepointx = ((mng_chrmp)pChunk)->iWhitepointx;
- pData->iGlobalWhitepointy = ((mng_chrmp)pChunk)->iWhitepointy;
- pData->iGlobalPrimaryredx = ((mng_chrmp)pChunk)->iRedx;
- pData->iGlobalPrimaryredy = ((mng_chrmp)pChunk)->iRedy;
- pData->iGlobalPrimarygreenx = ((mng_chrmp)pChunk)->iGreenx;
- pData->iGlobalPrimarygreeny = ((mng_chrmp)pChunk)->iGreeny;
- pData->iGlobalPrimarybluex = ((mng_chrmp)pChunk)->iBluex;
- pData->iGlobalPrimarybluey = ((mng_chrmp)pChunk)->iBluey;
- }
- /* create an animation object */
- return mng_create_ani_chrm (pData, pChunk);
- }
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-MNG_C_SPECIALFUNC (mng_special_srgb)
-{
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- pData->bHasSRGB = MNG_TRUE; /* indicate we've got it */
- else
- pData->bHasglobalSRGB = (mng_bool)!((mng_srgbp)pChunk)->bEmpty;
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- {
- mng_imagep pImage;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* update delta image ? */
- pImage = (mng_imagep)pData->pObjzero;
- else
-#endif
- {
- pImage = (mng_imagep)pData->pCurrentobj;
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
- }
- /* store for color-processing routines */
- pImage->pImgbuf->iRenderingintent = ((mng_srgbp)pChunk)->iRenderingintent;
- pImage->pImgbuf->bHasSRGB = MNG_TRUE;
- }
- else
- { /* store as global */
- if (!((mng_srgbp)pChunk)->bEmpty)
- pData->iGlobalRendintent = ((mng_srgbp)pChunk)->iRenderingintent;
- /* create an animation object */
- return mng_create_ani_srgb (pData, pChunk);
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-MNG_C_SPECIALFUNC (mng_special_iccp)
-{
- mng_retcode iRetcode;
- mng_chunk_headerp pDummy;
-
-#ifdef MNG_CHECK_BAD_ICCP /* Check for bad iCCP chunk */
- if (!strncmp (((mng_iccpp)pChunk)->zName, "Photoshop ICC profile", 21))
- {
- if (((mng_iccpp)pChunk)->iProfilesize == 2615) /* is it the sRGB profile ? */
- {
- mng_chunk_header chunk_srgb;
- mng_get_chunkheader (MNG_UINT_sRGB, &chunk_srgb);
- /* pretend it's an sRGB chunk then ! */
- iRetcode = mng_read_general (pData, &chunk_srgb, 1, (mng_ptr)"0", &pDummy);
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pDummy->fCleanup (pData, pDummy);
- }
- }
- else
- {
-#endif /* MNG_CHECK_BAD_ICCP */
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- pData->bHasICCP = MNG_TRUE; /* indicate we've got it */
- else
- pData->bHasglobalICCP = (mng_bool)!((mng_iccpp)pChunk)->bEmpty;
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- {
- mng_imagep pImage;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* update delta image ? */
- { /* store in object 0 ! */
- pImage = (mng_imagep)pData->pObjzero;
-
- if (pImage->pImgbuf->pProfile) /* profile existed ? */
- MNG_FREEX (pData, pImage->pImgbuf->pProfile, pImage->pImgbuf->iProfilesize);
- /* allocate a buffer & copy it */
- MNG_ALLOC (pData, pImage->pImgbuf->pProfile, ((mng_iccpp)pChunk)->iProfilesize);
- MNG_COPY (pImage->pImgbuf->pProfile, ((mng_iccpp)pChunk)->pProfile, ((mng_iccpp)pChunk)->iProfilesize);
- /* store its length as well */
- pImage->pImgbuf->iProfilesize = ((mng_iccpp)pChunk)->iProfilesize;
- pImage->pImgbuf->bHasICCP = MNG_TRUE;
- }
- else
-#endif
- {
- pImage = (mng_imagep)pData->pCurrentobj;
-
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
-
- if (pImage->pImgbuf->pProfile) /* profile existed ? */
- MNG_FREEX (pData, pImage->pImgbuf->pProfile, pImage->pImgbuf->iProfilesize);
- /* allocate a buffer & copy it */
- MNG_ALLOC (pData, pImage->pImgbuf->pProfile, ((mng_iccpp)pChunk)->iProfilesize);
- MNG_COPY (pImage->pImgbuf->pProfile, ((mng_iccpp)pChunk)->pProfile, ((mng_iccpp)pChunk)->iProfilesize);
- /* store its length as well */
- pImage->pImgbuf->iProfilesize = ((mng_iccpp)pChunk)->iProfilesize;
- pImage->pImgbuf->bHasICCP = MNG_TRUE;
- }
- }
- else
- { /* store as global */
- if (pData->pGlobalProfile) /* did we have a global profile ? */
- MNG_FREEX (pData, pData->pGlobalProfile, pData->iGlobalProfilesize);
-
- if (((mng_iccpp)pChunk)->bEmpty) /* empty chunk ? */
- {
- pData->iGlobalProfilesize = 0; /* reset to null */
- pData->pGlobalProfile = MNG_NULL;
- }
- else
- { /* allocate a global buffer & copy it */
- MNG_ALLOC (pData, pData->pGlobalProfile, ((mng_iccpp)pChunk)->iProfilesize);
- MNG_COPY (pData->pGlobalProfile, ((mng_iccpp)pChunk)->pProfile, ((mng_iccpp)pChunk)->iProfilesize);
- /* store its length as well */
- pData->iGlobalProfilesize = ((mng_iccpp)pChunk)->iProfilesize;
- }
- /* create an animation object */
- return mng_create_ani_iccp (pData, pChunk);
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_CHECK_BAD_ICCP
- }
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tEXt
-MNG_C_SPECIALFUNC (mng_special_text)
-{
- if (pData->fProcesstext) /* inform the application ? */
- {
- mng_bool bOke = pData->fProcesstext ((mng_handle)pData, MNG_TYPE_TEXT,
- ((mng_textp)pChunk)->zKeyword,
- ((mng_textp)pChunk)->zText, 0, 0);
- if (!bOke)
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_zTXt
-MNG_C_SPECIALFUNC (mng_special_ztxt)
-{
- if (pData->fProcesstext) /* inform the application ? */
- {
- mng_bool bOke = pData->fProcesstext ((mng_handle)pData, MNG_TYPE_ZTXT,
- ((mng_ztxtp)pChunk)->zKeyword,
- ((mng_ztxtp)pChunk)->zText, 0, 0);
- if (!bOke)
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iTXt
-MNG_F_SPECIALFUNC (mng_deflate_itxt)
-{
- mng_itxtp pITXT = (mng_itxtp)pChunk;
- mng_uint32 iBufsize = 0;
- mng_uint8p pBuf = 0;
- mng_uint32 iTextlen = 0;
-
- if (pITXT->iCompressionflag) /* decompress the text ? */
- {
- mng_retcode iRetcode = mng_inflate_buffer (pData, *ppRawdata, *piRawlen,
- &pBuf, &iBufsize, &iTextlen);
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffer */
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
-
- MNG_ALLOC (pData, pITXT->zText, iTextlen+1);
- MNG_COPY (pITXT->zText, pBuf, iTextlen);
-
- pITXT->iTextsize = iTextlen;
-
- MNG_FREEX (pData, pBuf, iBufsize);
-
- } else {
-
- MNG_ALLOC (pData, pITXT->zText, (*piRawlen)+1);
- MNG_COPY (pITXT->zText, *ppRawdata, *piRawlen);
-
- pITXT->iTextsize = *piRawlen;
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iTXt
-MNG_C_SPECIALFUNC (mng_special_itxt)
-{
- if (pData->fProcesstext) /* inform the application ? */
- {
- mng_bool bOke = pData->fProcesstext ((mng_handle)pData, MNG_TYPE_ITXT,
- ((mng_itxtp)pChunk)->zKeyword,
- ((mng_itxtp)pChunk)->zText,
- ((mng_itxtp)pChunk)->zLanguage,
- ((mng_itxtp)pChunk)->zTranslation);
- if (!bOke)
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_bKGD
-MNG_C_SPECIALFUNC (mng_special_bkgd)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- mng_imagep pImage = (mng_imagep)pData->pCurrentobj;
- mng_imagedatap pBuf;
-#endif
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- pData->bHasBKGD = MNG_TRUE; /* indicate bKGD available */
- else
- pData->bHasglobalBKGD = (mng_bool)!(((mng_bkgdp)pChunk)->bEmpty);
-
-#ifdef MNG_SUPPORT_DISPLAY
- if (!pImage) /* if no object dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
- pBuf = pImage->pImgbuf; /* address object buffer */
-
-#ifdef MNG_INCLUDE_JNG
- if (pData->bHasJHDR)
- {
- pBuf->bHasBKGD = MNG_TRUE; /* tell the object it's got bKGD now */
-
- switch (pData->iJHDRcolortype) /* store fields for future reference */
- {
- case 8 : ; /* gray */
- case 12 : { /* graya */
- pBuf->iBKGDgray = ((mng_bkgdp)pChunk)->iGray;
- break;
- }
- case 10 : ; /* rgb */
- case 14 : { /* rgba */
- pBuf->iBKGDred = ((mng_bkgdp)pChunk)->iRed;
- pBuf->iBKGDgreen = ((mng_bkgdp)pChunk)->iGreen;
- pBuf->iBKGDblue = ((mng_bkgdp)pChunk)->iBlue;
- break;
- }
- }
- }
- else
-#endif /* MNG_INCLUDE_JNG */
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- {
- pBuf->bHasBKGD = MNG_TRUE; /* tell the object it's got bKGD now */
-
- switch (pData->iColortype) /* store fields for future reference */
- {
- case 0 : ; /* gray */
- case 4 : { /* graya */
- pBuf->iBKGDgray = ((mng_bkgdp)pChunk)->iGray;
- break;
- }
- case 2 : ; /* rgb */
- case 6 : { /* rgba */
- pBuf->iBKGDred = ((mng_bkgdp)pChunk)->iRed;
- pBuf->iBKGDgreen = ((mng_bkgdp)pChunk)->iGreen;
- pBuf->iBKGDblue = ((mng_bkgdp)pChunk)->iBlue;
- break;
- }
- case 3 : { /* indexed */
- pBuf->iBKGDindex = ((mng_bkgdp)pChunk)->iIndex;
- break;
- }
- }
- }
- else /* store as global */
- {
- if (!(((mng_bkgdp)pChunk)->bEmpty))
- {
- pData->iGlobalBKGDred = ((mng_bkgdp)pChunk)->iRed;
- pData->iGlobalBKGDgreen = ((mng_bkgdp)pChunk)->iGreen;
- pData->iGlobalBKGDblue = ((mng_bkgdp)pChunk)->iBlue;
- }
- /* create an animation object */
- return mng_create_ani_bkgd (pData);
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYs
-MNG_C_SPECIALFUNC (mng_special_phys)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sBIT
-MNG_C_SPECIALFUNC (mng_special_sbit)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sPLT
-MNG_F_SPECIALFUNC (mng_splt_entries)
-{
- mng_spltp pSPLT = (mng_spltp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
-
- if ((pSPLT->iSampledepth != MNG_BITDEPTH_8 ) &&
- (pSPLT->iSampledepth != MNG_BITDEPTH_16) )
- MNG_ERROR (pData, MNG_INVSAMPLEDEPTH);
- /* check remaining length */
- if ( ((pSPLT->iSampledepth == MNG_BITDEPTH_8 ) && (iRawlen % 6 != 0)) ||
- ((pSPLT->iSampledepth == MNG_BITDEPTH_16) && (iRawlen % 10 != 0)) )
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if (pSPLT->iSampledepth == MNG_BITDEPTH_8)
- pSPLT->iEntrycount = iRawlen / 6;
- else
- pSPLT->iEntrycount = iRawlen / 10;
-
- if (iRawlen)
- {
- MNG_ALLOC (pData, pSPLT->pEntries, iRawlen);
- MNG_COPY (pSPLT->pEntries, pRawdata, iRawlen);
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sPLT
-MNG_C_SPECIALFUNC (mng_special_splt)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_hIST
-MNG_F_SPECIALFUNC (mng_hist_entries)
-{
- mng_histp pHIST = (mng_histp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
- mng_uint32 iX;
-
- if ( ((iRawlen & 0x01) != 0) || ((iRawlen >> 1) != pData->iPLTEcount) )
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pHIST->iEntrycount = iRawlen >> 1;
-
- for (iX = 0; iX < pHIST->iEntrycount; iX++)
- {
- pHIST->aEntries[iX] = mng_get_uint16 (pRawdata);
- pRawdata += 2;
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_hIST
-MNG_C_SPECIALFUNC (mng_special_hist)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tIME
-MNG_C_SPECIALFUNC (mng_special_time)
-{
-/* if (pData->fProcesstime) */ /* inform the application ? */
-/* {
-
- pData->fProcesstime ((mng_handle)pData, );
- } */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-/* JNG chunks */
-
-#ifdef MNG_INCLUDE_JNG
-MNG_C_SPECIALFUNC (mng_special_jhdr)
-{
- if ((pData->eSigtype == mng_it_jng) && (pData->iChunkseq > 1))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* inside a JHDR-IEND block now */
- pData->bHasJHDR = MNG_TRUE;
- /* and store interesting fields */
- pData->iDatawidth = ((mng_jhdrp)pChunk)->iWidth;
- pData->iDataheight = ((mng_jhdrp)pChunk)->iHeight;
- pData->iJHDRcolortype = ((mng_jhdrp)pChunk)->iColortype;
- pData->iJHDRimgbitdepth = ((mng_jhdrp)pChunk)->iImagesampledepth;
- pData->iJHDRimgcompression = ((mng_jhdrp)pChunk)->iImagecompression;
- pData->iJHDRimginterlace = ((mng_jhdrp)pChunk)->iImageinterlace;
- pData->iJHDRalphabitdepth = ((mng_jhdrp)pChunk)->iAlphasampledepth;
- pData->iJHDRalphacompression = ((mng_jhdrp)pChunk)->iAlphacompression;
- pData->iJHDRalphafilter = ((mng_jhdrp)pChunk)->iAlphafilter;
- pData->iJHDRalphainterlace = ((mng_jhdrp)pChunk)->iAlphainterlace;
-
-#if defined(MNG_NO_1_2_4BIT_SUPPORT) || defined(MNG_NO_16BIT_SUPPORT)
- pData->iPNGmult = 1;
- pData->iPNGdepth = pData->iJHDRalphabitdepth;
-#endif
-
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iJHDRalphabitdepth < 8)
- pData->iJHDRalphabitdepth = 8;
-#endif
-
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iJHDRalphabitdepth > 8)
- {
- pData->iPNGmult = 2;
- pData->iJHDRalphabitdepth = 8;
- }
-#endif
- /* parameter validity checks */
- if ((pData->iJHDRcolortype != MNG_COLORTYPE_JPEGGRAY ) &&
- (pData->iJHDRcolortype != MNG_COLORTYPE_JPEGCOLOR ) &&
- (pData->iJHDRcolortype != MNG_COLORTYPE_JPEGGRAYA ) &&
- (pData->iJHDRcolortype != MNG_COLORTYPE_JPEGCOLORA) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
- if ((pData->iJHDRimgbitdepth != MNG_BITDEPTH_JPEG8 ) &&
- (pData->iJHDRimgbitdepth != MNG_BITDEPTH_JPEG12 ) &&
- (pData->iJHDRimgbitdepth != MNG_BITDEPTH_JPEG8AND12) )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if ((pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA) )
- {
- if ((pData->iJHDRalphabitdepth != MNG_BITDEPTH_8 )
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- && (pData->iJHDRalphabitdepth != MNG_BITDEPTH_1 ) &&
- (pData->iJHDRalphabitdepth != MNG_BITDEPTH_2 ) &&
- (pData->iJHDRalphabitdepth != MNG_BITDEPTH_4 )
-#endif
-#ifndef MNG_NO_16BIT_SUPPORT
- && (pData->iJHDRalphabitdepth != MNG_BITDEPTH_16)
-#endif
- )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if ((pData->iJHDRalphacompression != MNG_COMPRESSION_DEFLATE ) &&
- (pData->iJHDRalphacompression != MNG_COMPRESSION_BASELINEJPEG) )
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
- if ((pData->iJHDRalphacompression == MNG_COMPRESSION_BASELINEJPEG) &&
- (pData->iJHDRalphabitdepth != MNG_BITDEPTH_8 ) )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
-#if defined(FILTER192) || defined(FILTER193)
- if ((pData->iJHDRalphafilter != MNG_FILTER_ADAPTIVE ) &&
-#if defined(FILTER192) && defined(FILTER193)
- (pData->iJHDRalphafilter != MNG_FILTER_DIFFERING) &&
- (pData->iJHDRalphafilter != MNG_FILTER_NOFILTER ) )
-#else
-#ifdef FILTER192
- (pData->iJHDRalphafilter != MNG_FILTER_DIFFERING) )
-#else
- (pData->iJHDRalphafilter != MNG_FILTER_NOFILTER ) )
-#endif
-#endif
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#else
- if (pData->iJHDRalphafilter)
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#endif
-
- }
- else
- {
- if (pData->iJHDRalphabitdepth)
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
- if (pData->iJHDRalphacompression)
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
- if (pData->iJHDRalphafilter)
- MNG_ERROR (pData, MNG_INVALIDFILTER);
- if (pData->iJHDRalphainterlace)
- MNG_ERROR (pData, MNG_INVALIDINTERLACE);
- }
-
- if (!pData->bHasheader) /* first chunk ? */
- {
- pData->bHasheader = MNG_TRUE; /* we've got a header */
- pData->eImagetype = mng_it_jng; /* then this must be a JNG */
- pData->iWidth = ((mng_jhdrp)pChunk)->iWidth;
- pData->iHeight = ((mng_jhdrp)pChunk)->iHeight;
- /* predict alpha-depth ! */
- if ((pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA) )
- pData->iAlphadepth = pData->iJHDRalphabitdepth;
- else
- pData->iAlphadepth = 0;
- /* fits on maximum canvas ? */
- if ((pData->iWidth > pData->iMaxwidth) || (pData->iHeight > pData->iMaxheight))
- MNG_WARNING (pData, MNG_IMAGETOOLARGE);
-
- if (pData->fProcessheader) /* inform the app ? */
- if (!pData->fProcessheader (((mng_handle)pData), pData->iWidth, pData->iHeight))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- }
-
- pData->iColortype = 0; /* fake grayscale for other routines */
- pData->iImagelevel++; /* one level deeper */
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode = mng_process_display_jhdr (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_NO_16BIT_SUPPORT
- if (((mng_jhdrp)pChunk)->iAlphasampledepth > 8)
- ((mng_jhdrp)pChunk)->iAlphasampledepth = 8;
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-MNG_C_SPECIALFUNC (mng_special_jdaa)
-{
- if (pData->iJHDRalphacompression != MNG_COMPRESSION_BASELINEJPEG)
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- pData->bHasJDAA = MNG_TRUE; /* got some JDAA now, don't we */
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-MNG_C_SPECIALFUNC (mng_special_jdat)
-{
- pData->bHasJDAT = MNG_TRUE; /* got some JDAT now, don't we */
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-MNG_C_SPECIALFUNC (mng_special_jsep)
-{
- pData->bHasJSEP = MNG_TRUE; /* indicate we've had the 8-/12-bit separator */
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-/* MNG chunks */
-
-MNG_C_SPECIALFUNC (mng_special_mhdr)
-{
- if (pData->bHasheader) /* can only be the first chunk! */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- pData->bHasMHDR = MNG_TRUE; /* oh boy, a real MNG */
- pData->bHasheader = MNG_TRUE; /* we've got a header */
- pData->eImagetype = mng_it_mng; /* fill header fields */
- pData->iWidth = ((mng_mhdrp)pChunk)->iWidth;
- pData->iHeight = ((mng_mhdrp)pChunk)->iHeight;
- pData->iTicks = ((mng_mhdrp)pChunk)->iTicks;
- pData->iLayercount = ((mng_mhdrp)pChunk)->iLayercount;
- pData->iFramecount = ((mng_mhdrp)pChunk)->iFramecount;
- pData->iPlaytime = ((mng_mhdrp)pChunk)->iPlaytime;
- pData->iSimplicity = ((mng_mhdrp)pChunk)->iSimplicity;
-#ifndef MNG_NO_OLD_VERSIONS
- pData->bPreDraft48 = MNG_FALSE;
-#endif
- /* predict alpha-depth */
- if ((pData->iSimplicity & 0x00000001) == 0)
-#ifndef MNG_NO_16BIT_SUPPORT
- pData->iAlphadepth = 16; /* no indicators = assume the worst */
-#else
- pData->iAlphadepth = 8; /* anything else = assume the worst */
-#endif
- else
- if ((pData->iSimplicity & 0x00000008) == 0)
- pData->iAlphadepth = 0; /* no transparency at all */
- else
- if ((pData->iSimplicity & 0x00000140) == 0x00000040)
- pData->iAlphadepth = 1; /* no semi-transparency guaranteed */
- else
-#ifndef MNG_NO_16BIT_SUPPORT
- pData->iAlphadepth = 16; /* anything else = assume the worst */
-#else
- pData->iAlphadepth = 8; /* anything else = assume the worst */
-#endif
-
-#ifdef MNG_INCLUDE_JNG /* can we handle the complexity ? */
- if (pData->iSimplicity & 0x0000FC00)
-#else
- if (pData->iSimplicity & 0x0000FC10)
-#endif
- MNG_ERROR (pData, MNG_MNGTOOCOMPLEX);
- /* fits on maximum canvas ? */
- if ((pData->iWidth > pData->iMaxwidth) || (pData->iHeight > pData->iMaxheight))
- MNG_WARNING (pData, MNG_IMAGETOOLARGE);
-
- if (pData->fProcessheader) /* inform the app ? */
- if (!pData->fProcessheader (((mng_handle)pData), pData->iWidth, pData->iHeight))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- pData->iImagelevel++; /* one level deeper */
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-MNG_C_SPECIALFUNC (mng_special_mend)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- { /* do something */
- mng_retcode iRetcode = mng_process_display_mend (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (!pData->iTotalframes) /* save totals */
- pData->iTotalframes = pData->iFrameseq;
- if (!pData->iTotallayers)
- pData->iTotallayers = pData->iLayerseq;
- if (!pData->iTotalplaytime)
- pData->iTotalplaytime = pData->iFrametime;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- pData->bHasMHDR = MNG_FALSE; /* end of the line, bro! */
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-MNG_F_SPECIALFUNC (mng_debunk_loop)
-{
- mng_loopp pLOOP = (mng_loopp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
-
- if (iRawlen >= 5) /* length checks */
- {
- if (iRawlen >= 6)
- {
- if ((iRawlen - 6) % 4 != 0)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if (iRawlen >= 5) /* store the fields */
- {
- pLOOP->iLevel = *pRawdata;
-
-#ifndef MNG_NO_OLD_VERSIONS
- if (pData->bPreDraft48)
- {
- pLOOP->iTermination = *(pRawdata+1);
- pLOOP->iRepeat = mng_get_uint32 (pRawdata+2);
- }
- else
-#endif
- {
- pLOOP->iRepeat = mng_get_uint32 (pRawdata+1);
- }
-
- if (iRawlen >= 6)
- {
-#ifndef MNG_NO_OLD_VERSIONS
- if (!pData->bPreDraft48)
-#endif
- pLOOP->iTermination = *(pRawdata+5);
-
- if (iRawlen >= 10)
- {
- pLOOP->iItermin = mng_get_uint32 (pRawdata+6);
-
-#ifndef MNG_NO_LOOP_SIGNALS_SUPPORTED
- if (iRawlen >= 14)
- {
- pLOOP->iItermax = mng_get_uint32 (pRawdata+10);
- pLOOP->iCount = (iRawlen - 14) / 4;
-
- if (pLOOP->iCount)
- {
- MNG_ALLOC (pData, pLOOP->pSignals, pLOOP->iCount << 2);
-
-#ifndef MNG_BIGENDIAN_SUPPORTED
- {
- mng_uint32 iX;
- mng_uint8p pIn = pRawdata + 14;
- mng_uint32p pOut = (mng_uint32p)pLOOP->pSignals;
-
- for (iX = 0; iX < pLOOP->iCount; iX++)
- {
- *pOut++ = mng_get_uint32 (pIn);
- pIn += 4;
- }
- }
-#else
- MNG_COPY (pLOOP->pSignals, pRawdata + 14, pLOOP->iCount << 2);
-#endif /* !MNG_BIGENDIAN_SUPPORTED */
- }
- }
-#endif
- }
- }
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-MNG_C_SPECIALFUNC (mng_special_loop)
-{
- if (!pData->bCacheplayback) /* must store playback info to work!! */
- MNG_ERROR (pData, MNG_LOOPWITHCACHEOFF);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode;
-
- pData->bHasLOOP = MNG_TRUE; /* indicate we're inside a loop */
- /* create the LOOP ani-object */
- iRetcode = mng_create_ani_loop (pData, pChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* skip till matching ENDL if iteration=0 */
- if ((!pData->bSkipping) && (((mng_loopp)pChunk)->iRepeat == 0))
- pData->bSkipping = MNG_TRUE;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-MNG_C_SPECIALFUNC (mng_special_endl)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- if (pData->bHasLOOP) /* are we really processing a loop ? */
- {
- mng_uint8 iLevel = ((mng_endlp)pChunk)->iLevel;
- /* create an ENDL animation object */
- return mng_create_ani_endl (pData, iLevel);
- }
- else
- MNG_ERROR (pData, MNG_NOMATCHINGLOOP);
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DEFI
-MNG_C_SPECIALFUNC (mng_special_defi)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- mng_retcode iRetcode;
-
- pData->iDEFIobjectid = ((mng_defip)pChunk)->iObjectid;
- pData->bDEFIhasdonotshow = ((mng_defip)pChunk)->bHasdonotshow;
- pData->iDEFIdonotshow = ((mng_defip)pChunk)->iDonotshow;
- pData->bDEFIhasconcrete = ((mng_defip)pChunk)->bHasconcrete;
- pData->iDEFIconcrete = ((mng_defip)pChunk)->iConcrete;
- pData->bDEFIhasloca = ((mng_defip)pChunk)->bHasloca;
- pData->iDEFIlocax = ((mng_defip)pChunk)->iXlocation;
- pData->iDEFIlocay = ((mng_defip)pChunk)->iYlocation;
- pData->bDEFIhasclip = ((mng_defip)pChunk)->bHasclip;
- pData->iDEFIclipl = ((mng_defip)pChunk)->iLeftcb;
- pData->iDEFIclipr = ((mng_defip)pChunk)->iRightcb;
- pData->iDEFIclipt = ((mng_defip)pChunk)->iTopcb;
- pData->iDEFIclipb = ((mng_defip)pChunk)->iBottomcb;
- /* create an animation object */
- iRetcode = mng_create_ani_defi (pData);
- if (!iRetcode) /* do display processing */
- iRetcode = mng_process_display_defi (pData);
- return iRetcode;
-#else
- return MNG_NOERROR; /* done */
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BASI
-MNG_C_SPECIALFUNC (mng_special_basi)
-{
- pData->bHasBASI = MNG_TRUE; /* inside a BASI-IEND block now */
- /* store interesting fields */
- pData->iDatawidth = ((mng_basip)pChunk)->iWidth;
- pData->iDataheight = ((mng_basip)pChunk)->iHeight;
- pData->iBitdepth = ((mng_basip)pChunk)->iBitdepth;
- pData->iColortype = ((mng_basip)pChunk)->iColortype;
- pData->iCompression = ((mng_basip)pChunk)->iCompression;
- pData->iFilter = ((mng_basip)pChunk)->iFilter;
- pData->iInterlace = ((mng_basip)pChunk)->iInterlace;
-
-#if defined(MNG_NO_1_2_4BIT_SUPPORT) || defined(MNG_NO_16BIT_SUPPORT)
- pData->iPNGmult = 1;
- pData->iPNGdepth = pData->iBitdepth;
-#endif
-
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iBitdepth < 8)
- pData->iBitdepth = 8;
-#endif
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth > 8)
- {
- pData->iBitdepth = 8;
- pData->iPNGmult = 2;
- }
-#endif
-
- if ((pData->iBitdepth != 8) /* parameter validity checks */
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- && (pData->iBitdepth != 1) &&
- (pData->iBitdepth != 2) &&
- (pData->iBitdepth != 4)
-#endif
-#ifndef MNG_NO_16BIT_SUPPORT
- && (pData->iBitdepth != 16)
-#endif
- )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if ((pData->iColortype != MNG_COLORTYPE_GRAY ) &&
- (pData->iColortype != MNG_COLORTYPE_RGB ) &&
- (pData->iColortype != MNG_COLORTYPE_INDEXED) &&
- (pData->iColortype != MNG_COLORTYPE_GRAYA ) &&
- (pData->iColortype != MNG_COLORTYPE_RGBA ) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
- if ((pData->iColortype == MNG_COLORTYPE_INDEXED) && (pData->iBitdepth > 8))
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if (((pData->iColortype == MNG_COLORTYPE_RGB ) ||
- (pData->iColortype == MNG_COLORTYPE_GRAYA ) ||
- (pData->iColortype == MNG_COLORTYPE_RGBA ) ) &&
- (pData->iBitdepth < 8 ) )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
-#if defined(FILTER192) || defined(FILTER193)
- if ((pData->iFilter != MNG_FILTER_ADAPTIVE ) &&
-#if defined(FILTER192) && defined(FILTER193)
- (pData->iFilter != MNG_FILTER_DIFFERING) &&
- (pData->iFilter != MNG_FILTER_NOFILTER ) )
-#else
-#ifdef FILTER192
- (pData->iFilter != MNG_FILTER_DIFFERING) )
-#else
- (pData->iFilter != MNG_FILTER_NOFILTER ) )
-#endif
-#endif
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#else
- if (pData->iFilter)
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#endif
-
- pData->iImagelevel++; /* one level deeper */
-
-#ifdef MNG_SUPPORT_DISPLAY
- { /* create an animation object */
- mng_retcode iRetcode = mng_create_ani_basi (pData, pChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_NO_16BIT_SUPPORT
- if (((mng_basip)pChunk)->iBitdepth > 8)
- ((mng_basip)pChunk)->iBitdepth = 8;
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLON
-MNG_C_SPECIALFUNC (mng_special_clon)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_create_ani_clon (pData, pChunk);
-#else
- return MNG_NOERROR; /* done */
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-MNG_F_SPECIALFUNC (mng_debunk_past)
-{
- mng_pastp pPAST = (mng_pastp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
- mng_uint32 iSize;
- mng_uint32 iX;
- mng_past_sourcep pSource;
- /* check the length */
- if ((iRawlen < 41) || (((iRawlen - 11) % 30) != 0))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pPAST->iDestid = mng_get_uint16 (pRawdata);
- pPAST->iTargettype = *(pRawdata+2);
- pPAST->iTargetx = mng_get_int32 (pRawdata+3);
- pPAST->iTargety = mng_get_int32 (pRawdata+7);
- pPAST->iCount = ((iRawlen - 11) / 30); /* how many entries again? */
- iSize = pPAST->iCount * sizeof (mng_past_source);
-
- pRawdata += 11;
- /* get a buffer for all the source blocks */
- MNG_ALLOC (pData, pPAST->pSources, iSize);
-
- pSource = (mng_past_sourcep)(pPAST->pSources);
-
- for (iX = pPAST->iCount; iX > 0; iX--)
- { /* now copy the source blocks */
- pSource->iSourceid = mng_get_uint16 (pRawdata);
- pSource->iComposition = *(pRawdata+2);
- pSource->iOrientation = *(pRawdata+3);
- pSource->iOffsettype = *(pRawdata+4);
- pSource->iOffsetx = mng_get_int32 (pRawdata+5);
- pSource->iOffsety = mng_get_int32 (pRawdata+9);
- pSource->iBoundarytype = *(pRawdata+13);
- pSource->iBoundaryl = mng_get_int32 (pRawdata+14);
- pSource->iBoundaryr = mng_get_int32 (pRawdata+18);
- pSource->iBoundaryt = mng_get_int32 (pRawdata+22);
- pSource->iBoundaryb = mng_get_int32 (pRawdata+26);
-
- pSource++;
- pRawdata += 30;
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-MNG_C_SPECIALFUNC (mng_special_past)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_create_ani_past (pData, pChunk);
-#else
- return MNG_NOERROR;
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-MNG_F_SPECIALFUNC (mng_disc_entries)
-{
- mng_discp pDISC = (mng_discp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
-
- if ((iRawlen % 2) != 0) /* check the length */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pDISC->iCount = (iRawlen / sizeof (mng_uint16));
-
- if (pDISC->iCount)
- {
- MNG_ALLOC (pData, pDISC->pObjectids, iRawlen);
-
-#ifndef MNG_BIGENDIAN_SUPPORTED
- {
- mng_uint32 iX;
- mng_uint8p pIn = pRawdata;
- mng_uint16p pOut = pDISC->pObjectids;
-
- for (iX = pDISC->iCount; iX > 0; iX--)
- {
- *pOut++ = mng_get_uint16 (pIn);
- pIn += 2;
- }
- }
-#else
- MNG_COPY (pDISC->pObjectids, pRawdata, iRawlen);
-#endif /* !MNG_BIGENDIAN_SUPPORTED */
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-MNG_C_SPECIALFUNC (mng_special_disc)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_create_ani_disc (pData, pChunk);
-#else
- return MNG_NOERROR;
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BACK
-MNG_C_SPECIALFUNC (mng_special_back)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- /* retrieve the fields */
- pData->bHasBACK = MNG_TRUE;
- pData->iBACKred = ((mng_backp)pChunk)->iRed;
- pData->iBACKgreen = ((mng_backp)pChunk)->iGreen;
- pData->iBACKblue = ((mng_backp)pChunk)->iBlue;
- pData->iBACKmandatory = ((mng_backp)pChunk)->iMandatory;
- pData->iBACKimageid = ((mng_backp)pChunk)->iImageid;
- pData->iBACKtile = ((mng_backp)pChunk)->iTile;
-
- return mng_create_ani_back (pData);
-#else
- return MNG_NOERROR;
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_FRAM
-MNG_F_SPECIALFUNC (mng_fram_remainder)
-{
- mng_framp pFRAM = (mng_framp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
- mng_uint32 iRequired = 0;
-
- if (iRawlen < 4) /* must have at least 4 bytes */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- iRequired = 4; /* calculate and check required remaining length */
-
- pFRAM->iChangedelay = *pRawdata;
- pFRAM->iChangetimeout = *(pRawdata+1);
- pFRAM->iChangeclipping = *(pRawdata+2);
- pFRAM->iChangesyncid = *(pRawdata+3);
-
- if (pFRAM->iChangedelay ) { iRequired += 4; }
- if (pFRAM->iChangetimeout ) { iRequired += 4; }
- if (pFRAM->iChangeclipping) { iRequired += 17; }
-
- if (pFRAM->iChangesyncid)
- {
- if ((iRawlen - iRequired) % 4 != 0)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- else
- {
- if (iRawlen != iRequired)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-
- pRawdata += 4;
-
- if (pFRAM->iChangedelay) /* delay changed ? */
- {
- pFRAM->iDelay = mng_get_uint32 (pRawdata);
- pRawdata += 4;
- }
-
- if (pFRAM->iChangetimeout) /* timeout changed ? */
- {
- pFRAM->iTimeout = mng_get_uint32 (pRawdata);
- pRawdata += 4;
- }
-
- if (pFRAM->iChangeclipping) /* clipping changed ? */
- {
- pFRAM->iBoundarytype = *pRawdata;
- pFRAM->iBoundaryl = mng_get_int32 (pRawdata+1);
- pFRAM->iBoundaryr = mng_get_int32 (pRawdata+5);
- pFRAM->iBoundaryt = mng_get_int32 (pRawdata+9);
- pFRAM->iBoundaryb = mng_get_int32 (pRawdata+13);
- pRawdata += 17;
- }
-
- if (pFRAM->iChangesyncid)
- {
- pFRAM->iCount = (iRawlen - iRequired) / 4;
-
- if (pFRAM->iCount)
- {
- MNG_ALLOC (pData, pFRAM->pSyncids, pFRAM->iCount * 4);
-
-#ifndef MNG_BIGENDIAN_SUPPORTED
- {
- mng_uint32 iX;
- mng_uint32p pOut = pFRAM->pSyncids;
-
- for (iX = pFRAM->iCount; iX > 0; iX--)
- {
- *pOut++ = mng_get_uint32 (pRawdata);
- pRawdata += 4;
- }
- }
-#else
- MNG_COPY (pFRAM->pSyncids, pRawdata, pFRAM->iCount * 4);
-#endif /* !MNG_BIGENDIAN_SUPPORTED */
- }
- }
-
-#ifndef MNG_NO_OLD_VERSIONS
- if (pData->bPreDraft48) /* old style input-stream ? */
- {
- switch (pFRAM->iMode) /* fix the framing mode then */
- {
- case 0: { break; }
- case 1: { pFRAM->iMode = 3; break; }
- case 2: { pFRAM->iMode = 4; break; }
- case 3: { pFRAM->iMode = 1; break; }
- case 4: { pFRAM->iMode = 1; break; }
- case 5: { pFRAM->iMode = 2; break; }
- default: { pFRAM->iMode = 1; break; }
- }
- }
-#endif
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_FRAM
-MNG_C_SPECIALFUNC (mng_special_fram)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_create_ani_fram (pData, pChunk);
-#else
- return MNG_NOERROR;
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MOVE
-MNG_C_SPECIALFUNC (mng_special_move)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_create_ani_move (pData, pChunk);
-#else
- return MNG_NOERROR;
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLIP
-MNG_C_SPECIALFUNC (mng_special_clip)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_create_ani_clip (pData, pChunk);
-#else
- return MNG_NOERROR;
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SHOW
-MNG_C_SPECIALFUNC (mng_special_show)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- mng_retcode iRetcode;
-
- if (!((mng_showp)pChunk)->bEmpty) /* any data ? */
- {
- if (!((mng_showp)pChunk)->bHaslastid)
- ((mng_showp)pChunk)->iLastid = ((mng_showp)pChunk)->iFirstid;
-
- pData->iSHOWfromid = ((mng_showp)pChunk)->iFirstid;
- pData->iSHOWtoid = ((mng_showp)pChunk)->iLastid;
- pData->iSHOWmode = ((mng_showp)pChunk)->iMode;
- }
- else /* use defaults then */
- {
- pData->iSHOWfromid = 1;
- pData->iSHOWtoid = 65535;
- pData->iSHOWmode = 2;
- }
- /* create a SHOW animation object */
- iRetcode = mng_create_ani_show (pData);
- if (!iRetcode) /* go and do it! */
- iRetcode = mng_process_display_show (pData);
-
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_TERM
-MNG_C_SPECIALFUNC (mng_special_term)
-{
- /* should be behind MHDR or SAVE !! */
- if ((!pData->bHasSAVE) && (pData->iChunkseq > 2))
- {
- pData->bMisplacedTERM = MNG_TRUE; /* indicate we found a misplaced TERM */
- /* and send a warning signal!!! */
- MNG_WARNING (pData, MNG_SEQUENCEERROR);
- }
-
- pData->bHasTERM = MNG_TRUE;
-
- if (pData->fProcessterm) /* inform the app ? */
- if (!pData->fProcessterm (((mng_handle)pData),
- ((mng_termp)pChunk)->iTermaction,
- ((mng_termp)pChunk)->iIteraction,
- ((mng_termp)pChunk)->iDelay,
- ((mng_termp)pChunk)->iItermax))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
-#ifdef MNG_SUPPORT_DISPLAY
- { /* create the TERM ani-object */
- mng_retcode iRetcode = mng_create_ani_term (pData, pChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* save for future reference */
- pData->pTermaniobj = pData->pLastaniobj;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-MNG_F_SPECIALFUNC (mng_save_entries)
-{
- mng_savep pSAVE = (mng_savep)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
- mng_save_entryp pEntry = MNG_NULL;
- mng_uint32 iCount = 0;
- mng_uint8 iOtype = *pRawdata;
- mng_uint8 iEtype;
- mng_uint8p pTemp;
- mng_uint8p pNull;
- mng_uint32 iLen;
- mng_uint32 iOffset[2];
- mng_uint32 iStarttime[2];
- mng_uint32 iFramenr;
- mng_uint32 iLayernr;
- mng_uint32 iX;
- mng_uint32 iNamesize;
-
- if ((iOtype != 4) && (iOtype != 8))
- MNG_ERROR (pData, MNG_INVOFFSETSIZE);
-
- pSAVE->iOffsettype = iOtype;
-
- for (iX = 0; iX < 2; iX++) /* do this twice to get the count first ! */
- {
- pTemp = pRawdata + 1;
- iLen = iRawlen - 1;
-
- if (iX) /* second run ? */
- {
- MNG_ALLOC (pData, pEntry, (iCount * sizeof (mng_save_entry)));
-
- pSAVE->iCount = iCount;
- pSAVE->pEntries = pEntry;
- }
-
- while (iLen) /* anything left ? */
- {
- iEtype = *pTemp; /* entrytype */
-
- if ((iEtype != 0) && (iEtype != 1) && (iEtype != 2) && (iEtype != 3))
- MNG_ERROR (pData, MNG_INVENTRYTYPE);
-
- pTemp++;
-
- if (iEtype > 1)
- {
- iOffset [0] = 0;
- iOffset [1] = 0;
- iStarttime [0] = 0;
- iStarttime [1] = 0;
- iLayernr = 0;
- iFramenr = 0;
- }
- else
- {
- if (iOtype == 4)
- {
- iOffset [0] = 0;
- iOffset [1] = mng_get_uint32 (pTemp);
-
- pTemp += 4;
- }
- else
- {
- iOffset [0] = mng_get_uint32 (pTemp);
- iOffset [1] = mng_get_uint32 (pTemp+4);
-
- pTemp += 8;
- }
-
- if (iEtype > 0)
- {
- iStarttime [0] = 0;
- iStarttime [1] = 0;
- iLayernr = 0;
- iFramenr = 0;
- }
- else
- {
- if (iOtype == 4)
- {
- iStarttime [0] = 0;
- iStarttime [1] = mng_get_uint32 (pTemp+0);
- iLayernr = mng_get_uint32 (pTemp+4);
- iFramenr = mng_get_uint32 (pTemp+8);
-
- pTemp += 12;
- }
- else
- {
- iStarttime [0] = mng_get_uint32 (pTemp+0);
- iStarttime [1] = mng_get_uint32 (pTemp+4);
- iLayernr = mng_get_uint32 (pTemp+8);
- iFramenr = mng_get_uint32 (pTemp+12);
-
- pTemp += 16;
- }
- }
- }
-
- pNull = pTemp; /* get the name length */
- while (*pNull)
- pNull++;
-
- if ((pNull - pRawdata) > (mng_int32)iRawlen)
- {
- iNamesize = iLen; /* no null found; so end of SAVE */
- iLen = 0;
- }
- else
- {
- iNamesize = pNull - pTemp; /* should be another entry */
- iLen -= iNamesize;
-
- if (!iLen) /* must not end with a null ! */
- MNG_ERROR (pData, MNG_ENDWITHNULL);
- }
-
- if (!pEntry)
- {
- iCount++;
- }
- else
- {
- pEntry->iEntrytype = iEtype;
- pEntry->iOffset [0] = iOffset [0];
- pEntry->iOffset [1] = iOffset [1];
- pEntry->iStarttime [0] = iStarttime [0];
- pEntry->iStarttime [1] = iStarttime [1];
- pEntry->iLayernr = iLayernr;
- pEntry->iFramenr = iFramenr;
- pEntry->iNamesize = iNamesize;
-
- if (iNamesize)
- {
- MNG_ALLOC (pData, pEntry->zName, iNamesize+1);
- MNG_COPY (pEntry->zName, pTemp, iNamesize);
- }
-
- pEntry++;
- }
-
- pTemp += iNamesize;
- }
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-MNG_C_SPECIALFUNC (mng_special_save)
-{
- pData->bHasSAVE = MNG_TRUE;
-
- if (pData->fProcesssave) /* inform the application ? */
- {
- mng_bool bOke = pData->fProcesssave ((mng_handle)pData);
- if (!bOke)
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode;
-
- /* TODO: something with the parameters */
-
- /* create a SAVE animation object */
- iRetcode = mng_create_ani_save (pData);
- if (!iRetcode) /* process it */
- iRetcode = mng_process_display_save (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-MNG_C_SPECIALFUNC (mng_special_seek)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_DISPLAY
- /* create a SEEK animation object */
- iRetcode = mng_create_ani_seek (pData, pChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#endif /* MNG_SUPPORT_DISPLAY */
-
- if (pData->fProcessseek) /* inform the app ? */
- if (!pData->fProcessseek ((mng_handle)pData, ((mng_seekp)pChunk)->zName))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_process_display_seek (pData);
-#else
- return MNG_NOERROR;
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_eXPI
-MNG_C_SPECIALFUNC (mng_special_expi)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_fPRI
-MNG_C_SPECIALFUNC (mng_special_fpri)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_nEED
-MNG_LOCAL mng_bool CheckKeyword (mng_datap pData,
- mng_uint8p pKeyword)
-{
- mng_chunkid handled_chunks [] =
- {
- MNG_UINT_BACK, /* keep it sorted !!!! */
- MNG_UINT_BASI,
- MNG_UINT_CLIP,
- MNG_UINT_CLON,
-#ifndef MNG_NO_DELTA_PNG
-/* TODO: MNG_UINT_DBYK, */
-#endif
- MNG_UINT_DEFI,
-#ifndef MNG_NO_DELTA_PNG
- MNG_UINT_DHDR,
-#endif
- MNG_UINT_DISC,
-#ifndef MNG_NO_DELTA_PNG
-/* TODO: MNG_UINT_DROP, */
-#endif
- MNG_UINT_ENDL,
- MNG_UINT_FRAM,
- MNG_UINT_IDAT,
- MNG_UINT_IEND,
- MNG_UINT_IHDR,
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
- MNG_UINT_IJNG,
-#endif
- MNG_UINT_IPNG,
-#endif
-#ifdef MNG_INCLUDE_JNG
- MNG_UINT_JDAA,
- MNG_UINT_JDAT,
- MNG_UINT_JHDR,
-/* TODO: MNG_UINT_JSEP, */
- MNG_UINT_JdAA,
-#endif
- MNG_UINT_LOOP,
- MNG_UINT_MAGN,
- MNG_UINT_MEND,
- MNG_UINT_MHDR,
- MNG_UINT_MOVE,
-/* TODO: MNG_UINT_ORDR, */
- MNG_UINT_PAST,
- MNG_UINT_PLTE,
-#ifndef MNG_NO_DELTA_PNG
- MNG_UINT_PPLT,
- MNG_UINT_PROM,
-#endif
- MNG_UINT_SAVE,
- MNG_UINT_SEEK,
- MNG_UINT_SHOW,
- MNG_UINT_TERM,
- MNG_UINT_bKGD,
- MNG_UINT_cHRM,
-/* TODO: MNG_UINT_eXPI, */
- MNG_UINT_evNT,
-/* TODO: MNG_UINT_fPRI, */
- MNG_UINT_gAMA,
-/* TODO: MNG_UINT_hIST, */
- MNG_UINT_iCCP,
- MNG_UINT_iTXt,
- MNG_UINT_nEED,
-/* TODO: MNG_UINT_oFFs, */
-/* TODO: MNG_UINT_pCAL, */
-/* TODO: MNG_UINT_pHYg, */
-/* TODO: MNG_UINT_pHYs, */
-/* TODO: MNG_UINT_sBIT, */
-/* TODO: MNG_UINT_sCAL, */
-/* TODO: MNG_UINT_sPLT, */
- MNG_UINT_sRGB,
- MNG_UINT_tEXt,
- MNG_UINT_tIME,
- MNG_UINT_tRNS,
- MNG_UINT_zTXt,
- };
-
- mng_bool bOke = MNG_FALSE;
-
- if (pData->fProcessneed) /* does the app handle it ? */
- bOke = pData->fProcessneed ((mng_handle)pData, (mng_pchar)pKeyword);
-
- if (!bOke)
- { /* find the keyword length */
- mng_uint8p pNull = pKeyword;
- while (*pNull)
- pNull++;
-
- if ((pNull - pKeyword) == 4) /* test a chunk ? */
- { /* get the chunk-id */
- mng_chunkid iChunkid = (*pKeyword << 24) + (*(pKeyword+1) << 16) +
- (*(pKeyword+2) << 8) + (*(pKeyword+3) );
- /* binary search variables */
- mng_int32 iTop, iLower, iUpper, iMiddle;
- /* determine max index of table */
- iTop = (sizeof (handled_chunks) / sizeof (handled_chunks [0])) - 1;
-
- /* binary search; with 52 chunks, worst-case is 7 comparisons */
- iLower = 0;
- iMiddle = iTop >> 1;
- iUpper = iTop;
-
- do /* the binary search itself */
- {
- if (handled_chunks [iMiddle] < iChunkid)
- iLower = iMiddle + 1;
- else if (handled_chunks [iMiddle] > iChunkid)
- iUpper = iMiddle - 1;
- else
- {
- bOke = MNG_TRUE;
- break;
- }
-
- iMiddle = (iLower + iUpper) >> 1;
- }
- while (iLower <= iUpper);
- }
- /* test draft ? */
- if ((!bOke) && ((pNull - pKeyword) == 8) &&
- (*pKeyword == 'd') && (*(pKeyword+1) == 'r') &&
- (*(pKeyword+2) == 'a') && (*(pKeyword+3) == 'f') &&
- (*(pKeyword+4) == 't') && (*(pKeyword+5) == ' '))
- {
- mng_uint32 iDraft;
-
- iDraft = (*(pKeyword+6) - '0') * 10 + (*(pKeyword+7) - '0');
- bOke = (mng_bool)(iDraft <= MNG_MNG_DRAFT);
- }
- /* test MNG 1.0/1.1 ? */
- if ((!bOke) && ((pNull - pKeyword) == 7) &&
- (*pKeyword == 'M') && (*(pKeyword+1) == 'N') &&
- (*(pKeyword+2) == 'G') && (*(pKeyword+3) == '-') &&
- (*(pKeyword+4) == '1') && (*(pKeyword+5) == '.') &&
- ((*(pKeyword+6) == '0') || (*(pKeyword+6) == '1')))
- bOke = MNG_TRUE;
- /* test CACHEOFF ? */
- if ((!bOke) && ((pNull - pKeyword) == 8) &&
- (*pKeyword == 'C') && (*(pKeyword+1) == 'A') &&
- (*(pKeyword+2) == 'C') && (*(pKeyword+3) == 'H') &&
- (*(pKeyword+4) == 'E') && (*(pKeyword+5) == 'O') &&
- (*(pKeyword+6) == 'F') && (*(pKeyword+7) == 'F'))
- {
- if (!pData->pFirstaniobj) /* only if caching hasn't started yet ! */
- {
- bOke = MNG_TRUE;
- pData->bCacheplayback = MNG_FALSE;
- pData->bStorechunks = MNG_FALSE;
- }
- }
- }
-
- return bOke;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_nEED
-MNG_C_SPECIALFUNC (mng_special_need)
-{
- /* let's check it */
- mng_bool bOke = MNG_TRUE;
- mng_uint8p pNull, pTemp, pMax;
-
- pTemp = (mng_uint8p)((mng_needp)pChunk)->zKeywords;
- pMax = (mng_uint8p)(pTemp + ((mng_needp)pChunk)->iKeywordssize);
- pNull = pTemp;
- while (*pNull)
- pNull++;
-
- while ((bOke) && (pNull < pMax))
- {
- bOke = CheckKeyword (pData, pTemp);
- pTemp = pNull + 1;
- pNull = pTemp;
- while (*pNull)
- pNull++;
- }
-
- if (bOke)
- bOke = CheckKeyword (pData, pTemp);
-
- if (!bOke)
- MNG_ERROR (pData, MNG_UNSUPPORTEDNEED);
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYg
-MNG_C_SPECIALFUNC (mng_special_phyg)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_C_SPECIALFUNC (mng_special_dhdr)
-{
- if ((((mng_dhdrp)pChunk)->iDeltatype == MNG_DELTATYPE_REPLACE) && (((mng_dhdrp)pChunk)->bHasblockloc))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- if ((((mng_dhdrp)pChunk)->iDeltatype == MNG_DELTATYPE_NOCHANGE) && (((mng_dhdrp)pChunk)->bHasblocksize))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pData->bHasDHDR = MNG_TRUE; /* inside a DHDR-IEND block now */
- pData->iDeltatype = ((mng_dhdrp)pChunk)->iDeltatype;
-
- pData->iImagelevel++; /* one level deeper */
-
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_create_ani_dhdr (pData, pChunk);
-#else
- return MNG_NOERROR;
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_C_SPECIALFUNC (mng_special_prom)
-{
- if ((((mng_promp)pChunk)->iColortype != MNG_COLORTYPE_GRAY ) &&
- (((mng_promp)pChunk)->iColortype != MNG_COLORTYPE_RGB ) &&
- (((mng_promp)pChunk)->iColortype != MNG_COLORTYPE_INDEXED) &&
- (((mng_promp)pChunk)->iColortype != MNG_COLORTYPE_GRAYA ) &&
- (((mng_promp)pChunk)->iColortype != MNG_COLORTYPE_RGBA ) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
-#ifdef MNG_NO_16BIT_SUPPORT
- if (((mng_promp)pChunk)->iSampledepth == MNG_BITDEPTH_16 )
- ((mng_promp)pChunk)->iSampledepth = MNG_BITDEPTH_8;
-#endif
-
- if ((((mng_promp)pChunk)->iSampledepth != MNG_BITDEPTH_1 ) &&
- (((mng_promp)pChunk)->iSampledepth != MNG_BITDEPTH_2 ) &&
- (((mng_promp)pChunk)->iSampledepth != MNG_BITDEPTH_4 ) &&
- (((mng_promp)pChunk)->iSampledepth != MNG_BITDEPTH_8 )
-#ifndef MNG_NO_16BIT_SUPPORT
- && (((mng_promp)pChunk)->iSampledepth != MNG_BITDEPTH_16)
-#endif
- )
- MNG_ERROR (pData, MNG_INVSAMPLEDEPTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode = mng_create_ani_prom (pData, pChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_C_SPECIALFUNC (mng_special_ipng)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- mng_retcode iRetcode = mng_create_ani_ipng (pData);
- if (!iRetcode) /* process it */
- iRetcode = mng_process_display_ipng (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_F_SPECIALFUNC (mng_pplt_entries)
-{
- mng_ppltp pPPLT = (mng_ppltp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
- mng_uint8 iDeltatype = pPPLT->iDeltatype;
- mng_uint32 iMax = 0;
- mng_int32 iX, iY, iM;
- mng_rgbpaltab aIndexentries;
- mng_uint8arr aAlphaentries;
- mng_uint8arr aUsedentries;
- /* must be indexed color ! */
- if (pData->iColortype != MNG_COLORTYPE_INDEXED)
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
- for (iY = 255; iY >= 0; iY--) /* reset arrays */
- {
- aIndexentries [iY].iRed = 0;
- aIndexentries [iY].iGreen = 0;
- aIndexentries [iY].iBlue = 0;
- aAlphaentries [iY] = 255;
- aUsedentries [iY] = 0;
- }
-
- while (iRawlen) /* as long as there are entries left ... */
- {
- mng_uint32 iDiff;
-
- if (iRawlen < 2)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- iX = (mng_int32)(*pRawdata); /* get start and end index */
- iM = (mng_int32)(*(pRawdata+1));
-
- if (iM < iX)
- MNG_ERROR (pData, MNG_INVALIDINDEX);
-
- if (iM >= (mng_int32) iMax) /* determine highest used index */
- iMax = iM + 1;
-
- pRawdata += 2;
- iRawlen -= 2;
- iDiff = (iM - iX + 1);
- if ((iDeltatype == MNG_DELTATYPE_REPLACERGB ) ||
- (iDeltatype == MNG_DELTATYPE_DELTARGB ) )
- iDiff = iDiff * 3;
- else
- if ((iDeltatype == MNG_DELTATYPE_REPLACERGBA) ||
- (iDeltatype == MNG_DELTATYPE_DELTARGBA ) )
- iDiff = iDiff * 4;
-
- if (iRawlen < iDiff)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((iDeltatype == MNG_DELTATYPE_REPLACERGB ) ||
- (iDeltatype == MNG_DELTATYPE_DELTARGB ) )
- {
- for (iY = iX; iY <= iM; iY++)
- {
- aIndexentries [iY].iRed = *pRawdata;
- aIndexentries [iY].iGreen = *(pRawdata+1);
- aIndexentries [iY].iBlue = *(pRawdata+2);
- aUsedentries [iY] = 1;
-
- pRawdata += 3;
- iRawlen -= 3;
- }
- }
- else
- if ((iDeltatype == MNG_DELTATYPE_REPLACEALPHA) ||
- (iDeltatype == MNG_DELTATYPE_DELTAALPHA ) )
- {
- for (iY = iX; iY <= iM; iY++)
- {
- aAlphaentries [iY] = *pRawdata;
- aUsedentries [iY] = 1;
-
- pRawdata++;
- iRawlen--;
- }
- }
- else
- {
- for (iY = iX; iY <= iM; iY++)
- {
- aIndexentries [iY].iRed = *pRawdata;
- aIndexentries [iY].iGreen = *(pRawdata+1);
- aIndexentries [iY].iBlue = *(pRawdata+2);
- aAlphaentries [iY] = *(pRawdata+3);
- aUsedentries [iY] = 1;
-
- pRawdata += 4;
- iRawlen -= 4;
- }
- }
- }
-
- switch (pData->iBitdepth) /* check maximum allowed entries for bitdepth */
- {
- case MNG_BITDEPTH_1 : {
- if (iMax > 2)
- MNG_ERROR (pData, MNG_INVALIDINDEX);
- break;
- }
- case MNG_BITDEPTH_2 : {
- if (iMax > 4)
- MNG_ERROR (pData, MNG_INVALIDINDEX);
- break;
- }
- case MNG_BITDEPTH_4 : {
- if (iMax > 16)
- MNG_ERROR (pData, MNG_INVALIDINDEX);
- break;
- }
- }
-
- pPPLT->iCount = iMax;
-
- for (iY = 255; iY >= 0; iY--)
- {
- pPPLT->aEntries [iY].iRed = aIndexentries [iY].iRed;
- pPPLT->aEntries [iY].iGreen = aIndexentries [iY].iGreen;
- pPPLT->aEntries [iY].iBlue = aIndexentries [iY].iBlue;
- pPPLT->aEntries [iY].iAlpha = aAlphaentries [iY];
- pPPLT->aEntries [iY].bUsed = (mng_bool)(aUsedentries [iY]);
- }
-
- { /* create animation object */
- mng_retcode iRetcode = mng_create_ani_pplt (pData, iDeltatype, iMax,
- aIndexentries, aAlphaentries,
- aUsedentries);
- if (iRetcode)
- return iRetcode;
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_C_SPECIALFUNC (mng_special_pplt)
-{
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
-MNG_C_SPECIALFUNC (mng_special_ijng)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- mng_retcode iRetcode = mng_create_ani_ijng (pData);
- if (!iRetcode) /* process it */
- iRetcode = mng_process_display_ijng (pData);
- return iRetcode;
-#else
- return MNG_NOERROR; /* done */
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_F_SPECIALFUNC (mng_drop_entries)
-{
- mng_dropp pDROP = (mng_dropp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
- mng_uint32 iX;
- mng_uint32p pEntry;
- /* check length */
- if ((iRawlen < 4) || ((iRawlen % 4) != 0))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- MNG_ALLOC (pData, pEntry, iRawlen);
- pDROP->iCount = iRawlen / 4;
- pDROP->pChunknames = (mng_ptr)pEntry;
-
- for (iX = pDROP->iCount; iX > 0; iX--)
- {
- *pEntry++ = mng_get_uint32 (pRawdata);
- pRawdata += 4;
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-MNG_C_SPECIALFUNC (mng_special_drop)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
-MNG_C_SPECIALFUNC (mng_special_dbyk)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-MNG_F_SPECIALFUNC (mng_ordr_entries)
-{
- mng_ordrp pORDR = (mng_ordrp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
- mng_uint32 iX;
- mng_ordr_entryp pEntry;
- /* check length */
- if ((iRawlen < 5) || ((iRawlen % 5) != 0))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- MNG_ALLOC (pData, pEntry, iRawlen);
- pORDR->iCount = iRawlen / 5;
- pORDR->pEntries = (mng_ptr)pEntry;
-
- for (iX = pORDR->iCount; iX > 0; iX--)
- {
- pEntry->iChunkname = mng_get_uint32 (pRawdata);
- pEntry->iOrdertype = *(pRawdata+4);
- pEntry++;
- pRawdata += 5;
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-MNG_C_SPECIALFUNC (mng_special_ordr)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-MNG_F_SPECIALFUNC (mng_debunk_magn)
-{
- mng_magnp pMAGN = (mng_magnp)pChunk;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
- mng_bool bFaulty;
- /* check length */
- if (iRawlen > 20)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- /* following is an ugly hack to allow faulty layout caused by previous
- versions of libmng and MNGeye, which wrote MAGN with a 16-bit
- MethodX/MethodY (as opposed to the proper 8-bit as defined in the spec!) */
-
- if ((iRawlen == 6) || (iRawlen == 8) || (iRawlen == 10) || (iRawlen == 12) ||
- (iRawlen == 14) || (iRawlen == 16) || (iRawlen == 20))
- bFaulty = MNG_TRUE; /* these lengths are all wrong */
- else /* length 18 can be right or wrong !!! */
- if ((iRawlen == 18) && (mng_get_uint16 (pRawdata+4) <= 5) &&
- (mng_get_uint16 (pRawdata+6) < 256) &&
- (mng_get_uint16 (pRawdata+8) < 256) &&
- (mng_get_uint16 (pRawdata+10) < 256) &&
- (mng_get_uint16 (pRawdata+12) < 256) &&
- (mng_get_uint16 (pRawdata+14) < 256) &&
- (mng_get_uint16 (pRawdata+16) < 256))
- bFaulty = MNG_TRUE; /* this is very likely the wrong layout */
- else
- bFaulty = MNG_FALSE; /* all other cases are handled as right */
-
- if (bFaulty) /* wrong layout ? */
- {
- if (iRawlen > 0) /* get the fields */
- pMAGN->iFirstid = mng_get_uint16 (pRawdata);
- else
- pMAGN->iFirstid = 0;
-
- if (iRawlen > 2)
- pMAGN->iLastid = mng_get_uint16 (pRawdata+2);
- else
- pMAGN->iLastid = pMAGN->iFirstid;
-
- if (iRawlen > 4)
- pMAGN->iMethodX = (mng_uint8)(mng_get_uint16 (pRawdata+4));
- else
- pMAGN->iMethodX = 0;
-
- if (iRawlen > 6)
- pMAGN->iMX = mng_get_uint16 (pRawdata+6);
- else
- pMAGN->iMX = 1;
-
- if (iRawlen > 8)
- pMAGN->iMY = mng_get_uint16 (pRawdata+8);
- else
- pMAGN->iMY = pMAGN->iMX;
-
- if (iRawlen > 10)
- pMAGN->iML = mng_get_uint16 (pRawdata+10);
- else
- pMAGN->iML = pMAGN->iMX;
-
- if (iRawlen > 12)
- pMAGN->iMR = mng_get_uint16 (pRawdata+12);
- else
- pMAGN->iMR = pMAGN->iMX;
-
- if (iRawlen > 14)
- pMAGN->iMT = mng_get_uint16 (pRawdata+14);
- else
- pMAGN->iMT = pMAGN->iMY;
-
- if (iRawlen > 16)
- pMAGN->iMB = mng_get_uint16 (pRawdata+16);
- else
- pMAGN->iMB = pMAGN->iMY;
-
- if (iRawlen > 18)
- pMAGN->iMethodY = (mng_uint8)(mng_get_uint16 (pRawdata+18));
- else
- pMAGN->iMethodY = pMAGN->iMethodX;
- }
- else /* proper layout !!!! */
- {
- if (iRawlen > 0) /* get the fields */
- pMAGN->iFirstid = mng_get_uint16 (pRawdata);
- else
- pMAGN->iFirstid = 0;
-
- if (iRawlen > 2)
- pMAGN->iLastid = mng_get_uint16 (pRawdata+2);
- else
- pMAGN->iLastid = pMAGN->iFirstid;
-
- if (iRawlen > 4)
- pMAGN->iMethodX = *(pRawdata+4);
- else
- pMAGN->iMethodX = 0;
-
- if (iRawlen > 5)
- pMAGN->iMX = mng_get_uint16 (pRawdata+5);
- else
- pMAGN->iMX = 1;
-
- if (iRawlen > 7)
- pMAGN->iMY = mng_get_uint16 (pRawdata+7);
- else
- pMAGN->iMY = pMAGN->iMX;
-
- if (iRawlen > 9)
- pMAGN->iML = mng_get_uint16 (pRawdata+9);
- else
- pMAGN->iML = pMAGN->iMX;
-
- if (iRawlen > 11)
- pMAGN->iMR = mng_get_uint16 (pRawdata+11);
- else
- pMAGN->iMR = pMAGN->iMX;
-
- if (iRawlen > 13)
- pMAGN->iMT = mng_get_uint16 (pRawdata+13);
- else
- pMAGN->iMT = pMAGN->iMY;
-
- if (iRawlen > 15)
- pMAGN->iMB = mng_get_uint16 (pRawdata+15);
- else
- pMAGN->iMB = pMAGN->iMY;
-
- if (iRawlen > 17)
- pMAGN->iMethodY = *(pRawdata+17);
- else
- pMAGN->iMethodY = pMAGN->iMethodX;
- }
- /* check field validity */
- if ((pMAGN->iMethodX > 5) || (pMAGN->iMethodY > 5))
- MNG_ERROR (pData, MNG_INVALIDMETHOD);
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-MNG_C_SPECIALFUNC (mng_special_magn)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_create_ani_magn (pData, pChunk);
-#else
- return MNG_NOERROR;
-#endif /* MNG_SUPPORT_DISPLAY */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_evNT
-MNG_F_SPECIALFUNC (mng_evnt_entries)
-{
- mng_evntp pEVNT = (mng_evntp)pChunk;
- mng_uint32 iRawlen;
- mng_uint8p pRawdata;
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_SUPPORT_DYNAMICMNG)
- mng_retcode iRetcode;
-#endif
- mng_uint8p pNull;
- mng_uint8 iEventtype;
- mng_uint8 iMasktype;
- mng_int32 iLeft;
- mng_int32 iRight;
- mng_int32 iTop;
- mng_int32 iBottom;
- mng_uint16 iObjectid;
- mng_uint8 iIndex;
- mng_uint32 iNamesize;
- mng_uint32 iCount = 0;
- mng_evnt_entryp pEntry = MNG_NULL;
- mng_uint32 iX;
-
- for (iX = 0; iX < 2; iX++)
- {
- iRawlen = *piRawlen;
- pRawdata = *ppRawdata;
-
- if (iX) /* second run ? */
- {
- MNG_ALLOC (pData, pEntry, (iCount * sizeof (mng_evnt_entry)));
- pEVNT->iCount = iCount;
- pEVNT->pEntries = pEntry;
- }
-
- while (iRawlen) /* anything left ? */
- {
- if (iRawlen < 2) /* must have at least 2 bytes ! */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- iEventtype = *pRawdata; /* eventtype */
- if (iEventtype > 5)
- MNG_ERROR (pData, MNG_INVALIDEVENT);
-
- pRawdata++;
-
- iMasktype = *pRawdata; /* masktype */
- if (iMasktype > 5)
- MNG_ERROR (pData, MNG_INVALIDMASK);
-
- pRawdata++;
- iRawlen -= 2;
-
- iLeft = 0;
- iRight = 0;
- iTop = 0;
- iBottom = 0;
- iObjectid = 0;
- iIndex = 0;
-
- switch (iMasktype)
- {
- case 1 :
- {
- if (iRawlen > 16)
- {
- iLeft = mng_get_int32 (pRawdata);
- iRight = mng_get_int32 (pRawdata+4);
- iTop = mng_get_int32 (pRawdata+8);
- iBottom = mng_get_int32 (pRawdata+12);
- pRawdata += 16;
- iRawlen -= 16;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 2 :
- {
- if (iRawlen > 2)
- {
- iObjectid = mng_get_uint16 (pRawdata);
- pRawdata += 2;
- iRawlen -= 2;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 3 :
- {
- if (iRawlen > 3)
- {
- iObjectid = mng_get_uint16 (pRawdata);
- iIndex = *(pRawdata+2);
- pRawdata += 3;
- iRawlen -= 3;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 4 :
- {
- if (iRawlen > 18)
- {
- iLeft = mng_get_int32 (pRawdata);
- iRight = mng_get_int32 (pRawdata+4);
- iTop = mng_get_int32 (pRawdata+8);
- iBottom = mng_get_int32 (pRawdata+12);
- iObjectid = mng_get_uint16 (pRawdata+16);
- pRawdata += 18;
- iRawlen -= 18;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 5 :
- {
- if (iRawlen > 19)
- {
- iLeft = mng_get_int32 (pRawdata);
- iRight = mng_get_int32 (pRawdata+4);
- iTop = mng_get_int32 (pRawdata+8);
- iBottom = mng_get_int32 (pRawdata+12);
- iObjectid = mng_get_uint16 (pRawdata+16);
- iIndex = *(pRawdata+18);
- pRawdata += 19;
- iRawlen -= 19;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- }
-
- pNull = pRawdata; /* get the name length */
- while (*pNull)
- pNull++;
-
- if ((pNull - pRawdata) > (mng_int32)iRawlen)
- {
- iNamesize = iRawlen; /* no null found; so end of evNT */
- iRawlen = 0;
- }
- else
- {
- iNamesize = pNull - pRawdata; /* should be another entry */
- iRawlen = iRawlen - iNamesize - 1;
-
- if (!iRawlen) /* must not end with a null ! */
- MNG_ERROR (pData, MNG_ENDWITHNULL);
- }
-
- if (!iX)
- {
- iCount++;
- }
- else
- {
- pEntry->iEventtype = iEventtype;
- pEntry->iMasktype = iMasktype;
- pEntry->iLeft = iLeft;
- pEntry->iRight = iRight;
- pEntry->iTop = iTop;
- pEntry->iBottom = iBottom;
- pEntry->iObjectid = iObjectid;
- pEntry->iIndex = iIndex;
- pEntry->iSegmentnamesize = iNamesize;
-
- if (iNamesize)
- {
- MNG_ALLOC (pData, pEntry->zSegmentname, iNamesize+1);
- MNG_COPY (pEntry->zSegmentname, pRawdata, iNamesize);
- }
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_SUPPORT_DYNAMICMNG)
- iRetcode = mng_create_event (pData, (mng_ptr)pEntry);
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif
-
- pEntry++;
- }
-
- pRawdata = pRawdata + iNamesize + 1;
- }
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_evNT
-MNG_C_SPECIALFUNC (mng_special_evnt)
-{
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-MNG_C_SPECIALFUNC (mng_special_mpng)
-{
- if ((pData->eImagetype != mng_it_png) && (pData->eImagetype != mng_it_jng))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
-
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_create_mpng_obj (pData, pChunk);
-#else
- return MNG_NOERROR;
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-MNG_C_SPECIALFUNC (mng_special_ahdr)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- return mng_create_ang_obj (pData, pChunk);
-#else
- return MNG_NOERROR;
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-MNG_F_SPECIALFUNC (mng_adat_tiles)
-{
- if ((pData->eImagetype != mng_it_ang) || (!pData->pANG))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
-
- {
- mng_adatp pADAT = (mng_adatp)pChunk;
- mng_ang_objp pANG = (mng_ang_objp)pData->pANG;
- mng_uint32 iRawlen = *piRawlen;
- mng_uint8p pRawdata = *ppRawdata;
- mng_retcode iRetcode;
- mng_uint8p pBuf;
- mng_uint32 iBufsize;
- mng_uint32 iRealsize;
- mng_uint8p pTemp;
- mng_uint8p pTemp2;
- mng_int32 iX;
- mng_int32 iSize;
-
-#ifdef MNG_SUPPORT_DISPLAY
- mng_imagep pImage;
- mng_int32 iTemplen;
- mng_uint8p pSwap;
-
- mng_processobject pProcess;
-
- mng_uint32 iSavedatawidth;
- mng_uint32 iSavedataheight;
-
- mng_fptr fSaveinitrowproc;
- mng_fptr fSavestorerow;
- mng_fptr fSaveprocessrow;
- mng_fptr fSavedifferrow;
- mng_imagep fSavestoreobj;
- mng_imagedatap fSavestorebuf;
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- png_imgtype eSavepngimgtype;
-#endif
-
- mng_uint8 iSaveinterlace;
- mng_int8 iSavepass;
- mng_int32 iSaverow;
- mng_int32 iSaverowinc;
- mng_int32 iSavecol;
- mng_int32 iSavecolinc;
- mng_int32 iSaverowsamples;
- mng_int32 iSavesamplemul;
- mng_int32 iSavesampleofs;
- mng_int32 iSavesamplediv;
- mng_int32 iSaverowsize;
- mng_int32 iSaverowmax;
- mng_int32 iSavefilterofs;
- mng_int32 iSavepixelofs;
- mng_uint32 iSavelevel0;
- mng_uint32 iSavelevel1;
- mng_uint32 iSavelevel2;
- mng_uint32 iSavelevel3;
- mng_uint8p pSaveworkrow;
- mng_uint8p pSaveprevrow;
- mng_uint8p pSaverGBArow;
- mng_bool bSaveisRGBA16;
- mng_bool bSaveisOpaque;
- mng_int32 iSavefilterbpp;
-
- mng_int32 iSavedestl;
- mng_int32 iSavedestt;
- mng_int32 iSavedestr;
- mng_int32 iSavedestb;
- mng_int32 iSavesourcel;
- mng_int32 iSavesourcet;
- mng_int32 iSavesourcer;
- mng_int32 iSavesourceb;
-#endif /* MNG_SUPPORT_DISPLAY */
-
- iRetcode = mng_inflate_buffer (pData, pRawdata, iRawlen,
- &pBuf, &iBufsize, &iRealsize);
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffer */
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
- /* get buffer for tile info in ADAT chunk */
- pADAT->iTilessize = pANG->iNumframes * sizeof(mng_adat_tile);
- MNG_ALLOCX (pData, pADAT->pTiles, pADAT->iTilessize);
- if (!pADAT->pTiles)
- {
- pADAT->iTilessize = 0;
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
-
- pTemp = pBuf;
- pTemp2 = (mng_uint8p)pADAT->pTiles;
-
- if (!pANG->iStillused)
- iSize = 12;
- else
- iSize = 13;
-
- for (iX = 0; iX < pANG->iNumframes; iX++)
- {
- MNG_COPY (pTemp2, pTemp, iSize);
- pTemp += iSize;
- pTemp2 += sizeof(mng_adat_tile);
- }
-
-#ifdef MNG_SUPPORT_DISPLAY
- /* get buffer for tile info in ANG object */
- pANG->iTilessize = pADAT->iTilessize;
- MNG_ALLOCX (pData, pANG->pTiles, pANG->iTilessize);
- if (!pANG->pTiles)
- {
- pANG->iTilessize = 0;
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
- /* copy it from the ADAT object */
- MNG_COPY (pANG->pTiles, pADAT->pTiles, pANG->iTilessize);
-
- /* save IDAT work-parms */
- fSaveinitrowproc = pData->fInitrowproc;
- fSavestorerow = pData->fDisplayrow;
- fSaveprocessrow = pData->fProcessrow;
- fSavedifferrow = pData->fDifferrow;
- fSavestoreobj = pData->pStoreobj;
- fSavestorebuf = pData->pStorebuf;
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- eSavepngimgtype = pData->ePng_imgtype;
-#endif
-
- iSavedatawidth = pData->iDatawidth;
- iSavedataheight = pData->iDataheight;
- iSaveinterlace = pData->iInterlace;
- iSavepass = pData->iPass;
- iSaverow = pData->iRow;
- iSaverowinc = pData->iRowinc;
- iSavecol = pData->iCol;
- iSavecolinc = pData->iColinc;
- iSaverowsamples = pData->iRowsamples;
- iSavesamplemul = pData->iSamplemul;
- iSavesampleofs = pData->iSampleofs;
- iSavesamplediv = pData->iSamplediv;
- iSaverowsize = pData->iRowsize;
- iSaverowmax = pData->iRowmax;
- iSavefilterofs = pData->iFilterofs;
- iSavepixelofs = pData->iPixelofs;
- iSavelevel0 = pData->iLevel0;
- iSavelevel1 = pData->iLevel1;
- iSavelevel2 = pData->iLevel2;
- iSavelevel3 = pData->iLevel3;
- pSaveworkrow = pData->pWorkrow;
- pSaveprevrow = pData->pPrevrow;
- pSaverGBArow = pData->pRGBArow;
- bSaveisRGBA16 = pData->bIsRGBA16;
- bSaveisOpaque = pData->bIsOpaque;
- iSavefilterbpp = pData->iFilterbpp;
- iSavedestl = pData->iDestl;
- iSavedestt = pData->iDestt;
- iSavedestr = pData->iDestr;
- iSavedestb = pData->iDestb;
- iSavesourcel = pData->iSourcel;
- iSavesourcet = pData->iSourcet;
- iSavesourcer = pData->iSourcer;
- iSavesourceb = pData->iSourceb;
-
- pData->iDatawidth = pANG->iTilewidth;
- pData->iDataheight = pANG->iTileheight;
-
- pData->iDestl = 0;
- pData->iDestt = 0;
- pData->iDestr = pANG->iTilewidth;
- pData->iDestb = pANG->iTileheight;
- pData->iSourcel = 0;
- pData->iSourcet = 0;
- pData->iSourcer = pANG->iTilewidth;
- pData->iSourceb = pANG->iTileheight;
-
- pData->fInitrowproc = MNG_NULL;
- pData->fStorerow = MNG_NULL;
- pData->fProcessrow = MNG_NULL;
- pData->fDifferrow = MNG_NULL;
-
- /* clone image object to store the pixel-data from object 0 */
- iRetcode = mng_clone_imageobject (pData, 1, MNG_FALSE, MNG_FALSE, MNG_FALSE,
- MNG_FALSE, 0, 0, 0, pData->pObjzero, &pImage);
- if (iRetcode) /* on error, drop temp buffer and bail */
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
-
- /* make sure we got the right dimensions and interlacing */
- iRetcode = mng_reset_object_details (pData, pImage, pANG->iTilewidth, pANG->iTileheight,
- pImage->pImgbuf->iBitdepth, pImage->pImgbuf->iColortype,
- pImage->pImgbuf->iCompression, pImage->pImgbuf->iFilter,
- pANG->iInterlace, MNG_FALSE);
- if (iRetcode) /* on error, drop temp buffer and bail */
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
-
- pData->pStoreobj = pImage;
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- pData->fInitrowproc = (mng_fptr)mng_init_rowproc;
- pData->ePng_imgtype = mng_png_imgtype(pData->iColortype,pData->iBitdepth);
-#else
- switch (pData->iColortype) /* determine row initialization routine */
- {
- case 0 : { /* gray */
- switch (pData->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g1_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g1_i;
-
- break;
- }
- case 2 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g2_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g2_i;
-
- break;
- }
- case 4 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g4_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g4_i;
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- case 2 : { /* rgb */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgb8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgb8_i;
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgb16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgb16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- case 3 : { /* indexed */
- switch (pData->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx1_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx1_i;
-
- break;
- }
- case 2 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx2_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx2_i;
-
- break;
- }
- case 4 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx4_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx4_i;
-
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx8_i;
-
- break;
- }
- }
-
- break;
- }
- case 4 : { /* gray+alpha */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_ga8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_ga8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_ga16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_ga16_i;
- break;
- }
-#endif
- }
-
- break;
- }
- case 6 : { /* rgb+alpha */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgba8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgba8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgba16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgba16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- }
-#endif /* MNG_OPTIMIZE_FOOTPRINT_INIT */
-
- pData->iFilterofs = 0; /* determine filter characteristics */
- pData->iLevel0 = 0; /* default levels */
- pData->iLevel1 = 0;
- pData->iLevel2 = 0;
- pData->iLevel3 = 0;
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- {
- switch (pData->iColortype)
- {
- case 0 : {
- if (pData->iBitdepth <= 8)
- pData->iFilterofs = 1;
- else
- pData->iFilterofs = 2;
-
- break;
- }
- case 2 : {
- if (pData->iBitdepth <= 8)
- pData->iFilterofs = 3;
- else
- pData->iFilterofs = 6;
-
- break;
- }
- case 3 : {
- pData->iFilterofs = 1;
- break;
- }
- case 4 : {
- if (pData->iBitdepth <= 8)
- pData->iFilterofs = 2;
- else
- pData->iFilterofs = 4;
-
- break;
- }
- case 6 : {
- if (pData->iBitdepth <= 8)
- pData->iFilterofs = 4;
- else
- pData->iFilterofs = 8;
-
- break;
- }
- }
- }
-#endif
-
-#ifdef FILTER193 /* no adaptive filtering ? */
- if (pData->iFilter == MNG_FILTER_NOFILTER)
- pData->iPixelofs = pData->iFilterofs;
- else
-#endif
- pData->iPixelofs = pData->iFilterofs + 1;
-
- if (pData->fInitrowproc) /* need to initialize row processing? */
- {
- iRetcode = ((mng_initrowproc)pData->fInitrowproc) (pData);
- if (iRetcode)
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
- }
- /* calculate remainder of buffer */
- pTemp = pBuf + (mng_int32)(pANG->iNumframes * iSize);
- iTemplen = iRealsize - (mng_int32)(pANG->iNumframes * iSize);
-
- do
- {
- if (iTemplen > pData->iRowmax) /* get a pixel-row from the temp buffer */
- {
- MNG_COPY (pData->pWorkrow, pTemp, pData->iRowmax);
- }
- else
- {
- MNG_COPY (pData->pWorkrow, pTemp, iTemplen);
- }
-
- { /* image not completed yet ? */
- if (pData->iRow < (mng_int32)pData->iDataheight)
- {
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iPNGdepth == 1)
- {
- /* Inflate Workrow to 8-bit */
- mng_int32 iX;
- mng_uint8p pSrc = pData->pWorkrow+1;
- mng_uint8p pDest = pSrc + pData->iRowsize - (pData->iRowsize+7)/8;
-
- for (iX = ((pData->iRowsize+7)/8) ; iX > 0 ; iX--)
- *pDest++ = *pSrc++;
-
- pDest = pData->pWorkrow+1;
- pSrc = pDest + pData->iRowsize - (pData->iRowsize+7)/8;
- for (iX = pData->iRowsize; ;)
- {
- *pDest++ = (((*pSrc)>>7)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>6)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>5)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>4)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>3)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>2)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>1)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc) )&1);
- if (iX-- <= 0)
- break;
- pSrc++;
- }
- }
- else if (pData->iPNGdepth == 2)
- {
- /* Inflate Workrow to 8-bit */
- mng_int32 iX;
- mng_uint8p pSrc = pData->pWorkrow+1;
- mng_uint8p pDest = pSrc + pData->iRowsize - (2*pData->iRowsize+7)/8;
-
- for (iX = ((2*pData->iRowsize+7)/8) ; iX > 0 ; iX--)
- *pDest++ = *pSrc++;
-
- pDest = pData->pWorkrow+1;
- pSrc = pDest + pData->iRowsize - (2*pData->iRowsize+7)/8;
- for (iX = pData->iRowsize; ;)
- {
- *pDest++ = (((*pSrc)>>6)&3);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>4)&3);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>2)&3);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc) )&3);
- if (iX-- <= 0)
- break;
- pSrc++;
- }
- }
- else if (pData->iPNGdepth == 4)
- {
- /* Inflate Workrow to 8-bit */
- mng_int32 iX;
- mng_uint8p pSrc = pData->pWorkrow+1;
- mng_uint8p pDest = pSrc + pData->iRowsize - (4*pData->iRowsize+7)/8;
-
- for (iX = ((4*pData->iRowsize+7)/8) ; iX > 0 ; iX--)
- *pDest++ = *pSrc++;
-
- pDest = pData->pWorkrow+1;
- pSrc = pDest + pData->iRowsize - (4*pData->iRowsize+7)/8;
- for (iX = pData->iRowsize; ;)
- {
- *pDest++ = (((*pSrc)>>4)&0x0f);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc) )&0x0f);
- if (iX-- <= 0)
- break;
- pSrc++;
- }
- }
- if (pData->iPNGdepth < 8 && pData->iColortype == 0)
- {
- /* Expand samples to 8-bit by LBR */
- mng_int32 iX;
- mng_uint8p pSrc = pData->pWorkrow+1;
- mng_uint8 multiplier[]={0,255,85,0,17,0,0,0,1};
-
- for (iX = pData->iRowsize; iX > 0; iX--)
- *pSrc++ *= multiplier[pData->iPNGdepth];
- }
-#endif
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iPNGdepth > 8)
- {
- /* Reduce Workrow to 8-bit */
- mng_int32 iX;
- mng_uint8p pSrc = pData->pWorkrow+1;
- mng_uint8p pDest = pSrc;
-
- for (iX = pData->iRowsize; iX > 0; iX--)
- {
- *pDest = *pSrc;
- pDest++;
- pSrc+=2;
- }
- }
-#endif
-
-#ifdef FILTER192 /* has leveling info ? */
- if (pData->iFilterofs == MNG_FILTER_DIFFERING)
- iRetcode = init_rowdiffering (pData);
- else
-#endif
- iRetcode = MNG_NOERROR;
- /* filter the row if necessary */
- if ((!iRetcode) && (pData->iFilterofs < pData->iPixelofs ) &&
- (*(pData->pWorkrow + pData->iFilterofs)) )
- iRetcode = mng_filter_a_row (pData);
-
- /* additional leveling/differing ? */
- if ((!iRetcode) && (pData->fDifferrow))
- {
- iRetcode = ((mng_differrow)pData->fDifferrow) (pData);
-
- pSwap = pData->pWorkrow;
- pData->pWorkrow = pData->pPrevrow;
- pData->pPrevrow = pSwap; /* make sure we're processing the right data */
- }
-
- if (!iRetcode)
- {
- { /* process this row */
- if ((!iRetcode) && (pData->fProcessrow))
- iRetcode = ((mng_processrow)pData->fProcessrow) (pData);
- /* store in object ? */
- if ((!iRetcode) && (pData->fStorerow))
- iRetcode = ((mng_storerow)pData->fStorerow) (pData);
- }
- }
-
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, iRetcode);
- }
-
- if (!pData->fDifferrow) /* swap row-pointers */
- {
- pSwap = pData->pWorkrow;
- pData->pWorkrow = pData->pPrevrow;
- pData->pPrevrow = pSwap; /* so prev points to the processed row! */
- }
- /* adjust variables for next row */
- iRetcode = mng_next_row (pData);
-
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, iRetcode);
- }
- }
- }
-
- pTemp += pData->iRowmax;
- iTemplen -= pData->iRowmax;
- } /* until some error or EOI
- or all pixels received */
- while ( (iTemplen > 0) &&
- ( (pData->iRow < (mng_int32)pData->iDataheight) ||
- ( (pData->iPass >= 0) && (pData->iPass < 7) ) ) );
-
- mng_cleanup_rowproc (pData); /* cleanup row processing buffers !! */
-
- /* restore saved work-parms */
- pData->iDatawidth = iSavedatawidth;
- pData->iDataheight = iSavedataheight;
-
- pData->fInitrowproc = fSaveinitrowproc;
- pData->fDisplayrow = fSavestorerow;
- pData->fProcessrow = fSaveprocessrow;
- pData->fDifferrow = fSavedifferrow;
- pData->pStoreobj = fSavestoreobj;
- pData->pStorebuf = fSavestorebuf;
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- pData->ePng_imgtype = eSavepngimgtype;
-#endif
-
- pData->iInterlace = iSaveinterlace;
- pData->iPass = iSavepass;
- pData->iRow = iSaverow;
- pData->iRowinc = iSaverowinc;
- pData->iCol = iSavecol;
- pData->iColinc = iSavecolinc;
- pData->iRowsamples = iSaverowsamples;
- pData->iSamplemul = iSavesamplemul;
- pData->iSampleofs = iSavesampleofs;
- pData->iSamplediv = iSavesamplediv;
- pData->iRowsize = iSaverowsize;
- pData->iRowmax = iSaverowmax;
- pData->iFilterofs = iSavefilterofs;
- pData->iPixelofs = iSavepixelofs;
- pData->iLevel0 = iSavelevel0;
- pData->iLevel1 = iSavelevel1;
- pData->iLevel2 = iSavelevel2;
- pData->iLevel3 = iSavelevel3;
- pData->pWorkrow = pSaveworkrow;
- pData->pPrevrow = pSaveprevrow;
- pData->pRGBArow = pSaverGBArow;
- pData->bIsRGBA16 = bSaveisRGBA16;
- pData->bIsOpaque = bSaveisOpaque;
- pData->iFilterbpp = iSavefilterbpp;
- pData->iDestl = iSavedestl;
- pData->iDestt = iSavedestt;
- pData->iDestr = iSavedestr;
- pData->iDestb = iSavedestb;
- pData->iSourcel = iSavesourcel;
- pData->iSourcet = iSavesourcet;
- pData->iSourcer = iSavesourcer;
- pData->iSourceb = iSavesourceb;
-
- /* create the animation directives ! */
- pProcess = (mng_processobject)pANG->sHeader.fProcess;
- iRetcode = pProcess (pData, (mng_objectp)pData->pANG);
- if (iRetcode)
- return iRetcode;
-
-#endif /* MNG_SUPPORT_DISPLAY */
-
- MNG_FREE (pData, pBuf, iBufsize); /* always free the temp buffer ! */
- }
-
- *piRawlen = 0;
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-MNG_C_SPECIALFUNC (mng_special_adat)
-{
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-MNG_C_SPECIALFUNC (mng_special_unknown)
-{
- /* critical chunk ? */
- if ((((mng_uint32)pData->iChunkname & 0x20000000) == 0)
-#ifdef MNG_SKIPCHUNK_SAVE
- && (pData->iChunkname != MNG_UINT_SAVE)
-#endif
-#ifdef MNG_SKIPCHUNK_SEEK
- && (pData->iChunkname != MNG_UINT_SEEK)
-#endif
-#ifdef MNG_SKIPCHUNK_DBYK
- && (pData->iChunkname != MNG_UINT_DBYK)
-#endif
-#ifdef MNG_SKIPCHUNK_ORDR
- && (pData->iChunkname != MNG_UINT_ORDR)
-#endif
- )
- MNG_ERROR (pData, MNG_UNKNOWNCRITICAL);
-
- if (pData->fProcessunknown) /* let the app handle it ? */
- {
- mng_bool bOke = pData->fProcessunknown ((mng_handle)pData, pData->iChunkname,
- ((mng_unknown_chunkp)pChunk)->iDatasize,
- ((mng_unknown_chunkp)pChunk)->pData);
- if (!bOke)
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_READ_PROCS || MNG_INCLUDE_WRITE_PROCS */
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
-
-
-
-
diff --git a/src/3rdparty/libmng/libmng_chunk_descr.h b/src/3rdparty/libmng/libmng_chunk_descr.h
deleted file mode 100644
index 3781ab0525..0000000000
--- a/src/3rdparty/libmng/libmng_chunk_descr.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_chunk_descr.h copyright (c) 2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Chunk descriptor functions (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : definition of the chunk- anf field-descriptor routines * */
-/* * * */
-/* * changes : 1.0.9 - 12/06/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKREADER * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_chunk_descr_h_
-#define _libmng_chunk_descr_h_
-
-/* ************************************************************************** */
-
-#ifdef MNG_OPTIMIZE_CHUNKREADER
-#if defined(MNG_INCLUDE_READ_PROCS) || defined(MNG_INCLUDE_WRITE_PROCS)
-
-/* ************************************************************************** */
-
-void mng_get_chunkheader (mng_chunkid iChunkname,
- mng_chunk_headerp pResult);
-
-/* ************************************************************************** */
-
-#define MNG_F_SPECIALFUNC(n) mng_retcode n (mng_datap pData, \
- mng_chunkp pChunk, \
- mng_uint32* piRawlen, \
- mng_uint8p* ppRawdata)
-
-MNG_F_SPECIALFUNC (mng_debunk_plte) ;
-MNG_F_SPECIALFUNC (mng_debunk_trns) ;
-MNG_F_SPECIALFUNC (mng_deflate_itxt) ;
-MNG_F_SPECIALFUNC (mng_splt_entries) ;
-MNG_F_SPECIALFUNC (mng_hist_entries) ;
-
-MNG_F_SPECIALFUNC (mng_debunk_loop) ;
-MNG_F_SPECIALFUNC (mng_debunk_past) ;
-MNG_F_SPECIALFUNC (mng_disc_entries) ;
-MNG_F_SPECIALFUNC (mng_fram_remainder) ;
-MNG_F_SPECIALFUNC (mng_save_entries) ;
-MNG_F_SPECIALFUNC (mng_pplt_entries) ;
-MNG_F_SPECIALFUNC (mng_drop_entries) ;
-MNG_F_SPECIALFUNC (mng_ordr_entries) ;
-MNG_F_SPECIALFUNC (mng_debunk_magn) ;
-MNG_F_SPECIALFUNC (mng_evnt_entries) ;
-MNG_F_SPECIALFUNC (mng_adat_tiles) ;
-
-/* ************************************************************************** */
-
-#define MNG_C_SPECIALFUNC(n) mng_retcode n (mng_datap pData, \
- mng_chunkp pChunk)
-
-MNG_C_SPECIALFUNC (mng_special_ihdr) ;
-MNG_C_SPECIALFUNC (mng_special_plte) ;
-MNG_C_SPECIALFUNC (mng_special_idat) ;
-MNG_C_SPECIALFUNC (mng_special_iend) ;
-MNG_C_SPECIALFUNC (mng_special_trns) ;
-MNG_C_SPECIALFUNC (mng_special_gama) ;
-MNG_C_SPECIALFUNC (mng_special_chrm) ;
-MNG_C_SPECIALFUNC (mng_special_srgb) ;
-MNG_C_SPECIALFUNC (mng_special_iccp) ;
-MNG_C_SPECIALFUNC (mng_special_text) ;
-MNG_C_SPECIALFUNC (mng_special_ztxt) ;
-MNG_C_SPECIALFUNC (mng_special_itxt) ;
-MNG_C_SPECIALFUNC (mng_special_bkgd) ;
-MNG_C_SPECIALFUNC (mng_special_phys) ;
-MNG_C_SPECIALFUNC (mng_special_sbit) ;
-MNG_C_SPECIALFUNC (mng_special_splt) ;
-MNG_C_SPECIALFUNC (mng_special_hist) ;
-MNG_C_SPECIALFUNC (mng_special_time) ;
-
-MNG_C_SPECIALFUNC (mng_special_jhdr) ;
-MNG_C_SPECIALFUNC (mng_special_jdaa) ;
-MNG_C_SPECIALFUNC (mng_special_jdat) ;
-MNG_C_SPECIALFUNC (mng_special_jsep) ;
-
-MNG_C_SPECIALFUNC (mng_special_mhdr) ;
-MNG_C_SPECIALFUNC (mng_special_mend) ;
-MNG_C_SPECIALFUNC (mng_special_loop) ;
-MNG_C_SPECIALFUNC (mng_special_endl) ;
-MNG_C_SPECIALFUNC (mng_special_defi) ;
-MNG_C_SPECIALFUNC (mng_special_basi) ;
-MNG_C_SPECIALFUNC (mng_special_clon) ;
-MNG_C_SPECIALFUNC (mng_special_past) ;
-MNG_C_SPECIALFUNC (mng_special_disc) ;
-MNG_C_SPECIALFUNC (mng_special_back) ;
-MNG_C_SPECIALFUNC (mng_special_fram) ;
-MNG_C_SPECIALFUNC (mng_special_move) ;
-MNG_C_SPECIALFUNC (mng_special_clip) ;
-MNG_C_SPECIALFUNC (mng_special_show) ;
-MNG_C_SPECIALFUNC (mng_special_term) ;
-MNG_C_SPECIALFUNC (mng_special_save) ;
-MNG_C_SPECIALFUNC (mng_special_seek) ;
-MNG_C_SPECIALFUNC (mng_special_expi) ;
-MNG_C_SPECIALFUNC (mng_special_fpri) ;
-MNG_C_SPECIALFUNC (mng_special_need) ;
-MNG_C_SPECIALFUNC (mng_special_phyg) ;
-
-MNG_C_SPECIALFUNC (mng_special_dhdr) ;
-MNG_C_SPECIALFUNC (mng_special_prom) ;
-MNG_C_SPECIALFUNC (mng_special_ipng) ;
-MNG_C_SPECIALFUNC (mng_special_pplt) ;
-MNG_C_SPECIALFUNC (mng_special_ijng) ;
-MNG_C_SPECIALFUNC (mng_special_drop) ;
-MNG_C_SPECIALFUNC (mng_special_dbyk) ;
-MNG_C_SPECIALFUNC (mng_special_ordr) ;
-
-MNG_C_SPECIALFUNC (mng_special_magn) ;
-MNG_C_SPECIALFUNC (mng_special_evnt) ;
-MNG_C_SPECIALFUNC (mng_special_mpng) ;
-MNG_C_SPECIALFUNC (mng_special_ahdr) ;
-MNG_C_SPECIALFUNC (mng_special_adat) ;
-MNG_C_SPECIALFUNC (mng_special_unknown) ;
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_READ_PROCS) || MNG_INCLUDE_WRITE_PROCS */
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
-
-/* ************************************************************************** */
-
-#endif /* _libmng_chunk_descr_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_chunk_io.c b/src/3rdparty/libmng/libmng_chunk_io.c
deleted file mode 100644
index eb18099fd6..0000000000
--- a/src/3rdparty/libmng/libmng_chunk_io.c
+++ /dev/null
@@ -1,10740 +0,0 @@
-/** ************************************************************************* */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_chunk_io.c copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Chunk I/O routines (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of chunk input/output routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/01/2000 - G.Juyn * */
-/* * - cleaned up left-over teststuff in the BACK chunk routine * */
-/* * 0.5.1 - 05/04/2000 - G.Juyn * */
-/* * - changed CRC initialization to use dynamic structure * */
-/* * (wasn't thread-safe the old way !) * */
-/* * 0.5.1 - 05/06/2000 - G.Juyn * */
-/* * - filled in many missing sequence&length checks * */
-/* * - filled in many missing chunk-store snippets * */
-/* * 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - added checks for running animations * */
-/* * - filled some write routines * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/10/2000 - G.Juyn * */
-/* * - filled some more write routines * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - filled remaining write routines * */
-/* * - fixed read_pplt with regard to deltatype * */
-/* * - added callback error-reporting support * */
-/* * - added pre-draft48 support (short MHDR, frame_mode, LOOP) * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * - fixed chunk-storage bit in several routines * */
-/* * 0.5.1 - 05/13/2000 - G.Juyn * */
-/* * - added eMNGma hack (will be removed in 1.0.0 !!!) * */
-/* * - added TERM animation object pointer (easier reference) * */
-/* * - supplemented the SAVE & SEEK display processing * */
-/* * * */
-/* * 0.5.2 - 05/18/2000 - G.Juyn * */
-/* * - B004 - fixed problem with MNG_SUPPORT_WRITE not defined * */
-/* * also for MNG_SUPPORT_WRITE without MNG_INCLUDE_JNG * */
-/* * 0.5.2 - 05/19/2000 - G.Juyn * */
-/* * - cleaned up some code regarding mixed support * */
-/* * 0.5.2 - 05/20/2000 - G.Juyn * */
-/* * - implemented JNG support * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - added support for global color-chunks in animation * */
-/* * - added support for global PLTE,tRNS,bKGD in animation * */
-/* * - added support for SAVE & SEEK in animation * */
-/* * 0.5.2 - 05/29/2000 - G.Juyn * */
-/* * - changed ani_create calls not returning object pointer * */
-/* * - create ani objects always (not just inside TERM/LOOP) * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - added support for delta-image processing * */
-/* * 0.5.2 - 05/31/2000 - G.Juyn * */
-/* * - fixed up punctuation (contributed by Tim Rowley) * */
-/* * 0.5.2 - 06/02/2000 - G.Juyn * */
-/* * - changed SWAP_ENDIAN to BIGENDIAN_SUPPORTED * */
-/* * 0.5.2 - 06/03/2000 - G.Juyn * */
-/* * - fixed makeup for Linux gcc compile * */
-/* * * */
-/* * 0.5.3 - 06/12/2000 - G.Juyn * */
-/* * - added processing of color-info on delta-image * */
-/* * 0.5.3 - 06/13/2000 - G.Juyn * */
-/* * - fixed handling of empty SAVE chunk * */
-/* * 0.5.3 - 06/17/2000 - G.Juyn * */
-/* * - changed to support delta-images * */
-/* * - added extra checks for delta-images * */
-/* * 0.5.3 - 06/20/2000 - G.Juyn * */
-/* * - fixed possible trouble if IEND display-process got * */
-/* * broken up * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - added processing of PLTE & tRNS for delta-images * */
-/* * - added administration of imagelevel parameter * */
-/* * 0.5.3 - 06/22/2000 - G.Juyn * */
-/* * - implemented support for PPLT chunk * */
-/* * 0.5.3 - 06/26/2000 - G.Juyn * */
-/* * - added precaution against faulty iCCP chunks from PS * */
-/* * 0.5.3 - 06/29/2000 - G.Juyn * */
-/* * - fixed some 64-bit warnings * */
-/* * * */
-/* * 0.9.1 - 07/14/2000 - G.Juyn * */
-/* * - changed pre-draft48 frame_mode=3 to frame_mode=1 * */
-/* * 0.9.1 - 07/16/2000 - G.Juyn * */
-/* * - fixed storage of images during mng_read() * */
-/* * - fixed support for mng_display() after mng_read() * */
-/* * 0.9.1 - 07/19/2000 - G.Juyn * */
-/* * - fixed several chunk-writing routines * */
-/* * 0.9.1 - 07/24/2000 - G.Juyn * */
-/* * - fixed reading of still-images * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/07/2000 - G.Juyn * */
-/* * - B111300 - fixup for improved portability * */
-/* * 0.9.3 - 08/08/2000 - G.Juyn * */
-/* * - fixed compiler-warnings from Mozilla * */
-/* * 0.9.3 - 08/09/2000 - G.Juyn * */
-/* * - added check for simplicity-bits in MHDR * */
-/* * 0.9.3 - 08/12/2000 - G.Juyn * */
-/* * - fixed check for simplicity-bits in MHDR (JNG) * */
-/* * 0.9.3 - 08/12/2000 - G.Juyn * */
-/* * - added workaround for faulty PhotoShop iCCP chunk * */
-/* * 0.9.3 - 08/22/2000 - G.Juyn * */
-/* * - fixed write-code for zTXt & iTXt * */
-/* * - fixed read-code for iTXt * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * 0.9.3 - 09/10/2000 - G.Juyn * */
-/* * - fixed DEFI behavior * */
-/* * 0.9.3 - 10/02/2000 - G.Juyn * */
-/* * - fixed simplicity-check in compliance with draft 81/0.98a * */
-/* * 0.9.3 - 10/10/2000 - G.Juyn * */
-/* * - added support for alpha-depth prediction * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - added support for nEED * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added support for JDAA * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - fixed support for MAGN * */
-/* * - implemented nEED "xxxx" (where "xxxx" is a chunkid) * */
-/* * - added callback to process non-critical unknown chunks * */
-/* * - fixed support for bKGD * */
-/* * 0.9.3 - 10/23/2000 - G.Juyn * */
-/* * - fixed bug in empty PLTE handling * */
-/* * * */
-/* * 0.9.4 - 11/20/2000 - G.Juyn * */
-/* * - changed IHDR filter_method check for PNGs * */
-/* * 0.9.4 - 1/18/2001 - G.Juyn * */
-/* * - added errorchecking for MAGN methods * */
-/* * - removed test filter-methods 1 & 65 * */
-/* * * */
-/* * 0.9.5 - 1/25/2001 - G.Juyn * */
-/* * - fixed some small compiler warnings (thanks Nikki) * */
-/* * * */
-/* * 1.0.2 - 05/05/2000 - G.Juyn * */
-/* * - B421427 - writes wrong format in bKGD and tRNS * */
-/* * 1.0.2 - 06/20/2000 - G.Juyn * */
-/* * - B434583 - compiler-warning if MNG_STORE_CHUNKS undefined * */
-/* * * */
-/* * 1.0.5 - 07/08/2002 - G.Juyn * */
-/* * - B578572 - removed eMNGma hack (thanks Dimitri!) * */
-/* * 1.0.5 - 08/07/2002 - G.Juyn * */
-/* * - added test-option for PNG filter method 193 (=no filter) * */
-/* * 1.0.5 - 08/15/2002 - G.Juyn * */
-/* * - completed PROM support * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/07/2002 - G.Juyn * */
-/* * - fixed reading of FRAM with just frame_mode and name * */
-/* * 1.0.5 - 09/13/2002 - G.Juyn * */
-/* * - fixed read/write of MAGN chunk * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 09/15/2002 - G.Juyn * */
-/* * - fixed LOOP iteration=0 special case * */
-/* * 1.0.5 - 09/19/2002 - G.Juyn * */
-/* * - misplaced TERM is now treated as warning * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - added support for PAST * */
-/* * 1.0.5 - 10/03/2002 - G.Juyn * */
-/* * - fixed chunk-storage for evNT chunk * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - fixed DISC support * */
-/* * - added another fix for misplaced TERM chunk * */
-/* * 1.0.5 - 10/17/2002 - G.Juyn * */
-/* * - fixed initializtion of pIds in dISC read routine * */
-/* * 1.0.5 - 11/06/2002 - G.Juyn * */
-/* * - added support for nEED "MNG 1.1" * */
-/* * - added support for nEED "CACHEOFF" * */
-/* * * */
-/* * 1.0.6 - 05/25/2003 - G.R-P * */
-/* * - added MNG_SKIPCHUNK_cHNK footprint optimizations * */
-/* * 1.0.6 - 06/02/2003 - G.R-P * */
-/* * - removed some redundant checks for iRawlen==0 * */
-/* * 1.0.6 - 06/22/2003 - G.R-P * */
-/* * - added MNG_NO_16BIT_SUPPORT, MNG_NO_DELTA_PNG reductions * */
-/* * - optionally use zlib's crc32 function instead of * */
-/* * local mng_update_crc * */
-/* * 1.0.6 - 07/14/2003 - G.R-P * */
-/* * - added MNG_NO_LOOP_SIGNALS_SUPPORTED conditional * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * 1.0.6 - 08/17/2003 - G.R-P * */
-/* * - added conditionals around non-VLC chunk support * */
-/* * * */
-/* * 1.0.7 - 10/29/2003 - G.R-P * */
-/* * - revised JDAA and JDAT readers to avoid compiler bug * */
-/* * 1.0.7 - 01/25/2004 - J.S * */
-/* * - added premultiplied alpha canvas' for RGBA, ARGB, ABGR * */
-/* * 1.0.7 - 01/27/2004 - J.S * */
-/* * - fixed inclusion of IJNG chunk for non-JNG use * */
-/* * 1.0.7 - 02/26/2004 - G.Juyn * */
-/* * - fixed bug in chunk-storage of SHOW chunk (from == to) * */
-/* * * */
-/* * 1.0.8 - 04/02/2004 - G.Juyn * */
-/* * - added CRC existence & checking flags * */
-/* * 1.0.8 - 07/07/2004 - G.R-P * */
-/* * - change worst-case iAlphadepth to 1 for standalone PNGs * */
-/* * * */
-/* * 1.0.9 - 09/28/2004 - G.R-P * */
-/* * - improved handling of cheap transparency when 16-bit * */
-/* * support is disabled * */
-/* * 1.0.9 - 10/04/2004 - G.Juyn * */
-/* * - fixed bug in writing sBIT for indexed color * */
-/* * 1.0.9 - 10/10/2004 - G.R-P. * */
-/* * - added MNG_NO_1_2_4BIT_SUPPORT * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKINITFREE * */
-/* * 1.0.9 - 12/06/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKASSIGN * */
-/* * 1.0.9 - 12/07/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKREADER * */
-/* * 1.0.9 - 12/11/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_DISPLAYCALLS * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * 1.0.9 - 01/17/2005 - G.Juyn * */
-/* * - fixed problem with global PLTE/tRNS * */
-/* * * */
-/* * 1.0.10 - 02/07/2005 - G.Juyn * */
-/* * - fixed display routines called twice for FULL_MNG * */
-/* * support in mozlibmngconf.h * */
-/* * 1.0.10 - 12/04/2005 - G.R-P. * */
-/* * - #ifdef out use of mng_inflate_buffer when it is not * */
-/* * available. * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * 1.0.10 - 05/02/2007 - G.Juyn * */
-/* * - fixed inflate_buffer for extreme compression ratios * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_objects.h"
-#include "libmng_object_prc.h"
-#include "libmng_chunks.h"
-#ifdef MNG_CHECK_BAD_ICCP
-#include "libmng_chunk_prc.h"
-#endif
-#include "libmng_memory.h"
-#include "libmng_display.h"
-#include "libmng_zlib.h"
-#include "libmng_pixels.h"
-#include "libmng_chunk_io.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * CRC - Cyclic Redundancy Check * */
-/* * * */
-/* * The code below is taken directly from the sample provided with the * */
-/* * PNG specification. * */
-/* * (it is only adapted to the library's internal data-definitions) * */
-/* * * */
-/* ************************************************************************** */
-/* Make the table for a fast CRC. */
-#ifndef MNG_USE_ZLIB_CRC
-MNG_LOCAL void make_crc_table (mng_datap pData)
-{
- mng_uint32 iC;
- mng_int32 iN, iK;
-
- for (iN = 0; iN < 256; iN++)
- {
- iC = (mng_uint32) iN;
-
- for (iK = 0; iK < 8; iK++)
- {
- if (iC & 1)
- iC = 0xedb88320U ^ (iC >> 1);
- else
- iC = iC >> 1;
- }
-
- pData->aCRCtable [iN] = iC;
- }
-
- pData->bCRCcomputed = MNG_TRUE;
-}
-#endif
-
-/* Update a running CRC with the bytes buf[0..len-1]--the CRC
- should be initialized to all 1's, and the transmitted value
- is the 1's complement of the final running CRC (see the
- crc() routine below). */
-
-MNG_LOCAL mng_uint32 update_crc (mng_datap pData,
- mng_uint32 iCrc,
- mng_uint8p pBuf,
- mng_int32 iLen)
-{
-#ifdef MNG_USE_ZLIB_CRC
- return crc32 (iCrc, pBuf, iLen);
-#else
- mng_uint32 iC = iCrc;
- mng_int32 iN;
-
- if (!pData->bCRCcomputed)
- make_crc_table (pData);
-
- for (iN = 0; iN < iLen; iN++)
- iC = pData->aCRCtable [(iC ^ pBuf [iN]) & 0xff] ^ (iC >> 8);
-
- return iC;
-#endif
-}
-
-/* Return the CRC of the bytes buf[0..len-1]. */
-mng_uint32 mng_crc (mng_datap pData,
- mng_uint8p pBuf,
- mng_int32 iLen)
-{
-#ifdef MNG_USE_ZLIB_CRC
- return update_crc (pData, 0, pBuf, iLen);
-#else
- return update_crc (pData, 0xffffffffU, pBuf, iLen) ^ 0xffffffffU;
-#endif
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * Routines for swapping byte-order from and to graphic files * */
-/* * (This code is adapted from the libpng package) * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_BIGENDIAN_SUPPORTED
-
-/* ************************************************************************** */
-
-mng_uint32 mng_get_uint32 (mng_uint8p pBuf)
-{
- mng_uint32 i = ((mng_uint32)(*pBuf) << 24) +
- ((mng_uint32)(*(pBuf + 1)) << 16) +
- ((mng_uint32)(*(pBuf + 2)) << 8) +
- (mng_uint32)(*(pBuf + 3));
- return (i);
-}
-
-/* ************************************************************************** */
-
-mng_int32 mng_get_int32 (mng_uint8p pBuf)
-{
- mng_int32 i = ((mng_int32)(*pBuf) << 24) +
- ((mng_int32)(*(pBuf + 1)) << 16) +
- ((mng_int32)(*(pBuf + 2)) << 8) +
- (mng_int32)(*(pBuf + 3));
- return (i);
-}
-
-/* ************************************************************************** */
-
-mng_uint16 mng_get_uint16 (mng_uint8p pBuf)
-{
- mng_uint16 i = (mng_uint16)(((mng_uint16)(*pBuf) << 8) +
- (mng_uint16)(*(pBuf + 1)));
- return (i);
-}
-
-/* ************************************************************************** */
-
-void mng_put_uint32 (mng_uint8p pBuf,
- mng_uint32 i)
-{
- *pBuf = (mng_uint8)((i >> 24) & 0xff);
- *(pBuf+1) = (mng_uint8)((i >> 16) & 0xff);
- *(pBuf+2) = (mng_uint8)((i >> 8) & 0xff);
- *(pBuf+3) = (mng_uint8)(i & 0xff);
-}
-
-/* ************************************************************************** */
-
-void mng_put_int32 (mng_uint8p pBuf,
- mng_int32 i)
-{
- *pBuf = (mng_uint8)((i >> 24) & 0xff);
- *(pBuf+1) = (mng_uint8)((i >> 16) & 0xff);
- *(pBuf+2) = (mng_uint8)((i >> 8) & 0xff);
- *(pBuf+3) = (mng_uint8)(i & 0xff);
-}
-
-/* ************************************************************************** */
-
-void mng_put_uint16 (mng_uint8p pBuf,
- mng_uint16 i)
-{
- *pBuf = (mng_uint8)((i >> 8) & 0xff);
- *(pBuf+1) = (mng_uint8)(i & 0xff);
-}
-
-/* ************************************************************************** */
-
-#endif /* !MNG_BIGENDIAN_SUPPORTED */
-
-/* ************************************************************************** */
-/* * * */
-/* * Helper routines to simplify chunk-data extraction * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_READ_PROCS
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-MNG_LOCAL mng_uint8p find_null (mng_uint8p pIn)
-{
- mng_uint8p pOut = pIn;
- while (*pOut) /* the read_graphic routine has made sure there's */
- pOut++; /* always at least 1 zero-byte in the buffer */
- return pOut;
-}
-#endif
-
-/* ************************************************************************** */
-
-#if !defined(MNG_SKIPCHUNK_iCCP) || !defined(MNG_SKIPCHUNK_zTXt) || \
- !defined(MNG_SKIPCHUNK_iTXt) || defined(MNG_INCLUDE_MPNG_PROPOSAL) || \
- defined(MNG_INCLUDE_ANG_PROPOSAL)
-mng_retcode mng_inflate_buffer (mng_datap pData,
- mng_uint8p pInbuf,
- mng_uint32 iInsize,
- mng_uint8p *pOutbuf,
- mng_uint32 *iOutsize,
- mng_uint32 *iRealsize)
-{
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INFLATE_BUFFER, MNG_LC_START);
-#endif
-
- if (iInsize) /* anything to do ? */
- {
- *iOutsize = iInsize * 3; /* estimate uncompressed size */
- /* and allocate a temporary buffer */
- MNG_ALLOC (pData, *pOutbuf, *iOutsize);
-
- do
- {
- mngzlib_inflateinit (pData); /* initialize zlib */
- /* let zlib know where to store the output */
- pData->sZlib.next_out = *pOutbuf;
- /* "size - 1" so we've got space for the
- zero-termination of a possible string */
- pData->sZlib.avail_out = *iOutsize - 1;
- /* ok; let's inflate... */
- iRetcode = mngzlib_inflatedata (pData, iInsize, pInbuf);
- /* determine actual output size */
- *iRealsize = (mng_uint32)pData->sZlib.total_out;
-
- mngzlib_inflatefree (pData); /* zlib's done */
-
- if (iRetcode == MNG_BUFOVERFLOW) /* not enough space ? */
- { /* then get some more */
- MNG_FREEX (pData, *pOutbuf, *iOutsize);
- *iOutsize = *iOutsize + *iOutsize;
- MNG_ALLOC (pData, *pOutbuf, *iOutsize);
- }
- } /* repeat if we didn't have enough space */
- while ((iRetcode == MNG_BUFOVERFLOW) &&
- (*iOutsize < 200 * iInsize));
-
- if (!iRetcode) /* if oke ? */
- *((*pOutbuf) + *iRealsize) = 0; /* then put terminator zero */
-
- }
- else
- {
- *pOutbuf = 0; /* nothing to do; then there's no output */
- *iOutsize = 0;
- *iRealsize = 0;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INFLATE_BUFFER, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_READ_PROCS */
-
-/* ************************************************************************** */
-/* * * */
-/* * Helper routines to simplify chunk writing * */
-/* * * */
-/* ************************************************************************** */
-#ifdef MNG_INCLUDE_WRITE_PROCS
-/* ************************************************************************** */
-
-#if !defined(MNG_SKIPCHUNK_iCCP) || !defined(MNG_SKIPCHUNK_zTXt) || !defined(MNG_SKIPCHUNK_iTXt)
-MNG_LOCAL mng_retcode deflate_buffer (mng_datap pData,
- mng_uint8p pInbuf,
- mng_uint32 iInsize,
- mng_uint8p *pOutbuf,
- mng_uint32 *iOutsize,
- mng_uint32 *iRealsize)
-{
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DEFLATE_BUFFER, MNG_LC_START);
-#endif
-
- if (iInsize) /* anything to do ? */
- {
- *iOutsize = (iInsize * 5) >> 2; /* estimate compressed size */
- /* and allocate a temporary buffer */
- MNG_ALLOC (pData, *pOutbuf, *iOutsize);
-
- do
- {
- mngzlib_deflateinit (pData); /* initialize zlib */
- /* let zlib know where to store the output */
- pData->sZlib.next_out = *pOutbuf;
- pData->sZlib.avail_out = *iOutsize;
- /* ok; let's deflate... */
- iRetcode = mngzlib_deflatedata (pData, iInsize, pInbuf);
- /* determine actual output size */
- *iRealsize = pData->sZlib.total_out;
-
- mngzlib_deflatefree (pData); /* zlib's done */
-
- if (iRetcode == MNG_BUFOVERFLOW) /* not enough space ? */
- { /* then get some more */
- MNG_FREEX (pData, *pOutbuf, *iOutsize);
- *iOutsize = *iOutsize + (iInsize >> 1);
- MNG_ALLOC (pData, *pOutbuf, *iOutsize);
- }
- } /* repeat if we didn't have enough space */
- while (iRetcode == MNG_BUFOVERFLOW);
- }
- else
- {
- *pOutbuf = 0; /* nothing to do; then there's no output */
- *iOutsize = 0;
- *iRealsize = 0;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DEFLATE_BUFFER, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode write_raw_chunk (mng_datap pData,
- mng_chunkid iChunkname,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata)
-{
- mng_uint32 iCrc;
- mng_uint32 iWritten;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_RAW_CHUNK, MNG_LC_START);
-#endif
- /* temporary buffer ? */
- if ((pRawdata != 0) && (pRawdata != pData->pWritebuf+8))
- { /* store length & chunktype in default buffer */
- mng_put_uint32 (pData->pWritebuf, iRawlen);
- mng_put_uint32 (pData->pWritebuf+4, (mng_uint32)iChunkname);
-
- if (pData->iCrcmode & MNG_CRC_OUTPUT)
- {
- if ((pData->iCrcmode & MNG_CRC_OUTPUT) == MNG_CRC_OUTPUT_GENERATE)
- { /* calculate the crc */
- iCrc = update_crc (pData, 0xffffffffL, pData->pWritebuf+4, 4);
- iCrc = update_crc (pData, iCrc, pRawdata, iRawlen) ^ 0xffffffffL;
- } else {
- iCrc = 0; /* dummy crc */
- } /* store in default buffer */
- mng_put_uint32 (pData->pWritebuf+8, iCrc);
- }
- /* write the length & chunktype */
- if (!pData->fWritedata ((mng_handle)pData, pData->pWritebuf, 8, &iWritten))
- MNG_ERROR (pData, MNG_APPIOERROR);
-
- if (iWritten != 8) /* disk full ? */
- MNG_ERROR (pData, MNG_OUTPUTERROR);
- /* write the temporary buffer */
- if (!pData->fWritedata ((mng_handle)pData, pRawdata, iRawlen, &iWritten))
- MNG_ERROR (pData, MNG_APPIOERROR);
-
- if (iWritten != iRawlen) /* disk full ? */
- MNG_ERROR (pData, MNG_OUTPUTERROR);
-
- if (pData->iCrcmode & MNG_CRC_OUTPUT)
- { /* write the crc */
- if (!pData->fWritedata ((mng_handle)pData, pData->pWritebuf+8, 4, &iWritten))
- MNG_ERROR (pData, MNG_APPIOERROR);
-
- if (iWritten != 4) /* disk full ? */
- MNG_ERROR (pData, MNG_OUTPUTERROR);
- }
- }
- else
- { /* prefix with length & chunktype */
- mng_put_uint32 (pData->pWritebuf, iRawlen);
- mng_put_uint32 (pData->pWritebuf+4, (mng_uint32)iChunkname);
-
- if (pData->iCrcmode & MNG_CRC_OUTPUT)
- {
- if ((pData->iCrcmode & MNG_CRC_OUTPUT) == MNG_CRC_OUTPUT_GENERATE)
- /* calculate the crc */
- iCrc = mng_crc (pData, pData->pWritebuf+4, iRawlen + 4);
- else
- iCrc = 0; /* dummy crc */
- /* add it to the buffer */
- mng_put_uint32 (pData->pWritebuf + iRawlen + 8, iCrc);
- /* write it in a single pass */
- if (!pData->fWritedata ((mng_handle)pData, pData->pWritebuf, iRawlen + 12, &iWritten))
- MNG_ERROR (pData, MNG_APPIOERROR);
-
- if (iWritten != iRawlen + 12) /* disk full ? */
- MNG_ERROR (pData, MNG_OUTPUTERROR);
- } else {
- if (!pData->fWritedata ((mng_handle)pData, pData->pWritebuf, iRawlen + 8, &iWritten))
- MNG_ERROR (pData, MNG_APPIOERROR);
-
- if (iWritten != iRawlen + 8) /* disk full ? */
- MNG_ERROR (pData, MNG_OUTPUTERROR);
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_RAW_CHUNK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* B004 */
-#endif /* MNG_INCLUDE_WRITE_PROCS */
-/* B004 */
-/* ************************************************************************** */
-/* * * */
-/* * chunk read functions * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_READ_PROCS
-
-/* ************************************************************************** */
-
-#ifdef MNG_OPTIMIZE_CHUNKREADER
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode create_chunk_storage (mng_datap pData,
- mng_chunkp pHeader,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata,
- mng_field_descp pField,
- mng_uint16 iFields,
- mng_chunkp* ppChunk,
- mng_bool bWorkcopy)
-{
- mng_field_descp pTempfield = pField;
- mng_uint16 iFieldcount = iFields;
- mng_uint8p pTempdata = pRawdata;
- mng_uint32 iTemplen = iRawlen;
- mng_uint16 iLastgroup = 0;
- mng_uint8p pChunkdata;
- mng_uint32 iDatalen;
- mng_uint8 iColortype;
- mng_bool bProcess;
- /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (((mng_chunk_headerp)(*ppChunk))->iChunkname == MNG_UINT_HUH)
- ((mng_chunk_headerp)(*ppChunk))->iChunkname = pData->iChunkname;
-
- if ((!bWorkcopy) ||
- ((((mng_chunk_headerp)pHeader)->iChunkname != MNG_UINT_IDAT) &&
- (((mng_chunk_headerp)pHeader)->iChunkname != MNG_UINT_JDAT) &&
- (((mng_chunk_headerp)pHeader)->iChunkname != MNG_UINT_JDAA) ))
- {
- pChunkdata = (mng_uint8p)(*ppChunk);
-
-#ifdef MNG_INCLUDE_JNG /* determine current colortype */
- if (pData->bHasJHDR)
- iColortype = (mng_uint8)(pData->iJHDRcolortype - 8);
- else
-#endif /* MNG_INCLUDE_JNG */
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- iColortype = pData->iColortype;
- else
- iColortype = 6;
-
- if (iTemplen) /* not empty ? */
- { /* then go fill the fields */
- while ((iFieldcount) && (iTemplen))
- {
- if (pTempfield->iOffsetchunk)
- {
- if (pTempfield->iFlags & MNG_FIELD_PUTIMGTYPE)
- {
- *(pChunkdata+pTempfield->iOffsetchunk) = iColortype;
- bProcess = MNG_FALSE;
- }
- else
- if (pTempfield->iFlags & MNG_FIELD_IFIMGTYPES)
- bProcess = (mng_bool)(((pTempfield->iFlags & MNG_FIELD_IFIMGTYPE0) && (iColortype == 0)) ||
- ((pTempfield->iFlags & MNG_FIELD_IFIMGTYPE2) && (iColortype == 2)) ||
- ((pTempfield->iFlags & MNG_FIELD_IFIMGTYPE3) && (iColortype == 3)) ||
- ((pTempfield->iFlags & MNG_FIELD_IFIMGTYPE4) && (iColortype == 4)) ||
- ((pTempfield->iFlags & MNG_FIELD_IFIMGTYPE6) && (iColortype == 6)) );
- else
- bProcess = MNG_TRUE;
-
- if (bProcess)
- {
- iLastgroup = (mng_uint16)(pTempfield->iFlags & MNG_FIELD_GROUPMASK);
- /* numeric field ? */
- if (pTempfield->iFlags & MNG_FIELD_INT)
- {
- if (iTemplen < pTempfield->iLengthmax)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- switch (pTempfield->iLengthmax)
- {
- case 1 : { mng_uint8 iNum = *pTempdata;
- if (((mng_uint16)iNum < pTempfield->iMinvalue) ||
- ((mng_uint16)iNum > pTempfield->iMaxvalue) )
- MNG_ERROR (pData, MNG_INVALIDFIELDVAL);
- *(pChunkdata+pTempfield->iOffsetchunk) = iNum;
- break; }
- case 2 : { mng_uint16 iNum = mng_get_uint16 (pTempdata);
- if ((iNum < pTempfield->iMinvalue) || (iNum > pTempfield->iMaxvalue))
- MNG_ERROR (pData, MNG_INVALIDFIELDVAL);
- *((mng_uint16p)(pChunkdata+pTempfield->iOffsetchunk)) = iNum;
- break; }
- case 4 : { mng_uint32 iNum = mng_get_uint32 (pTempdata);
- if ((iNum < pTempfield->iMinvalue) ||
- ((pTempfield->iFlags & MNG_FIELD_NOHIGHBIT) && (iNum & 0x80000000)) )
- MNG_ERROR (pData, MNG_INVALIDFIELDVAL);
- *((mng_uint32p)(pChunkdata+pTempfield->iOffsetchunk)) = iNum;
- break; }
- }
-
- pTempdata += pTempfield->iLengthmax;
- iTemplen -= pTempfield->iLengthmax;
-
- } else { /* not numeric so it's a bunch of bytes */
-
- if (!pTempfield->iOffsetchunklen) /* big fat NONO */
- MNG_ERROR (pData, MNG_INTERNALERROR);
- /* with terminating 0 ? */
- if (pTempfield->iFlags & MNG_FIELD_TERMINATOR)
- {
- mng_uint8p pWork = pTempdata;
- while (*pWork) /* find the zero */
- pWork++;
- iDatalen = (mng_uint32)(pWork - pTempdata);
- } else { /* no terminator, so everything that's left ! */
- iDatalen = iTemplen;
- }
-
- if ((pTempfield->iLengthmax) && (iDatalen > pTempfield->iLengthmax))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-#if !defined(MNG_SKIPCHUNK_iCCP) || !defined(MNG_SKIPCHUNK_zTXt) || \
- !defined(MNG_SKIPCHUNK_iTXt) || defined(MNG_INCLUDE_MPNG_PROPOSAL) || \
- defined(MNG_INCLUDE_ANG_PROPOSAL)
- /* needs decompression ? */
- if (pTempfield->iFlags & MNG_FIELD_DEFLATED)
- {
- mng_uint8p pBuf = 0;
- mng_uint32 iBufsize = 0;
- mng_uint32 iRealsize;
- mng_ptr pWork;
-
- iRetcode = mng_inflate_buffer (pData, pTempdata, iDatalen,
- &pBuf, &iBufsize, &iRealsize);
-
-#ifdef MNG_CHECK_BAD_ICCP /* Check for bad iCCP chunk */
- if ((iRetcode) && (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_iCCP))
- {
- *((mng_ptr *)(pChunkdata+pTempfield->iOffsetchunk)) = MNG_NULL;
- *((mng_uint32p)(pChunkdata+pTempfield->iOffsetchunklen)) = iDatalen;
- }
- else
-#endif
- {
- if (iRetcode)
- return iRetcode;
-
-#if defined(MNG_INCLUDE_MPNG_PROPOSAL) || defined(MNG_INCLUDE_ANG_PROPOSAL)
- if ( (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_mpNG) ||
- (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_adAT) )
- {
- MNG_ALLOC (pData, pWork, iRealsize);
- }
- else
- {
-#endif
- /* don't forget to generate null terminator */
- MNG_ALLOC (pData, pWork, iRealsize+1);
-#if defined(MNG_INCLUDE_MPNG_PROPOSAL) || defined(MNG_INCLUDE_ANG_PROPOSAL)
- }
-#endif
- MNG_COPY (pWork, pBuf, iRealsize);
-
- *((mng_ptr *)(pChunkdata+pTempfield->iOffsetchunk)) = pWork;
- *((mng_uint32p)(pChunkdata+pTempfield->iOffsetchunklen)) = iRealsize;
- }
-
- if (pBuf) /* free the temporary buffer */
- MNG_FREEX (pData, pBuf, iBufsize);
-
- } else
-#endif
- { /* no decompression, so just copy */
-
- mng_ptr pWork;
- /* don't forget to generate null terminator */
- MNG_ALLOC (pData, pWork, iDatalen+1);
- MNG_COPY (pWork, pTempdata, iDatalen);
-
- *((mng_ptr *)(pChunkdata+pTempfield->iOffsetchunk)) = pWork;
- *((mng_uint32p)(pChunkdata+pTempfield->iOffsetchunklen)) = iDatalen;
- }
-
- if (pTempfield->iFlags & MNG_FIELD_TERMINATOR)
- iDatalen++; /* skip the terminating zero as well !!! */
-
- iTemplen -= iDatalen;
- pTempdata += iDatalen;
- }
- /* need to set an indicator ? */
- if (pTempfield->iOffsetchunkind)
- *((mng_uint8p)(pChunkdata+pTempfield->iOffsetchunkind)) = MNG_TRUE;
- }
- }
-
- if (pTempfield->pSpecialfunc) /* special function required ? */
- {
- iRetcode = pTempfield->pSpecialfunc(pData, *ppChunk, &iTemplen, &pTempdata);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
- pTempfield++; /* Neeeeeeexxxtt */
- iFieldcount--;
- }
-
- if (iTemplen) /* extra data ??? */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- while (iFieldcount) /* not enough data ??? */
- {
- if (pTempfield->iFlags & MNG_FIELD_IFIMGTYPES)
- bProcess = (mng_bool)(((pTempfield->iFlags & MNG_FIELD_IFIMGTYPE0) && (iColortype == 0)) ||
- ((pTempfield->iFlags & MNG_FIELD_IFIMGTYPE2) && (iColortype == 2)) ||
- ((pTempfield->iFlags & MNG_FIELD_IFIMGTYPE3) && (iColortype == 3)) ||
- ((pTempfield->iFlags & MNG_FIELD_IFIMGTYPE4) && (iColortype == 4)) ||
- ((pTempfield->iFlags & MNG_FIELD_IFIMGTYPE6) && (iColortype == 6)) );
- else
- bProcess = MNG_TRUE;
-
- if (bProcess)
- {
- if (!(pTempfield->iFlags & MNG_FIELD_OPTIONAL))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- if ((pTempfield->iFlags & MNG_FIELD_GROUPMASK) &&
- ((mng_uint16)(pTempfield->iFlags & MNG_FIELD_GROUPMASK) == iLastgroup))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-
- pTempfield++;
- iFieldcount--;
- }
- }
- }
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-READ_CHUNK (mng_read_general)
-{
- mng_retcode iRetcode = MNG_NOERROR;
- mng_chunk_descp pDescr = ((mng_chunk_headerp)pHeader)->pChunkdescr;
- mng_field_descp pField;
- mng_uint16 iFields;
-
- if (!pDescr) /* this is a bad booboo !!! */
- MNG_ERROR (pData, MNG_INTERNALERROR);
-
- pField = pDescr->pFielddesc;
- iFields = pDescr->iFielddesc;
- /* check chunk against signature */
- if ((pDescr->eImgtype == mng_it_mng) && (pData->eSigtype != mng_it_mng))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
-
- if ((pDescr->eImgtype == mng_it_jng) && (pData->eSigtype == mng_it_png))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
- /* empties allowed ? */
- if ((iRawlen == 0) && (!(pDescr->iAllowed & MNG_DESCR_EMPTY)))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->eImagetype != mng_it_mng) || (!(pDescr->iAllowed & MNG_DESCR_GLOBAL)))
- { /* *a* header required ? */
- if ((pDescr->iMusthaves & MNG_DESCR_GenHDR) &&
-#ifdef MNG_INCLUDE_JNG
- (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pDescr->iMusthaves & MNG_DESCR_JngHDR) &&
- (!pData->bHasDHDR) && (!pData->bHasJHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-#endif
- }
- /* specific chunk pre-requisite ? */
- if (((pDescr->iMusthaves & MNG_DESCR_IHDR) && (!pData->bHasIHDR)) ||
-#ifdef MNG_INCLUDE_JNG
- ((pDescr->iMusthaves & MNG_DESCR_JHDR) && (!pData->bHasJHDR)) ||
-#endif
- ((pDescr->iMusthaves & MNG_DESCR_DHDR) && (!pData->bHasDHDR)) ||
- ((pDescr->iMusthaves & MNG_DESCR_LOOP) && (!pData->bHasLOOP)) ||
- ((pDescr->iMusthaves & MNG_DESCR_PLTE) && (!pData->bHasPLTE)) ||
- ((pDescr->iMusthaves & MNG_DESCR_MHDR) && (!pData->bHasMHDR)) ||
- ((pDescr->iMusthaves & MNG_DESCR_SAVE) && (!pData->bHasSAVE)) )
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* specific chunk undesired ? */
- if (((pDescr->iMustNOThaves & MNG_DESCR_NOIHDR) && (pData->bHasIHDR)) ||
- ((pDescr->iMustNOThaves & MNG_DESCR_NOBASI) && (pData->bHasBASI)) ||
- ((pDescr->iMustNOThaves & MNG_DESCR_NODHDR) && (pData->bHasDHDR)) ||
- ((pDescr->iMustNOThaves & MNG_DESCR_NOIDAT) && (pData->bHasIDAT)) ||
- ((pDescr->iMustNOThaves & MNG_DESCR_NOPLTE) && (pData->bHasPLTE)) ||
-#ifdef MNG_INCLUDE_JNG
- ((pDescr->iMustNOThaves & MNG_DESCR_NOJHDR) && (pData->bHasJHDR)) ||
- ((pDescr->iMustNOThaves & MNG_DESCR_NOJDAT) && (pData->bHasJDAT)) ||
- ((pDescr->iMustNOThaves & MNG_DESCR_NOJDAA) && (pData->bHasJDAA)) ||
- ((pDescr->iMustNOThaves & MNG_DESCR_NOJSEP) && (pData->bHasJSEP)) ||
-#endif
- ((pDescr->iMustNOThaves & MNG_DESCR_NOMHDR) && (pData->bHasMHDR)) ||
- ((pDescr->iMustNOThaves & MNG_DESCR_NOLOOP) && (pData->bHasLOOP)) ||
- ((pDescr->iMustNOThaves & MNG_DESCR_NOTERM) && (pData->bHasTERM)) ||
- ((pDescr->iMustNOThaves & MNG_DESCR_NOSAVE) && (pData->bHasSAVE)) )
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (pData->eSigtype == mng_it_mng) /* check global and embedded empty chunks */
- {
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- {
- if ((iRawlen == 0) && (!(pDescr->iAllowed & MNG_DESCR_EMPTYEMBED)))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- } else {
- if ((iRawlen == 0) && (!(pDescr->iAllowed & MNG_DESCR_EMPTYGLOBAL)))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- }
-
- if (pDescr->pSpecialfunc) /* need special processing ? */
- {
- iRetcode = create_chunk_storage (pData, pHeader, iRawlen, pRawdata,
- pField, iFields, ppChunk, MNG_TRUE);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* empty indicator ? */
- if ((!iRawlen) && (pDescr->iOffsetempty))
- *(((mng_uint8p)*ppChunk)+pDescr->iOffsetempty) = MNG_TRUE;
-
- iRetcode = pDescr->pSpecialfunc(pData, *ppChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if ((((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_IDAT) ||
- (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_JDAT) ||
- (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_JDAA) )
- {
- iRetcode = ((mng_chunk_headerp)*ppChunk)->fCleanup (pData, *ppChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- *ppChunk = MNG_NULL;
- } else {
-#ifdef MNG_STORE_CHUNKS
- if (!pData->bStorechunks)
-#endif
- {
- iRetcode = ((mng_chunk_headerp)*ppChunk)->fCleanup (pData, *ppChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- *ppChunk = MNG_NULL;
- }
- }
- }
-
-#ifdef MNG_SUPPORT_DISPLAY
- if (iRawlen)
- {
-#ifdef MNG_OPTIMIZE_DISPLAYCALLS
- pData->iRawlen = iRawlen;
- pData->pRawdata = pRawdata;
-#endif
-
- /* display processing */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_IDAT)
- iRetcode = mng_process_display_idat (pData, iRawlen, pRawdata);
-#ifdef MNG_INCLUDE_JNG
- else
- if (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_JDAT)
- iRetcode = mng_process_display_jdat (pData, iRawlen, pRawdata);
- else
- if (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_JDAA)
- iRetcode = mng_process_display_jdaa (pData, iRawlen, pRawdata);
-#endif
-#else
- if (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_IDAT)
- iRetcode = mng_process_display_idat (pData);
-#ifdef MNG_INCLUDE_JNG
- else
- if (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_JDAT)
- iRetcode = mng_process_display_jdat (pData);
- else
- if (((mng_chunk_headerp)pHeader)->iChunkname == MNG_UINT_JDAA)
- iRetcode = mng_process_display_jdaa (pData);
-#endif
-#endif
-
- if (iRetcode)
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if ((pData->bStorechunks) && (!(*ppChunk)))
- {
- iRetcode = create_chunk_storage (pData, pHeader, iRawlen, pRawdata,
- pField, iFields, ppChunk, MNG_FALSE);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* empty indicator ? */
- if ((!iRawlen) && (pDescr->iOffsetempty))
- *(((mng_uint8p)*ppChunk)+pDescr->iOffsetempty) = MNG_TRUE;
- }
-#endif /* MNG_STORE_CHUNKS */
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_ihdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_IHDR, MNG_LC_START);
-#endif
-
- if (iRawlen != 13) /* length oke ? */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- /* only allowed inside PNG or MNG */
- if ((pData->eSigtype != mng_it_png) && (pData->eSigtype != mng_it_mng))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
- /* sequence checks */
- if ((pData->eSigtype == mng_it_png) && (pData->iChunkseq > 1))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasIDAT) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasIDAT))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- pData->bHasIHDR = MNG_TRUE; /* indicate IHDR is present */
- /* and store interesting fields */
- if ((!pData->bHasDHDR) || (pData->iDeltatype == MNG_DELTATYPE_NOCHANGE))
- {
- pData->iDatawidth = mng_get_uint32 (pRawdata);
- pData->iDataheight = mng_get_uint32 (pRawdata+4);
- }
-
- pData->iBitdepth = *(pRawdata+8);
- pData->iColortype = *(pRawdata+9);
- pData->iCompression = *(pRawdata+10);
- pData->iFilter = *(pRawdata+11);
- pData->iInterlace = *(pRawdata+12);
-
-#if defined(MNG_NO_1_2_4BIT_SUPPORT) || defined(MNG_NO_16BIT_SUPPORT)
- pData->iPNGmult = 1;
- pData->iPNGdepth = pData->iBitdepth;
-#endif
-
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iBitdepth < 8)
- pData->iBitdepth = 8;
-#endif
-
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth > 8)
- {
- pData->iBitdepth = 8;
- pData->iPNGmult = 2;
- }
-#endif
-
- if ((pData->iBitdepth != 8) /* parameter validity checks */
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- && (pData->iBitdepth != 1) &&
- (pData->iBitdepth != 2) &&
- (pData->iBitdepth != 4)
-#endif
-#ifndef MNG_NO_16BIT_SUPPORT
- && (pData->iBitdepth != 16)
-#endif
- )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if ((pData->iColortype != MNG_COLORTYPE_GRAY ) &&
- (pData->iColortype != MNG_COLORTYPE_RGB ) &&
- (pData->iColortype != MNG_COLORTYPE_INDEXED) &&
- (pData->iColortype != MNG_COLORTYPE_GRAYA ) &&
- (pData->iColortype != MNG_COLORTYPE_RGBA ) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
- if ((pData->iColortype == MNG_COLORTYPE_INDEXED) && (pData->iBitdepth > 8))
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if (((pData->iColortype == MNG_COLORTYPE_RGB ) ||
- (pData->iColortype == MNG_COLORTYPE_GRAYA ) ||
- (pData->iColortype == MNG_COLORTYPE_RGBA ) ) &&
- (pData->iBitdepth < 8 ) )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if (pData->iCompression != MNG_COMPRESSION_DEFLATE)
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
-#if defined(FILTER192) || defined(FILTER193)
- if ((pData->iFilter != MNG_FILTER_ADAPTIVE ) &&
-#if defined(FILTER192) && defined(FILTER193)
- (pData->iFilter != MNG_FILTER_DIFFERING) &&
- (pData->iFilter != MNG_FILTER_NOFILTER ) )
-#else
-#ifdef FILTER192
- (pData->iFilter != MNG_FILTER_DIFFERING) )
-#else
- (pData->iFilter != MNG_FILTER_NOFILTER ) )
-#endif
-#endif
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#else
- if (pData->iFilter)
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#endif
-
- if ((pData->iInterlace != MNG_INTERLACE_NONE ) &&
- (pData->iInterlace != MNG_INTERLACE_ADAM7) )
- MNG_ERROR (pData, MNG_INVALIDINTERLACE);
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* check the colortype for delta-images ! */
- {
- mng_imagedatap pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
-
- if (pData->iColortype != pBuf->iColortype)
- {
- if ( ( (pData->iColortype != MNG_COLORTYPE_INDEXED) ||
- (pBuf->iColortype == MNG_COLORTYPE_GRAY ) ) &&
- ( (pData->iColortype != MNG_COLORTYPE_GRAY ) ||
- (pBuf->iColortype == MNG_COLORTYPE_INDEXED) ) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
- }
- }
-#endif
-#endif
-
- if (!pData->bHasheader) /* first chunk ? */
- {
- pData->bHasheader = MNG_TRUE; /* we've got a header */
- pData->eImagetype = mng_it_png; /* then this must be a PNG */
- pData->iWidth = pData->iDatawidth;
- pData->iHeight = pData->iDataheight;
- /* predict alpha-depth ! */
- if ((pData->iColortype == MNG_COLORTYPE_GRAYA ) ||
- (pData->iColortype == MNG_COLORTYPE_RGBA ) )
- pData->iAlphadepth = pData->iBitdepth;
- else
- if (pData->iColortype == MNG_COLORTYPE_INDEXED)
- pData->iAlphadepth = 8; /* worst case scenario */
- else
- pData->iAlphadepth = 1; /* Possible tRNS cheap binary transparency */
- /* fits on maximum canvas ? */
- if ((pData->iWidth > pData->iMaxwidth) || (pData->iHeight > pData->iMaxheight))
- MNG_WARNING (pData, MNG_IMAGETOOLARGE);
-
-#if !defined(MNG_INCLUDE_MPNG_PROPOSAL) || !defined(MNG_SUPPORT_DISPLAY)
- if (pData->fProcessheader) /* inform the app ? */
- if (!pData->fProcessheader (((mng_handle)pData), pData->iWidth, pData->iHeight))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-#endif
- }
-
- if (!pData->bHasDHDR)
- pData->iImagelevel++; /* one level deeper */
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode = mng_process_display_ihdr (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the fields */
- ((mng_ihdrp)*ppChunk)->iWidth = mng_get_uint32 (pRawdata);
- ((mng_ihdrp)*ppChunk)->iHeight = mng_get_uint32 (pRawdata+4);
- ((mng_ihdrp)*ppChunk)->iBitdepth = pData->iBitdepth;
- ((mng_ihdrp)*ppChunk)->iColortype = pData->iColortype;
- ((mng_ihdrp)*ppChunk)->iCompression = pData->iCompression;
- ((mng_ihdrp)*ppChunk)->iFilter = pData->iFilter;
- ((mng_ihdrp)*ppChunk)->iInterlace = pData->iInterlace;
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_IHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_plte)
-{
-#if defined(MNG_SUPPORT_DISPLAY) || defined(MNG_STORE_CHUNKS)
- mng_uint32 iX;
- mng_uint8p pRawdata2;
-#endif
-#ifdef MNG_SUPPORT_DISPLAY
- mng_uint32 iRawlen2;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PLTE, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIDAT) || (pData->bHasJHDR))
-#else
- if (pData->bHasIDAT)
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* multiple PLTE only inside BASI */
- if ((pData->bHasPLTE) && (!pData->bHasBASI))
- MNG_ERROR (pData, MNG_MULTIPLEERROR);
- /* length must be multiple of 3 */
- if (((iRawlen % 3) != 0) || (iRawlen > 768))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- { /* only allowed for indexed-color or
- rgb(a)-color! */
- if ((pData->iColortype != 2) && (pData->iColortype != 3) && (pData->iColortype != 6))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
- /* empty only allowed if global present */
- if ((iRawlen == 0) && (!pData->bHasglobalPLTE))
- MNG_ERROR (pData, MNG_CANNOTBEEMPTY);
- }
- else
- {
- if (iRawlen == 0) /* cannot be empty as global! */
- MNG_ERROR (pData, MNG_CANNOTBEEMPTY);
- }
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- pData->bHasPLTE = MNG_TRUE; /* got it! */
- else
- pData->bHasglobalPLTE = MNG_TRUE;
-
- pData->iPLTEcount = iRawlen / 3;
-
-#ifdef MNG_SUPPORT_DISPLAY
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- {
- mng_imagep pImage;
- mng_imagedatap pBuf;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* processing delta-image ? */
- { /* store in object 0 !!! */
- pImage = (mng_imagep)pData->pObjzero;
- pBuf = pImage->pImgbuf;
- pBuf->bHasPLTE = MNG_TRUE; /* it's definitely got a PLTE now */
- pBuf->iPLTEcount = iRawlen / 3; /* this is the exact length */
- pRawdata2 = pRawdata; /* copy the entries */
-
- for (iX = 0; iX < iRawlen / 3; iX++)
- {
- pBuf->aPLTEentries[iX].iRed = *pRawdata2;
- pBuf->aPLTEentries[iX].iGreen = *(pRawdata2+1);
- pBuf->aPLTEentries[iX].iBlue = *(pRawdata2+2);
-
- pRawdata2 += 3;
- }
- }
- else
-#endif
- { /* get the current object */
- pImage = (mng_imagep)pData->pCurrentobj;
-
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
-
- pBuf = pImage->pImgbuf; /* address the object buffer */
- pBuf->bHasPLTE = MNG_TRUE; /* and tell it it's got a PLTE now */
-
- if (!iRawlen) /* if empty, inherit from global */
- {
- pBuf->iPLTEcount = pData->iGlobalPLTEcount;
- MNG_COPY (pBuf->aPLTEentries, pData->aGlobalPLTEentries,
- sizeof (pBuf->aPLTEentries));
-
- if (pData->bHasglobalTRNS) /* also copy global tRNS ? */
- { /* indicate tRNS available */
- pBuf->bHasTRNS = MNG_TRUE;
-
- iRawlen2 = pData->iGlobalTRNSrawlen;
- pRawdata2 = (mng_uint8p)(pData->aGlobalTRNSrawdata);
- /* global length oke ? */
- if ((iRawlen2 == 0) || (iRawlen2 > pBuf->iPLTEcount))
- MNG_ERROR (pData, MNG_GLOBALLENGTHERR);
- /* copy it */
- pBuf->iTRNScount = iRawlen2;
- MNG_COPY (pBuf->aTRNSentries, pRawdata2, iRawlen2);
- }
- }
- else
- { /* store fields for future reference */
- pBuf->iPLTEcount = iRawlen / 3;
- pRawdata2 = pRawdata;
-
- for (iX = 0; iX < pBuf->iPLTEcount; iX++)
- {
- pBuf->aPLTEentries[iX].iRed = *pRawdata2;
- pBuf->aPLTEentries[iX].iGreen = *(pRawdata2+1);
- pBuf->aPLTEentries[iX].iBlue = *(pRawdata2+2);
-
- pRawdata2 += 3;
- }
- }
- }
- }
- else /* store as global */
- {
- pData->iGlobalPLTEcount = iRawlen / 3;
- pRawdata2 = pRawdata;
-
- for (iX = 0; iX < pData->iGlobalPLTEcount; iX++)
- {
- pData->aGlobalPLTEentries[iX].iRed = *pRawdata2;
- pData->aGlobalPLTEentries[iX].iGreen = *(pRawdata2+1);
- pData->aGlobalPLTEentries[iX].iBlue = *(pRawdata2+2);
-
- pRawdata2 += 3;
- }
-
- { /* create an animation object */
- mng_retcode iRetcode = mng_create_ani_plte (pData, pData->iGlobalPLTEcount,
- pData->aGlobalPLTEentries);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_pltep)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
- ((mng_pltep)*ppChunk)->iEntrycount = iRawlen / 3;
- pRawdata2 = pRawdata;
-
- for (iX = 0; iX < ((mng_pltep)*ppChunk)->iEntrycount; iX++)
- {
- ((mng_pltep)*ppChunk)->aEntries[iX].iRed = *pRawdata2;
- ((mng_pltep)*ppChunk)->aEntries[iX].iGreen = *(pRawdata2+1);
- ((mng_pltep)*ppChunk)->aEntries[iX].iBlue = *(pRawdata2+2);
-
- pRawdata2 += 3;
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PLTE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_idat)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_IDAT, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_JNG /* sequence checks */
- if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasJHDR) &&
- (pData->iJHDRalphacompression != MNG_COMPRESSION_DEFLATE))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (pData->bHasJSEP)
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-#endif
- /* not allowed for deltatype NO_CHANGE */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && ((pData->iDeltatype == MNG_DELTATYPE_NOCHANGE)))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
-#endif
- /* can only be empty in BASI-block! */
- if ((iRawlen == 0) && (!pData->bHasBASI))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- /* indexed-color requires PLTE */
- if ((pData->bHasIHDR) && (pData->iColortype == 3) && (!pData->bHasPLTE))
- MNG_ERROR (pData, MNG_PLTEMISSING);
-
- pData->bHasIDAT = MNG_TRUE; /* got some IDAT now, don't we */
-
-#ifdef MNG_SUPPORT_DISPLAY
- if (iRawlen)
- { /* display processing */
- mng_retcode iRetcode = mng_process_display_idat (pData, iRawlen, pRawdata);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_idatp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
- ((mng_idatp)*ppChunk)->iDatasize = iRawlen;
-
- if (iRawlen != 0) /* is there any data ? */
- {
- MNG_ALLOC (pData, ((mng_idatp)*ppChunk)->pData, iRawlen);
- MNG_COPY (((mng_idatp)*ppChunk)->pData, pRawdata, iRawlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_IDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_iend)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_IEND, MNG_LC_START);
-#endif
-
- if (iRawlen > 0) /* must not contain data! */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_INCLUDE_JNG /* sequence checks */
- if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* IHDR-block requires IDAT */
- if ((pData->bHasIHDR) && (!pData->bHasIDAT))
- MNG_ERROR (pData, MNG_IDATMISSING);
-
- pData->iImagelevel--; /* one level up */
-
-#ifdef MNG_SUPPORT_DISPLAY
- { /* create an animation object */
- mng_retcode iRetcode = mng_create_ani_image (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* display processing */
- iRetcode = mng_process_display_iend (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_SUPPORT_DISPLAY
- if (!pData->bTimerset) /* reset only if not broken !!! */
- {
-#endif
- /* IEND signals the end for most ... */
- pData->bHasIHDR = MNG_FALSE;
- pData->bHasBASI = MNG_FALSE;
- pData->bHasDHDR = MNG_FALSE;
-#ifdef MNG_INCLUDE_JNG
- pData->bHasJHDR = MNG_FALSE;
- pData->bHasJSEP = MNG_FALSE;
- pData->bHasJDAA = MNG_FALSE;
- pData->bHasJDAT = MNG_FALSE;
-#endif
- pData->bHasPLTE = MNG_FALSE;
- pData->bHasTRNS = MNG_FALSE;
- pData->bHasGAMA = MNG_FALSE;
- pData->bHasCHRM = MNG_FALSE;
- pData->bHasSRGB = MNG_FALSE;
- pData->bHasICCP = MNG_FALSE;
- pData->bHasBKGD = MNG_FALSE;
- pData->bHasIDAT = MNG_FALSE;
-#ifdef MNG_SUPPORT_DISPLAY
- }
-#endif
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_IEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_trns)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_TRNS, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIDAT) || (pData->bHasJHDR))
-#else
- if (pData->bHasIDAT)
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* multiple tRNS only inside BASI */
- if ((pData->bHasTRNS) && (!pData->bHasBASI))
- MNG_ERROR (pData, MNG_MULTIPLEERROR);
-
- if (iRawlen > 256) /* it just can't be bigger than that! */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- { /* not allowed with full alpha-channel */
- if ((pData->iColortype == 4) || (pData->iColortype == 6))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
-
- if (iRawlen != 0) /* filled ? */
- { /* length checks */
- if ((pData->iColortype == 0) && (iRawlen != 2))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->iColortype == 2) && (iRawlen != 6))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- if (pData->iColortype == 3)
- {
- mng_imagep pImage = (mng_imagep)pData->pCurrentobj;
- mng_imagedatap pBuf;
-
- if (!pImage) /* no object then check obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
-
- pBuf = pImage->pImgbuf; /* address object buffer */
-
- if (iRawlen > pBuf->iPLTEcount)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-#endif
- }
- else /* if empty there must be global stuff! */
- {
- if (!pData->bHasglobalTRNS)
- MNG_ERROR (pData, MNG_CANNOTBEEMPTY);
- }
- }
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- pData->bHasTRNS = MNG_TRUE; /* indicate tRNS available */
- else
- pData->bHasglobalTRNS = MNG_TRUE;
-
-#ifdef MNG_SUPPORT_DISPLAY
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- {
- mng_imagep pImage;
- mng_imagedatap pBuf;
- mng_uint8p pRawdata2;
- mng_uint32 iRawlen2;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* processing delta-image ? */
- { /* store in object 0 !!! */
- pImage = (mng_imagep)pData->pObjzero;
- pBuf = pImage->pImgbuf; /* address object buffer */
-
- switch (pData->iColortype) /* store fields for future reference */
- {
- case 0: { /* gray */
-#if defined(MNG_NO_1_2_4BIT_SUPPORT)
- mng_uint8 multiplier[]={0,255,85,0,17,0,0,0,1,
- 0,0,0,0,0,0,0,1};
-#endif
- pBuf->iTRNSgray = mng_get_uint16 (pRawdata);
- pBuf->iTRNSred = 0;
- pBuf->iTRNSgreen = 0;
- pBuf->iTRNSblue = 0;
- pBuf->iTRNScount = 0;
-#if defined(MNG_NO_1_2_4BIT_SUPPORT)
- pBuf->iTRNSgray *= multiplier[pData->iPNGdepth];
-#endif
-#if defined(MNG_NO_16BIT_SUPPORT)
- if (pData->iPNGmult == 2)
- pBuf->iTRNSgray >>= 8;
-#endif
- break;
- }
- case 2: { /* rgb */
- pBuf->iTRNSgray = 0;
- pBuf->iTRNSred = mng_get_uint16 (pRawdata);
- pBuf->iTRNSgreen = mng_get_uint16 (pRawdata+2);
- pBuf->iTRNSblue = mng_get_uint16 (pRawdata+4);
- pBuf->iTRNScount = 0;
-#if defined(MNG_NO_16BIT_SUPPORT)
- if (pData->iPNGmult == 2)
- {
- pBuf->iTRNSred >>= 8;
- pBuf->iTRNSgreen >>= 8;
- pBuf->iTRNSblue >>= 8;
- }
-#endif
- break;
- }
- case 3: { /* indexed */
- pBuf->iTRNSgray = 0;
- pBuf->iTRNSred = 0;
- pBuf->iTRNSgreen = 0;
- pBuf->iTRNSblue = 0;
- pBuf->iTRNScount = iRawlen;
- MNG_COPY (pBuf->aTRNSentries, pRawdata, iRawlen);
- break;
- }
- }
-
- pBuf->bHasTRNS = MNG_TRUE; /* tell it it's got a tRNS now */
- }
- else
-#endif
- { /* address current object */
- pImage = (mng_imagep)pData->pCurrentobj;
-
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
-
- pBuf = pImage->pImgbuf; /* address object buffer */
- pBuf->bHasTRNS = MNG_TRUE; /* and tell it it's got a tRNS now */
-
- if (iRawlen == 0) /* if empty, inherit from global */
- {
- iRawlen2 = pData->iGlobalTRNSrawlen;
- pRawdata2 = (mng_ptr)(pData->aGlobalTRNSrawdata);
- /* global length oke ? */
- if ((pData->iColortype == 0) && (iRawlen2 != 2))
- MNG_ERROR (pData, MNG_GLOBALLENGTHERR);
-
- if ((pData->iColortype == 2) && (iRawlen2 != 6))
- MNG_ERROR (pData, MNG_GLOBALLENGTHERR);
-
- if ((pData->iColortype == 3) && ((iRawlen2 == 0) || (iRawlen2 > pBuf->iPLTEcount)))
- MNG_ERROR (pData, MNG_GLOBALLENGTHERR);
- }
- else
- {
- iRawlen2 = iRawlen;
- pRawdata2 = pRawdata;
- }
-
- switch (pData->iColortype) /* store fields for future reference */
- {
- case 0: { /* gray */
- pBuf->iTRNSgray = mng_get_uint16 (pRawdata2);
- pBuf->iTRNSred = 0;
- pBuf->iTRNSgreen = 0;
- pBuf->iTRNSblue = 0;
- pBuf->iTRNScount = 0;
-#if defined(MNG_NO_16BIT_SUPPORT)
- if (pData->iPNGmult == 2)
- pBuf->iTRNSgray >>= 8;
-#endif
- break;
- }
- case 2: { /* rgb */
- pBuf->iTRNSgray = 0;
- pBuf->iTRNSred = mng_get_uint16 (pRawdata2);
- pBuf->iTRNSgreen = mng_get_uint16 (pRawdata2+2);
- pBuf->iTRNSblue = mng_get_uint16 (pRawdata2+4);
- pBuf->iTRNScount = 0;
-#if defined(MNG_NO_16BIT_SUPPORT)
- if (pData->iPNGmult == 2)
- {
- pBuf->iTRNSred >>= 8;
- pBuf->iTRNSgreen >>= 8;
- pBuf->iTRNSblue >>= 8;
- }
-#endif
- break;
- }
- case 3: { /* indexed */
- pBuf->iTRNSgray = 0;
- pBuf->iTRNSred = 0;
- pBuf->iTRNSgreen = 0;
- pBuf->iTRNSblue = 0;
- pBuf->iTRNScount = iRawlen2;
- MNG_COPY (pBuf->aTRNSentries, pRawdata2, iRawlen2);
- break;
- }
- }
- }
- }
- else /* store as global */
- {
- pData->iGlobalTRNSrawlen = iRawlen;
- MNG_COPY (pData->aGlobalTRNSrawdata, pRawdata, iRawlen);
-
- { /* create an animation object */
- mng_retcode iRetcode = mng_create_ani_trns (pData, pData->iGlobalTRNSrawlen,
- pData->aGlobalTRNSrawdata);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- { /* not global! */
- ((mng_trnsp)*ppChunk)->bGlobal = MNG_FALSE;
- ((mng_trnsp)*ppChunk)->iType = pData->iColortype;
-
- if (iRawlen == 0) /* if empty, indicate so */
- ((mng_trnsp)*ppChunk)->bEmpty = MNG_TRUE;
- else
- {
- ((mng_trnsp)*ppChunk)->bEmpty = MNG_FALSE;
-
- switch (pData->iColortype) /* store fields */
- {
- case 0: { /* gray */
- ((mng_trnsp)*ppChunk)->iGray = mng_get_uint16 (pRawdata);
- break;
- }
- case 2: { /* rgb */
- ((mng_trnsp)*ppChunk)->iRed = mng_get_uint16 (pRawdata);
- ((mng_trnsp)*ppChunk)->iGreen = mng_get_uint16 (pRawdata+2);
- ((mng_trnsp)*ppChunk)->iBlue = mng_get_uint16 (pRawdata+4);
- break;
- }
- case 3: { /* indexed */
- ((mng_trnsp)*ppChunk)->iCount = iRawlen;
- MNG_COPY (((mng_trnsp)*ppChunk)->aEntries, pRawdata, iRawlen);
- break;
- }
- }
- }
- }
- else /* it's global! */
- {
- ((mng_trnsp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
- ((mng_trnsp)*ppChunk)->bGlobal = MNG_TRUE;
- ((mng_trnsp)*ppChunk)->iType = 0;
- ((mng_trnsp)*ppChunk)->iRawlen = iRawlen;
-
- MNG_COPY (((mng_trnsp)*ppChunk)->aRawdata, pRawdata, iRawlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_TRNS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_gama)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_GAMA, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA))
-#else
- if ((pData->bHasIDAT) || (pData->bHasPLTE))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- { /* length must be exactly 4 */
- if (iRawlen != 4)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- else
- { /* length must be empty or exactly 4 */
- if ((iRawlen != 0) && (iRawlen != 4))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- pData->bHasGAMA = MNG_TRUE; /* indicate we've got it */
- else
- pData->bHasglobalGAMA = (mng_bool)(iRawlen != 0);
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- {
- mng_imagep pImage;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* update delta image ? */
- { /* store in object 0 ! */
- pImage = (mng_imagep)pData->pObjzero;
- /* store for color-processing routines */
- pImage->pImgbuf->iGamma = mng_get_uint32 (pRawdata);
- pImage->pImgbuf->bHasGAMA = MNG_TRUE;
- }
- else
-#endif
- {
- pImage = (mng_imagep)pData->pCurrentobj;
-
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
- /* store for color-processing routines */
- pImage->pImgbuf->iGamma = mng_get_uint32 (pRawdata);
- pImage->pImgbuf->bHasGAMA = MNG_TRUE;
- }
- }
- else
- { /* store as global */
- if (iRawlen != 0)
- pData->iGlobalGamma = mng_get_uint32 (pRawdata);
-
- { /* create an animation object */
- mng_retcode iRetcode = mng_create_ani_gama (pData, (mng_bool)(iRawlen == 0),
- pData->iGlobalGamma);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_gamap)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen)
- ((mng_gamap)*ppChunk)->iGamma = mng_get_uint32 (pRawdata);
-
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_GAMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_cHRM
-READ_CHUNK (mng_read_chrm)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_CHRM, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA))
-#else
- if ((pData->bHasIDAT) || (pData->bHasPLTE))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- { /* length must be exactly 32 */
- if (iRawlen != 32)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- else
- { /* length must be empty or exactly 32 */
- if ((iRawlen != 0) && (iRawlen != 32))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- pData->bHasCHRM = MNG_TRUE; /* indicate we've got it */
- else
- pData->bHasglobalCHRM = (mng_bool)(iRawlen != 0);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_uint32 iWhitepointx, iWhitepointy;
- mng_uint32 iPrimaryredx, iPrimaryredy;
- mng_uint32 iPrimarygreenx, iPrimarygreeny;
- mng_uint32 iPrimarybluex, iPrimarybluey;
-
- iWhitepointx = mng_get_uint32 (pRawdata);
- iWhitepointy = mng_get_uint32 (pRawdata+4);
- iPrimaryredx = mng_get_uint32 (pRawdata+8);
- iPrimaryredy = mng_get_uint32 (pRawdata+12);
- iPrimarygreenx = mng_get_uint32 (pRawdata+16);
- iPrimarygreeny = mng_get_uint32 (pRawdata+20);
- iPrimarybluex = mng_get_uint32 (pRawdata+24);
- iPrimarybluey = mng_get_uint32 (pRawdata+28);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- {
- mng_imagep pImage;
- mng_imagedatap pBuf;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* update delta image ? */
- { /* store it in object 0 ! */
- pImage = (mng_imagep)pData->pObjzero;
-
- pBuf = pImage->pImgbuf; /* address object buffer */
- pBuf->bHasCHRM = MNG_TRUE; /* and tell it it's got a CHRM now */
- /* store for color-processing routines */
- pBuf->iWhitepointx = iWhitepointx;
- pBuf->iWhitepointy = iWhitepointy;
- pBuf->iPrimaryredx = iPrimaryredx;
- pBuf->iPrimaryredy = iPrimaryredy;
- pBuf->iPrimarygreenx = iPrimarygreenx;
- pBuf->iPrimarygreeny = iPrimarygreeny;
- pBuf->iPrimarybluex = iPrimarybluex;
- pBuf->iPrimarybluey = iPrimarybluey;
- }
- else
-#endif
- {
- pImage = (mng_imagep)pData->pCurrentobj;
-
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
-
- pBuf = pImage->pImgbuf; /* address object buffer */
- pBuf->bHasCHRM = MNG_TRUE; /* and tell it it's got a CHRM now */
- /* store for color-processing routines */
- pBuf->iWhitepointx = iWhitepointx;
- pBuf->iWhitepointy = iWhitepointy;
- pBuf->iPrimaryredx = iPrimaryredx;
- pBuf->iPrimaryredy = iPrimaryredy;
- pBuf->iPrimarygreenx = iPrimarygreenx;
- pBuf->iPrimarygreeny = iPrimarygreeny;
- pBuf->iPrimarybluex = iPrimarybluex;
- pBuf->iPrimarybluey = iPrimarybluey;
- }
- }
- else
- { /* store as global */
- if (iRawlen != 0)
- {
- pData->iGlobalWhitepointx = iWhitepointx;
- pData->iGlobalWhitepointy = iWhitepointy;
- pData->iGlobalPrimaryredx = iPrimaryredx;
- pData->iGlobalPrimaryredy = iPrimaryredy;
- pData->iGlobalPrimarygreenx = iPrimarygreenx;
- pData->iGlobalPrimarygreeny = iPrimarygreeny;
- pData->iGlobalPrimarybluex = iPrimarybluex;
- pData->iGlobalPrimarybluey = iPrimarybluey;
- }
-
- { /* create an animation object */
- mng_retcode iRetcode = mng_create_ani_chrm (pData, (mng_bool)(iRawlen == 0),
- iWhitepointx, iWhitepointy,
- iPrimaryredx, iPrimaryredy,
- iPrimarygreenx, iPrimarygreeny,
- iPrimarybluex, iPrimarybluey);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_chrmp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen)
- {
- ((mng_chrmp)*ppChunk)->iWhitepointx = mng_get_uint32 (pRawdata);
- ((mng_chrmp)*ppChunk)->iWhitepointy = mng_get_uint32 (pRawdata+4);
- ((mng_chrmp)*ppChunk)->iRedx = mng_get_uint32 (pRawdata+8);
- ((mng_chrmp)*ppChunk)->iRedy = mng_get_uint32 (pRawdata+12);
- ((mng_chrmp)*ppChunk)->iGreenx = mng_get_uint32 (pRawdata+16);
- ((mng_chrmp)*ppChunk)->iGreeny = mng_get_uint32 (pRawdata+20);
- ((mng_chrmp)*ppChunk)->iBluex = mng_get_uint32 (pRawdata+24);
- ((mng_chrmp)*ppChunk)->iBluey = mng_get_uint32 (pRawdata+28);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_CHRM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_srgb)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SRGB, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA))
-#else
- if ((pData->bHasIDAT) || (pData->bHasPLTE))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- { /* length must be exactly 1 */
- if (iRawlen != 1)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- else
- { /* length must be empty or exactly 1 */
- if ((iRawlen != 0) && (iRawlen != 1))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- pData->bHasSRGB = MNG_TRUE; /* indicate we've got it */
- else
- pData->bHasglobalSRGB = (mng_bool)(iRawlen != 0);
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- {
- mng_imagep pImage;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* update delta image ? */
- { /* store in object 0 ! */
- pImage = (mng_imagep)pData->pObjzero;
- /* store for color-processing routines */
- pImage->pImgbuf->iRenderingintent = *pRawdata;
- pImage->pImgbuf->bHasSRGB = MNG_TRUE;
- }
- else
-#endif
- {
- pImage = (mng_imagep)pData->pCurrentobj;
-
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
- /* store for color-processing routines */
- pImage->pImgbuf->iRenderingintent = *pRawdata;
- pImage->pImgbuf->bHasSRGB = MNG_TRUE;
- }
- }
- else
- { /* store as global */
- if (iRawlen != 0)
- pData->iGlobalRendintent = *pRawdata;
-
- { /* create an animation object */
- mng_retcode iRetcode = mng_create_ani_srgb (pData, (mng_bool)(iRawlen == 0),
- pData->iGlobalRendintent);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_srgbp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen)
- ((mng_srgbp)*ppChunk)->iRenderingintent = *pRawdata;
-
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_iCCP
-READ_CHUNK (mng_read_iccp)
-{
- mng_retcode iRetcode;
- mng_uint8p pTemp;
- mng_uint32 iCompressedsize;
- mng_uint32 iProfilesize;
- mng_uint32 iBufsize = 0;
- mng_uint8p pBuf = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_ICCP, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA))
-#else
- if ((pData->bHasIDAT) || (pData->bHasPLTE))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- { /* length must be at least 2 */
- if (iRawlen < 2)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- else
- { /* length must be empty or at least 2 */
- if ((iRawlen != 0) && (iRawlen < 2))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-
- pTemp = find_null (pRawdata); /* find null-separator */
- /* not found inside input-data ? */
- if ((pTemp - pRawdata) > (mng_int32)iRawlen)
- MNG_ERROR (pData, MNG_NULLNOTFOUND);
- /* determine size of compressed profile */
- iCompressedsize = (mng_uint32)(iRawlen - (pTemp - pRawdata) - 2);
- /* decompress the profile */
- iRetcode = mng_inflate_buffer (pData, pTemp+2, iCompressedsize,
- &pBuf, &iBufsize, &iProfilesize);
-
-#ifdef MNG_CHECK_BAD_ICCP /* Check for bad iCCP chunk */
- if ((iRetcode) && (!strncmp ((char *)pRawdata, "Photoshop ICC profile", 21)))
- {
- if (iRawlen == 2615) /* is it the sRGB profile ? */
- {
- mng_chunk_header chunk_srgb =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_sRGB, mng_init_general, mng_free_general, mng_read_srgb, mng_write_srgb, mng_assign_general, 0, 0, sizeof(mng_srgb)};
-#else
- {MNG_UINT_sRGB, mng_init_srgb, mng_free_srgb, mng_read_srgb, mng_write_srgb, mng_assign_srgb, 0, 0};
-#endif
- /* pretend it's an sRGB chunk then ! */
- iRetcode = mng_read_srgb (pData, &chunk_srgb, 1, (mng_ptr)"0", ppChunk);
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffer */
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
- }
- }
- else
- {
-#endif /* MNG_CHECK_BAD_ICCP */
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffer */
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- pData->bHasICCP = MNG_TRUE; /* indicate we've got it */
- else
- pData->bHasglobalICCP = (mng_bool)(iRawlen != 0);
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- {
- mng_imagep pImage;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* update delta image ? */
- { /* store in object 0 ! */
- pImage = (mng_imagep)pData->pObjzero;
-
- if (pImage->pImgbuf->pProfile) /* profile existed ? */
- MNG_FREEX (pData, pImage->pImgbuf->pProfile, pImage->pImgbuf->iProfilesize);
- /* allocate a buffer & copy it */
- MNG_ALLOC (pData, pImage->pImgbuf->pProfile, iProfilesize);
- MNG_COPY (pImage->pImgbuf->pProfile, pBuf, iProfilesize);
- /* store its length as well */
- pImage->pImgbuf->iProfilesize = iProfilesize;
- pImage->pImgbuf->bHasICCP = MNG_TRUE;
- }
- else
-#endif
- {
- pImage = (mng_imagep)pData->pCurrentobj;
-
- if (!pImage) /* no object then dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
-
- if (pImage->pImgbuf->pProfile) /* profile existed ? */
- MNG_FREEX (pData, pImage->pImgbuf->pProfile, pImage->pImgbuf->iProfilesize);
- /* allocate a buffer & copy it */
- MNG_ALLOC (pData, pImage->pImgbuf->pProfile, iProfilesize);
- MNG_COPY (pImage->pImgbuf->pProfile, pBuf, iProfilesize);
- /* store its length as well */
- pImage->pImgbuf->iProfilesize = iProfilesize;
- pImage->pImgbuf->bHasICCP = MNG_TRUE;
- }
- }
- else
- { /* store as global */
- if (iRawlen == 0) /* empty chunk ? */
- {
- if (pData->pGlobalProfile) /* did we have a global profile ? */
- MNG_FREEX (pData, pData->pGlobalProfile, pData->iGlobalProfilesize);
-
- pData->iGlobalProfilesize = 0; /* reset to null */
- pData->pGlobalProfile = MNG_NULL;
- }
- else
- { /* allocate a global buffer & copy it */
- MNG_ALLOC (pData, pData->pGlobalProfile, iProfilesize);
- MNG_COPY (pData->pGlobalProfile, pBuf, iProfilesize);
- /* store its length as well */
- pData->iGlobalProfilesize = iProfilesize;
- }
-
- /* create an animation object */
- iRetcode = mng_create_ani_iccp (pData, (mng_bool)(iRawlen == 0),
- pData->iGlobalProfilesize,
- pData->pGlobalProfile);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffer */
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
- /* store the fields */
- ((mng_iccpp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen) /* not empty ? */
- {
- if (!pBuf) /* hasn't been unpuzzled it yet ? */
- { /* find null-separator */
- pTemp = find_null (pRawdata);
- /* not found inside input-data ? */
- if ((pTemp - pRawdata) > (mng_int32)iRawlen)
- MNG_ERROR (pData, MNG_NULLNOTFOUND);
- /* determine size of compressed profile */
- iCompressedsize = iRawlen - (pTemp - pRawdata) - 2;
- /* decompress the profile */
- iRetcode = mng_inflate_buffer (pData, pTemp+2, iCompressedsize,
- &pBuf, &iBufsize, &iProfilesize);
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffer */
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
- }
-
- ((mng_iccpp)*ppChunk)->iNamesize = (mng_uint32)(pTemp - pRawdata);
-
- if (((mng_iccpp)*ppChunk)->iNamesize)
- {
- MNG_ALLOC (pData, ((mng_iccpp)*ppChunk)->zName,
- ((mng_iccpp)*ppChunk)->iNamesize + 1);
- MNG_COPY (((mng_iccpp)*ppChunk)->zName, pRawdata,
- ((mng_iccpp)*ppChunk)->iNamesize);
- }
-
- ((mng_iccpp)*ppChunk)->iCompression = *(pTemp+1);
- ((mng_iccpp)*ppChunk)->iProfilesize = iProfilesize;
-
- MNG_ALLOC (pData, ((mng_iccpp)*ppChunk)->pProfile, iProfilesize);
- MNG_COPY (((mng_iccpp)*ppChunk)->pProfile, pBuf, iProfilesize);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
- if (pBuf) /* free the temporary buffer */
- MNG_FREEX (pData, pBuf, iBufsize);
-
-#ifdef MNG_CHECK_BAD_ICCP
- }
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_ICCP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_tEXt
-READ_CHUNK (mng_read_text)
-{
- mng_uint32 iKeywordlen, iTextlen;
- mng_pchar zKeyword, zText;
- mng_uint8p pTemp;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_TEXT, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen < 2) /* length must be at least 2 */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pTemp = find_null (pRawdata); /* find the null separator */
- /* not found inside input-data ? */
- if ((pTemp - pRawdata) > (mng_int32)iRawlen)
- MNG_ERROR (pData, MNG_NULLNOTFOUND);
-
- if (pTemp == pRawdata) /* there must be at least 1 char for keyword */
- MNG_ERROR (pData, MNG_KEYWORDNULL);
-
- iKeywordlen = (mng_uint32)(pTemp - pRawdata);
- iTextlen = iRawlen - iKeywordlen - 1;
-
- if (pData->fProcesstext) /* inform the application ? */
- {
- mng_bool bOke;
-
- MNG_ALLOC (pData, zKeyword, iKeywordlen + 1);
- MNG_COPY (zKeyword, pRawdata, iKeywordlen);
-
- MNG_ALLOCX (pData, zText, iTextlen + 1);
-
- if (!zText) /* on error bail out */
- {
- MNG_FREEX (pData, zKeyword, iKeywordlen + 1);
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
-
- if (iTextlen)
- MNG_COPY (zText, pTemp+1, iTextlen);
-
- bOke = pData->fProcesstext ((mng_handle)pData, MNG_TYPE_TEXT, zKeyword, zText, 0, 0);
-
- MNG_FREEX (pData, zText, iTextlen + 1);
- MNG_FREEX (pData, zKeyword, iKeywordlen + 1);
-
- if (!bOke)
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- }
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_textp)*ppChunk)->iKeywordsize = iKeywordlen;
- ((mng_textp)*ppChunk)->iTextsize = iTextlen;
-
- if (iKeywordlen)
- {
- MNG_ALLOC (pData, ((mng_textp)*ppChunk)->zKeyword, iKeywordlen+1);
- MNG_COPY (((mng_textp)*ppChunk)->zKeyword, pRawdata, iKeywordlen);
- }
-
- if (iTextlen)
- {
- MNG_ALLOC (pData, ((mng_textp)*ppChunk)->zText, iTextlen+1);
- MNG_COPY (((mng_textp)*ppChunk)->zText, pTemp+1, iTextlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_TEXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_zTXt
-READ_CHUNK (mng_read_ztxt)
-{
- mng_retcode iRetcode;
- mng_uint32 iKeywordlen, iTextlen;
- mng_pchar zKeyword;
- mng_uint8p pTemp;
- mng_uint32 iCompressedsize;
- mng_uint32 iBufsize;
- mng_uint8p pBuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_ZTXT, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen < 3) /* length must be at least 3 */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pTemp = find_null (pRawdata); /* find the null separator */
- /* not found inside input-data ? */
- if ((pTemp - pRawdata) > (mng_int32)iRawlen)
- MNG_ERROR (pData, MNG_NULLNOTFOUND);
-
- if (pTemp == pRawdata) /* there must be at least 1 char for keyword */
- MNG_ERROR (pData, MNG_KEYWORDNULL);
-
- if (*(pTemp+1) != 0) /* only deflate compression-method allowed */
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
- iKeywordlen = (mng_uint32)(pTemp - pRawdata);
- iCompressedsize = (mng_uint32)(iRawlen - iKeywordlen - 2);
-
- zKeyword = 0; /* there's no keyword buffer yet */
- pBuf = 0; /* or a temporary buffer ! */
-
- if (pData->fProcesstext) /* inform the application ? */
- { /* decompress the text */
- iRetcode = mng_inflate_buffer (pData, pTemp+2, iCompressedsize,
- &pBuf, &iBufsize, &iTextlen);
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
-
- MNG_ALLOCX (pData, zKeyword, iKeywordlen+1);
-
- if (!zKeyword) /* on error bail out */
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
-
- MNG_COPY (zKeyword, pRawdata, iKeywordlen);
-
- if (!pData->fProcesstext ((mng_handle)pData, MNG_TYPE_ZTXT, zKeyword, (mng_pchar)pBuf, 0, 0))
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_FREEX (pData, zKeyword, iKeywordlen+1);
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
- }
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_FREEX (pData, zKeyword, iKeywordlen+1);
- return iRetcode;
- }
- /* store the fields */
- ((mng_ztxtp)*ppChunk)->iKeywordsize = iKeywordlen;
- ((mng_ztxtp)*ppChunk)->iCompression = *(pTemp+1);
-
- if ((!pBuf) && (iCompressedsize)) /* did we not get a text-buffer yet ? */
- { /* decompress the text */
- iRetcode = mng_inflate_buffer (pData, pTemp+2, iCompressedsize,
- &pBuf, &iBufsize, &iTextlen);
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_FREEX (pData, zKeyword, iKeywordlen+1);
- return iRetcode;
- }
- }
-
- MNG_ALLOCX (pData, ((mng_ztxtp)*ppChunk)->zKeyword, iKeywordlen + 1);
- /* on error bail out */
- if (!((mng_ztxtp)*ppChunk)->zKeyword)
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_FREEX (pData, zKeyword, iKeywordlen+1);
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
-
- MNG_COPY (((mng_ztxtp)*ppChunk)->zKeyword, pRawdata, iKeywordlen);
-
- ((mng_ztxtp)*ppChunk)->iTextsize = iTextlen;
-
- if (iCompressedsize)
- {
- MNG_ALLOCX (pData, ((mng_ztxtp)*ppChunk)->zText, iTextlen + 1);
- /* on error bail out */
- if (!((mng_ztxtp)*ppChunk)->zText)
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_FREEX (pData, zKeyword, iKeywordlen+1);
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
-
- MNG_COPY (((mng_ztxtp)*ppChunk)->zText, pBuf, iTextlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
- MNG_FREEX (pData, pBuf, iBufsize); /* free the temporary buffers */
- MNG_FREEX (pData, zKeyword, iKeywordlen+1);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_ZTXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_iTXt
-READ_CHUNK (mng_read_itxt)
-{
- mng_retcode iRetcode;
- mng_uint32 iKeywordlen, iTextlen, iLanguagelen, iTranslationlen;
- mng_pchar zKeyword, zLanguage, zTranslation;
- mng_uint8p pNull1, pNull2, pNull3;
- mng_uint32 iCompressedsize;
- mng_uint8 iCompressionflag;
- mng_uint32 iBufsize;
- mng_uint8p pBuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_ITXT, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen < 6) /* length must be at least 6 */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pNull1 = find_null (pRawdata); /* find the null separators */
- pNull2 = find_null (pNull1+3);
- pNull3 = find_null (pNull2+1);
- /* not found inside input-data ? */
- if (((pNull1 - pRawdata) > (mng_int32)iRawlen) ||
- ((pNull2 - pRawdata) > (mng_int32)iRawlen) ||
- ((pNull3 - pRawdata) > (mng_int32)iRawlen) )
- MNG_ERROR (pData, MNG_NULLNOTFOUND);
-
- if (pNull1 == pRawdata) /* there must be at least 1 char for keyword */
- MNG_ERROR (pData, MNG_KEYWORDNULL);
- /* compression or not ? */
- if ((*(pNull1+1) != 0) && (*(pNull1+1) != 1))
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
- if (*(pNull1+2) != 0) /* only deflate compression-method allowed */
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
- iKeywordlen = (mng_uint32)(pNull1 - pRawdata);
- iLanguagelen = (mng_uint32)(pNull2 - pNull1 - 3);
- iTranslationlen = (mng_uint32)(pNull3 - pNull2 - 1);
- iCompressedsize = (mng_uint32)(iRawlen - iKeywordlen - iLanguagelen - iTranslationlen - 5);
- iCompressionflag = *(pNull1+1);
-
- zKeyword = 0; /* no buffers acquired yet */
- zLanguage = 0;
- zTranslation = 0;
- pBuf = 0;
- iTextlen = 0;
-
- if (pData->fProcesstext) /* inform the application ? */
- {
- if (iCompressionflag) /* decompress the text ? */
- {
- iRetcode = mng_inflate_buffer (pData, pNull3+1, iCompressedsize,
- &pBuf, &iBufsize, &iTextlen);
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffer */
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
- }
- else
- {
- iTextlen = iCompressedsize;
- iBufsize = iTextlen+1; /* plus 1 for terminator byte!!! */
-
- MNG_ALLOC (pData, pBuf, iBufsize);
- MNG_COPY (pBuf, pNull3+1, iTextlen);
- }
-
- MNG_ALLOCX (pData, zKeyword, iKeywordlen + 1);
- MNG_ALLOCX (pData, zLanguage, iLanguagelen + 1);
- MNG_ALLOCX (pData, zTranslation, iTranslationlen + 1);
- /* on error bail out */
- if ((!zKeyword) || (!zLanguage) || (!zTranslation))
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, zTranslation, iTranslationlen + 1);
- MNG_FREEX (pData, zLanguage, iLanguagelen + 1);
- MNG_FREEX (pData, zKeyword, iKeywordlen + 1);
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
-
- MNG_COPY (zKeyword, pRawdata, iKeywordlen);
- MNG_COPY (zLanguage, pNull1+3, iLanguagelen);
- MNG_COPY (zTranslation, pNull2+1, iTranslationlen);
-
- if (!pData->fProcesstext ((mng_handle)pData, MNG_TYPE_ITXT, zKeyword, (mng_pchar)pBuf,
- zLanguage, zTranslation))
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, zTranslation, iTranslationlen + 1);
- MNG_FREEX (pData, zLanguage, iLanguagelen + 1);
- MNG_FREEX (pData, zKeyword, iKeywordlen + 1);
- MNG_FREEX (pData, pBuf, iBufsize);
-
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
- }
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, zTranslation, iTranslationlen + 1);
- MNG_FREEX (pData, zLanguage, iLanguagelen + 1);
- MNG_FREEX (pData, zKeyword, iKeywordlen + 1);
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
- /* store the fields */
- ((mng_itxtp)*ppChunk)->iKeywordsize = iKeywordlen;
- ((mng_itxtp)*ppChunk)->iLanguagesize = iLanguagelen;
- ((mng_itxtp)*ppChunk)->iTranslationsize = iTranslationlen;
- ((mng_itxtp)*ppChunk)->iCompressionflag = *(pNull1+1);
- ((mng_itxtp)*ppChunk)->iCompressionmethod = *(pNull1+2);
-
- if ((!pBuf) && (iCompressedsize)) /* did we not get a text-buffer yet ? */
- {
- if (iCompressionflag) /* decompress the text ? */
- {
- iRetcode = mng_inflate_buffer (pData, pNull3+1, iCompressedsize,
- &pBuf, &iBufsize, &iTextlen);
-
- if (iRetcode) /* on error bail out */
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, zTranslation, iTranslationlen + 1);
- MNG_FREEX (pData, zLanguage, iLanguagelen + 1);
- MNG_FREEX (pData, zKeyword, iKeywordlen + 1);
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
- }
- else
- {
- iTextlen = iCompressedsize;
- iBufsize = iTextlen+1; /* plus 1 for terminator byte!!! */
-
- MNG_ALLOC (pData, pBuf, iBufsize);
- MNG_COPY (pBuf, pNull3+1, iTextlen);
- }
- }
-
- MNG_ALLOCX (pData, ((mng_itxtp)*ppChunk)->zKeyword, iKeywordlen + 1);
- MNG_ALLOCX (pData, ((mng_itxtp)*ppChunk)->zLanguage, iLanguagelen + 1);
- MNG_ALLOCX (pData, ((mng_itxtp)*ppChunk)->zTranslation, iTranslationlen + 1);
- /* on error bail out */
- if ((!((mng_itxtp)*ppChunk)->zKeyword ) ||
- (!((mng_itxtp)*ppChunk)->zLanguage ) ||
- (!((mng_itxtp)*ppChunk)->zTranslation) )
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, zTranslation, iTranslationlen + 1);
- MNG_FREEX (pData, zLanguage, iLanguagelen + 1);
- MNG_FREEX (pData, zKeyword, iKeywordlen + 1);
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
-
- MNG_COPY (((mng_itxtp)*ppChunk)->zKeyword, pRawdata, iKeywordlen);
- MNG_COPY (((mng_itxtp)*ppChunk)->zLanguage, pNull1+3, iLanguagelen);
- MNG_COPY (((mng_itxtp)*ppChunk)->zTranslation, pNull2+1, iTranslationlen);
-
- ((mng_itxtp)*ppChunk)->iTextsize = iTextlen;
-
- if (iTextlen)
- {
- MNG_ALLOCX (pData, ((mng_itxtp)*ppChunk)->zText, iTextlen + 1);
-
- if (!((mng_itxtp)*ppChunk)->zText)
- { /* don't forget to drop the temp buffers */
- MNG_FREEX (pData, zTranslation, iTranslationlen + 1);
- MNG_FREEX (pData, zLanguage, iLanguagelen + 1);
- MNG_FREEX (pData, zKeyword, iKeywordlen + 1);
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
-
- MNG_COPY (((mng_itxtp)*ppChunk)->zText, pBuf, iTextlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
- /* free the temporary buffers */
- MNG_FREEX (pData, zTranslation, iTranslationlen + 1);
- MNG_FREEX (pData, zLanguage, iLanguagelen + 1);
- MNG_FREEX (pData, zKeyword, iKeywordlen + 1);
- MNG_FREEX (pData, pBuf, iBufsize);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_ITXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_bKGD
-READ_CHUNK (mng_read_bkgd)
-{
-#ifdef MNG_SUPPORT_DISPLAY
- mng_imagep pImage = (mng_imagep)pData->pCurrentobj;
- mng_imagedatap pBuf;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_BKGD, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA))
-#else
- if (pData->bHasIDAT)
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen > 6) /* it just can't be bigger than that! */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_INCLUDE_JNG /* length checks */
- if (pData->bHasJHDR)
- {
- if (((pData->iJHDRcolortype == 8) || (pData->iJHDRcolortype == 12)) && (iRawlen != 2))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if (((pData->iJHDRcolortype == 10) || (pData->iJHDRcolortype == 14)) && (iRawlen != 6))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- else
-#endif /* MNG_INCLUDE_JNG */
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- {
- if (((pData->iColortype == 0) || (pData->iColortype == 4)) && (iRawlen != 2))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if (((pData->iColortype == 2) || (pData->iColortype == 6)) && (iRawlen != 6))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->iColortype == 3) && (iRawlen != 1))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- else
- {
- if (iRawlen != 6) /* global is always 16-bit RGB ! */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- pData->bHasBKGD = MNG_TRUE; /* indicate bKGD available */
- else
- pData->bHasglobalBKGD = (mng_bool)(iRawlen != 0);
-
-#ifdef MNG_SUPPORT_DISPLAY
- if (!pImage) /* if no object dump it in obj 0 */
- pImage = (mng_imagep)pData->pObjzero;
-
- pBuf = pImage->pImgbuf; /* address object buffer */
-
-#ifdef MNG_INCLUDE_JNG
- if (pData->bHasJHDR)
- {
- pBuf->bHasBKGD = MNG_TRUE; /* tell the object it's got bKGD now */
-
- switch (pData->iJHDRcolortype) /* store fields for future reference */
- {
- case 8 : ; /* gray */
- case 12 : { /* graya */
- pBuf->iBKGDgray = mng_get_uint16 (pRawdata);
- break;
- }
- case 10 : ; /* rgb */
- case 14 : { /* rgba */
- pBuf->iBKGDred = mng_get_uint16 (pRawdata);
- pBuf->iBKGDgreen = mng_get_uint16 (pRawdata+2);
- pBuf->iBKGDblue = mng_get_uint16 (pRawdata+4);
- break;
- }
- }
- }
- else
-#endif /* MNG_INCLUDE_JNG */
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- {
- pBuf->bHasBKGD = MNG_TRUE; /* tell the object it's got bKGD now */
-
- switch (pData->iColortype) /* store fields for future reference */
- {
- case 0 : ; /* gray */
- case 4 : { /* graya */
- pBuf->iBKGDgray = mng_get_uint16 (pRawdata);
- break;
- }
- case 2 : ; /* rgb */
- case 6 : { /* rgba */
- pBuf->iBKGDred = mng_get_uint16 (pRawdata);
- pBuf->iBKGDgreen = mng_get_uint16 (pRawdata+2);
- pBuf->iBKGDblue = mng_get_uint16 (pRawdata+4);
- break;
- }
- case 3 : { /* indexed */
- pBuf->iBKGDindex = *pRawdata;
- break;
- }
- }
- }
- else /* store as global */
- {
- if (iRawlen)
- {
- pData->iGlobalBKGDred = mng_get_uint16 (pRawdata);
- pData->iGlobalBKGDgreen = mng_get_uint16 (pRawdata+2);
- pData->iGlobalBKGDblue = mng_get_uint16 (pRawdata+4);
- }
-
- { /* create an animation object */
- mng_retcode iRetcode = mng_create_ani_bkgd (pData, pData->iGlobalBKGDred,
- pData->iGlobalBKGDgreen,
- pData->iGlobalBKGDblue);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_bkgdp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
- ((mng_bkgdp)*ppChunk)->iType = pData->iColortype;
-
- if (iRawlen)
- {
- switch (iRawlen) /* guess from length */
- {
- case 1 : { /* indexed */
- ((mng_bkgdp)*ppChunk)->iType = 3;
- ((mng_bkgdp)*ppChunk)->iIndex = *pRawdata;
- break;
- }
- case 2 : { /* gray */
- ((mng_bkgdp)*ppChunk)->iType = 0;
- ((mng_bkgdp)*ppChunk)->iGray = mng_get_uint16 (pRawdata);
- break;
- }
- case 6 : { /* rgb */
- ((mng_bkgdp)*ppChunk)->iType = 2;
- ((mng_bkgdp)*ppChunk)->iRed = mng_get_uint16 (pRawdata);
- ((mng_bkgdp)*ppChunk)->iGreen = mng_get_uint16 (pRawdata+2);
- ((mng_bkgdp)*ppChunk)->iBlue = mng_get_uint16 (pRawdata+4);
- break;
- }
- }
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_BKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_pHYs
-READ_CHUNK (mng_read_phys)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PHYS, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA))
-#else
- if (pData->bHasIDAT)
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* it's 9 bytes or empty; no more, no less! */
- if ((iRawlen != 9) && (iRawlen != 0))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_physp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen)
- {
- ((mng_physp)*ppChunk)->iSizex = mng_get_uint32 (pRawdata);
- ((mng_physp)*ppChunk)->iSizey = mng_get_uint32 (pRawdata+4);
- ((mng_physp)*ppChunk)->iUnit = *(pRawdata+8);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PHYS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_sBIT
-READ_CHUNK (mng_read_sbit)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SBIT, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasPLTE) || (pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA))
-#else
- if ((pData->bHasPLTE) || (pData->bHasIDAT))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen > 4) /* it just can't be bigger than that! */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_INCLUDE_JNG /* length checks */
- if (pData->bHasJHDR)
- {
- if ((pData->iJHDRcolortype == 8) && (iRawlen != 1))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->iJHDRcolortype == 10) && (iRawlen != 3))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->iJHDRcolortype == 12) && (iRawlen != 2))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->iJHDRcolortype == 14) && (iRawlen != 4))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- else
-#endif /* MNG_INCLUDE_JNG */
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
- {
- if ((pData->iColortype == 0) && (iRawlen != 1))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->iColortype == 2) && (iRawlen != 3))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->iColortype == 3) && (iRawlen != 3))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->iColortype == 4) && (iRawlen != 2))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((pData->iColortype == 6) && (iRawlen != 4))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- else
- { /* global = empty or RGBA */
- if ((iRawlen != 0) && (iRawlen != 4))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_sbitp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen)
- {
-#ifdef MNG_INCLUDE_JNG
- if (pData->bHasJHDR)
- ((mng_sbitp)*ppChunk)->iType = pData->iJHDRcolortype;
- else
-#endif
- if (pData->bHasIHDR)
- ((mng_sbitp)*ppChunk)->iType = pData->iColortype;
- else /* global ! */
- ((mng_sbitp)*ppChunk)->iType = 6;
-
- if (iRawlen > 0)
- ((mng_sbitp)*ppChunk)->aBits [0] = *pRawdata;
- if (iRawlen > 1)
- ((mng_sbitp)*ppChunk)->aBits [1] = *(pRawdata+1);
- if (iRawlen > 2)
- ((mng_sbitp)*ppChunk)->aBits [2] = *(pRawdata+2);
- if (iRawlen > 3)
- ((mng_sbitp)*ppChunk)->aBits [3] = *(pRawdata+3);
-
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SBIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_sPLT
-READ_CHUNK (mng_read_splt)
-{
- mng_uint8p pTemp;
- mng_uint32 iNamelen;
- mng_uint8 iSampledepth;
- mng_uint32 iRemain;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SPLT, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (pData->bHasIDAT)
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen)
- {
- pTemp = find_null (pRawdata); /* find null-separator */
- /* not found inside input-data ? */
- if ((pTemp - pRawdata) > (mng_int32)iRawlen)
- MNG_ERROR (pData, MNG_NULLNOTFOUND);
-
- iNamelen = (mng_uint32)(pTemp - pRawdata);
- iSampledepth = *(pTemp+1);
- iRemain = (iRawlen - 2 - iNamelen);
-
- if ((iSampledepth != 1) && (iSampledepth != 2))
- MNG_ERROR (pData, MNG_INVSAMPLEDEPTH);
- /* check remaining length */
- if ( ((iSampledepth == 1) && (iRemain % 6 != 0)) ||
- ((iSampledepth == 2) && (iRemain % 10 != 0)) )
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- }
- else
- {
- pTemp = MNG_NULL;
- iNamelen = 0;
- iSampledepth = 0;
- iRemain = 0;
- }
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_spltp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen)
- {
- ((mng_spltp)*ppChunk)->iNamesize = iNamelen;
- ((mng_spltp)*ppChunk)->iSampledepth = iSampledepth;
-
- if (iSampledepth == 1)
- ((mng_spltp)*ppChunk)->iEntrycount = iRemain / 6;
- else
- ((mng_spltp)*ppChunk)->iEntrycount = iRemain / 10;
-
- if (iNamelen)
- {
- MNG_ALLOC (pData, ((mng_spltp)*ppChunk)->zName, iNamelen+1);
- MNG_COPY (((mng_spltp)*ppChunk)->zName, pRawdata, iNamelen);
- }
-
- if (iRemain)
- {
- MNG_ALLOC (pData, ((mng_spltp)*ppChunk)->pEntries, iRemain);
- MNG_COPY (((mng_spltp)*ppChunk)->pEntries, pTemp+2, iRemain);
- }
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_hIST
-READ_CHUNK (mng_read_hist)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_HIST, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) )
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if ((!pData->bHasPLTE) || (pData->bHasIDAT))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* length oke ? */
- if ( ((iRawlen & 0x01) != 0) || ((iRawlen >> 1) != pData->iPLTEcount) )
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- {
- mng_uint32 iX;
- /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_histp)*ppChunk)->iEntrycount = iRawlen >> 1;
-
- for (iX = 0; iX < (iRawlen >> 1); iX++)
- {
- ((mng_histp)*ppChunk)->aEntries [iX] = mng_get_uint16 (pRawdata);
- pRawdata += 2;
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_HIST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_tIME
-READ_CHUNK (mng_read_time)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_TIME, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen != 7) /* length must be exactly 7 */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-/* if (pData->fProcesstime) */ /* inform the application ? */
-/* {
-
- pData->fProcesstime ((mng_handle)pData, );
- } */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_timep)*ppChunk)->iYear = mng_get_uint16 (pRawdata);
- ((mng_timep)*ppChunk)->iMonth = *(pRawdata+2);
- ((mng_timep)*ppChunk)->iDay = *(pRawdata+3);
- ((mng_timep)*ppChunk)->iHour = *(pRawdata+4);
- ((mng_timep)*ppChunk)->iMinute = *(pRawdata+5);
- ((mng_timep)*ppChunk)->iSecond = *(pRawdata+6);
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_TIME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_mhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_MHDR, MNG_LC_START);
-#endif
-
- if (pData->eSigtype != mng_it_mng) /* sequence checks */
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
-
- if (pData->bHasheader) /* can only be the first chunk! */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* correct length ? */
-#ifndef MNG_NO_OLD_VERSIONS
- if ((iRawlen != 28) && (iRawlen != 12))
-#else
- if ((iRawlen != 28))
-#endif
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pData->bHasMHDR = MNG_TRUE; /* oh boy, a real MNG */
- pData->bHasheader = MNG_TRUE; /* we've got a header */
- pData->eImagetype = mng_it_mng; /* fill header fields */
- pData->iWidth = mng_get_uint32 (pRawdata);
- pData->iHeight = mng_get_uint32 (pRawdata+4);
- pData->iTicks = mng_get_uint32 (pRawdata+8);
-
-#ifndef MNG_NO_OLD_VERSIONS
- if (iRawlen == 28) /* proper MHDR ? */
- {
-#endif
- pData->iLayercount = mng_get_uint32 (pRawdata+12);
- pData->iFramecount = mng_get_uint32 (pRawdata+16);
- pData->iPlaytime = mng_get_uint32 (pRawdata+20);
- pData->iSimplicity = mng_get_uint32 (pRawdata+24);
-
-#ifndef MNG_NO_OLD_VERSIONS
- pData->bPreDraft48 = MNG_FALSE;
- }
- else /* probably pre-draft48 then */
- {
- pData->iLayercount = 0;
- pData->iFramecount = 0;
- pData->iPlaytime = 0;
- pData->iSimplicity = 0;
-
- pData->bPreDraft48 = MNG_TRUE;
- }
-#endif
- /* predict alpha-depth */
- if ((pData->iSimplicity & 0x00000001) == 0)
-#ifndef MNG_NO_16BIT_SUPPORT
- pData->iAlphadepth = 16; /* no indicators = assume the worst */
-#else
- pData->iAlphadepth = 8; /* anything else = assume the worst */
-#endif
- else
- if ((pData->iSimplicity & 0x00000008) == 0)
- pData->iAlphadepth = 0; /* no transparency at all */
- else
- if ((pData->iSimplicity & 0x00000140) == 0x00000040)
- pData->iAlphadepth = 1; /* no semi-transparency guaranteed */
- else
-#ifndef MNG_NO_16BIT_SUPPORT
- pData->iAlphadepth = 16; /* anything else = assume the worst */
-#else
- pData->iAlphadepth = 8; /* anything else = assume the worst */
-#endif
-
-#ifdef MNG_INCLUDE_JNG /* can we handle the complexity ? */
- if (pData->iSimplicity & 0x0000FC00)
-#else
- if (pData->iSimplicity & 0x0000FC10)
-#endif
- MNG_ERROR (pData, MNG_MNGTOOCOMPLEX);
- /* fits on maximum canvas ? */
- if ((pData->iWidth > pData->iMaxwidth) || (pData->iHeight > pData->iMaxheight))
- MNG_WARNING (pData, MNG_IMAGETOOLARGE);
-
- if (pData->fProcessheader) /* inform the app ? */
- if (!pData->fProcessheader (((mng_handle)pData), pData->iWidth, pData->iHeight))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- pData->iImagelevel++; /* one level deeper */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_mhdrp)*ppChunk)->iWidth = pData->iWidth;
- ((mng_mhdrp)*ppChunk)->iHeight = pData->iHeight;
- ((mng_mhdrp)*ppChunk)->iTicks = pData->iTicks;
- ((mng_mhdrp)*ppChunk)->iLayercount = pData->iLayercount;
- ((mng_mhdrp)*ppChunk)->iFramecount = pData->iFramecount;
- ((mng_mhdrp)*ppChunk)->iPlaytime = pData->iPlaytime;
- ((mng_mhdrp)*ppChunk)->iSimplicity = pData->iSimplicity;
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_MHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_mend)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_MEND, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen > 0) /* must not contain data! */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- { /* do something */
- mng_retcode iRetcode = mng_process_display_mend (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (!pData->iTotalframes) /* save totals */
- pData->iTotalframes = pData->iFrameseq;
- if (!pData->iTotallayers)
- pData->iTotallayers = pData->iLayerseq;
- if (!pData->iTotalplaytime)
- pData->iTotalplaytime = pData->iFrametime;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
- pData->bHasMHDR = MNG_FALSE; /* end of the line, bro! */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_MEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_LOOP
-READ_CHUNK (mng_read_loop)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_LOOP, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (!pData->bCacheplayback) /* must store playback info to work!! */
- MNG_ERROR (pData, MNG_LOOPWITHCACHEOFF);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen >= 5) /* length checks */
- {
- if (iRawlen >= 6)
- {
- if ((iRawlen - 6) % 4 != 0)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_uint8 iLevel;
- mng_uint32 iRepeat;
- mng_uint8 iTermination = 0;
- mng_uint32 iItermin = 1;
- mng_uint32 iItermax = 0x7fffffffL;
- mng_retcode iRetcode;
-
- pData->bHasLOOP = MNG_TRUE; /* indicate we're inside a loop */
-
- iLevel = *pRawdata; /* determine the fields for processing */
-
-#ifndef MNG_NO_OLD_VERSIONS
- if (pData->bPreDraft48)
- {
- iTermination = *(pRawdata+1);
-
- iRepeat = mng_get_uint32 (pRawdata+2);
- }
- else
-#endif
- iRepeat = mng_get_uint32 (pRawdata+1);
-
- if (iRawlen >= 6)
- {
-#ifndef MNG_NO_OLD_VERSIONS
- if (!pData->bPreDraft48)
-#endif
- iTermination = *(pRawdata+5);
-
- if (iRawlen >= 10)
- {
- iItermin = mng_get_uint32 (pRawdata+6);
-
- if (iRawlen >= 14)
- {
- iItermax = mng_get_uint32 (pRawdata+10);
-
- /* TODO: process signals */
-
- }
- }
- }
- /* create the LOOP ani-object */
- iRetcode = mng_create_ani_loop (pData, iLevel, iRepeat, iTermination,
- iItermin, iItermax, 0, 0);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* skip till matching ENDL if iteration=0 */
- if ((!pData->bSkipping) && (iRepeat == 0))
- pData->bSkipping = MNG_TRUE;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (iRawlen >= 5) /* store the fields */
- {
- ((mng_loopp)*ppChunk)->iLevel = *pRawdata;
-
-#ifndef MNG_NO_OLD_VERSIONS
- if (pData->bPreDraft48)
- {
- ((mng_loopp)*ppChunk)->iTermination = *(pRawdata+1);
- ((mng_loopp)*ppChunk)->iRepeat = mng_get_uint32 (pRawdata+2);
- }
- else
-#endif
- {
- ((mng_loopp)*ppChunk)->iRepeat = mng_get_uint32 (pRawdata+1);
- }
-
- if (iRawlen >= 6)
- {
-#ifndef MNG_NO_OLD_VERSIONS
- if (!pData->bPreDraft48)
-#endif
- ((mng_loopp)*ppChunk)->iTermination = *(pRawdata+5);
-
- if (iRawlen >= 10)
- {
- ((mng_loopp)*ppChunk)->iItermin = mng_get_uint32 (pRawdata+6);
-
-#ifndef MNG_NO_LOOP_SIGNALS_SUPPORTED
- if (iRawlen >= 14)
- {
- ((mng_loopp)*ppChunk)->iItermax = mng_get_uint32 (pRawdata+10);
- ((mng_loopp)*ppChunk)->iCount = (iRawlen - 14) / 4;
-
- if (((mng_loopp)*ppChunk)->iCount)
- {
- MNG_ALLOC (pData, ((mng_loopp)*ppChunk)->pSignals,
- ((mng_loopp)*ppChunk)->iCount << 2);
-
-#ifndef MNG_BIGENDIAN_SUPPORTED
- {
- mng_uint32 iX;
- mng_uint8p pIn = pRawdata + 14;
- mng_uint32p pOut = (mng_uint32p)((mng_loopp)*ppChunk)->pSignals;
-
- for (iX = 0; iX < ((mng_loopp)*ppChunk)->iCount; iX++)
- {
- *pOut++ = mng_get_uint32 (pIn);
- pIn += 4;
- }
- }
-#else
- MNG_COPY (((mng_loopp)*ppChunk)->pSignals, pRawdata + 14,
- ((mng_loopp)*ppChunk)->iCount << 2);
-#endif /* !MNG_BIGENDIAN_SUPPORTED */
- }
- }
-#endif
- }
- }
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_LOOP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_LOOP
-READ_CHUNK (mng_read_endl)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_ENDL, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen != 1) /* length must be exactly 1 */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- if (pData->bHasLOOP) /* are we really processing a loop ? */
- {
- mng_uint8 iLevel = *pRawdata; /* get the nest level */
- /* create an ENDL animation object */
- mng_retcode iRetcode = mng_create_ani_endl (pData, iLevel);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-/* {
- mng_ani_endlp pENDL = (mng_ani_endlp)pData->pLastaniobj;
-
- iRetcode = pENDL->sHeader.fProcess (pData, pENDL);
-
- if (iRetcode)
- return iRetcode;
- } */
- }
- else
- MNG_ERROR (pData, MNG_NOMATCHINGLOOP);
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_endlp)*ppChunk)->iLevel = *pRawdata;
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_ENDL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_DEFI
-READ_CHUNK (mng_read_defi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DEFI, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* check the length */
- if ((iRawlen != 2) && (iRawlen != 3) && (iRawlen != 4) &&
- (iRawlen != 12) && (iRawlen != 28))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode;
-
- pData->iDEFIobjectid = mng_get_uint16 (pRawdata);
-
- if (iRawlen > 2)
- {
- pData->bDEFIhasdonotshow = MNG_TRUE;
- pData->iDEFIdonotshow = *(pRawdata+2);
- }
- else
- {
- pData->bDEFIhasdonotshow = MNG_FALSE;
- pData->iDEFIdonotshow = 0;
- }
-
- if (iRawlen > 3)
- {
- pData->bDEFIhasconcrete = MNG_TRUE;
- pData->iDEFIconcrete = *(pRawdata+3);
- }
- else
- {
- pData->bDEFIhasconcrete = MNG_FALSE;
- pData->iDEFIconcrete = 0;
- }
-
- if (iRawlen > 4)
- {
- pData->bDEFIhasloca = MNG_TRUE;
- pData->iDEFIlocax = mng_get_int32 (pRawdata+4);
- pData->iDEFIlocay = mng_get_int32 (pRawdata+8);
- }
- else
- {
- pData->bDEFIhasloca = MNG_FALSE;
- pData->iDEFIlocax = 0;
- pData->iDEFIlocay = 0;
- }
-
- if (iRawlen > 12)
- {
- pData->bDEFIhasclip = MNG_TRUE;
- pData->iDEFIclipl = mng_get_int32 (pRawdata+12);
- pData->iDEFIclipr = mng_get_int32 (pRawdata+16);
- pData->iDEFIclipt = mng_get_int32 (pRawdata+20);
- pData->iDEFIclipb = mng_get_int32 (pRawdata+24);
- }
- else
- {
- pData->bDEFIhasclip = MNG_FALSE;
- pData->iDEFIclipl = 0;
- pData->iDEFIclipr = 0;
- pData->iDEFIclipt = 0;
- pData->iDEFIclipb = 0;
- }
- /* create an animation object */
- iRetcode = mng_create_ani_defi (pData);
-
- if (!iRetcode) /* do display processing */
- iRetcode = mng_process_display_defi (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_defip)*ppChunk)->iObjectid = mng_get_uint16 (pRawdata);
-
- if (iRawlen > 2)
- {
- ((mng_defip)*ppChunk)->bHasdonotshow = MNG_TRUE;
- ((mng_defip)*ppChunk)->iDonotshow = *(pRawdata+2);
- }
- else
- ((mng_defip)*ppChunk)->bHasdonotshow = MNG_FALSE;
-
- if (iRawlen > 3)
- {
- ((mng_defip)*ppChunk)->bHasconcrete = MNG_TRUE;
- ((mng_defip)*ppChunk)->iConcrete = *(pRawdata+3);
- }
- else
- ((mng_defip)*ppChunk)->bHasconcrete = MNG_FALSE;
-
- if (iRawlen > 4)
- {
- ((mng_defip)*ppChunk)->bHasloca = MNG_TRUE;
- ((mng_defip)*ppChunk)->iXlocation = mng_get_int32 (pRawdata+4);
- ((mng_defip)*ppChunk)->iYlocation = mng_get_int32 (pRawdata+8);
- }
- else
- ((mng_defip)*ppChunk)->bHasloca = MNG_FALSE;
-
- if (iRawlen > 12)
- {
- ((mng_defip)*ppChunk)->bHasclip = MNG_TRUE;
- ((mng_defip)*ppChunk)->iLeftcb = mng_get_int32 (pRawdata+12);
- ((mng_defip)*ppChunk)->iRightcb = mng_get_int32 (pRawdata+16);
- ((mng_defip)*ppChunk)->iTopcb = mng_get_int32 (pRawdata+20);
- ((mng_defip)*ppChunk)->iBottomcb = mng_get_int32 (pRawdata+24);
- }
- else
- ((mng_defip)*ppChunk)->bHasclip = MNG_FALSE;
-
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DEFI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_BASI
-READ_CHUNK (mng_read_basi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_BASI, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* check the length */
- if ((iRawlen != 13) && (iRawlen != 19) && (iRawlen != 21) && (iRawlen != 22))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pData->bHasBASI = MNG_TRUE; /* inside a BASI-IEND block now */
- /* store interesting fields */
- pData->iDatawidth = mng_get_uint32 (pRawdata);
- pData->iDataheight = mng_get_uint32 (pRawdata+4);
- pData->iBitdepth = *(pRawdata+8);
- pData->iColortype = *(pRawdata+9);
- pData->iCompression = *(pRawdata+10);
- pData->iFilter = *(pRawdata+11);
- pData->iInterlace = *(pRawdata+12);
-
-
-#if defined(MNG_NO_1_2_4BIT_SUPPORT) || defined(MNG_NO_16BIT_SUPPORT)
- pData->iPNGmult = 1;
- pData->iPNGdepth = pData->iBitdepth;
-#endif
-
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iBitdepth < 8)
- pData->iBitdepth = 8;
-#endif
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth > 8)
- {
- pData->iBitdepth = 8;
- pData->iPNGmult = 2;
- }
-#endif
-
- if ((pData->iBitdepth != 8) /* parameter validity checks */
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- && (pData->iBitdepth != 1) &&
- (pData->iBitdepth != 2) &&
- (pData->iBitdepth != 4)
-#endif
-#ifndef MNG_NO_16BIT_SUPPORT
- && (pData->iBitdepth != 16)
-#endif
- )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if ((pData->iColortype != MNG_COLORTYPE_GRAY ) &&
- (pData->iColortype != MNG_COLORTYPE_RGB ) &&
- (pData->iColortype != MNG_COLORTYPE_INDEXED) &&
- (pData->iColortype != MNG_COLORTYPE_GRAYA ) &&
- (pData->iColortype != MNG_COLORTYPE_RGBA ) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
- if ((pData->iColortype == MNG_COLORTYPE_INDEXED) && (pData->iBitdepth > 8))
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if (((pData->iColortype == MNG_COLORTYPE_RGB ) ||
- (pData->iColortype == MNG_COLORTYPE_GRAYA ) ||
- (pData->iColortype == MNG_COLORTYPE_RGBA ) ) &&
- (pData->iBitdepth < 8 ) )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if (pData->iCompression != MNG_COMPRESSION_DEFLATE)
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
-#if defined(FILTER192) || defined(FILTER193)
- if ((pData->iFilter != MNG_FILTER_ADAPTIVE ) &&
-#if defined(FILTER192) && defined(FILTER193)
- (pData->iFilter != MNG_FILTER_DIFFERING) &&
- (pData->iFilter != MNG_FILTER_NOFILTER ) )
-#else
-#ifdef FILTER192
- (pData->iFilter != MNG_FILTER_DIFFERING) )
-#else
- (pData->iFilter != MNG_FILTER_NOFILTER ) )
-#endif
-#endif
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#else
- if (pData->iFilter)
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#endif
-
- if ((pData->iInterlace != MNG_INTERLACE_NONE ) &&
- (pData->iInterlace != MNG_INTERLACE_ADAM7) )
- MNG_ERROR (pData, MNG_INVALIDINTERLACE);
-
- pData->iImagelevel++; /* one level deeper */
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_uint16 iRed = 0;
- mng_uint16 iGreen = 0;
- mng_uint16 iBlue = 0;
- mng_bool bHasalpha = MNG_FALSE;
- mng_uint16 iAlpha = 0xFFFF;
- mng_uint8 iViewable = 0;
- mng_retcode iRetcode;
-
- if (iRawlen > 13) /* get remaining fields, if any */
- {
- iRed = mng_get_uint16 (pRawdata+13);
- iGreen = mng_get_uint16 (pRawdata+15);
- iBlue = mng_get_uint16 (pRawdata+17);
- }
-
- if (iRawlen > 19)
- {
- bHasalpha = MNG_TRUE;
- iAlpha = mng_get_uint16 (pRawdata+19);
- }
-
- if (iRawlen > 21)
- iViewable = *(pRawdata+21);
- /* create an animation object */
- iRetcode = mng_create_ani_basi (pData, iRed, iGreen, iBlue,
- bHasalpha, iAlpha, iViewable);
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_basi (pData, iRed, iGreen, iBlue,
- bHasalpha, iAlpha, iViewable); */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_basip)*ppChunk)->iWidth = mng_get_uint32 (pRawdata);
- ((mng_basip)*ppChunk)->iHeight = mng_get_uint32 (pRawdata+4);
-#ifdef MNG_NO_16BIT_SUPPORT
- if (*(pRawdata+8) > 8)
- ((mng_basip)*ppChunk)->iBitdepth = 8;
- else
-#endif
- ((mng_basip)*ppChunk)->iBitdepth = *(pRawdata+8);
- ((mng_basip)*ppChunk)->iColortype = *(pRawdata+9);
- ((mng_basip)*ppChunk)->iCompression = *(pRawdata+10);
- ((mng_basip)*ppChunk)->iFilter = *(pRawdata+11);
- ((mng_basip)*ppChunk)->iInterlace = *(pRawdata+12);
-
- if (iRawlen > 13)
- {
- ((mng_basip)*ppChunk)->iRed = mng_get_uint16 (pRawdata+13);
- ((mng_basip)*ppChunk)->iGreen = mng_get_uint16 (pRawdata+15);
- ((mng_basip)*ppChunk)->iBlue = mng_get_uint16 (pRawdata+17);
- }
-
- if (iRawlen > 19)
- ((mng_basip)*ppChunk)->iAlpha = mng_get_uint16 (pRawdata+19);
-
- if (iRawlen > 21)
- ((mng_basip)*ppChunk)->iViewable = *(pRawdata+21);
-
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_BASI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_CLON
-READ_CHUNK (mng_read_clon)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_CLON, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* check the length */
- if ((iRawlen != 4) && (iRawlen != 5) && (iRawlen != 6) &&
- (iRawlen != 7) && (iRawlen != 16))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_uint16 iSourceid, iCloneid;
- mng_uint8 iClonetype = 0;
- mng_bool bHasdonotshow = MNG_FALSE;
- mng_uint8 iDonotshow = 0;
- mng_uint8 iConcrete = 0;
- mng_bool bHasloca = MNG_FALSE;
- mng_uint8 iLocationtype = 0;
- mng_int32 iLocationx = 0;
- mng_int32 iLocationy = 0;
- mng_retcode iRetcode;
-
- iSourceid = mng_get_uint16 (pRawdata);
- iCloneid = mng_get_uint16 (pRawdata+2);
-
- if (iRawlen > 4)
- iClonetype = *(pRawdata+4);
-
- if (iRawlen > 5)
- {
- bHasdonotshow = MNG_TRUE;
- iDonotshow = *(pRawdata+5);
- }
-
- if (iRawlen > 6)
- iConcrete = *(pRawdata+6);
-
- if (iRawlen > 7)
- {
- bHasloca = MNG_TRUE;
- iLocationtype = *(pRawdata+7);
- iLocationx = mng_get_int32 (pRawdata+8);
- iLocationy = mng_get_int32 (pRawdata+12);
- }
-
- iRetcode = mng_create_ani_clon (pData, iSourceid, iCloneid, iClonetype,
- bHasdonotshow, iDonotshow, iConcrete,
- bHasloca, iLocationtype, iLocationx, iLocationy);
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_clon (pData, iSourceid, iCloneid, iClonetype,
- bHasdonotshow, iDonotshow, iConcrete,
- bHasloca, iLocationtype, iLocationx,
- iLocationy); */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_clonp)*ppChunk)->iSourceid = mng_get_uint16 (pRawdata);
- ((mng_clonp)*ppChunk)->iCloneid = mng_get_uint16 (pRawdata+2);
-
- if (iRawlen > 4)
- ((mng_clonp)*ppChunk)->iClonetype = *(pRawdata+4);
-
- if (iRawlen > 5)
- ((mng_clonp)*ppChunk)->iDonotshow = *(pRawdata+5);
-
- if (iRawlen > 6)
- ((mng_clonp)*ppChunk)->iConcrete = *(pRawdata+6);
-
- if (iRawlen > 7)
- {
- ((mng_clonp)*ppChunk)->bHasloca = MNG_TRUE;
- ((mng_clonp)*ppChunk)->iLocationtype = *(pRawdata+7);
- ((mng_clonp)*ppChunk)->iLocationx = mng_get_int32 (pRawdata+8);
- ((mng_clonp)*ppChunk)->iLocationy = mng_get_int32 (pRawdata+12);
- }
- else
- {
- ((mng_clonp)*ppChunk)->bHasloca = MNG_FALSE;
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_CLON, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_PAST
-READ_CHUNK (mng_read_past)
-{
-#if defined(MNG_STORE_CHUNKS) || defined(MNG_SUPPORT_DISPLAY)
- mng_retcode iRetcode;
- mng_uint16 iTargetid;
- mng_uint8 iTargettype;
- mng_int32 iTargetx;
- mng_int32 iTargety;
- mng_uint32 iCount;
- mng_uint32 iSize;
- mng_ptr pSources;
- mng_uint32 iX;
- mng_past_sourcep pSource;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PAST, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- /* check the length */
- if ((iRawlen < 41) || (((iRawlen - 11) % 30) != 0))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#if defined(MNG_STORE_CHUNKS) || defined(MNG_SUPPORT_DISPLAY)
- iTargetid = mng_get_uint16 (pRawdata);
- iTargettype = *(pRawdata+2);
- iTargetx = mng_get_int32 (pRawdata+3);
- iTargety = mng_get_int32 (pRawdata+7);
- iCount = ((iRawlen - 11) / 30); /* how many entries again? */
- iSize = iCount * sizeof (mng_past_source);
-
- pRawdata += 11;
- /* get a buffer for all the source blocks */
- MNG_ALLOC (pData, pSources, iSize);
-
- pSource = (mng_past_sourcep)pSources;
-
- for (iX = 0; iX < iCount; iX++) /* now copy the source blocks */
- {
- pSource->iSourceid = mng_get_uint16 (pRawdata);
- pSource->iComposition = *(pRawdata+2);
- pSource->iOrientation = *(pRawdata+3);
- pSource->iOffsettype = *(pRawdata+4);
- pSource->iOffsetx = mng_get_int32 (pRawdata+5);
- pSource->iOffsety = mng_get_int32 (pRawdata+9);
- pSource->iBoundarytype = *(pRawdata+13);
- pSource->iBoundaryl = mng_get_int32 (pRawdata+14);
- pSource->iBoundaryr = mng_get_int32 (pRawdata+18);
- pSource->iBoundaryt = mng_get_int32 (pRawdata+22);
- pSource->iBoundaryb = mng_get_int32 (pRawdata+26);
-
- pSource++;
- pRawdata += 30;
- }
-#endif
-
-#ifdef MNG_SUPPORT_DISPLAY
- { /* create playback object */
- iRetcode = mng_create_ani_past (pData, iTargetid, iTargettype, iTargetx,
- iTargety, iCount, pSources);
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_past (pData, iTargetid, iTargettype, iTargetx,
- iTargety, iCount, pSources); */
-
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pSources, iSize);
- return iRetcode;
- }
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pSources, iSize);
- return iRetcode;
- }
- /* store the fields */
- ((mng_pastp)*ppChunk)->iDestid = iTargetid;
- ((mng_pastp)*ppChunk)->iTargettype = iTargettype;
- ((mng_pastp)*ppChunk)->iTargetx = iTargetx;
- ((mng_pastp)*ppChunk)->iTargety = iTargety;
- ((mng_pastp)*ppChunk)->iCount = iCount;
- /* get a buffer & copy the source blocks */
- MNG_ALLOC (pData, ((mng_pastp)*ppChunk)->pSources, iSize);
- MNG_COPY (((mng_pastp)*ppChunk)->pSources, pSources, iSize);
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#if defined(MNG_STORE_CHUNKS) || defined(MNG_SUPPORT_DISPLAY)
- /* free the source block buffer */
- MNG_FREEX (pData, pSources, iSize);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PAST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_DISC
-READ_CHUNK (mng_read_disc)
-{
-#if defined(MNG_SUPPORT_DISPLAY) || defined(MNG_STORE_CHUNKS)
- mng_uint32 iCount;
- mng_uint16p pIds = MNG_NULL;
- mng_retcode iRetcode;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DISC, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if ((iRawlen % 2) != 0) /* check the length */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#if defined(MNG_SUPPORT_DISPLAY) || defined(MNG_STORE_CHUNKS)
- iCount = (iRawlen / sizeof (mng_uint16));
-
- if (iCount)
- {
- MNG_ALLOC (pData, pIds, iRawlen);
-
-#ifndef MNG_BIGENDIAN_SUPPORTED
- {
- mng_uint32 iX;
- mng_uint8p pIn = pRawdata;
- mng_uint16p pOut = pIds;
-
- for (iX = 0; iX < iCount; iX++)
- {
- *pOut++ = mng_get_uint16 (pIn);
- pIn += 2;
- }
- }
-#else
- MNG_COPY (pIds, pRawdata, iRawlen);
-#endif /* !MNG_BIGENDIAN_SUPPORTED */
- }
-#endif
-
-#ifdef MNG_SUPPORT_DISPLAY
- { /* create playback object */
- iRetcode = mng_create_ani_disc (pData, iCount, pIds);
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_disc (pData, iCount, pIds); */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_discp)*ppChunk)->iCount = iCount;
-
- if (iRawlen)
- {
- MNG_ALLOC (pData, ((mng_discp)*ppChunk)->pObjectids, iRawlen);
- MNG_COPY (((mng_discp)*ppChunk)->pObjectids, pIds, iRawlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#if defined(MNG_SUPPORT_DISPLAY) || defined(MNG_STORE_CHUNKS)
- if (iRawlen)
- MNG_FREEX (pData, pIds, iRawlen);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DISC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_BACK
-READ_CHUNK (mng_read_back)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_BACK, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* check the length */
- if ((iRawlen != 6) && (iRawlen != 7) && (iRawlen != 9) && (iRawlen != 10))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode;
- /* retrieve the fields */
- pData->bHasBACK = MNG_TRUE;
- pData->iBACKred = mng_get_uint16 (pRawdata);
- pData->iBACKgreen = mng_get_uint16 (pRawdata+2);
- pData->iBACKblue = mng_get_uint16 (pRawdata+4);
-
- if (iRawlen > 6)
- pData->iBACKmandatory = *(pRawdata+6);
- else
- pData->iBACKmandatory = 0;
-
- if (iRawlen > 7)
- pData->iBACKimageid = mng_get_uint16 (pRawdata+7);
- else
- pData->iBACKimageid = 0;
-
- if (iRawlen > 9)
- pData->iBACKtile = *(pRawdata+9);
- else
- pData->iBACKtile = 0;
-
- iRetcode = mng_create_ani_back (pData, pData->iBACKred, pData->iBACKgreen,
- pData->iBACKblue, pData->iBACKmandatory,
- pData->iBACKimageid, pData->iBACKtile);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_backp)*ppChunk)->iRed = mng_get_uint16 (pRawdata);
- ((mng_backp)*ppChunk)->iGreen = mng_get_uint16 (pRawdata+2);
- ((mng_backp)*ppChunk)->iBlue = mng_get_uint16 (pRawdata+4);
-
- if (iRawlen > 6)
- ((mng_backp)*ppChunk)->iMandatory = *(pRawdata+6);
-
- if (iRawlen > 7)
- ((mng_backp)*ppChunk)->iImageid = mng_get_uint16 (pRawdata+7);
-
- if (iRawlen > 9)
- ((mng_backp)*ppChunk)->iTile = *(pRawdata+9);
-
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_BACK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_FRAM
-READ_CHUNK (mng_read_fram)
-{
- mng_uint8p pTemp;
-#ifdef MNG_STORE_CHUNKS
- mng_uint32 iNamelen;
-#endif
- mng_uint32 iRemain;
- mng_uint32 iRequired = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_FRAM, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen <= 1) /* only framing-mode ? */
- {
-#ifdef MNG_STORE_CHUNKS
- iNamelen = 0; /* indicate so */
-#endif
- iRemain = 0;
- pTemp = MNG_NULL;
- }
- else
- {
- pTemp = find_null (pRawdata+1); /* find null-separator */
- /* not found inside input-data ? */
- if ((pTemp - pRawdata) > (mng_int32)iRawlen)
- pTemp = pRawdata + iRawlen; /* than remainder is name */
-
-#ifdef MNG_STORE_CHUNKS
- iNamelen = (mng_uint32)((pTemp - pRawdata) - 1);
-#endif
- iRemain = (mng_uint32)(iRawlen - (pTemp - pRawdata));
-
- if (iRemain) /* if there is remaining data it's less 1 byte */
- iRemain--;
-
- if ((iRemain) && (iRemain < 4)) /* remains must be empty or at least 4 bytes */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if (iRemain)
- {
- iRequired = 4; /* calculate and check required remaining length */
-
- if (*(pTemp+1)) { iRequired += 4; }
- if (*(pTemp+2)) { iRequired += 4; }
- if (*(pTemp+3)) { iRequired += 17; }
-
- if (*(pTemp+4))
- {
- if ((iRemain - iRequired) % 4 != 0)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- else
- {
- if (iRemain != iRequired)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
- }
- }
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_uint8p pWork = pTemp;
- mng_uint8 iFramemode = 0;
- mng_uint8 iChangedelay = 0;
- mng_uint32 iDelay = 0;
- mng_uint8 iChangetimeout = 0;
- mng_uint32 iTimeout = 0;
- mng_uint8 iChangeclipping = 0;
- mng_uint8 iCliptype = 0;
- mng_int32 iClipl = 0;
- mng_int32 iClipr = 0;
- mng_int32 iClipt = 0;
- mng_int32 iClipb = 0;
- mng_retcode iRetcode;
-
- if (iRawlen) /* any data specified ? */
- {
- if (*(pRawdata)) /* save the new framing mode ? */
- {
- iFramemode = *(pRawdata);
-
-#ifndef MNG_NO_OLD_VERSIONS
- if (pData->bPreDraft48) /* old style input-stream ? */
- {
- switch (iFramemode)
- {
- case 0: { break; }
- case 1: { iFramemode = 3; break; }
- case 2: { iFramemode = 4; break; }
- case 3: { iFramemode = 1; break; }
- case 4: { iFramemode = 1; break; }
- case 5: { iFramemode = 2; break; }
- default: { iFramemode = 1; break; }
- }
- }
-#endif
- }
-
- if (iRemain)
- {
- iChangedelay = *(pWork+1);
- iChangetimeout = *(pWork+2);
- iChangeclipping = *(pWork+3);
- pWork += 5;
-
- if (iChangedelay) /* delay changed ? */
- {
- iDelay = mng_get_uint32 (pWork);
- pWork += 4;
- }
-
- if (iChangetimeout) /* timeout changed ? */
- {
- iTimeout = mng_get_uint32 (pWork);
- pWork += 4;
- }
-
- if (iChangeclipping) /* clipping changed ? */
- {
- iCliptype = *pWork;
- iClipl = mng_get_int32 (pWork+1);
- iClipr = mng_get_int32 (pWork+5);
- iClipt = mng_get_int32 (pWork+9);
- iClipb = mng_get_int32 (pWork+13);
- }
- }
- }
-
- iRetcode = mng_create_ani_fram (pData, iFramemode, iChangedelay, iDelay,
- iChangetimeout, iTimeout,
- iChangeclipping, iCliptype,
- iClipl, iClipr, iClipt, iClipb);
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_fram (pData, iFramemode, iChangedelay, iDelay,
- iChangetimeout, iTimeout,
- iChangeclipping, iCliptype,
- iClipl, iClipr, iClipt, iClipb); */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_framp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen)
- {
- mng_uint8 iFramemode = *(pRawdata);
-
-#ifndef MNG_NO_OLD_VERSIONS
- if (pData->bPreDraft48) /* old style input-stream ? */
- {
- switch (iFramemode)
- {
- case 1: { iFramemode = 3; break; }
- case 2: { iFramemode = 4; break; }
- case 3: { iFramemode = 5; break; } /* TODO: provision for mode=5 ??? */
- case 4: { iFramemode = 1; break; }
- case 5: { iFramemode = 2; break; }
- default: { iFramemode = 1; break; }
- }
- }
-#endif
-
- ((mng_framp)*ppChunk)->iMode = iFramemode;
- ((mng_framp)*ppChunk)->iNamesize = iNamelen;
-
- if (iNamelen)
- {
- MNG_ALLOC (pData, ((mng_framp)*ppChunk)->zName, iNamelen+1);
- MNG_COPY (((mng_framp)*ppChunk)->zName, pRawdata+1, iNamelen);
- }
-
- if (iRemain)
- {
- ((mng_framp)*ppChunk)->iChangedelay = *(pTemp+1);
- ((mng_framp)*ppChunk)->iChangetimeout = *(pTemp+2);
- ((mng_framp)*ppChunk)->iChangeclipping = *(pTemp+3);
- ((mng_framp)*ppChunk)->iChangesyncid = *(pTemp+4);
-
- pTemp += 5;
-
- if (((mng_framp)*ppChunk)->iChangedelay)
- {
- ((mng_framp)*ppChunk)->iDelay = mng_get_uint32 (pTemp);
- pTemp += 4;
- }
-
- if (((mng_framp)*ppChunk)->iChangetimeout)
- {
- ((mng_framp)*ppChunk)->iTimeout = mng_get_uint32 (pTemp);
- pTemp += 4;
- }
-
- if (((mng_framp)*ppChunk)->iChangeclipping)
- {
- ((mng_framp)*ppChunk)->iBoundarytype = *pTemp;
- ((mng_framp)*ppChunk)->iBoundaryl = mng_get_int32 (pTemp+1);
- ((mng_framp)*ppChunk)->iBoundaryr = mng_get_int32 (pTemp+5);
- ((mng_framp)*ppChunk)->iBoundaryt = mng_get_int32 (pTemp+9);
- ((mng_framp)*ppChunk)->iBoundaryb = mng_get_int32 (pTemp+13);
- pTemp += 17;
- }
-
- if (((mng_framp)*ppChunk)->iChangesyncid)
- {
- ((mng_framp)*ppChunk)->iCount = (iRemain - iRequired) / 4;
-
- if (((mng_framp)*ppChunk)->iCount)
- {
- MNG_ALLOC (pData, ((mng_framp)*ppChunk)->pSyncids,
- ((mng_framp)*ppChunk)->iCount * 4);
-
-#ifndef MNG_BIGENDIAN_SUPPORTED
- {
- mng_uint32 iX;
- mng_uint32p pOut = ((mng_framp)*ppChunk)->pSyncids;
-
- for (iX = 0; iX < ((mng_framp)*ppChunk)->iCount; iX++)
- {
- *pOut++ = mng_get_uint32 (pTemp);
- pTemp += 4;
- }
- }
-#else
- MNG_COPY (((mng_framp)*ppChunk)->pSyncids, pTemp,
- ((mng_framp)*ppChunk)->iCount * 4);
-#endif /* !MNG_BIGENDIAN_SUPPORTED */
- }
- }
- }
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_FRAM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_MOVE
-READ_CHUNK (mng_read_move)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_MOVE, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen != 13) /* check the length */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode;
- /* create a MOVE animation object */
- iRetcode = mng_create_ani_move (pData, mng_get_uint16 (pRawdata),
- mng_get_uint16 (pRawdata+2),
- *(pRawdata+4),
- mng_get_int32 (pRawdata+5),
- mng_get_int32 (pRawdata+9));
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_move (pData,
- mng_get_uint16 (pRawdata),
- mng_get_uint16 (pRawdata+2),
- *(pRawdata+4),
- mng_get_int32 (pRawdata+5),
- mng_get_int32 (pRawdata+9)); */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_movep)*ppChunk)->iFirstid = mng_get_uint16 (pRawdata);
- ((mng_movep)*ppChunk)->iLastid = mng_get_uint16 (pRawdata+2);
- ((mng_movep)*ppChunk)->iMovetype = *(pRawdata+4);
- ((mng_movep)*ppChunk)->iMovex = mng_get_int32 (pRawdata+5);
- ((mng_movep)*ppChunk)->iMovey = mng_get_int32 (pRawdata+9);
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_MOVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_CLIP
-READ_CHUNK (mng_read_clip)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_CLIP, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen != 21) /* check the length */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode;
- /* create a CLIP animation object */
- iRetcode = mng_create_ani_clip (pData, mng_get_uint16 (pRawdata),
- mng_get_uint16 (pRawdata+2),
- *(pRawdata+4),
- mng_get_int32 (pRawdata+5),
- mng_get_int32 (pRawdata+9),
- mng_get_int32 (pRawdata+13),
- mng_get_int32 (pRawdata+17));
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_clip (pData,
- mng_get_uint16 (pRawdata),
- mng_get_uint16 (pRawdata+2),
- *(pRawdata+4),
- mng_get_int32 (pRawdata+5),
- mng_get_int32 (pRawdata+9),
- mng_get_int32 (pRawdata+13),
- mng_get_int32 (pRawdata+17)); */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_clipp)*ppChunk)->iFirstid = mng_get_uint16 (pRawdata);
- ((mng_clipp)*ppChunk)->iLastid = mng_get_uint16 (pRawdata+2);
- ((mng_clipp)*ppChunk)->iCliptype = *(pRawdata+4);
- ((mng_clipp)*ppChunk)->iClipl = mng_get_int32 (pRawdata+5);
- ((mng_clipp)*ppChunk)->iClipr = mng_get_int32 (pRawdata+9);
- ((mng_clipp)*ppChunk)->iClipt = mng_get_int32 (pRawdata+13);
- ((mng_clipp)*ppChunk)->iClipb = mng_get_int32 (pRawdata+17);
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_CLIP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_SHOW
-READ_CHUNK (mng_read_show)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SHOW, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* check the length */
- if ((iRawlen != 0) && (iRawlen != 2) && (iRawlen != 4) && (iRawlen != 5))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode;
-
- if (iRawlen) /* determine parameters if any */
- {
- pData->iSHOWfromid = mng_get_uint16 (pRawdata);
-
- if (iRawlen > 2)
- pData->iSHOWtoid = mng_get_uint16 (pRawdata+2);
- else
- pData->iSHOWtoid = pData->iSHOWfromid;
-
- if (iRawlen > 4)
- pData->iSHOWmode = *(pRawdata+4);
- else
- pData->iSHOWmode = 0;
- }
- else /* use defaults then */
- {
- pData->iSHOWmode = 2;
- pData->iSHOWfromid = 1;
- pData->iSHOWtoid = 65535;
- }
- /* create a SHOW animation object */
- iRetcode = mng_create_ani_show (pData, pData->iSHOWfromid,
- pData->iSHOWtoid, pData->iSHOWmode);
-
- if (!iRetcode)
- iRetcode = mng_process_display_show (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_showp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen)
- {
- ((mng_showp)*ppChunk)->iFirstid = mng_get_uint16 (pRawdata);
-
- if (iRawlen > 2)
- ((mng_showp)*ppChunk)->iLastid = mng_get_uint16 (pRawdata+2);
- else
- ((mng_showp)*ppChunk)->iLastid = ((mng_showp)*ppChunk)->iFirstid;
-
- if (iRawlen > 4)
- ((mng_showp)*ppChunk)->iMode = *(pRawdata+4);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SHOW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_TERM
-READ_CHUNK (mng_read_term)
-{
- mng_uint8 iTermaction;
- mng_uint8 iIteraction = 0;
- mng_uint32 iDelay = 0;
- mng_uint32 iItermax = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_TERM, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- /* should be behind MHDR or SAVE !! */
- if ((!pData->bHasSAVE) && (pData->iChunkseq > 2))
- {
- pData->bMisplacedTERM = MNG_TRUE; /* indicate we found a misplaced TERM */
- /* and send a warning signal!!! */
- MNG_WARNING (pData, MNG_SEQUENCEERROR);
- }
-
- if (pData->bHasLOOP) /* no way, jose! */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (pData->bHasTERM) /* only 1 allowed! */
- MNG_ERROR (pData, MNG_MULTIPLEERROR);
- /* check the length */
- if ((iRawlen != 1) && (iRawlen != 10))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pData->bHasTERM = MNG_TRUE;
-
- iTermaction = *pRawdata; /* get the fields */
-
- if (iRawlen > 1)
- {
- iIteraction = *(pRawdata+1);
- iDelay = mng_get_uint32 (pRawdata+2);
- iItermax = mng_get_uint32 (pRawdata+6);
- }
-
- if (pData->fProcessterm) /* inform the app ? */
- if (!pData->fProcessterm (((mng_handle)pData), iTermaction, iIteraction,
- iDelay, iItermax))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
-#ifdef MNG_SUPPORT_DISPLAY
- { /* create the TERM ani-object */
- mng_retcode iRetcode = mng_create_ani_term (pData, iTermaction, iIteraction,
- iDelay, iItermax);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* save for future reference */
- pData->pTermaniobj = pData->pLastaniobj;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_termp)*ppChunk)->iTermaction = iTermaction;
- ((mng_termp)*ppChunk)->iIteraction = iIteraction;
- ((mng_termp)*ppChunk)->iDelay = iDelay;
- ((mng_termp)*ppChunk)->iItermax = iItermax;
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_TERM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_SAVE
-READ_CHUNK (mng_read_save)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SAVE, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) || (pData->bHasSAVE))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- pData->bHasSAVE = MNG_TRUE;
-
- if (pData->fProcesssave) /* inform the application ? */
- {
- mng_bool bOke = pData->fProcesssave ((mng_handle)pData);
-
- if (!bOke)
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode;
-
-
- /* TODO: something with the parameters */
-
-
- /* create a SAVE animation object */
- iRetcode = mng_create_ani_save (pData);
-
- if (!iRetcode)
- iRetcode = mng_process_display_save (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_savep)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen) /* not empty ? */
- {
- mng_uint8 iOtype = *pRawdata;
- mng_uint8 iEtype;
- mng_uint32 iCount = 0;
- mng_uint8p pTemp;
- mng_uint8p pNull;
- mng_uint32 iLen;
- mng_uint32 iOffset[2];
- mng_uint32 iStarttime[2];
- mng_uint32 iFramenr;
- mng_uint32 iLayernr;
- mng_uint32 iX;
- mng_save_entryp pEntry = MNG_NULL;
- mng_uint32 iNamesize;
-
- if ((iOtype != 4) && (iOtype != 8))
- MNG_ERROR (pData, MNG_INVOFFSETSIZE);
-
- ((mng_savep)*ppChunk)->iOffsettype = iOtype;
-
- for (iX = 0; iX < 2; iX++) /* do this twice to get the count first ! */
- {
- pTemp = pRawdata + 1;
- iLen = iRawlen - 1;
-
- if (iX) /* second run ? */
- {
- MNG_ALLOC (pData, pEntry, (iCount * sizeof (mng_save_entry)));
-
- ((mng_savep)*ppChunk)->iCount = iCount;
- ((mng_savep)*ppChunk)->pEntries = pEntry;
- }
-
- while (iLen) /* anything left ? */
- {
- iEtype = *pTemp; /* entrytype */
-
- if ((iEtype != 0) && (iEtype != 1) && (iEtype != 2) && (iEtype != 3))
- MNG_ERROR (pData, MNG_INVENTRYTYPE);
-
- pTemp++;
-
- if (iEtype > 1)
- {
- iOffset [0] = 0;
- iOffset [1] = 0;
- iStarttime [0] = 0;
- iStarttime [1] = 0;
- iLayernr = 0;
- iFramenr = 0;
- }
- else
- {
- if (iOtype == 4)
- {
- iOffset [0] = 0;
- iOffset [1] = mng_get_uint32 (pTemp);
-
- pTemp += 4;
- }
- else
- {
- iOffset [0] = mng_get_uint32 (pTemp);
- iOffset [1] = mng_get_uint32 (pTemp+4);
-
- pTemp += 8;
- }
-
- if (iEtype > 0)
- {
- iStarttime [0] = 0;
- iStarttime [1] = 0;
- iLayernr = 0;
- iFramenr = 0;
- }
- else
- {
- if (iOtype == 4)
- {
- iStarttime [0] = 0;
- iStarttime [1] = mng_get_uint32 (pTemp+0);
- iLayernr = mng_get_uint32 (pTemp+4);
- iFramenr = mng_get_uint32 (pTemp+8);
-
- pTemp += 12;
- }
- else
- {
- iStarttime [0] = mng_get_uint32 (pTemp+0);
- iStarttime [1] = mng_get_uint32 (pTemp+4);
- iLayernr = mng_get_uint32 (pTemp+8);
- iFramenr = mng_get_uint32 (pTemp+12);
-
- pTemp += 16;
- }
- }
- }
-
- pNull = find_null (pTemp); /* get the name length */
-
- if ((pNull - pRawdata) > (mng_int32)iRawlen)
- {
- iNamesize = iLen; /* no null found; so end of SAVE */
- iLen = 0;
- }
- else
- {
- iNamesize = pNull - pTemp; /* should be another entry */
- iLen -= iNamesize;
-
- if (!iLen) /* must not end with a null ! */
- MNG_ERROR (pData, MNG_ENDWITHNULL);
- }
-
- if (!pEntry)
- {
- iCount++;
- }
- else
- {
- pEntry->iEntrytype = iEtype;
- pEntry->iOffset [0] = iOffset [0];
- pEntry->iOffset [1] = iOffset [1];
- pEntry->iStarttime [0] = iStarttime [0];
- pEntry->iStarttime [1] = iStarttime [1];
- pEntry->iLayernr = iLayernr;
- pEntry->iFramenr = iFramenr;
- pEntry->iNamesize = iNamesize;
-
- if (iNamesize)
- {
- MNG_ALLOC (pData, pEntry->zName, iNamesize+1);
- MNG_COPY (pEntry->zName, pTemp, iNamesize);
- }
-
- pEntry++;
- }
-
- pTemp += iNamesize;
- }
- }
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SAVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_SEEK
-READ_CHUNK (mng_read_seek)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SEEK, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) || (!pData->bHasSAVE))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_SUPPORT_DISPLAY
- /* create a SEEK animation object */
- iRetcode = mng_create_ani_seek (pData, iRawlen, (mng_pchar)pRawdata);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#endif /* MNG_SUPPORT_DISPLAY */
-
- if (pData->fProcessseek) /* inform the app ? */
- {
- mng_bool bOke;
- mng_pchar zName;
-
- MNG_ALLOC (pData, zName, iRawlen + 1);
-
- if (iRawlen)
- MNG_COPY (zName, pRawdata, iRawlen);
-
- bOke = pData->fProcessseek ((mng_handle)pData, zName);
-
- MNG_FREEX (pData, zName, iRawlen + 1);
-
- if (!bOke)
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
-
-#ifdef MNG_SUPPORT_DISPLAY
- /* do display processing of the SEEK */
- iRetcode = mng_process_display_seek (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_seekp)*ppChunk)->iNamesize = iRawlen;
-
- if (iRawlen)
- {
- MNG_ALLOC (pData, ((mng_seekp)*ppChunk)->zName, iRawlen+1);
- MNG_COPY (((mng_seekp)*ppChunk)->zName, pRawdata, iRawlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_SEEK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_eXPI
-READ_CHUNK (mng_read_expi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_EXPI, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen < 3) /* check the length */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_expip)*ppChunk)->iSnapshotid = mng_get_uint16 (pRawdata);
- ((mng_expip)*ppChunk)->iNamesize = iRawlen - 2;
-
- if (((mng_expip)*ppChunk)->iNamesize)
- {
- MNG_ALLOC (pData, ((mng_expip)*ppChunk)->zName,
- ((mng_expip)*ppChunk)->iNamesize + 1);
- MNG_COPY (((mng_expip)*ppChunk)->zName, pRawdata+2,
- ((mng_expip)*ppChunk)->iNamesize);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_EXPI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_fPRI
-READ_CHUNK (mng_read_fpri)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_FPRI, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen != 2) /* must be two bytes long */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_fprip)*ppChunk)->iDeltatype = *pRawdata;
- ((mng_fprip)*ppChunk)->iPriority = *(pRawdata+1);
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_FPRI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_nEED
-MNG_LOCAL mng_bool CheckKeyword (mng_datap pData,
- mng_uint8p pKeyword)
-{
- mng_chunkid handled_chunks [] =
- {
- MNG_UINT_BACK, /* keep it sorted !!!! */
- MNG_UINT_BASI,
- MNG_UINT_CLIP,
- MNG_UINT_CLON,
-#ifndef MNG_NO_DELTA_PNG
-/* TODO: MNG_UINT_DBYK, */
-#endif
- MNG_UINT_DEFI,
-#ifndef MNG_NO_DELTA_PNG
- MNG_UINT_DHDR,
-#endif
- MNG_UINT_DISC,
-#ifndef MNG_NO_DELTA_PNG
-/* TODO: MNG_UINT_DROP, */
-#endif
- MNG_UINT_ENDL,
- MNG_UINT_FRAM,
- MNG_UINT_IDAT,
- MNG_UINT_IEND,
- MNG_UINT_IHDR,
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
- MNG_UINT_IJNG,
-#endif
- MNG_UINT_IPNG,
-#endif
-#ifdef MNG_INCLUDE_JNG
- MNG_UINT_JDAA,
- MNG_UINT_JDAT,
- MNG_UINT_JHDR,
-/* TODO: MNG_UINT_JSEP, */
- MNG_UINT_JdAA,
-#endif
- MNG_UINT_LOOP,
- MNG_UINT_MAGN,
- MNG_UINT_MEND,
- MNG_UINT_MHDR,
- MNG_UINT_MOVE,
-/* TODO: MNG_UINT_ORDR, */
- MNG_UINT_PAST,
- MNG_UINT_PLTE,
-#ifndef MNG_NO_DELTA_PNG
- MNG_UINT_PPLT,
- MNG_UINT_PROM,
-#endif
- MNG_UINT_SAVE,
- MNG_UINT_SEEK,
- MNG_UINT_SHOW,
- MNG_UINT_TERM,
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
- MNG_UINT_adAT,
- MNG_UINT_ahDR,
-#endif
- MNG_UINT_bKGD,
- MNG_UINT_cHRM,
-/* TODO: MNG_UINT_eXPI, */
- MNG_UINT_evNT,
-/* TODO: MNG_UINT_fPRI, */
- MNG_UINT_gAMA,
-/* TODO: MNG_UINT_hIST, */
- MNG_UINT_iCCP,
- MNG_UINT_iTXt,
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- MNG_UINT_mpNG,
-#endif
- MNG_UINT_nEED,
-/* TODO: MNG_UINT_oFFs, */
-/* TODO: MNG_UINT_pCAL, */
-/* TODO: MNG_UINT_pHYg, */
-/* TODO: MNG_UINT_pHYs, */
-/* TODO: MNG_UINT_sBIT, */
-/* TODO: MNG_UINT_sCAL, */
-/* TODO: MNG_UINT_sPLT, */
- MNG_UINT_sRGB,
- MNG_UINT_tEXt,
- MNG_UINT_tIME,
- MNG_UINT_tRNS,
- MNG_UINT_zTXt,
- };
-
- mng_bool bOke = MNG_FALSE;
-
- if (pData->fProcessneed) /* does the app handle it ? */
- bOke = pData->fProcessneed ((mng_handle)pData, (mng_pchar)pKeyword);
-
- if (!bOke)
- { /* find the keyword length */
- mng_uint8p pNull = find_null (pKeyword);
-
- if (pNull - pKeyword == 4) /* test a chunk ? */
- { /* get the chunk-id */
- mng_chunkid iChunkid = (*pKeyword << 24) + (*(pKeyword+1) << 16) +
- (*(pKeyword+2) << 8) + (*(pKeyword+3) );
- /* binary search variables */
- mng_int32 iTop, iLower, iUpper, iMiddle;
- /* determine max index of table */
- iTop = (sizeof (handled_chunks) / sizeof (handled_chunks [0])) - 1;
-
- /* binary search; with 52 chunks, worst-case is 7 comparisons */
- iLower = 0;
- iMiddle = iTop >> 1;
- iUpper = iTop;
-
- do /* the binary search itself */
- {
- if (handled_chunks [iMiddle] < iChunkid)
- iLower = iMiddle + 1;
- else if (handled_chunks [iMiddle] > iChunkid)
- iUpper = iMiddle - 1;
- else
- {
- bOke = MNG_TRUE;
- break;
- }
-
- iMiddle = (iLower + iUpper) >> 1;
- }
- while (iLower <= iUpper);
- }
- /* test draft ? */
- if ((!bOke) && (pNull - pKeyword == 8) &&
- (*pKeyword == 'd') && (*(pKeyword+1) == 'r') &&
- (*(pKeyword+2) == 'a') && (*(pKeyword+3) == 'f') &&
- (*(pKeyword+4) == 't') && (*(pKeyword+5) == ' '))
- {
- mng_uint32 iDraft;
-
- iDraft = (*(pKeyword+6) - '0') * 10 + (*(pKeyword+7) - '0');
- bOke = (mng_bool)(iDraft <= MNG_MNG_DRAFT);
- }
- /* test MNG 1.0/1.1 ? */
- if ((!bOke) && (pNull - pKeyword == 7) &&
- (*pKeyword == 'M') && (*(pKeyword+1) == 'N') &&
- (*(pKeyword+2) == 'G') && (*(pKeyword+3) == '-') &&
- (*(pKeyword+4) == '1') && (*(pKeyword+5) == '.') &&
- ((*(pKeyword+6) == '0') || (*(pKeyword+6) == '1')))
- bOke = MNG_TRUE;
- /* test CACHEOFF ? */
- if ((!bOke) && (pNull - pKeyword == 8) &&
- (*pKeyword == 'C') && (*(pKeyword+1) == 'A') &&
- (*(pKeyword+2) == 'C') && (*(pKeyword+3) == 'H') &&
- (*(pKeyword+4) == 'E') && (*(pKeyword+5) == 'O') &&
- (*(pKeyword+6) == 'F') && (*(pKeyword+7) == 'F'))
- {
- if (!pData->pFirstaniobj) /* only if caching hasn't started yet ! */
- {
- bOke = MNG_TRUE;
- pData->bCacheplayback = MNG_FALSE;
- pData->bStorechunks = MNG_FALSE;
- }
- }
- }
-
- return bOke;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_nEED
-READ_CHUNK (mng_read_need)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_NEED, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen < 1) /* check the length */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- { /* let's check it */
- mng_bool bOke = MNG_TRUE;
- mng_pchar zKeywords;
- mng_uint8p pNull, pTemp;
-
- MNG_ALLOC (pData, zKeywords, iRawlen + 1);
-
- if (iRawlen)
- MNG_COPY (zKeywords, pRawdata, iRawlen);
-
- pTemp = (mng_uint8p)zKeywords;
- pNull = find_null (pTemp);
-
- while ((bOke) && (pNull < (mng_uint8p)zKeywords + iRawlen))
- {
- bOke = CheckKeyword (pData, pTemp);
- pTemp = pNull + 1;
- pNull = find_null (pTemp);
- }
-
- if (bOke)
- bOke = CheckKeyword (pData, pTemp);
-
- MNG_FREEX (pData, zKeywords, iRawlen + 1);
-
- if (!bOke)
- MNG_ERROR (pData, MNG_UNSUPPORTEDNEED);
- }
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_needp)*ppChunk)->iKeywordssize = iRawlen;
-
- if (iRawlen)
- {
- MNG_ALLOC (pData, ((mng_needp)*ppChunk)->zKeywords, iRawlen+1);
- MNG_COPY (((mng_needp)*ppChunk)->zKeywords, pRawdata, iRawlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_NEED, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_pHYg
-READ_CHUNK (mng_read_phyg)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PHYG, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* it's 9 bytes or empty; no more, no less! */
- if ((iRawlen != 9) && (iRawlen != 0))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_phygp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
-
- if (iRawlen)
- {
- ((mng_phygp)*ppChunk)->iSizex = mng_get_uint32 (pRawdata);
- ((mng_phygp)*ppChunk)->iSizey = mng_get_uint32 (pRawdata+4);
- ((mng_phygp)*ppChunk)->iUnit = *(pRawdata+8);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PHYG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_INCLUDE_JNG
-READ_CHUNK (mng_read_jhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_JHDR, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((pData->eSigtype != mng_it_jng) && (pData->eSigtype != mng_it_mng))
- MNG_ERROR (pData, MNG_CHUNKNOTALLOWED);
-
- if ((pData->eSigtype == mng_it_jng) && (pData->iChunkseq > 1))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen != 16) /* length oke ? */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- /* inside a JHDR-IEND block now */
- pData->bHasJHDR = MNG_TRUE;
- /* and store interesting fields */
- pData->iDatawidth = mng_get_uint32 (pRawdata);
- pData->iDataheight = mng_get_uint32 (pRawdata+4);
- pData->iJHDRcolortype = *(pRawdata+8);
- pData->iJHDRimgbitdepth = *(pRawdata+9);
- pData->iJHDRimgcompression = *(pRawdata+10);
- pData->iJHDRimginterlace = *(pRawdata+11);
- pData->iJHDRalphabitdepth = *(pRawdata+12);
- pData->iJHDRalphacompression = *(pRawdata+13);
- pData->iJHDRalphafilter = *(pRawdata+14);
- pData->iJHDRalphainterlace = *(pRawdata+15);
-
-
-#if defined(MNG_NO_1_2_4BIT_SUPPORT) || defined(MNG_NO_16BIT_SUPPORT)
- pData->iPNGmult = 1;
- pData->iPNGdepth = pData->iJHDRalphabitdepth;
-#endif
-
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iJHDRalphabitdepth < 8)
- pData->iJHDRalphabitdepth = 8;
-#endif
-
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iJHDRalphabitdepth > 8)
- {
- pData->iPNGmult = 2;
- pData->iJHDRalphabitdepth = 8;
- }
-#endif
- /* parameter validity checks */
- if ((pData->iJHDRcolortype != MNG_COLORTYPE_JPEGGRAY ) &&
- (pData->iJHDRcolortype != MNG_COLORTYPE_JPEGCOLOR ) &&
- (pData->iJHDRcolortype != MNG_COLORTYPE_JPEGGRAYA ) &&
- (pData->iJHDRcolortype != MNG_COLORTYPE_JPEGCOLORA) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
- if ((pData->iJHDRimgbitdepth != MNG_BITDEPTH_JPEG8 ) &&
- (pData->iJHDRimgbitdepth != MNG_BITDEPTH_JPEG12 ) &&
- (pData->iJHDRimgbitdepth != MNG_BITDEPTH_JPEG8AND12) )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if (pData->iJHDRimgcompression != MNG_COMPRESSION_BASELINEJPEG)
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
- if ((pData->iJHDRimginterlace != MNG_INTERLACE_SEQUENTIAL ) &&
- (pData->iJHDRimginterlace != MNG_INTERLACE_PROGRESSIVE) )
- MNG_ERROR (pData, MNG_INVALIDINTERLACE);
-
- if ((pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA) )
- {
- if ((pData->iJHDRalphabitdepth != MNG_BITDEPTH_8 )
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- && (pData->iJHDRalphabitdepth != MNG_BITDEPTH_1 ) &&
- (pData->iJHDRalphabitdepth != MNG_BITDEPTH_2 ) &&
- (pData->iJHDRalphabitdepth != MNG_BITDEPTH_4 )
-#endif
-#ifndef MNG_NO_16BIT_SUPPORT
- && (pData->iJHDRalphabitdepth != MNG_BITDEPTH_16)
-#endif
- )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if ((pData->iJHDRalphacompression != MNG_COMPRESSION_DEFLATE ) &&
- (pData->iJHDRalphacompression != MNG_COMPRESSION_BASELINEJPEG) )
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
- if ((pData->iJHDRalphacompression == MNG_COMPRESSION_BASELINEJPEG) &&
- (pData->iJHDRalphabitdepth != MNG_BITDEPTH_8 ) )
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
-#if defined(FILTER192) || defined(FILTER193)
- if ((pData->iJHDRalphafilter != MNG_FILTER_ADAPTIVE ) &&
-#if defined(FILTER192) && defined(FILTER193)
- (pData->iJHDRalphafilter != MNG_FILTER_DIFFERING) &&
- (pData->iJHDRalphafilter != MNG_FILTER_NOFILTER ) )
-#else
-#ifdef FILTER192
- (pData->iJHDRalphafilter != MNG_FILTER_DIFFERING) )
-#else
- (pData->iJHDRalphafilter != MNG_FILTER_NOFILTER ) )
-#endif
-#endif
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#else
- if (pData->iJHDRalphafilter)
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-#endif
-
- if ((pData->iJHDRalphainterlace != MNG_INTERLACE_NONE ) &&
- (pData->iJHDRalphainterlace != MNG_INTERLACE_ADAM7) )
- MNG_ERROR (pData, MNG_INVALIDINTERLACE);
-
- }
- else
- {
- if (pData->iJHDRalphabitdepth)
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if (pData->iJHDRalphacompression)
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
- if (pData->iJHDRalphafilter)
- MNG_ERROR (pData, MNG_INVALIDFILTER);
-
- if (pData->iJHDRalphainterlace)
- MNG_ERROR (pData, MNG_INVALIDINTERLACE);
-
- }
-
- if (!pData->bHasheader) /* first chunk ? */
- {
- pData->bHasheader = MNG_TRUE; /* we've got a header */
- pData->eImagetype = mng_it_jng; /* then this must be a JNG */
- pData->iWidth = mng_get_uint32 (pRawdata);
- pData->iHeight = mng_get_uint32 (pRawdata+4);
- /* predict alpha-depth ! */
- if ((pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA) )
- pData->iAlphadepth = pData->iJHDRalphabitdepth;
- else
- pData->iAlphadepth = 0;
- /* fits on maximum canvas ? */
- if ((pData->iWidth > pData->iMaxwidth) || (pData->iHeight > pData->iMaxheight))
- MNG_WARNING (pData, MNG_IMAGETOOLARGE);
-
- if (pData->fProcessheader) /* inform the app ? */
- if (!pData->fProcessheader (((mng_handle)pData), pData->iWidth, pData->iHeight))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- }
-
- pData->iColortype = 0; /* fake grayscale for other routines */
- pData->iImagelevel++; /* one level deeper */
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode = mng_process_display_jhdr (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_jhdrp)*ppChunk)->iWidth = mng_get_uint32 (pRawdata);
- ((mng_jhdrp)*ppChunk)->iHeight = mng_get_uint32 (pRawdata+4);
- ((mng_jhdrp)*ppChunk)->iColortype = *(pRawdata+8);
- ((mng_jhdrp)*ppChunk)->iImagesampledepth = *(pRawdata+9);
- ((mng_jhdrp)*ppChunk)->iImagecompression = *(pRawdata+10);
- ((mng_jhdrp)*ppChunk)->iImageinterlace = *(pRawdata+11);
- ((mng_jhdrp)*ppChunk)->iAlphasampledepth = *(pRawdata+12);
-#ifdef MNG_NO_16BIT_SUPPORT
- if (*(pRawdata+12) > 8)
- ((mng_jhdrp)*ppChunk)->iAlphasampledepth = 8;
-#endif
- ((mng_jhdrp)*ppChunk)->iAlphacompression = *(pRawdata+13);
- ((mng_jhdrp)*ppChunk)->iAlphafilter = *(pRawdata+14);
- ((mng_jhdrp)*ppChunk)->iAlphainterlace = *(pRawdata+15);
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_JHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#else
-#define read_jhdr 0
-#endif /* MNG_INCLUDE_JNG */
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_INCLUDE_JNG
-READ_CHUNK (mng_read_jdaa)
-{
-#if defined(MNG_SUPPORT_DISPLAY) || defined(MNG_STORE_CHUNKS)
- volatile mng_retcode iRetcode;
-
- iRetcode=MNG_NOERROR;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_JDAA, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasJHDR) && (!pData->bHasDHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (pData->bHasJSEP)
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (pData->iJHDRalphacompression != MNG_COMPRESSION_BASELINEJPEG)
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen == 0) /* can never be empty */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pData->bHasJDAA = MNG_TRUE; /* got some JDAA now, don't we */
-
-#ifdef MNG_SUPPORT_DISPLAY
- iRetcode = mng_process_display_jdaa (pData, iRawlen, pRawdata);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_jdaap)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
- ((mng_jdaap)*ppChunk)->iDatasize = iRawlen;
-
- if (iRawlen != 0) /* is there any data ? */
- {
- MNG_ALLOC (pData, ((mng_jdaap)*ppChunk)->pData, iRawlen);
- MNG_COPY (((mng_jdaap)*ppChunk)->pData, pRawdata, iRawlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_JDAA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#else
-#define read_jdaa 0
-#endif /* MNG_INCLUDE_JNG */
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_INCLUDE_JNG
-READ_CHUNK (mng_read_jdat)
-{
-#if defined(MNG_SUPPORT_DISPLAY) || defined(MNG_STORE_CHUNKS)
- volatile mng_retcode iRetcode;
-
- iRetcode=MNG_NOERROR;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_JDAT, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasJHDR) && (!pData->bHasDHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen == 0) /* can never be empty */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pData->bHasJDAT = MNG_TRUE; /* got some JDAT now, don't we */
-
-#ifdef MNG_SUPPORT_DISPLAY
- iRetcode = mng_process_display_jdat (pData, iRawlen, pRawdata);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_jdatp)*ppChunk)->bEmpty = (mng_bool)(iRawlen == 0);
- ((mng_jdatp)*ppChunk)->iDatasize = iRawlen;
-
- if (iRawlen != 0) /* is there any data ? */
- {
- MNG_ALLOC (pData, ((mng_jdatp)*ppChunk)->pData, iRawlen);
- MNG_COPY (((mng_jdatp)*ppChunk)->pData, pRawdata, iRawlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_JDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#else
-#define read_jdat 0
-#endif /* MNG_INCLUDE_JNG */
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_INCLUDE_JNG
-READ_CHUNK (mng_read_jsep)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_JSEP, MNG_LC_START);
-#endif
-
- if (!pData->bHasJHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen != 0) /* must be empty ! */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pData->bHasJSEP = MNG_TRUE; /* indicate we've had the 8-/12-bit separator */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_JSEP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#else
-#define read_jsep 0
-#endif /* MNG_INCLUDE_JNG */
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_NO_DELTA_PNG
-READ_CHUNK (mng_read_dhdr)
-{
- mng_uint8 iImagetype, iDeltatype;
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DHDR, MNG_LC_START);
-#endif
-
- if (!pData->bHasMHDR) /* sequence checks */
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* check for valid length */
- if ((iRawlen != 4) && (iRawlen != 12) && (iRawlen != 20))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- iImagetype = *(pRawdata+2); /* check fields for validity */
- iDeltatype = *(pRawdata+3);
-
- if (iImagetype > MNG_IMAGETYPE_JNG)
- MNG_ERROR (pData, MNG_INVIMAGETYPE);
-
- if (iDeltatype > MNG_DELTATYPE_NOCHANGE)
- MNG_ERROR (pData, MNG_INVDELTATYPE);
-
- if ((iDeltatype == MNG_DELTATYPE_REPLACE) && (iRawlen > 12))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((iDeltatype == MNG_DELTATYPE_NOCHANGE) && (iRawlen > 4))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- pData->bHasDHDR = MNG_TRUE; /* inside a DHDR-IEND block now */
- pData->iDeltatype = iDeltatype;
-
- pData->iImagelevel++; /* one level deeper */
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_uint16 iObjectid = mng_get_uint16 (pRawdata);
- mng_uint32 iBlockwidth = 0;
- mng_uint32 iBlockheight = 0;
- mng_uint32 iBlockx = 0;
- mng_uint32 iBlocky = 0;
- mng_retcode iRetcode;
-
- if (iRawlen > 4)
- {
- iBlockwidth = mng_get_uint32 (pRawdata+4);
- iBlockheight = mng_get_uint32 (pRawdata+8);
- }
-
- if (iRawlen > 12)
- {
- iBlockx = mng_get_uint32 (pRawdata+12);
- iBlocky = mng_get_uint32 (pRawdata+16);
- }
-
- iRetcode = mng_create_ani_dhdr (pData, iObjectid, iImagetype, iDeltatype,
- iBlockwidth, iBlockheight, iBlockx, iBlocky);
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_dhdr (pData, iObjectid, iImagetype, iDeltatype,
- iBlockwidth, iBlockheight, iBlockx, iBlocky); */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_dhdrp)*ppChunk)->iObjectid = mng_get_uint16 (pRawdata);
- ((mng_dhdrp)*ppChunk)->iImagetype = iImagetype;
- ((mng_dhdrp)*ppChunk)->iDeltatype = iDeltatype;
-
- if (iRawlen > 4)
- {
- ((mng_dhdrp)*ppChunk)->iBlockwidth = mng_get_uint32 (pRawdata+4);
- ((mng_dhdrp)*ppChunk)->iBlockheight = mng_get_uint32 (pRawdata+8);
- }
-
- if (iRawlen > 12)
- {
- ((mng_dhdrp)*ppChunk)->iBlockx = mng_get_uint32 (pRawdata+12);
- ((mng_dhdrp)*ppChunk)->iBlocky = mng_get_uint32 (pRawdata+16);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_NO_DELTA_PNG
-READ_CHUNK (mng_read_prom)
-{
- mng_uint8 iColortype;
- mng_uint8 iSampledepth;
- mng_uint8 iFilltype;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PROM, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) || (!pData->bHasDHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen != 3) /* gotta be exactly 3 bytes */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- iColortype = *pRawdata; /* check fields for validity */
- iSampledepth = *(pRawdata+1);
- iFilltype = *(pRawdata+2);
-
- if ((iColortype != MNG_COLORTYPE_GRAY ) &&
- (iColortype != MNG_COLORTYPE_RGB ) &&
- (iColortype != MNG_COLORTYPE_INDEXED) &&
- (iColortype != MNG_COLORTYPE_GRAYA ) &&
- (iColortype != MNG_COLORTYPE_RGBA ) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
-#ifdef MNG_NO_16BIT_SUPPORT
- if (iSampledepth == MNG_BITDEPTH_16 )
- iSampledepth = MNG_BITDEPTH_8;
-#endif
-
- if ((iSampledepth != MNG_BITDEPTH_1 ) &&
- (iSampledepth != MNG_BITDEPTH_2 ) &&
- (iSampledepth != MNG_BITDEPTH_4 ) &&
- (iSampledepth != MNG_BITDEPTH_8 )
-#ifndef MNG_NO_16BIT_SUPPORT
- && (iSampledepth != MNG_BITDEPTH_16)
-#endif
- )
- MNG_ERROR (pData, MNG_INVSAMPLEDEPTH);
-
- if ((iFilltype != MNG_FILLMETHOD_LEFTBITREPLICATE) &&
- (iFilltype != MNG_FILLMETHOD_ZEROFILL ) )
- MNG_ERROR (pData, MNG_INVFILLMETHOD);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode = mng_create_ani_prom (pData, iSampledepth,
- iColortype, iFilltype);
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_prom (pData, iSampledepth,
- iColortype, iFilltype); */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_promp)*ppChunk)->iColortype = iColortype;
- ((mng_promp)*ppChunk)->iSampledepth = iSampledepth;
- ((mng_promp)*ppChunk)->iFilltype = iFilltype;
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PROM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_NO_DELTA_PNG
-READ_CHUNK (mng_read_ipng)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_IPNG, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) || (!pData->bHasDHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen != 0) /* gotta be empty */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode = mng_create_ani_ipng (pData);
-
- if (!iRetcode)
- iRetcode = mng_process_display_ipng (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_IPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_NO_DELTA_PNG
-READ_CHUNK (mng_read_pplt)
-{
- mng_uint8 iDeltatype;
- mng_uint8p pTemp;
- mng_uint32 iLen;
- mng_uint8 iX, iM;
- mng_uint32 iY;
- mng_uint32 iMax;
- mng_rgbpaltab aIndexentries;
- mng_uint8arr aAlphaentries;
- mng_uint8arr aUsedentries;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PPLT, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) && (!pData->bHasDHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen < 1) /* must have at least 1 byte */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- iDeltatype = *pRawdata;
- /* valid ? */
- if (iDeltatype > MNG_DELTATYPE_DELTARGBA)
- MNG_ERROR (pData, MNG_INVDELTATYPE);
- /* must be indexed color ! */
- if (pData->iColortype != MNG_COLORTYPE_INDEXED)
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
- pTemp = pRawdata + 1;
- iLen = iRawlen - 1;
- iMax = 0;
-
- for (iY = 0; iY < 256; iY++) /* reset arrays */
- {
- aIndexentries [iY].iRed = 0;
- aIndexentries [iY].iGreen = 0;
- aIndexentries [iY].iBlue = 0;
- aAlphaentries [iY] = 255;
- aUsedentries [iY] = 0;
- }
-
- while (iLen) /* as long as there are entries left ... */
- {
- mng_uint32 iDiff;
-
- if (iLen < 2)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- iX = *pTemp; /* get start and end index */
- iM = *(pTemp+1);
-
- if (iM < iX)
- MNG_ERROR (pData, MNG_INVALIDINDEX);
-
- if ((mng_uint32)iM >= iMax) /* determine highest used index */
- iMax = (mng_uint32)iM + 1;
-
- pTemp += 2;
- iLen -= 2;
- iDiff = (iM - iX + 1);
- if ((iDeltatype == MNG_DELTATYPE_REPLACERGB ) ||
- (iDeltatype == MNG_DELTATYPE_DELTARGB ) )
- iDiff = iDiff * 3;
- else
- if ((iDeltatype == MNG_DELTATYPE_REPLACERGBA) ||
- (iDeltatype == MNG_DELTATYPE_DELTARGBA ) )
- iDiff = iDiff * 4;
-
- if (iLen < iDiff)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- if ((iDeltatype == MNG_DELTATYPE_REPLACERGB ) ||
- (iDeltatype == MNG_DELTATYPE_DELTARGB ) )
- {
- for (iY = (mng_uint32)iX; iY <= (mng_uint32)iM; iY++)
- {
- aIndexentries [iY].iRed = *pTemp;
- aIndexentries [iY].iGreen = *(pTemp+1);
- aIndexentries [iY].iBlue = *(pTemp+2);
- aUsedentries [iY] = 1;
-
- pTemp += 3;
- iLen -= 3;
- }
- }
- else
- if ((iDeltatype == MNG_DELTATYPE_REPLACEALPHA) ||
- (iDeltatype == MNG_DELTATYPE_DELTAALPHA ) )
- {
- for (iY = (mng_uint32)iX; iY <= (mng_uint32)iM; iY++)
- {
- aAlphaentries [iY] = *pTemp;
- aUsedentries [iY] = 1;
-
- pTemp++;
- iLen--;
- }
- }
- else
- {
- for (iY = (mng_uint32)iX; iY <= (mng_uint32)iM; iY++)
- {
- aIndexentries [iY].iRed = *pTemp;
- aIndexentries [iY].iGreen = *(pTemp+1);
- aIndexentries [iY].iBlue = *(pTemp+2);
- aAlphaentries [iY] = *(pTemp+3);
- aUsedentries [iY] = 1;
-
- pTemp += 4;
- iLen -= 4;
- }
- }
- }
-
- switch (pData->iBitdepth) /* check maximum allowed entries for bitdepth */
- {
- case MNG_BITDEPTH_1 : {
- if (iMax > 2)
- MNG_ERROR (pData, MNG_INVALIDINDEX);
- break;
- }
- case MNG_BITDEPTH_2 : {
- if (iMax > 4)
- MNG_ERROR (pData, MNG_INVALIDINDEX);
- break;
- }
- case MNG_BITDEPTH_4 : {
- if (iMax > 16)
- MNG_ERROR (pData, MNG_INVALIDINDEX);
- break;
- }
- }
-
-#ifdef MNG_SUPPORT_DISPLAY
- { /* create animation object */
- mng_retcode iRetcode = mng_create_ani_pplt (pData, iDeltatype, iMax,
- aIndexentries, aAlphaentries,
- aUsedentries);
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_pplt (pData, iDeltatype, iMax, aIndexentries,
- aAlphaentries, aUsedentries); */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_ppltp)*ppChunk)->iDeltatype = iDeltatype;
- ((mng_ppltp)*ppChunk)->iCount = iMax;
-
- for (iY = 0; iY < 256; iY++)
- {
- ((mng_ppltp)*ppChunk)->aEntries [iY].iRed = aIndexentries [iY].iRed;
- ((mng_ppltp)*ppChunk)->aEntries [iY].iGreen = aIndexentries [iY].iGreen;
- ((mng_ppltp)*ppChunk)->aEntries [iY].iBlue = aIndexentries [iY].iBlue;
- ((mng_ppltp)*ppChunk)->aEntries [iY].iAlpha = aAlphaentries [iY];
- ((mng_ppltp)*ppChunk)->aEntries [iY].bUsed = (mng_bool)(aUsedentries [iY]);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_PPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
-READ_CHUNK (mng_read_ijng)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_IJNG, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) || (!pData->bHasDHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen != 0) /* gotta be empty */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode = mng_create_ani_ijng (pData);
-
- if (!iRetcode)
- iRetcode = mng_process_display_ijng (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_IJNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_NO_DELTA_PNG
-READ_CHUNK (mng_read_drop)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DROP, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) || (!pData->bHasDHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* check length */
- if ((iRawlen < 4) || ((iRawlen % 4) != 0))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_dropp)*ppChunk)->iCount = iRawlen / 4;
-
- if (iRawlen)
- {
- mng_uint32 iX;
- mng_uint8p pTemp = pRawdata;
- mng_uint32p pEntry;
-
- MNG_ALLOC (pData, pEntry, iRawlen);
-
- ((mng_dropp)*ppChunk)->pChunknames = (mng_ptr)pEntry;
-
- for (iX = 0; iX < iRawlen / 4; iX++)
- {
- *pEntry = mng_get_uint32 (pTemp);
-
- pTemp += 4;
- pEntry++;
- }
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DROP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
-READ_CHUNK (mng_read_dbyk)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DBYK, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) || (!pData->bHasDHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen < 6) /* must be at least 6 long */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_dbykp)*ppChunk)->iChunkname = mng_get_uint32 (pRawdata);
- ((mng_dbykp)*ppChunk)->iPolarity = *(pRawdata+4);
- ((mng_dbykp)*ppChunk)->iKeywordssize = iRawlen - 5;
-
- if (iRawlen > 5)
- {
- MNG_ALLOC (pData, ((mng_dbykp)*ppChunk)->zKeywords, iRawlen-4);
- MNG_COPY (((mng_dbykp)*ppChunk)->zKeywords, pRawdata+5, iRawlen-5);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DBYK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-READ_CHUNK (mng_read_ordr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_ORDR, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) || (!pData->bHasDHDR))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* check length */
- if ((iRawlen < 5) || ((iRawlen % 5) != 0))
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
-
-
- /* TODO: something !!! */
-
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_ordrp)*ppChunk)->iCount = iRawlen / 5;
-
- if (iRawlen)
- {
- mng_uint32 iX;
- mng_ordr_entryp pEntry;
- mng_uint8p pTemp = pRawdata;
-
- MNG_ALLOC (pData, pEntry, iRawlen);
-
- ((mng_ordrp)*ppChunk)->pEntries = pEntry;
-
- for (iX = 0; iX < iRawlen / 5; iX++)
- {
- pEntry->iChunkname = mng_get_uint32 (pTemp);
- pEntry->iOrdertype = *(pTemp+4);
-
- pTemp += 5;
- pEntry++;
- }
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_ORDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_MAGN
-READ_CHUNK (mng_read_magn)
-{
- mng_uint16 iFirstid, iLastid;
- mng_uint8 iMethodX, iMethodY;
- mng_uint16 iMX, iMY, iML, iMR, iMT, iMB;
- mng_bool bFaulty;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_MAGN, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_SUPPORT_JNG
- if ((!pData->bHasMHDR) || (pData->bHasIHDR) || (pData->bHasDHDR) || (pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) || (pData->bHasIHDR) || (pData->bHasDHDR))
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* check length */
- if (iRawlen > 20)
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- /* following is an ugly hack to allow faulty layout caused by previous
- versions of libmng and MNGeye, which wrote MAGN with a 16-bit
- MethodX/MethodY (as opposed to the proper 8-bit as defined in the spec!) */
-
- if ((iRawlen == 6) || (iRawlen == 8) || (iRawlen == 10) || (iRawlen == 12) ||
- (iRawlen == 14) || (iRawlen == 16) || (iRawlen == 20))
- bFaulty = MNG_TRUE; /* these lengths are all wrong */
- else /* length 18 can be right or wrong !!! */
- if ((iRawlen == 18) && (mng_get_uint16 (pRawdata+4) <= 5) &&
- (mng_get_uint16 (pRawdata+6) < 256) &&
- (mng_get_uint16 (pRawdata+8) < 256) &&
- (mng_get_uint16 (pRawdata+10) < 256) &&
- (mng_get_uint16 (pRawdata+12) < 256) &&
- (mng_get_uint16 (pRawdata+14) < 256) &&
- (mng_get_uint16 (pRawdata+16) < 256))
- bFaulty = MNG_TRUE; /* this is very likely the wrong layout */
- else
- bFaulty = MNG_FALSE; /* all other cases are handled as right */
-
- if (bFaulty) /* wrong layout ? */
- {
- if (iRawlen > 0) /* get the fields */
- iFirstid = mng_get_uint16 (pRawdata);
- else
- iFirstid = 0;
-
- if (iRawlen > 2)
- iLastid = mng_get_uint16 (pRawdata+2);
- else
- iLastid = iFirstid;
-
- if (iRawlen > 4)
- iMethodX = (mng_uint8)(mng_get_uint16 (pRawdata+4));
- else
- iMethodX = 0;
-
- if (iRawlen > 6)
- iMX = mng_get_uint16 (pRawdata+6);
- else
- iMX = 1;
-
- if (iRawlen > 8)
- iMY = mng_get_uint16 (pRawdata+8);
- else
- iMY = iMX;
-
- if (iRawlen > 10)
- iML = mng_get_uint16 (pRawdata+10);
- else
- iML = iMX;
-
- if (iRawlen > 12)
- iMR = mng_get_uint16 (pRawdata+12);
- else
- iMR = iMX;
-
- if (iRawlen > 14)
- iMT = mng_get_uint16 (pRawdata+14);
- else
- iMT = iMY;
-
- if (iRawlen > 16)
- iMB = mng_get_uint16 (pRawdata+16);
- else
- iMB = iMY;
-
- if (iRawlen > 18)
- iMethodY = (mng_uint8)(mng_get_uint16 (pRawdata+18));
- else
- iMethodY = iMethodX;
- }
- else /* proper layout !!!! */
- {
- if (iRawlen > 0) /* get the fields */
- iFirstid = mng_get_uint16 (pRawdata);
- else
- iFirstid = 0;
-
- if (iRawlen > 2)
- iLastid = mng_get_uint16 (pRawdata+2);
- else
- iLastid = iFirstid;
-
- if (iRawlen > 4)
- iMethodX = *(pRawdata+4);
- else
- iMethodX = 0;
-
- if (iRawlen > 5)
- iMX = mng_get_uint16 (pRawdata+5);
- else
- iMX = 1;
-
- if (iRawlen > 7)
- iMY = mng_get_uint16 (pRawdata+7);
- else
- iMY = iMX;
-
- if (iRawlen > 9)
- iML = mng_get_uint16 (pRawdata+9);
- else
- iML = iMX;
-
- if (iRawlen > 11)
- iMR = mng_get_uint16 (pRawdata+11);
- else
- iMR = iMX;
-
- if (iRawlen > 13)
- iMT = mng_get_uint16 (pRawdata+13);
- else
- iMT = iMY;
-
- if (iRawlen > 15)
- iMB = mng_get_uint16 (pRawdata+15);
- else
- iMB = iMY;
-
- if (iRawlen > 17)
- iMethodY = *(pRawdata+17);
- else
- iMethodY = iMethodX;
- }
- /* check field validity */
- if ((iMethodX > 5) || (iMethodY > 5))
- MNG_ERROR (pData, MNG_INVALIDMETHOD);
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- mng_retcode iRetcode;
-
- iRetcode = mng_create_ani_magn (pData, iFirstid, iLastid, iMethodX,
- iMX, iMY, iML, iMR, iMT, iMB, iMethodY);
-
-/* if (!iRetcode)
- iRetcode = mng_process_display_magn (pData, iFirstid, iLastid, iMethodX,
- iMX, iMY, iML, iMR, iMT, iMB, iMethodY); */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_magnp)*ppChunk)->iFirstid = iFirstid;
- ((mng_magnp)*ppChunk)->iLastid = iLastid;
- ((mng_magnp)*ppChunk)->iMethodX = iMethodX;
- ((mng_magnp)*ppChunk)->iMX = iMX;
- ((mng_magnp)*ppChunk)->iMY = iMY;
- ((mng_magnp)*ppChunk)->iML = iML;
- ((mng_magnp)*ppChunk)->iMR = iMR;
- ((mng_magnp)*ppChunk)->iMT = iMT;
- ((mng_magnp)*ppChunk)->iMB = iMB;
- ((mng_magnp)*ppChunk)->iMethodY = iMethodY;
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_MAGN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-READ_CHUNK (mng_read_mpng)
-{
- mng_uint32 iFramewidth;
- mng_uint32 iFrameheight;
- mng_uint16 iTickspersec;
- mng_uint32 iFramessize;
- mng_uint32 iCompressedsize;
-#if defined(MNG_SUPPORT_DISPLAY) || defined(MNG_STORE_CHUNKS)
- mng_retcode iRetcode;
- mng_uint16 iNumplays;
- mng_uint32 iBufsize;
- mng_uint8p pBuf = 0;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_MPNG, MNG_LC_START);
-#endif
- /* sequence checks */
- if (!pData->bHasIHDR)
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen < 41) /* length must be at least 41 */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
- iFramewidth = mng_get_int32 (pRawdata);
- if (iFramewidth == 0) /* frame_width must not be zero */
- MNG_ERROR (pData, MNG_INVALIDWIDTH);
-
- iFrameheight = mng_get_int32 (pRawdata+4);
- if (iFrameheight == 0) /* frame_height must not be zero */
- MNG_ERROR (pData, MNG_INVALIDHEIGHT);
-
- iTickspersec = mng_get_uint16 (pRawdata+10);
- if (iTickspersec == 0) /* delay_den must not be zero */
- MNG_ERROR (pData, MNG_INVALIDFIELDVAL);
-
- if (*(pRawdata+12) != 0) /* only deflate compression-method allowed */
- MNG_ERROR (pData, MNG_INVALIDCOMPRESS);
-
-#if defined(MNG_SUPPORT_DISPLAY) || defined(MNG_STORE_CHUNKS)
- iNumplays = mng_get_uint16 (pRawdata+8);
- iCompressedsize = (mng_uint32)(iRawlen - 13);
-#endif
-
-#ifdef MNG_SUPPORT_DISPLAY
- {
- iRetcode = mng_inflate_buffer (pData, pRawdata+13, iCompressedsize,
- &pBuf, &iBufsize, &iFramessize);
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
-
- if (iFramessize % 26)
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-
- iRetcode = mng_create_mpng_obj (pData, iFramewidth, iFrameheight, iNumplays,
- iTickspersec, iFramessize, pBuf);
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
- }
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the fields */
- ((mng_mpngp)*ppChunk)->iFramewidth = iFramewidth;
- ((mng_mpngp)*ppChunk)->iFrameheight = iFrameheight;
- ((mng_mpngp)*ppChunk)->iNumplays = iNumplays;
- ((mng_mpngp)*ppChunk)->iTickspersec = iTickspersec;
- ((mng_mpngp)*ppChunk)->iCompressionmethod = *(pRawdata+14);
-
-#ifndef MNG_SUPPORT_DISPLAY
- iRetcode = mng_inflate_buffer (pData, pRawdata+13, iCompressedsize,
- &pBuf, &iBufsize, &iFramessize);
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- return iRetcode;
- }
-
- if (iFramessize % 26)
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- }
-#endif
-
- if (iFramessize)
- {
- MNG_ALLOCX (pData, ((mng_mpngp)*ppChunk)->pFrames, iFramessize);
- if (((mng_mpngp)*ppChunk)->pFrames == 0)
- {
- MNG_FREEX (pData, pBuf, iBufsize);
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
-
- ((mng_mpngp)*ppChunk)->iFramessize = iFramessize;
- MNG_COPY (((mng_mpngp)*ppChunk)->pFrames, pBuf, iFramessize);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#if defined(MNG_SUPPORT_DISPLAY) || defined(MNG_STORE_CHUNKS)
- MNG_FREEX (pData, pBuf, iBufsize);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_MPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifndef MNG_SKIPCHUNK_evNT
-READ_CHUNK (mng_read_evnt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_EVNT, MNG_LC_START);
-#endif
- /* sequence checks */
- if ((!pData->bHasMHDR) || (pData->bHasSAVE))
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
-
- if (iRawlen < 2) /* must have at least 1 entry ! */
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_SUPPORT_DYNAMICMNG)
- {
- if (iRawlen) /* not empty ? */
- {
- mng_retcode iRetcode;
- mng_uint8p pTemp;
- mng_uint8p pNull;
- mng_uint32 iLen;
- mng_uint8 iEventtype;
- mng_uint8 iMasktype;
- mng_int32 iLeft;
- mng_int32 iRight;
- mng_int32 iTop;
- mng_int32 iBottom;
- mng_uint16 iObjectid;
- mng_uint8 iIndex;
- mng_uint32 iNamesize;
-
- pTemp = pRawdata;
- iLen = iRawlen;
-
- while (iLen) /* anything left ? */
- {
- iEventtype = *pTemp; /* eventtype */
- if (iEventtype > 5)
- MNG_ERROR (pData, MNG_INVALIDEVENT);
-
- pTemp++;
-
- iMasktype = *pTemp; /* masktype */
- if (iMasktype > 5)
- MNG_ERROR (pData, MNG_INVALIDMASK);
-
- pTemp++;
- iLen -= 2;
-
- iLeft = 0;
- iRight = 0;
- iTop = 0;
- iBottom = 0;
- iObjectid = 0;
- iIndex = 0;
-
- switch (iMasktype)
- {
- case 1 :
- {
- if (iLen > 16)
- {
- iLeft = mng_get_int32 (pTemp);
- iRight = mng_get_int32 (pTemp+4);
- iTop = mng_get_int32 (pTemp+8);
- iBottom = mng_get_int32 (pTemp+12);
- pTemp += 16;
- iLen -= 16;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 2 :
- {
- if (iLen > 2)
- {
- iObjectid = mng_get_uint16 (pTemp);
- pTemp += 2;
- iLen -= 2;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 3 :
- {
- if (iLen > 3)
- {
- iObjectid = mng_get_uint16 (pTemp);
- iIndex = *(pTemp+2);
- pTemp += 3;
- iLen -= 3;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 4 :
- {
- if (iLen > 18)
- {
- iLeft = mng_get_int32 (pTemp);
- iRight = mng_get_int32 (pTemp+4);
- iTop = mng_get_int32 (pTemp+8);
- iBottom = mng_get_int32 (pTemp+12);
- iObjectid = mng_get_uint16 (pTemp+16);
- pTemp += 18;
- iLen -= 18;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 5 :
- {
- if (iLen > 19)
- {
- iLeft = mng_get_int32 (pTemp);
- iRight = mng_get_int32 (pTemp+4);
- iTop = mng_get_int32 (pTemp+8);
- iBottom = mng_get_int32 (pTemp+12);
- iObjectid = mng_get_uint16 (pTemp+16);
- iIndex = *(pTemp+18);
- pTemp += 19;
- iLen -= 19;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- }
-
- pNull = find_null (pTemp); /* get the name length */
-
- if ((pNull - pTemp) > (mng_int32)iLen)
- {
- iNamesize = iLen; /* no null found; so end of evNT */
- iLen = 0;
- }
- else
- {
- iNamesize = pNull - pTemp; /* should be another entry */
- iLen = iLen - iNamesize - 1;
-
- if (!iLen) /* must not end with a null ! */
- MNG_ERROR (pData, MNG_ENDWITHNULL);
- }
-
- iRetcode = mng_create_event (pData, iEventtype, iMasktype, iLeft, iRight,
- iTop, iBottom, iObjectid, iIndex,
- iNamesize, (mng_pchar)pTemp);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pTemp = pTemp + iNamesize + 1;
- }
- }
- }
-#endif /* MNG_SUPPORT_DISPLAY && MNG_SUPPORT_DYNAMICMNG */
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (iRawlen) /* not empty ? */
- {
- mng_uint32 iX;
- mng_uint32 iCount = 0;
- mng_uint8p pTemp;
- mng_uint8p pNull;
- mng_uint32 iLen;
- mng_uint8 iEventtype;
- mng_uint8 iMasktype;
- mng_int32 iLeft;
- mng_int32 iRight;
- mng_int32 iTop;
- mng_int32 iBottom;
- mng_uint16 iObjectid;
- mng_uint8 iIndex;
- mng_uint32 iNamesize;
- mng_evnt_entryp pEntry = MNG_NULL;
-
- for (iX = 0; iX < 2; iX++) /* do this twice to get the count first ! */
- {
- pTemp = pRawdata;
- iLen = iRawlen;
-
- if (iX) /* second run ? */
- {
- MNG_ALLOC (pData, pEntry, (iCount * sizeof (mng_evnt_entry)));
-
- ((mng_evntp)*ppChunk)->iCount = iCount;
- ((mng_evntp)*ppChunk)->pEntries = pEntry;
- }
-
- while (iLen) /* anything left ? */
- {
- iEventtype = *pTemp; /* eventtype */
- if (iEventtype > 5)
- MNG_ERROR (pData, MNG_INVALIDEVENT);
-
- pTemp++;
-
- iMasktype = *pTemp; /* masktype */
- if (iMasktype > 5)
- MNG_ERROR (pData, MNG_INVALIDMASK);
-
- pTemp++;
- iLen -= 2;
-
- iLeft = 0;
- iRight = 0;
- iTop = 0;
- iBottom = 0;
- iObjectid = 0;
- iIndex = 0;
-
- switch (iMasktype)
- {
- case 1 :
- {
- if (iLen > 16)
- {
- iLeft = mng_get_int32 (pTemp);
- iRight = mng_get_int32 (pTemp+4);
- iTop = mng_get_int32 (pTemp+8);
- iBottom = mng_get_int32 (pTemp+12);
- pTemp += 16;
- iLen -= 16;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 2 :
- {
- if (iLen > 2)
- {
- iObjectid = mng_get_uint16 (pTemp);
- pTemp += 2;
- iLen -= 2;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 3 :
- {
- if (iLen > 3)
- {
- iObjectid = mng_get_uint16 (pTemp);
- iIndex = *(pTemp+2);
- pTemp += 3;
- iLen -= 3;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 4 :
- {
- if (iLen > 18)
- {
- iLeft = mng_get_int32 (pTemp);
- iRight = mng_get_int32 (pTemp+4);
- iTop = mng_get_int32 (pTemp+8);
- iBottom = mng_get_int32 (pTemp+12);
- iObjectid = mng_get_uint16 (pTemp+16);
- pTemp += 18;
- iLen -= 18;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- case 5 :
- {
- if (iLen > 19)
- {
- iLeft = mng_get_int32 (pTemp);
- iRight = mng_get_int32 (pTemp+4);
- iTop = mng_get_int32 (pTemp+8);
- iBottom = mng_get_int32 (pTemp+12);
- iObjectid = mng_get_uint16 (pTemp+16);
- iIndex = *(pTemp+18);
- pTemp += 19;
- iLen -= 19;
- }
- else
- MNG_ERROR (pData, MNG_INVALIDLENGTH);
- break;
- }
- }
-
- pNull = find_null (pTemp); /* get the name length */
-
- if ((pNull - pTemp) > (mng_int32)iLen)
- {
- iNamesize = iLen; /* no null found; so end of evNT */
- iLen = 0;
- }
- else
- {
- iNamesize = pNull - pTemp; /* should be another entry */
- iLen = iLen - iNamesize - 1;
-
- if (!iLen) /* must not end with a null ! */
- MNG_ERROR (pData, MNG_ENDWITHNULL);
- }
-
- if (!iX)
- {
- iCount++;
- }
- else
- {
- pEntry->iEventtype = iEventtype;
- pEntry->iMasktype = iMasktype;
- pEntry->iLeft = iLeft;
- pEntry->iRight = iRight;
- pEntry->iTop = iTop;
- pEntry->iBottom = iBottom;
- pEntry->iObjectid = iObjectid;
- pEntry->iIndex = iIndex;
- pEntry->iSegmentnamesize = iNamesize;
-
- if (iNamesize)
- {
- MNG_ALLOC (pData, pEntry->zSegmentname, iNamesize+1);
- MNG_COPY (pEntry->zSegmentname, pTemp, iNamesize);
- }
-
- pEntry++;
- }
-
- pTemp = pTemp + iNamesize + 1;
- }
- }
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_EVNT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_unknown)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_UNKNOWN, MNG_LC_START);
-#endif
- /* sequence checks */
-#ifdef MNG_INCLUDE_JNG
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) &&
- (!pData->bHasBASI) && (!pData->bHasDHDR) )
-#endif
- MNG_ERROR (pData, MNG_SEQUENCEERROR);
- /* critical chunk ? */
- if ((((mng_uint32)pData->iChunkname & 0x20000000) == 0)
-#ifdef MNG_SKIPCHUNK_SAVE
- && (pData->iChunkname != MNG_UINT_SAVE)
-#endif
-#ifdef MNG_SKIPCHUNK_SEEK
- && (pData->iChunkname != MNG_UINT_SEEK)
-#endif
-#ifdef MNG_SKIPCHUNK_DBYK
- && (pData->iChunkname != MNG_UINT_DBYK)
-#endif
-#ifdef MNG_SKIPCHUNK_ORDR
- && (pData->iChunkname != MNG_UINT_ORDR)
-#endif
- )
- MNG_ERROR (pData, MNG_UNKNOWNCRITICAL);
-
- if (pData->fProcessunknown) /* let the app handle it ? */
- {
- mng_bool bOke = pData->fProcessunknown ((mng_handle)pData, pData->iChunkname,
- iRawlen, (mng_ptr)pRawdata);
-
- if (!bOke)
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
-
-#ifdef MNG_STORE_CHUNKS
- if (pData->bStorechunks)
- { /* initialize storage */
- mng_retcode iRetcode = ((mng_chunk_headerp)pHeader)->fCreate (pData, pHeader, ppChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* store the length */
- ((mng_chunk_headerp)*ppChunk)->iChunkname = pData->iChunkname;
- ((mng_unknown_chunkp)*ppChunk)->iDatasize = iRawlen;
-
- if (iRawlen == 0) /* any data at all ? */
- ((mng_unknown_chunkp)*ppChunk)->pData = 0;
- else
- { /* then store it */
- MNG_ALLOC (pData, ((mng_unknown_chunkp)*ppChunk)->pData, iRawlen);
- MNG_COPY (((mng_unknown_chunkp)*ppChunk)->pData, pRawdata, iRawlen);
- }
- }
-#endif /* MNG_STORE_CHUNKS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_UNKNOWN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-#endif
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_READ_PROCS */
-
-/* ************************************************************************** */
-/* * * */
-/* * chunk write functions * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_WRITE_PROCS
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_ihdr)
-{
- mng_ihdrp pIHDR;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_IHDR, MNG_LC_START);
-#endif
-
- pIHDR = (mng_ihdrp)pChunk; /* address the proper chunk */
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 13;
- /* fill the output buffer */
- mng_put_uint32 (pRawdata, pIHDR->iWidth);
- mng_put_uint32 (pRawdata+4, pIHDR->iHeight);
-
- *(pRawdata+8) = pIHDR->iBitdepth;
- *(pRawdata+9) = pIHDR->iColortype;
- *(pRawdata+10) = pIHDR->iCompression;
- *(pRawdata+11) = pIHDR->iFilter;
- *(pRawdata+12) = pIHDR->iInterlace;
- /* and write it */
- iRetcode = write_raw_chunk (pData, pIHDR->sHeader.iChunkname, iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_IHDR, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_plte)
-{
- mng_pltep pPLTE;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint8p pTemp;
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PLTE, MNG_LC_START);
-#endif
-
- pPLTE = (mng_pltep)pChunk; /* address the proper chunk */
-
- if (pPLTE->bEmpty) /* write empty chunk ? */
- iRetcode = write_raw_chunk (pData, pPLTE->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pPLTE->iEntrycount * 3;
- /* fill the output buffer */
- pTemp = pRawdata;
-
- for (iX = 0; iX < pPLTE->iEntrycount; iX++)
- {
- *pTemp = pPLTE->aEntries [iX].iRed;
- *(pTemp+1) = pPLTE->aEntries [iX].iGreen;
- *(pTemp+2) = pPLTE->aEntries [iX].iBlue;
-
- pTemp += 3;
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pPLTE->sHeader.iChunkname, iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PLTE, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_idat)
-{
- mng_idatp pIDAT;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_IDAT, MNG_LC_START);
-#endif
-
- pIDAT = (mng_idatp)pChunk; /* address the proper chunk */
-
- if (pIDAT->bEmpty) /* and write it */
- iRetcode = write_raw_chunk (pData, pIDAT->sHeader.iChunkname, 0, 0);
- else
- iRetcode = write_raw_chunk (pData, pIDAT->sHeader.iChunkname,
- pIDAT->iDatasize, pIDAT->pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_IDAT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_iend)
-{
- mng_iendp pIEND;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_IEND, MNG_LC_START);
-#endif
-
- pIEND = (mng_iendp)pChunk; /* address the proper chunk */
- /* and write it */
- iRetcode = write_raw_chunk (pData, pIEND->sHeader.iChunkname, 0, 0);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_IEND, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_trns)
-{
- mng_trnsp pTRNS;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint8p pTemp;
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_TRNS, MNG_LC_START);
-#endif
-
- pTRNS = (mng_trnsp)pChunk; /* address the proper chunk */
-
- if (pTRNS->bEmpty) /* write empty chunk ? */
- iRetcode = write_raw_chunk (pData, pTRNS->sHeader.iChunkname, 0, 0);
- else
- if (pTRNS->bGlobal) /* write global chunk ? */
- iRetcode = write_raw_chunk (pData, pTRNS->sHeader.iChunkname,
- pTRNS->iRawlen, (mng_uint8p)pTRNS->aRawdata);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer */
- iRawlen = 0; /* and default size */
-
- switch (pTRNS->iType)
- {
- case 0: {
- iRawlen = 2; /* fill the size & output buffer */
- mng_put_uint16 (pRawdata, pTRNS->iGray);
-
- break;
- }
- case 2: {
- iRawlen = 6; /* fill the size & output buffer */
- mng_put_uint16 (pRawdata, pTRNS->iRed);
- mng_put_uint16 (pRawdata+2, pTRNS->iGreen);
- mng_put_uint16 (pRawdata+4, pTRNS->iBlue);
-
- break;
- }
- case 3: { /* init output buffer size */
- iRawlen = pTRNS->iCount;
-
- pTemp = pRawdata; /* fill the output buffer */
-
- for (iX = 0; iX < pTRNS->iCount; iX++)
- {
- *pTemp = pTRNS->aEntries[iX];
- pTemp++;
- }
-
- break;
- }
- }
- /* write the chunk */
- iRetcode = write_raw_chunk (pData, pTRNS->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_TRNS, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_gama)
-{
- mng_gamap pGAMA;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_GAMA, MNG_LC_START);
-#endif
-
- pGAMA = (mng_gamap)pChunk; /* address the proper chunk */
-
- if (pGAMA->bEmpty) /* write empty ? */
- iRetcode = write_raw_chunk (pData, pGAMA->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 4;
- /* fill the buffer */
- mng_put_uint32 (pRawdata, pGAMA->iGamma);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pGAMA->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_GAMA, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_cHRM
-WRITE_CHUNK (mng_write_chrm)
-{
- mng_chrmp pCHRM;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_CHRM, MNG_LC_START);
-#endif
-
- pCHRM = (mng_chrmp)pChunk; /* address the proper chunk */
-
- if (pCHRM->bEmpty) /* write empty ? */
- iRetcode = write_raw_chunk (pData, pCHRM->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 32;
- /* fill the buffer */
- mng_put_uint32 (pRawdata, pCHRM->iWhitepointx);
- mng_put_uint32 (pRawdata+4, pCHRM->iWhitepointy);
- mng_put_uint32 (pRawdata+8, pCHRM->iRedx);
- mng_put_uint32 (pRawdata+12, pCHRM->iRedy);
- mng_put_uint32 (pRawdata+16, pCHRM->iGreenx);
- mng_put_uint32 (pRawdata+20, pCHRM->iGreeny);
- mng_put_uint32 (pRawdata+24, pCHRM->iBluex);
- mng_put_uint32 (pRawdata+28, pCHRM->iBluey);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pCHRM->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_CHRM, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_srgb)
-{
- mng_srgbp pSRGB;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SRGB, MNG_LC_START);
-#endif
-
- pSRGB = (mng_srgbp)pChunk; /* address the proper chunk */
-
- if (pSRGB->bEmpty) /* write empty ? */
- iRetcode = write_raw_chunk (pData, pSRGB->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 1;
- /* fill the buffer */
- *pRawdata = pSRGB->iRenderingintent;
- /* and write it */
- iRetcode = write_raw_chunk (pData, pSRGB->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SRGB, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-WRITE_CHUNK (mng_write_iccp)
-{
- mng_iccpp pICCP;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint8p pTemp;
- mng_uint8p pBuf = 0;
- mng_uint32 iBuflen;
- mng_uint32 iReallen;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_ICCP, MNG_LC_START);
-#endif
-
- pICCP = (mng_iccpp)pChunk; /* address the proper chunk */
-
- if (pICCP->bEmpty) /* write empty ? */
- iRetcode = write_raw_chunk (pData, pICCP->sHeader.iChunkname, 0, 0);
- else
- { /* compress the profile */
- iRetcode = deflate_buffer (pData, pICCP->pProfile, pICCP->iProfilesize,
- &pBuf, &iBuflen, &iReallen);
-
- if (!iRetcode) /* still oke ? */
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pICCP->iNamesize + 2 + iReallen;
- /* requires large buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_ALLOC (pData, pRawdata, iRawlen);
-
- pTemp = pRawdata; /* fill the buffer */
-
- if (pICCP->iNamesize)
- {
- MNG_COPY (pTemp, pICCP->zName, pICCP->iNamesize);
- pTemp += pICCP->iNamesize;
- }
-
- *pTemp = 0;
- *(pTemp+1) = pICCP->iCompression;
- pTemp += 2;
-
- if (iReallen)
- MNG_COPY (pTemp, pBuf, iReallen);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pICCP->sHeader.iChunkname,
- iRawlen, pRawdata);
- /* drop the temp buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_FREEX (pData, pRawdata, iRawlen);
-
- }
-
- MNG_FREEX (pData, pBuf, iBuflen); /* always drop the extra buffer */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_ICCP, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tEXt
-WRITE_CHUNK (mng_write_text)
-{
- mng_textp pTEXT;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint8p pTemp;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_TEXT, MNG_LC_START);
-#endif
-
- pTEXT = (mng_textp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pTEXT->iKeywordsize + 1 + pTEXT->iTextsize;
- /* requires large buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_ALLOC (pData, pRawdata, iRawlen);
-
- pTemp = pRawdata; /* fill the buffer */
-
- if (pTEXT->iKeywordsize)
- {
- MNG_COPY (pTemp, pTEXT->zKeyword, pTEXT->iKeywordsize);
- pTemp += pTEXT->iKeywordsize;
- }
-
- *pTemp = 0;
- pTemp += 1;
-
- if (pTEXT->iTextsize)
- MNG_COPY (pTemp, pTEXT->zText, pTEXT->iTextsize);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pTEXT->sHeader.iChunkname,
- iRawlen, pRawdata);
-
- if (iRawlen > pData->iWritebufsize) /* drop the temp buffer ? */
- MNG_FREEX (pData, pRawdata, iRawlen);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_TEXT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_zTXt
-WRITE_CHUNK (mng_write_ztxt)
-{
- mng_ztxtp pZTXT;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint8p pTemp;
- mng_uint8p pBuf = 0;
- mng_uint32 iBuflen;
- mng_uint32 iReallen;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_ZTXT, MNG_LC_START);
-#endif
-
- pZTXT = (mng_ztxtp)pChunk; /* address the proper chunk */
- /* compress the text */
- iRetcode = deflate_buffer (pData, (mng_uint8p)pZTXT->zText, pZTXT->iTextsize,
- &pBuf, &iBuflen, &iReallen);
-
- if (!iRetcode) /* all ok ? */
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pZTXT->iKeywordsize + 2 + iReallen;
- /* requires large buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_ALLOC (pData, pRawdata, iRawlen);
-
- pTemp = pRawdata; /* fill the buffer */
-
- if (pZTXT->iKeywordsize)
- {
- MNG_COPY (pTemp, pZTXT->zKeyword, pZTXT->iKeywordsize);
- pTemp += pZTXT->iKeywordsize;
- }
-
- *pTemp = 0; /* terminator zero */
- pTemp++;
- *pTemp = 0; /* compression type */
- pTemp++;
-
- if (iReallen)
- MNG_COPY (pTemp, pBuf, iReallen);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pZTXT->sHeader.iChunkname,
- iRawlen, pRawdata);
- /* drop the temp buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_FREEX (pData, pRawdata, iRawlen);
-
- }
-
- MNG_FREEX (pData, pBuf, iBuflen); /* always drop the compression buffer */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_ZTXT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iTXt
-WRITE_CHUNK (mng_write_itxt)
-{
- mng_itxtp pITXT;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint8p pTemp;
- mng_uint8p pBuf = 0;
- mng_uint32 iBuflen;
- mng_uint32 iReallen;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_ITXT, MNG_LC_START);
-#endif
-
- pITXT = (mng_itxtp)pChunk; /* address the proper chunk */
-
- if (pITXT->iCompressionflag) /* compress the text */
- iRetcode = deflate_buffer (pData, (mng_uint8p)pITXT->zText, pITXT->iTextsize,
- &pBuf, &iBuflen, &iReallen);
- else
- iRetcode = MNG_NOERROR;
-
- if (!iRetcode) /* all ok ? */
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pITXT->iKeywordsize + pITXT->iLanguagesize +
- pITXT->iTranslationsize + 5;
-
- if (pITXT->iCompressionflag)
- iRawlen = iRawlen + iReallen;
- else
- iRawlen = iRawlen + pITXT->iTextsize;
- /* requires large buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_ALLOC (pData, pRawdata, iRawlen);
-
- pTemp = pRawdata; /* fill the buffer */
-
- if (pITXT->iKeywordsize)
- {
- MNG_COPY (pTemp, pITXT->zKeyword, pITXT->iKeywordsize);
- pTemp += pITXT->iKeywordsize;
- }
-
- *pTemp = 0;
- pTemp++;
- *pTemp = pITXT->iCompressionflag;
- pTemp++;
- *pTemp = pITXT->iCompressionmethod;
- pTemp++;
-
- if (pITXT->iLanguagesize)
- {
- MNG_COPY (pTemp, pITXT->zLanguage, pITXT->iLanguagesize);
- pTemp += pITXT->iLanguagesize;
- }
-
- *pTemp = 0;
- pTemp++;
-
- if (pITXT->iTranslationsize)
- {
- MNG_COPY (pTemp, pITXT->zTranslation, pITXT->iTranslationsize);
- pTemp += pITXT->iTranslationsize;
- }
-
- *pTemp = 0;
- pTemp++;
-
- if (pITXT->iCompressionflag)
- {
- if (iReallen)
- MNG_COPY (pTemp, pBuf, iReallen);
- }
- else
- {
- if (pITXT->iTextsize)
- MNG_COPY (pTemp, pITXT->zText, pITXT->iTextsize);
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pITXT->sHeader.iChunkname,
- iRawlen, pRawdata);
- /* drop the temp buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_FREEX (pData, pRawdata, iRawlen);
-
- }
-
- MNG_FREEX (pData, pBuf, iBuflen); /* always drop the compression buffer */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_ITXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_bKGD
-WRITE_CHUNK (mng_write_bkgd)
-{
- mng_bkgdp pBKGD;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_BKGD, MNG_LC_START);
-#endif
-
- pBKGD = (mng_bkgdp)pChunk; /* address the proper chunk */
-
- if (pBKGD->bEmpty) /* write empty ? */
- iRetcode = write_raw_chunk (pData, pBKGD->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 0; /* and default size */
-
- switch (pBKGD->iType)
- {
- case 0: { /* gray */
- iRawlen = 2; /* fill the size & output buffer */
- mng_put_uint16 (pRawdata, pBKGD->iGray);
-
- break;
- }
- case 2: { /* rgb */
- iRawlen = 6; /* fill the size & output buffer */
- mng_put_uint16 (pRawdata, pBKGD->iRed);
- mng_put_uint16 (pRawdata+2, pBKGD->iGreen);
- mng_put_uint16 (pRawdata+4, pBKGD->iBlue);
-
- break;
- }
- case 3: { /* indexed */
- iRawlen = 1; /* fill the size & output buffer */
- *pRawdata = pBKGD->iIndex;
-
- break;
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pBKGD->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_BKGD, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYs
-WRITE_CHUNK (mng_write_phys)
-{
- mng_physp pPHYS;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PHYS, MNG_LC_START);
-#endif
-
- pPHYS = (mng_physp)pChunk; /* address the proper chunk */
-
- if (pPHYS->bEmpty) /* write empty ? */
- iRetcode = write_raw_chunk (pData, pPHYS->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 9;
- /* fill the output buffer */
- mng_put_uint32 (pRawdata, pPHYS->iSizex);
- mng_put_uint32 (pRawdata+4, pPHYS->iSizey);
-
- *(pRawdata+8) = pPHYS->iUnit;
- /* and write it */
- iRetcode = write_raw_chunk (pData, pPHYS->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PHYS, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sBIT
-WRITE_CHUNK (mng_write_sbit)
-{
- mng_sbitp pSBIT;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SBIT, MNG_LC_START);
-#endif
-
- pSBIT = (mng_sbitp)pChunk; /* address the proper chunk */
-
- if (pSBIT->bEmpty) /* write empty ? */
- iRetcode = write_raw_chunk (pData, pSBIT->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 0; /* and default size */
-
- switch (pSBIT->iType)
- {
- case 0: { /* gray */
- iRawlen = 1; /* fill the size & output buffer */
- *pRawdata = pSBIT->aBits[0];
-
- break;
- }
- case 2: { /* rgb */
- iRawlen = 3; /* fill the size & output buffer */
- *pRawdata = pSBIT->aBits[0];
- *(pRawdata+1) = pSBIT->aBits[1];
- *(pRawdata+2) = pSBIT->aBits[2];
-
- break;
- }
- case 3: { /* indexed */
- iRawlen = 3; /* fill the size & output buffer */
- *pRawdata = pSBIT->aBits[0];
- *pRawdata = pSBIT->aBits[1];
- *pRawdata = pSBIT->aBits[2];
-
- break;
- }
- case 4: { /* gray + alpha */
- iRawlen = 2; /* fill the size & output buffer */
- *pRawdata = pSBIT->aBits[0];
- *(pRawdata+1) = pSBIT->aBits[1];
-
- break;
- }
- case 6: { /* rgb + alpha */
- iRawlen = 4; /* fill the size & output buffer */
- *pRawdata = pSBIT->aBits[0];
- *(pRawdata+1) = pSBIT->aBits[1];
- *(pRawdata+2) = pSBIT->aBits[2];
- *(pRawdata+3) = pSBIT->aBits[3];
-
- break;
- }
- case 10: { /* jpeg gray */
- iRawlen = 1; /* fill the size & output buffer */
- *pRawdata = pSBIT->aBits[0];
-
- break;
- }
- case 12: { /* jpeg rgb */
- iRawlen = 3; /* fill the size & output buffer */
- *pRawdata = pSBIT->aBits[0];
- *(pRawdata+1) = pSBIT->aBits[1];
- *(pRawdata+2) = pSBIT->aBits[2];
-
- break;
- }
- case 14: { /* jpeg gray + alpha */
- iRawlen = 2; /* fill the size & output buffer */
- *pRawdata = pSBIT->aBits[0];
- *(pRawdata+1) = pSBIT->aBits[1];
-
- break;
- }
- case 16: { /* jpeg rgb + alpha */
- iRawlen = 4; /* fill the size & output buffer */
- *pRawdata = pSBIT->aBits[0];
- *(pRawdata+1) = pSBIT->aBits[1];
- *(pRawdata+2) = pSBIT->aBits[2];
- *(pRawdata+3) = pSBIT->aBits[3];
-
- break;
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pSBIT->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SBIT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sPLT
-WRITE_CHUNK (mng_write_splt)
-{
- mng_spltp pSPLT;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint32 iEntrieslen;
- mng_uint8p pTemp;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SPLT, MNG_LC_START);
-#endif
-
- pSPLT = (mng_spltp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iEntrieslen = ((pSPLT->iSampledepth >> 3) * 4 + 2) * pSPLT->iEntrycount;
- iRawlen = pSPLT->iNamesize + 2 + iEntrieslen;
- /* requires large buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_ALLOC (pData, pRawdata, iRawlen);
-
- pTemp = pRawdata; /* fill the buffer */
-
- if (pSPLT->iNamesize)
- {
- MNG_COPY (pTemp, pSPLT->zName, pSPLT->iNamesize);
- pTemp += pSPLT->iNamesize;
- }
-
- *pTemp = 0;
- *(pTemp+1) = pSPLT->iSampledepth;
- pTemp += 2;
-
- if (pSPLT->iEntrycount)
- MNG_COPY (pTemp, pSPLT->pEntries, iEntrieslen);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pSPLT->sHeader.iChunkname,
- iRawlen, pRawdata);
-
- if (iRawlen > pData->iWritebufsize) /* drop the temp buffer ? */
- MNG_FREEX (pData, pRawdata, iRawlen);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SPLT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_hIST
-WRITE_CHUNK (mng_write_hist)
-{
- mng_histp pHIST;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint8p pTemp;
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_HIST, MNG_LC_START);
-#endif
-
- pHIST = (mng_histp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pHIST->iEntrycount << 1;
-
- pTemp = pRawdata; /* fill the output buffer */
-
- for (iX = 0; iX < pHIST->iEntrycount; iX++)
- {
- mng_put_uint16 (pTemp, pHIST->aEntries [iX]);
- pTemp += 2;
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pHIST->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_HIST, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tIME
-WRITE_CHUNK (mng_write_time)
-{
- mng_timep pTIME;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_TIME, MNG_LC_START);
-#endif
-
- pTIME = (mng_timep)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 7;
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pTIME->iYear);
-
- *(pRawdata+2) = pTIME->iMonth;
- *(pRawdata+3) = pTIME->iDay;
- *(pRawdata+4) = pTIME->iHour;
- *(pRawdata+5) = pTIME->iMinute;
- *(pRawdata+6) = pTIME->iSecond;
- /* and write it */
- iRetcode = write_raw_chunk (pData, pTIME->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_TIME, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_mhdr)
-{
- mng_mhdrp pMHDR;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_MHDR, MNG_LC_START);
-#endif
-
- pMHDR = (mng_mhdrp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 28;
- /* fill the output buffer */
- mng_put_uint32 (pRawdata, pMHDR->iWidth);
- mng_put_uint32 (pRawdata+4, pMHDR->iHeight);
- mng_put_uint32 (pRawdata+8, pMHDR->iTicks);
- mng_put_uint32 (pRawdata+12, pMHDR->iLayercount);
- mng_put_uint32 (pRawdata+16, pMHDR->iFramecount);
- mng_put_uint32 (pRawdata+20, pMHDR->iPlaytime);
- mng_put_uint32 (pRawdata+24, pMHDR->iSimplicity);
-
- /* and write it */
- iRetcode = write_raw_chunk (pData, pMHDR->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_MHDR, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_mend)
-{
- mng_mendp pMEND;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_MEND, MNG_LC_START);
-#endif
-
- pMEND = (mng_mendp)pChunk; /* address the proper chunk */
- /* and write it */
- iRetcode = write_raw_chunk (pData, pMEND->sHeader.iChunkname, 0, 0);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_MEND, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_loop)
-{
- mng_loopp pLOOP;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-#ifndef MNG_NO_LOOP_SIGNALS_SUPPORTED
- mng_uint8p pTemp1;
- mng_uint32p pTemp2;
- mng_uint32 iX;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_LOOP, MNG_LC_START);
-#endif
-
- pLOOP = (mng_loopp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 5;
- /* fill the output buffer */
- *pRawdata = pLOOP->iLevel;
- mng_put_uint32 (pRawdata+1, pLOOP->iRepeat);
-
- if (pLOOP->iTermination)
- {
- iRawlen++;
- *(pRawdata+5) = pLOOP->iTermination;
-
- if ((pLOOP->iCount) ||
- (pLOOP->iItermin != 1) || (pLOOP->iItermax != 0x7FFFFFFFL))
- {
- iRawlen += 8;
-
- mng_put_uint32 (pRawdata+6, pLOOP->iItermin);
- mng_put_uint32 (pRawdata+10, pLOOP->iItermax);
-
-#ifndef MNG_NO_LOOP_SIGNALS_SUPPORTED
- if (pLOOP->iCount)
- {
- iRawlen += pLOOP->iCount * 4;
-
- pTemp1 = pRawdata+14;
- pTemp2 = pLOOP->pSignals;
-
- for (iX = 0; iX < pLOOP->iCount; iX++)
- {
- mng_put_uint32 (pTemp1, *pTemp2);
-
- pTemp1 += 4;
- pTemp2++;
- }
- }
-#endif
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pLOOP->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_LOOP, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_endl)
-{
- mng_endlp pENDL;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_ENDL, MNG_LC_START);
-#endif
-
- pENDL = (mng_endlp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 1;
-
- *pRawdata = pENDL->iLevel; /* fill the output buffer */
- /* and write it */
- iRetcode = write_raw_chunk (pData, pENDL->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_ENDL, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_defi)
-{
- mng_defip pDEFI;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_DEFI, MNG_LC_START);
-#endif
-
- pDEFI = (mng_defip)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 2;
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pDEFI->iObjectid);
-
- if ((pDEFI->iDonotshow) || (pDEFI->iConcrete) || (pDEFI->bHasloca) || (pDEFI->bHasclip))
- {
- iRawlen++;
- *(pRawdata+2) = pDEFI->iDonotshow;
-
- if ((pDEFI->iConcrete) || (pDEFI->bHasloca) || (pDEFI->bHasclip))
- {
- iRawlen++;
- *(pRawdata+3) = pDEFI->iConcrete;
-
- if ((pDEFI->bHasloca) || (pDEFI->bHasclip))
- {
- iRawlen += 8;
-
- mng_put_uint32 (pRawdata+4, pDEFI->iXlocation);
- mng_put_uint32 (pRawdata+8, pDEFI->iYlocation);
-
- if (pDEFI->bHasclip)
- {
- iRawlen += 16;
-
- mng_put_uint32 (pRawdata+12, pDEFI->iLeftcb);
- mng_put_uint32 (pRawdata+16, pDEFI->iRightcb);
- mng_put_uint32 (pRawdata+20, pDEFI->iTopcb);
- mng_put_uint32 (pRawdata+24, pDEFI->iBottomcb);
- }
- }
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pDEFI->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_DEFI, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_basi)
-{
- mng_basip pBASI;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_bool bOpaque;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_BASI, MNG_LC_START);
-#endif
-
- pBASI = (mng_basip)pChunk; /* address the proper chunk */
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBASI->iBitdepth <= 8) /* determine opacity alpha-field */
-#endif
- bOpaque = (mng_bool)(pBASI->iAlpha == 0xFF);
-#ifndef MNG_NO_16BIT_SUPPORT
- else
- bOpaque = (mng_bool)(pBASI->iAlpha == 0xFFFF);
-#endif
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 13;
- /* fill the output buffer */
- mng_put_uint32 (pRawdata, pBASI->iWidth);
- mng_put_uint32 (pRawdata+4, pBASI->iHeight);
-
- *(pRawdata+8) = pBASI->iBitdepth;
- *(pRawdata+9) = pBASI->iColortype;
- *(pRawdata+10) = pBASI->iCompression;
- *(pRawdata+11) = pBASI->iFilter;
- *(pRawdata+12) = pBASI->iInterlace;
-
- if ((pBASI->iRed) || (pBASI->iGreen) || (pBASI->iBlue) ||
- (!bOpaque) || (pBASI->iViewable))
- {
- iRawlen += 6;
- mng_put_uint16 (pRawdata+13, pBASI->iRed);
- mng_put_uint16 (pRawdata+15, pBASI->iGreen);
- mng_put_uint16 (pRawdata+17, pBASI->iBlue);
-
- if ((!bOpaque) || (pBASI->iViewable))
- {
- iRawlen += 2;
- mng_put_uint16 (pRawdata+19, pBASI->iAlpha);
-
- if (pBASI->iViewable)
- {
- iRawlen++;
- *(pRawdata+21) = pBASI->iViewable;
- }
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pBASI->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_BASI, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_clon)
-{
- mng_clonp pCLON;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_CLON, MNG_LC_START);
-#endif
-
- pCLON = (mng_clonp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 4;
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pCLON->iSourceid);
- mng_put_uint16 (pRawdata+2, pCLON->iCloneid);
-
- if ((pCLON->iClonetype) || (pCLON->iDonotshow) || (pCLON->iConcrete) || (pCLON->bHasloca))
- {
- iRawlen++;
- *(pRawdata+4) = pCLON->iClonetype;
-
- if ((pCLON->iDonotshow) || (pCLON->iConcrete) || (pCLON->bHasloca))
- {
- iRawlen++;
- *(pRawdata+5) = pCLON->iDonotshow;
-
- if ((pCLON->iConcrete) || (pCLON->bHasloca))
- {
- iRawlen++;
- *(pRawdata+6) = pCLON->iConcrete;
-
- if (pCLON->bHasloca)
- {
- iRawlen += 9;
- *(pRawdata+7) = pCLON->iLocationtype;
- mng_put_int32 (pRawdata+8, pCLON->iLocationx);
- mng_put_int32 (pRawdata+12, pCLON->iLocationy);
- }
- }
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pCLON->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_CLON, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-WRITE_CHUNK (mng_write_past)
-{
- mng_pastp pPAST;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_past_sourcep pSource;
- mng_uint32 iX;
- mng_uint8p pTemp;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PAST, MNG_LC_START);
-#endif
-
- pPAST = (mng_pastp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 11 + (30 * pPAST->iCount);
- /* requires large buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_ALLOC (pData, pRawdata, iRawlen);
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pPAST->iDestid);
-
- *(pRawdata+2) = pPAST->iTargettype;
-
- mng_put_int32 (pRawdata+3, pPAST->iTargetx);
- mng_put_int32 (pRawdata+7, pPAST->iTargety);
-
- pTemp = pRawdata+11;
- pSource = pPAST->pSources;
-
- for (iX = 0; iX < pPAST->iCount; iX++)
- {
- mng_put_uint16 (pTemp, pSource->iSourceid);
-
- *(pTemp+2) = pSource->iComposition;
- *(pTemp+3) = pSource->iOrientation;
- *(pTemp+4) = pSource->iOffsettype;
-
- mng_put_int32 (pTemp+5, pSource->iOffsetx);
- mng_put_int32 (pTemp+9, pSource->iOffsety);
-
- *(pTemp+13) = pSource->iBoundarytype;
-
- mng_put_int32 (pTemp+14, pSource->iBoundaryl);
- mng_put_int32 (pTemp+18, pSource->iBoundaryr);
- mng_put_int32 (pTemp+22, pSource->iBoundaryt);
- mng_put_int32 (pTemp+26, pSource->iBoundaryb);
-
- pSource++;
- pTemp += 30;
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pPAST->sHeader.iChunkname,
- iRawlen, pRawdata);
- /* free temporary buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_FREEX (pData, pRawdata, iRawlen);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PAST, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_disc)
-{
- mng_discp pDISC;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint32 iX;
- mng_uint8p pTemp1;
- mng_uint16p pTemp2;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_DISC, MNG_LC_START);
-#endif
-
- pDISC = (mng_discp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pDISC->iCount << 1;
-
- pTemp1 = pRawdata; /* fill the output buffer */
- pTemp2 = pDISC->pObjectids;
-
- for (iX = 0; iX < pDISC->iCount; iX++)
- {
- mng_put_uint16 (pTemp1, *pTemp2);
-
- pTemp2++;
- pTemp1 += 2;
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pDISC->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_DISC, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_back)
-{
- mng_backp pBACK;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_BACK, MNG_LC_START);
-#endif
-
- pBACK = (mng_backp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 6;
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pBACK->iRed);
- mng_put_uint16 (pRawdata+2, pBACK->iGreen);
- mng_put_uint16 (pRawdata+4, pBACK->iBlue);
-
- if ((pBACK->iMandatory) || (pBACK->iImageid) || (pBACK->iTile))
- {
- iRawlen++;
- *(pRawdata+6) = pBACK->iMandatory;
-
- if ((pBACK->iImageid) || (pBACK->iTile))
- {
- iRawlen += 2;
- mng_put_uint16 (pRawdata+7, pBACK->iImageid);
-
- if (pBACK->iTile)
- {
- iRawlen++;
- *(pRawdata+9) = pBACK->iTile;
- }
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pBACK->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_BACK, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_fram)
-{
- mng_framp pFRAM;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint8p pTemp;
- mng_uint32p pTemp2;
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_FRAM, MNG_LC_START);
-#endif
-
- pFRAM = (mng_framp)pChunk; /* address the proper chunk */
-
- if (pFRAM->bEmpty) /* empty ? */
- iRetcode = write_raw_chunk (pData, pFRAM->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 1;
- /* fill the output buffer */
- *pRawdata = pFRAM->iMode;
-
- if ((pFRAM->iNamesize ) ||
- (pFRAM->iChangedelay ) || (pFRAM->iChangetimeout) ||
- (pFRAM->iChangeclipping) || (pFRAM->iChangesyncid ) )
- {
- if (pFRAM->iNamesize)
- MNG_COPY (pRawdata+1, pFRAM->zName, pFRAM->iNamesize);
-
- iRawlen += pFRAM->iNamesize;
- pTemp = pRawdata + pFRAM->iNamesize + 1;
-
- if ((pFRAM->iChangedelay ) || (pFRAM->iChangetimeout) ||
- (pFRAM->iChangeclipping) || (pFRAM->iChangesyncid ) )
- {
- *pTemp = 0;
- *(pTemp+1) = pFRAM->iChangedelay;
- *(pTemp+2) = pFRAM->iChangetimeout;
- *(pTemp+3) = pFRAM->iChangeclipping;
- *(pTemp+4) = pFRAM->iChangesyncid;
-
- iRawlen += 5;
- pTemp += 5;
-
- if (pFRAM->iChangedelay)
- {
- mng_put_uint32 (pTemp, pFRAM->iDelay);
- iRawlen += 4;
- pTemp += 4;
- }
-
- if (pFRAM->iChangetimeout)
- {
- mng_put_uint32 (pTemp, pFRAM->iTimeout);
- iRawlen += 4;
- pTemp += 4;
- }
-
- if (pFRAM->iChangeclipping)
- {
- *pTemp = pFRAM->iBoundarytype;
-
- mng_put_uint32 (pTemp+1, pFRAM->iBoundaryl);
- mng_put_uint32 (pTemp+5, pFRAM->iBoundaryr);
- mng_put_uint32 (pTemp+9, pFRAM->iBoundaryt);
- mng_put_uint32 (pTemp+13, pFRAM->iBoundaryb);
-
- iRawlen += 17;
- pTemp += 17;
- }
-
- if (pFRAM->iChangesyncid)
- {
- iRawlen += pFRAM->iCount * 4;
- pTemp2 = pFRAM->pSyncids;
-
- for (iX = 0; iX < pFRAM->iCount; iX++)
- {
- mng_put_uint32 (pTemp, *pTemp2);
-
- pTemp2++;
- pTemp += 4;
- }
- }
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pFRAM->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_FRAM, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_move)
-{
- mng_movep pMOVE;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_MOVE, MNG_LC_START);
-#endif
-
- pMOVE = (mng_movep)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 13;
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pMOVE->iFirstid);
- mng_put_uint16 (pRawdata+2, pMOVE->iLastid);
-
- *(pRawdata+4) = pMOVE->iMovetype;
-
- mng_put_int32 (pRawdata+5, pMOVE->iMovex);
- mng_put_int32 (pRawdata+9, pMOVE->iMovey);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pMOVE->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_MOVE, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_clip)
-{
- mng_clipp pCLIP;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_CLIP, MNG_LC_START);
-#endif
-
- pCLIP = (mng_clipp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 21;
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pCLIP->iFirstid);
- mng_put_uint16 (pRawdata+2, pCLIP->iLastid);
-
- *(pRawdata+4) = pCLIP->iCliptype;
-
- mng_put_int32 (pRawdata+5, pCLIP->iClipl);
- mng_put_int32 (pRawdata+9, pCLIP->iClipr);
- mng_put_int32 (pRawdata+13, pCLIP->iClipt);
- mng_put_int32 (pRawdata+17, pCLIP->iClipb);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pCLIP->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_CLIP, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_show)
-{
- mng_showp pSHOW;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SHOW, MNG_LC_START);
-#endif
-
- pSHOW = (mng_showp)pChunk; /* address the proper chunk */
-
- if (pSHOW->bEmpty) /* empty ? */
- iRetcode = write_raw_chunk (pData, pSHOW->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 2;
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pSHOW->iFirstid);
-
- if ((pSHOW->iLastid != pSHOW->iFirstid) || (pSHOW->iMode))
- {
- iRawlen += 2;
- mng_put_uint16 (pRawdata+2, pSHOW->iLastid);
-
- if (pSHOW->iMode)
- {
- iRawlen++;
- *(pRawdata+4) = pSHOW->iMode;
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pSHOW->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SHOW, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_term)
-{
- mng_termp pTERM;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_TERM, MNG_LC_START);
-#endif
-
- pTERM = (mng_termp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 1;
-
- *pRawdata = pTERM->iTermaction; /* fill the output buffer */
-
- if (pTERM->iTermaction == 3)
- {
- iRawlen = 10;
- *(pRawdata+1) = pTERM->iIteraction;
-
- mng_put_uint32 (pRawdata+2, pTERM->iDelay);
- mng_put_uint32 (pRawdata+6, pTERM->iItermax);
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pTERM->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_TERM, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-WRITE_CHUNK (mng_write_save)
-{
- mng_savep pSAVE;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_save_entryp pEntry;
- mng_uint32 iEntrysize;
- mng_uint8p pTemp;
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SAVE, MNG_LC_START);
-#endif
-
- pSAVE = (mng_savep)pChunk; /* address the proper chunk */
-
- if (pSAVE->bEmpty) /* empty ? */
- iRetcode = write_raw_chunk (pData, pSAVE->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 1;
-
- *pRawdata = pSAVE->iOffsettype; /* fill the output buffer */
-
- if (pSAVE->iOffsettype == 16)
- iEntrysize = 25;
- else
- iEntrysize = 17;
-
- pTemp = pRawdata+1;
- pEntry = pSAVE->pEntries;
-
- for (iX = 0; iX < pSAVE->iCount; iX++)
- {
- if (iX) /* put separator null-byte, except the first */
- {
- *pTemp = 0;
- pTemp++;
- iRawlen++;
- }
-
- iRawlen += iEntrysize + pEntry->iNamesize;
- *pTemp = pEntry->iEntrytype;
-
- if (pSAVE->iOffsettype == 16)
- {
- mng_put_uint32 (pTemp+1, pEntry->iOffset[0]);
- mng_put_uint32 (pTemp+5, pEntry->iOffset[1]);
- mng_put_uint32 (pTemp+9, pEntry->iStarttime[0]);
- mng_put_uint32 (pTemp+13, pEntry->iStarttime[1]);
- mng_put_uint32 (pTemp+17, pEntry->iLayernr);
- mng_put_uint32 (pTemp+21, pEntry->iFramenr);
-
- pTemp += 25;
- }
- else
- {
- mng_put_uint32 (pTemp+1, pEntry->iOffset[1]);
- mng_put_uint32 (pTemp+5, pEntry->iStarttime[1]);
- mng_put_uint32 (pTemp+9, pEntry->iLayernr);
- mng_put_uint32 (pTemp+13, pEntry->iFramenr);
-
- pTemp += 17;
- }
-
- if (pEntry->iNamesize)
- {
- MNG_COPY (pTemp, pEntry->zName, pEntry->iNamesize);
- pTemp += pEntry->iNamesize;
- }
-
- pEntry++;
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pSAVE->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SAVE, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-WRITE_CHUNK (mng_write_seek)
-{
- mng_seekp pSEEK;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SEEK, MNG_LC_START);
-#endif
-
- pSEEK = (mng_seekp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pSEEK->iNamesize;
-
- if (iRawlen) /* fill the output buffer */
- MNG_COPY (pRawdata, pSEEK->zName, iRawlen);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pSEEK->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_SEEK, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_eXPI
-WRITE_CHUNK (mng_write_expi)
-{
- mng_expip pEXPI;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_EXPI, MNG_LC_START);
-#endif
-
- pEXPI = (mng_expip)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 2 + pEXPI->iNamesize;
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pEXPI->iSnapshotid);
-
- if (pEXPI->iNamesize)
- MNG_COPY (pRawdata+2, pEXPI->zName, pEXPI->iNamesize);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pEXPI->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_EXPI, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_fPRI
-WRITE_CHUNK (mng_write_fpri)
-{
- mng_fprip pFPRI;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_FPRI, MNG_LC_START);
-#endif
-
- pFPRI = (mng_fprip)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 2;
-
- *pRawdata = pFPRI->iDeltatype; /* fill the output buffer */
- *(pRawdata+1) = pFPRI->iPriority;
- /* and write it */
- iRetcode = write_raw_chunk (pData, pFPRI->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_FPRI, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_nEED
-WRITE_CHUNK (mng_write_need)
-{
- mng_needp pNEED;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_NEED, MNG_LC_START);
-#endif
-
- pNEED = (mng_needp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pNEED->iKeywordssize;
- /* fill the output buffer */
- if (pNEED->iKeywordssize)
- MNG_COPY (pRawdata, pNEED->zKeywords, pNEED->iKeywordssize);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pNEED->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_NEED, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYg
-WRITE_CHUNK (mng_write_phyg)
-{
- mng_phygp pPHYG;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PHYG, MNG_LC_START);
-#endif
-
- pPHYG = (mng_phygp)pChunk; /* address the proper chunk */
-
- if (pPHYG->bEmpty) /* write empty ? */
- iRetcode = write_raw_chunk (pData, pPHYG->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 9;
- /* fill the output buffer */
- mng_put_uint32 (pRawdata, pPHYG->iSizex);
- mng_put_uint32 (pRawdata+4, pPHYG->iSizey);
-
- *(pRawdata+8) = pPHYG->iUnit;
- /* and write it */
- iRetcode = write_raw_chunk (pData, pPHYG->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PHYG, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-/* B004 */
-#ifdef MNG_INCLUDE_JNG
-/* B004 */
-WRITE_CHUNK (mng_write_jhdr)
-{
- mng_jhdrp pJHDR;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_JHDR, MNG_LC_START);
-#endif
-
- pJHDR = (mng_jhdrp)pChunk; /* address the proper chunk */
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 16;
- /* fill the output buffer */
- mng_put_uint32 (pRawdata, pJHDR->iWidth);
- mng_put_uint32 (pRawdata+4, pJHDR->iHeight);
-
- *(pRawdata+8) = pJHDR->iColortype;
- *(pRawdata+9) = pJHDR->iImagesampledepth;
- *(pRawdata+10) = pJHDR->iImagecompression;
- *(pRawdata+11) = pJHDR->iImageinterlace;
- *(pRawdata+12) = pJHDR->iAlphasampledepth;
- *(pRawdata+13) = pJHDR->iAlphacompression;
- *(pRawdata+14) = pJHDR->iAlphafilter;
- *(pRawdata+15) = pJHDR->iAlphainterlace;
- /* and write it */
- iRetcode = write_raw_chunk (pData, pJHDR->sHeader.iChunkname, iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_JHDR, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#else
-#define write_jhdr 0
-/* B004 */
-#endif /* MNG_INCLUDE_JNG */
-/* B004 */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-WRITE_CHUNK (mng_write_jdaa)
-{
- mng_jdatp pJDAA;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_JDAA, MNG_LC_START);
-#endif
-
- pJDAA = (mng_jdaap)pChunk; /* address the proper chunk */
-
- if (pJDAA->bEmpty) /* and write it */
- iRetcode = write_raw_chunk (pData, pJDAA->sHeader.iChunkname, 0, 0);
- else
- iRetcode = write_raw_chunk (pData, pJDAA->sHeader.iChunkname,
- pJDAA->iDatasize, pJDAA->pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_JDAA, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#else
-#define write_jdaa 0
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-/* B004 */
-#ifdef MNG_INCLUDE_JNG
-/* B004 */
-WRITE_CHUNK (mng_write_jdat)
-{
- mng_jdatp pJDAT;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_JDAT, MNG_LC_START);
-#endif
-
- pJDAT = (mng_jdatp)pChunk; /* address the proper chunk */
-
- if (pJDAT->bEmpty) /* and write it */
- iRetcode = write_raw_chunk (pData, pJDAT->sHeader.iChunkname, 0, 0);
- else
- iRetcode = write_raw_chunk (pData, pJDAT->sHeader.iChunkname,
- pJDAT->iDatasize, pJDAT->pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_JDAT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#else
-#define write_jdat 0
-/* B004 */
-#endif /* MNG_INCLUDE_JNG */
-/* B004 */
-
-/* ************************************************************************** */
-
-/* B004 */
-#ifdef MNG_INCLUDE_JNG
-/* B004 */
-WRITE_CHUNK (mng_write_jsep)
-{
- mng_jsepp pJSEP;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_JSEP, MNG_LC_START);
-#endif
-
- pJSEP = (mng_jsepp)pChunk; /* address the proper chunk */
- /* and write it */
- iRetcode = write_raw_chunk (pData, pJSEP->sHeader.iChunkname, 0, 0);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_JSEP, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#else
-#define write_jsep 0
-/* B004 */
-#endif /* MNG_INCLUDE_JNG */
-/* B004 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-WRITE_CHUNK (mng_write_dhdr)
-{
- mng_dhdrp pDHDR;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_DHDR, MNG_LC_START);
-#endif
-
- pDHDR = (mng_dhdrp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 4;
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pDHDR->iObjectid);
-
- *(pRawdata+2) = pDHDR->iImagetype;
- *(pRawdata+3) = pDHDR->iDeltatype;
-
- if (pDHDR->iDeltatype != 7)
- {
- iRawlen += 8;
- mng_put_uint32 (pRawdata+4, pDHDR->iBlockwidth);
- mng_put_uint32 (pRawdata+8, pDHDR->iBlockheight);
-
- if (pDHDR->iDeltatype != 0)
- {
- iRawlen += 8;
- mng_put_uint32 (pRawdata+12, pDHDR->iBlockx);
- mng_put_uint32 (pRawdata+16, pDHDR->iBlocky);
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pDHDR->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_DHDR, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-WRITE_CHUNK (mng_write_prom)
-{
- mng_promp pPROM;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PROM, MNG_LC_START);
-#endif
-
- pPROM = (mng_promp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 3;
-
- *pRawdata = pPROM->iColortype; /* fill the output buffer */
- *(pRawdata+1) = pPROM->iSampledepth;
- *(pRawdata+2) = pPROM->iFilltype;
- /* and write it */
- iRetcode = write_raw_chunk (pData, pPROM->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PROM, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-WRITE_CHUNK (mng_write_ipng)
-{
- mng_ipngp pIPNG;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_IPNG, MNG_LC_START);
-#endif
-
- pIPNG = (mng_ipngp)pChunk; /* address the proper chunk */
- /* and write it */
- iRetcode = write_raw_chunk (pData, pIPNG->sHeader.iChunkname, 0, 0);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_IPNG, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-WRITE_CHUNK (mng_write_pplt)
-{
- mng_ppltp pPPLT;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_pplt_entryp pEntry;
- mng_uint8p pTemp;
- mng_uint32 iX;
- mng_bool bHasgroup;
- mng_uint8p pLastid = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PPLT, MNG_LC_START);
-#endif
-
- pPPLT = (mng_ppltp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 1;
-
- *pRawdata = pPPLT->iDeltatype; /* fill the output buffer */
-
- pTemp = pRawdata+1;
- bHasgroup = MNG_FALSE;
-
- for (iX = 0; iX < pPPLT->iCount; iX++)
- {
- pEntry = &pPPLT->aEntries[iX];
-
- if (pEntry->bUsed) /* valid entry ? */
- {
- if (!bHasgroup) /* start a new group ? */
- {
- bHasgroup = MNG_TRUE;
- pLastid = pTemp+1;
-
- *pTemp = (mng_uint8)iX;
- *(pTemp+1) = 0;
-
- pTemp += 2;
- iRawlen += 2;
- }
-
- switch (pPPLT->iDeltatype) /* add group-entry depending on type */
- {
- case 0: ;
- case 1: {
- *pTemp = pEntry->iRed;
- *(pTemp+1) = pEntry->iGreen;
- *(pTemp+2) = pEntry->iBlue;
-
- pTemp += 3;
- iRawlen += 3;
-
- break;
- }
-
- case 2: ;
- case 3: {
- *pTemp = pEntry->iAlpha;
-
- pTemp++;
- iRawlen++;
-
- break;
- }
-
- case 4: ;
- case 5: {
- *pTemp = pEntry->iRed;
- *(pTemp+1) = pEntry->iGreen;
- *(pTemp+2) = pEntry->iBlue;
- *(pTemp+3) = pEntry->iAlpha;
-
- pTemp += 4;
- iRawlen += 4;
-
- break;
- }
-
- }
- }
- else
- {
- if (bHasgroup) /* finish off a group ? */
- *pLastid = (mng_uint8)(iX-1);
-
- bHasgroup = MNG_FALSE;
- }
- }
-
- if (bHasgroup) /* last group unfinished ? */
- *pLastid = (mng_uint8)(pPPLT->iCount-1);
- /* write the output buffer */
- iRetcode = write_raw_chunk (pData, pPPLT->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_PPLT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
-WRITE_CHUNK (mng_write_ijng)
-{
- mng_ijngp pIJNG;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_IJNG, MNG_LC_START);
-#endif
-
- pIJNG = (mng_ijngp)pChunk; /* address the proper chunk */
- /* and write it */
- iRetcode = write_raw_chunk (pData, pIJNG->sHeader.iChunkname, 0, 0);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_IJNG, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-WRITE_CHUNK (mng_write_drop)
-{
- mng_dropp pDROP;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint32 iX;
- mng_uint8p pTemp1;
- mng_chunkidp pTemp2;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_DROP, MNG_LC_START);
-#endif
-
- pDROP = (mng_dropp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pDROP->iCount << 2;
-
- pTemp1 = pRawdata; /* fill the output buffer */
- pTemp2 = pDROP->pChunknames;
-
- for (iX = 0; iX < pDROP->iCount; iX++)
- {
- mng_put_uint32 (pTemp1, (mng_uint32)*pTemp2);
-
- pTemp2++;
- pTemp1 += 4;
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pDROP->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_DROP, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
-WRITE_CHUNK (mng_write_dbyk)
-{
- mng_dbykp pDBYK;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_DBYK, MNG_LC_START);
-#endif
-
- pDBYK = (mng_dbykp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 5 + pDBYK->iKeywordssize;
- /* fill the output buffer */
- mng_put_uint32 (pRawdata, pDBYK->iChunkname);
- *(pRawdata+4) = pDBYK->iPolarity;
-
- if (pDBYK->iKeywordssize)
- MNG_COPY (pRawdata+5, pDBYK->zKeywords, pDBYK->iKeywordssize);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pDBYK->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_DBYK, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-WRITE_CHUNK (mng_write_ordr)
-{
- mng_ordrp pORDR;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint8p pTemp;
- mng_ordr_entryp pEntry;
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_ORDR, MNG_LC_START);
-#endif
-
- pORDR = (mng_ordrp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = pORDR->iCount * 5;
-
- pTemp = pRawdata; /* fill the output buffer */
- pEntry = pORDR->pEntries;
-
- for (iX = 0; iX < pORDR->iCount; iX++)
- {
- mng_put_uint32 (pTemp, pEntry->iChunkname);
- *(pTemp+4) = pEntry->iOrdertype;
- pTemp += 5;
- pEntry++;
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pORDR->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_ORDR, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_magn)
-{
- mng_magnp pMAGN;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_MAGN, MNG_LC_START);
-#endif
-
- pMAGN = (mng_magnp)pChunk; /* address the proper chunk */
-
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 18;
- /* fill the output buffer */
- mng_put_uint16 (pRawdata, pMAGN->iFirstid);
- mng_put_uint16 (pRawdata+2, pMAGN->iLastid);
- *(pRawdata+4) = pMAGN->iMethodX;
- mng_put_uint16 (pRawdata+5, pMAGN->iMX);
- mng_put_uint16 (pRawdata+7, pMAGN->iMY);
- mng_put_uint16 (pRawdata+9, pMAGN->iML);
- mng_put_uint16 (pRawdata+11, pMAGN->iMR);
- mng_put_uint16 (pRawdata+13, pMAGN->iMT);
- mng_put_uint16 (pRawdata+15, pMAGN->iMB);
- *(pRawdata+17) = pMAGN->iMethodY;
- /* optimize length */
- if (pMAGN->iMethodY == pMAGN->iMethodX)
- {
- iRawlen--;
-
- if (pMAGN->iMB == pMAGN->iMY)
- {
- iRawlen -= 2;
-
- if (pMAGN->iMT == pMAGN->iMY)
- {
- iRawlen -= 2;
-
- if (pMAGN->iMR == pMAGN->iMX)
- {
- iRawlen -= 2;
-
- if (pMAGN->iML == pMAGN->iMX)
- {
- iRawlen -= 2;
-
- if (pMAGN->iMY == pMAGN->iMX)
- {
- iRawlen -= 2;
-
- if (pMAGN->iMX == 1)
- {
- iRawlen -= 2;
-
- if (pMAGN->iMethodX == 0)
- {
- iRawlen--;
-
- if (pMAGN->iLastid == pMAGN->iFirstid)
- {
- iRawlen -= 2;
-
- if (pMAGN->iFirstid == 0)
- iRawlen = 0;
-
- }
- }
- }
- }
- }
- }
- }
- }
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pMAGN->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_MAGN, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-WRITE_CHUNK (mng_write_mpng)
-{
- mng_mpngp pMPNG;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_uint8p pBuf = 0;
- mng_uint32 iBuflen;
- mng_uint32 iReallen;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_MPNG, MNG_LC_START);
-#endif
-
- pMPNG = (mng_mpngp)pChunk; /* address the proper chunk */
- /* compress the frame structures */
- iRetcode = deflate_buffer (pData, (mng_uint8p)pMPNG->pFrames, pMPNG->iFramessize,
- &pBuf, &iBuflen, &iReallen);
-
- if (!iRetcode) /* all ok ? */
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 15 + iReallen;
- /* requires large buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_ALLOC (pData, pRawdata, iRawlen);
- /* fill the buffer */
- mng_put_uint32 (pRawdata, pMPNG->iFramewidth);
- mng_put_uint32 (pRawdata+4, pMPNG->iFrameheight);
- mng_put_uint16 (pRawdata+8, pMPNG->iNumplays);
- mng_put_uint16 (pRawdata+10, pMPNG->iTickspersec);
- *(pRawdata+12) = pMPNG->iCompressionmethod;
-
- if (iReallen)
- MNG_COPY (pRawdata+13, pBuf, iReallen);
- /* and write it */
- iRetcode = write_raw_chunk (pData, pMPNG->sHeader.iChunkname,
- iRawlen, pRawdata);
- /* drop the temp buffer ? */
- if (iRawlen > pData->iWritebufsize)
- MNG_FREEX (pData, pRawdata, iRawlen);
- }
-
- MNG_FREEX (pData, pBuf, iBuflen); /* always drop the compression buffer */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_MPNG, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-WRITE_CHUNK (mng_write_ahdr)
-{
- mng_ahdrp pAHDR;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_AHDR, MNG_LC_START);
-#endif
-
- pAHDR = (mng_ahdrp)pChunk; /* address the proper chunk */
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 22;
- /* fill the buffer */
- mng_put_uint32 (pRawdata, pAHDR->iNumframes);
- mng_put_uint32 (pRawdata+4, pAHDR->iTickspersec);
- mng_put_uint32 (pRawdata+8, pAHDR->iNumplays);
- mng_put_uint32 (pRawdata+12, pAHDR->iTilewidth);
- mng_put_uint32 (pRawdata+16, pAHDR->iTileheight);
- *(pRawdata+20) = pAHDR->iInterlace;
- *(pRawdata+21) = pAHDR->iStillused;
- /* and write it */
- iRetcode = write_raw_chunk (pData, pAHDR->sHeader.iChunkname,
- iRawlen, pRawdata);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_AHDR, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-WRITE_CHUNK (mng_write_adat)
-{
-
- /* TODO: something */
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_evNT
-WRITE_CHUNK (mng_write_evnt)
-{
- mng_evntp pEVNT;
- mng_uint8p pRawdata;
- mng_uint32 iRawlen;
- mng_retcode iRetcode;
- mng_evnt_entryp pEntry;
- mng_uint8p pTemp;
- mng_uint32 iX;
- mng_uint32 iNamesize;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_EVNT, MNG_LC_START);
-#endif
-
- pEVNT = (mng_evntp)pChunk; /* address the proper chunk */
-
- if (!pEVNT->iCount) /* empty ? */
- iRetcode = write_raw_chunk (pData, pEVNT->sHeader.iChunkname, 0, 0);
- else
- {
- pRawdata = pData->pWritebuf+8; /* init output buffer & size */
- iRawlen = 0;
- pTemp = pRawdata;
- pEntry = pEVNT->pEntries;
-
- for (iX = 0; iX < pEVNT->iCount; iX++)
- {
- if (iX) /* put separator null-byte, except the first */
- {
- *pTemp = 0;
- pTemp++;
- iRawlen++;
- }
-
- *pTemp = pEntry->iEventtype;
- *(pTemp+1) = pEntry->iMasktype;
- pTemp += 2;
- iRawlen += 2;
-
- switch (pEntry->iMasktype)
- {
- case 1 :
- {
- mng_put_int32 (pTemp, pEntry->iLeft);
- mng_put_int32 (pTemp+4, pEntry->iRight);
- mng_put_int32 (pTemp+8, pEntry->iTop);
- mng_put_int32 (pTemp+12, pEntry->iBottom);
- pTemp += 16;
- iRawlen += 16;
- break;
- }
- case 2 :
- {
- mng_put_uint16 (pTemp, pEntry->iObjectid);
- pTemp += 2;
- iRawlen += 2;
- break;
- }
- case 3 :
- {
- mng_put_uint16 (pTemp, pEntry->iObjectid);
- *(pTemp+2) = pEntry->iIndex;
- pTemp += 3;
- iRawlen += 3;
- break;
- }
- case 4 :
- {
- mng_put_int32 (pTemp, pEntry->iLeft);
- mng_put_int32 (pTemp+4, pEntry->iRight);
- mng_put_int32 (pTemp+8, pEntry->iTop);
- mng_put_int32 (pTemp+12, pEntry->iBottom);
- mng_put_uint16 (pTemp+16, pEntry->iObjectid);
- pTemp += 18;
- iRawlen += 18;
- break;
- }
- case 5 :
- {
- mng_put_int32 (pTemp, pEntry->iLeft);
- mng_put_int32 (pTemp+4, pEntry->iRight);
- mng_put_int32 (pTemp+8, pEntry->iTop);
- mng_put_int32 (pTemp+12, pEntry->iBottom);
- mng_put_uint16 (pTemp+16, pEntry->iObjectid);
- *(pTemp+18) = pEntry->iIndex;
- pTemp += 19;
- iRawlen += 19;
- break;
- }
- }
-
- iNamesize = pEntry->iSegmentnamesize;
-
- if (iNamesize)
- {
- MNG_COPY (pTemp, pEntry->zSegmentname, iNamesize);
- pTemp += iNamesize;
- iRawlen += iNamesize;
- }
-
- pEntry++;
- }
- /* and write it */
- iRetcode = write_raw_chunk (pData, pEVNT->sHeader.iChunkname,
- iRawlen, pRawdata);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_EVNT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-WRITE_CHUNK (mng_write_unknown)
-{
- mng_unknown_chunkp pUnknown;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_UNKNOWN, MNG_LC_START);
-#endif
- /* address the proper chunk */
- pUnknown = (mng_unknown_chunkp)pChunk;
- /* and write it */
- iRetcode = write_raw_chunk (pData, pUnknown->sHeader.iChunkname,
- pUnknown->iDatasize, pUnknown->pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_UNKNOWN, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_WRITE_PROCS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_chunk_io.h b/src/3rdparty/libmng/libmng_chunk_io.h
deleted file mode 100644
index f8505baece..0000000000
--- a/src/3rdparty/libmng/libmng_chunk_io.h
+++ /dev/null
@@ -1,415 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_chunk_io.h copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.109 * */
-/* * * */
-/* * purpose : Chunk I/O routines (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the chunk input/output routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/04/2000 - G.Juyn * */
-/* * - changed CRC initialization to use dynamic structure * */
-/* * (wasn't thread-safe the old way !) * */
-/* * 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed write routines definition * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added support for JDAA * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added SKIP_CHUNK and NO_DELTA_PNG support * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * * */
-/* * 1.0.7 - 03/24/2004 - G.R-P * */
-/* * - fixed SKIPCHUNK_itXT and SKIPCHUNK_ztXT typos * */
-/* * * */
-/* * 1.0.9 - 12/07/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKREADER * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_chunk_io_h_
-#define _libmng_chunk_io_h_
-
-/* ************************************************************************** */
-
-mng_uint32 mng_crc (mng_datap pData,
- mng_uint8p buf,
- mng_int32 len);
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_READ_PROCS
-
-/* ************************************************************************** */
-
-mng_retcode mng_inflate_buffer (mng_datap pData,
- mng_uint8p pInbuf,
- mng_uint32 iInsize,
- mng_uint8p *pOutbuf,
- mng_uint32 *iOutsize,
- mng_uint32 *iRealsize);
-
-/* ************************************************************************** */
-
-#define READ_CHUNK(n) mng_retcode n (mng_datap pData, \
- mng_chunkp pHeader, \
- mng_uint32 iRawlen, \
- mng_uint8p pRawdata, \
- mng_chunkp* ppChunk)
-
-#ifdef MNG_OPTIMIZE_CHUNKREADER
-READ_CHUNK (mng_read_general) ;
-#endif
-
-READ_CHUNK (mng_read_ihdr) ;
-READ_CHUNK (mng_read_plte) ;
-READ_CHUNK (mng_read_idat) ;
-READ_CHUNK (mng_read_iend) ;
-READ_CHUNK (mng_read_trns) ;
-READ_CHUNK (mng_read_gama) ;
-READ_CHUNK (mng_read_chrm) ;
-READ_CHUNK (mng_read_srgb) ;
-#ifndef MNG_SKIPCHUNK_iCCP
-READ_CHUNK (mng_read_iccp) ;
-#endif
-#ifndef MNG_SKIPCHUNK_tEXt
-READ_CHUNK (mng_read_text) ;
-#endif
-#ifndef MNG_SKIPCHUNK_zTXt
-READ_CHUNK (mng_read_ztxt) ;
-#endif
-#ifndef MNG_SKIPCHUNK_iTXt
-READ_CHUNK (mng_read_itxt) ;
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
-READ_CHUNK (mng_read_bkgd) ;
-#endif
-#ifndef MNG_SKIPCHUNK_pHYs
-READ_CHUNK (mng_read_phys) ;
-#endif
-#ifndef MNG_SKIPCHUNK_sBIT
-READ_CHUNK (mng_read_sbit) ;
-#endif
-#ifndef MNG_SKIPCHUNK_sPLT
-READ_CHUNK (mng_read_splt) ;
-#endif
-#ifndef MNG_SKIPCHUNK_hIST
-READ_CHUNK (mng_read_hist) ;
-#endif
-#ifndef MNG_SKIPCHUNK_tIME
-READ_CHUNK (mng_read_time) ;
-#endif
-READ_CHUNK (mng_read_mhdr) ;
-READ_CHUNK (mng_read_mend) ;
-READ_CHUNK (mng_read_loop) ;
-READ_CHUNK (mng_read_endl) ;
-READ_CHUNK (mng_read_defi) ;
-READ_CHUNK (mng_read_basi) ;
-READ_CHUNK (mng_read_clon) ;
-#ifndef MNG_SKIPCHUNK_PAST
-READ_CHUNK (mng_read_past) ;
-#endif
-READ_CHUNK (mng_read_disc) ;
-READ_CHUNK (mng_read_back) ;
-READ_CHUNK (mng_read_fram) ;
-READ_CHUNK (mng_read_move) ;
-READ_CHUNK (mng_read_clip) ;
-READ_CHUNK (mng_read_show) ;
-READ_CHUNK (mng_read_term) ;
-READ_CHUNK (mng_read_save) ;
-READ_CHUNK (mng_read_seek) ;
-#ifndef MNG_SKIPCHUNK_eXPI
-READ_CHUNK (mng_read_expi) ;
-#endif
-#ifndef MNG_SKIPCHUNK_fPRI
-READ_CHUNK (mng_read_fpri) ;
-#endif
-#ifndef MNG_SKIPCHUNK_pHYg
-READ_CHUNK (mng_read_phyg) ;
-#endif
-#ifdef MNG_INCLUDE_JNG
-READ_CHUNK (mng_read_jhdr) ;
-READ_CHUNK (mng_read_jdaa) ;
-READ_CHUNK (mng_read_jdat) ;
-READ_CHUNK (mng_read_jsep) ;
-#endif
-#ifndef MNG_NO_DELTA_PNG
-READ_CHUNK (mng_read_dhdr) ;
-READ_CHUNK (mng_read_prom) ;
-READ_CHUNK (mng_read_ipng) ;
-READ_CHUNK (mng_read_pplt) ;
-#ifdef MNG_INCLUDE_JNG
-READ_CHUNK (mng_read_ijng) ;
-#endif
-READ_CHUNK (mng_read_drop) ;
-READ_CHUNK (mng_read_dbyk) ;
-READ_CHUNK (mng_read_ordr) ;
-#endif
-READ_CHUNK (mng_read_magn) ;
-#ifndef MNG_SKIPCHUNK_nEED
-READ_CHUNK (mng_read_need) ;
-#endif
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-READ_CHUNK (mng_read_mpng) ;
-#endif
-#ifndef MNG_SKIPCHUNK_evNT
-READ_CHUNK (mng_read_evnt) ;
-#endif
-READ_CHUNK (mng_read_unknown) ;
-
-/* ************************************************************************** */
-
-#else /* MNG_INCLUDE_READ_PROCS */
-#define mng_read_ihdr 0
-#define mng_read_plte 0
-#define mng_read_idat 0
-#define mng_read_iend 0
-#define mng_read_trns 0
-#define mng_read_gama 0
-#define mng_read_chrm 0
-#define mng_read_srgb 0
-#define mng_read_iccp 0
-#define mng_read_text 0
-#define mng_read_ztxt 0
-#define mng_read_itxt 0
-#define mng_read_bkgd 0
-#define mng_read_phys 0
-#define mng_read_sbit 0
-#define mng_read_splt 0
-#define mng_read_hist 0
-#define mng_read_time 0
-#define mng_read_mhdr 0
-#define mng_read_mend 0
-#define mng_read_loop 0
-#define mng_read_endl 0
-#define mng_read_defi 0
-#define mng_read_basi 0
-#define mng_read_clon 0
-#ifndef MNG_SKIPCHUNK_PAST
-#define mng_read_past 0
-#endif
-#define mng_read_disc 0
-#define mng_read_back 0
-#define mng_read_fram 0
-#define mng_read_move 0
-#define mng_read_clip 0
-#define mng_read_show 0
-#define mng_read_term 0
-#define mng_read_save 0
-#define mng_read_seek 0
-#define mng_read_expi 0
-#define mng_read_fpri 0
-#define mng_read_phyg 0
-#ifdef MNG_INCLUDE_JNG
-#define mng_read_jhdr 0
-#define mng_read_jdaa 0
-#define mng_read_jdat 0
-#define mng_read_jsep 0
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#define mng_read_dhdr 0
-#define mng_read_prom 0
-#define mng_read_ipng 0
-#define mng_read_pplt 0
-#ifdef MNG_INCLUDE_JNG
-#define mng_read_ijng 0
-#endif
-#define mng_read_drop 0
-#define mng_read_dbyk 0
-#define mng_read_ordr 0
-#endif
-#define mng_read_magn 0
-#define mng_read_need 0
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-#define mng_read_mpng 0
-#endif
-#define mng_read_evnt 0
-#define mng_read_unknown 0
-#endif /* MNG_INCLUDE_READ_PROCS */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_WRITE_PROCS
-
-#define WRITE_CHUNK(n) mng_retcode n (mng_datap pData, \
- mng_chunkp pChunk)
-
-WRITE_CHUNK (mng_write_ihdr) ;
-WRITE_CHUNK (mng_write_plte) ;
-WRITE_CHUNK (mng_write_idat) ;
-WRITE_CHUNK (mng_write_iend) ;
-WRITE_CHUNK (mng_write_trns) ;
-WRITE_CHUNK (mng_write_gama) ;
-WRITE_CHUNK (mng_write_chrm) ;
-WRITE_CHUNK (mng_write_srgb) ;
-WRITE_CHUNK (mng_write_iccp) ;
-WRITE_CHUNK (mng_write_text) ;
-WRITE_CHUNK (mng_write_ztxt) ;
-WRITE_CHUNK (mng_write_itxt) ;
-WRITE_CHUNK (mng_write_bkgd) ;
-WRITE_CHUNK (mng_write_phys) ;
-WRITE_CHUNK (mng_write_sbit) ;
-WRITE_CHUNK (mng_write_splt) ;
-WRITE_CHUNK (mng_write_hist) ;
-WRITE_CHUNK (mng_write_time) ;
-WRITE_CHUNK (mng_write_mhdr) ;
-WRITE_CHUNK (mng_write_mend) ;
-WRITE_CHUNK (mng_write_loop) ;
-WRITE_CHUNK (mng_write_endl) ;
-WRITE_CHUNK (mng_write_defi) ;
-WRITE_CHUNK (mng_write_basi) ;
-WRITE_CHUNK (mng_write_clon) ;
-#ifndef MNG_SKIPCHUNK_PAST
-WRITE_CHUNK (mng_write_past) ;
-#endif
-WRITE_CHUNK (mng_write_disc) ;
-WRITE_CHUNK (mng_write_back) ;
-WRITE_CHUNK (mng_write_fram) ;
-WRITE_CHUNK (mng_write_move) ;
-WRITE_CHUNK (mng_write_clip) ;
-WRITE_CHUNK (mng_write_show) ;
-WRITE_CHUNK (mng_write_term) ;
-WRITE_CHUNK (mng_write_save) ;
-WRITE_CHUNK (mng_write_seek) ;
-WRITE_CHUNK (mng_write_expi) ;
-WRITE_CHUNK (mng_write_fpri) ;
-WRITE_CHUNK (mng_write_phyg) ;
-#ifdef MNG_INCLUDE_JNG
-WRITE_CHUNK (mng_write_jhdr) ;
-WRITE_CHUNK (mng_write_jdaa) ;
-WRITE_CHUNK (mng_write_jdat) ;
-WRITE_CHUNK (mng_write_jsep) ;
-#endif
-#ifndef MNG_NO_DELTA_PNG
-WRITE_CHUNK (mng_write_dhdr) ;
-WRITE_CHUNK (mng_write_prom) ;
-WRITE_CHUNK (mng_write_ipng) ;
-WRITE_CHUNK (mng_write_pplt) ;
-#ifdef MNG_INCLUDE_JNG
-WRITE_CHUNK (mng_write_ijng) ;
-#endif
-WRITE_CHUNK (mng_write_drop) ;
-WRITE_CHUNK (mng_write_dbyk) ;
-WRITE_CHUNK (mng_write_ordr) ;
-#endif
-WRITE_CHUNK (mng_write_magn) ;
-WRITE_CHUNK (mng_write_need) ;
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-WRITE_CHUNK (mng_write_mpng) ;
-#endif
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-WRITE_CHUNK (mng_write_ahdr) ;
-WRITE_CHUNK (mng_write_adat) ;
-#endif
-WRITE_CHUNK (mng_write_evnt) ;
-WRITE_CHUNK (mng_write_unknown) ;
-
-/* ************************************************************************** */
-
-#else /* MNG_INCLUDE_WRITE_PROCS */
-#define mng_write_ihdr 0
-#define mng_write_plte 0
-#define mng_write_idat 0
-#define mng_write_iend 0
-#define mng_write_trns 0
-#define mng_write_gama 0
-#define mng_write_chrm 0
-#define mng_write_srgb 0
-#define mng_write_iccp 0
-#define mng_write_text 0
-#define mng_write_ztxt 0
-#define mng_write_itxt 0
-#define mng_write_bkgd 0
-#define mng_write_phys 0
-#define mng_write_sbit 0
-#define mng_write_splt 0
-#define mng_write_hist 0
-#define mng_write_time 0
-#define mng_write_mhdr 0
-#define mng_write_mend 0
-#define mng_write_loop 0
-#define mng_write_endl 0
-#define mng_write_defi 0
-#define mng_write_basi 0
-#define mng_write_clon 0
-#ifndef MNG_SKIPCHUNK_PAST
-#define mng_write_past 0
-#endif
-#define mng_write_disc 0
-#define mng_write_back 0
-#define mng_write_fram 0
-#define mng_write_move 0
-#define mng_write_clip 0
-#define mng_write_show 0
-#define mng_write_term 0
-#define mng_write_save 0
-#define mng_write_seek 0
-#define mng_write_expi 0
-#define mng_write_fpri 0
-#define mng_write_phyg 0
-#ifdef MNG_INCLUDE_JNG
-#define mng_write_jhdr 0
-#define mng_write_jdaa 0
-#define mng_write_jdat 0
-#define mng_write_jsep 0
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#define mng_write_dhdr 0
-#define mng_write_prom 0
-#define mng_write_ipng 0
-#define mng_write_pplt 0
-#ifdef MNG_INCLUDE_JNG
-#define mng_write_ijng 0
-#endif
-#define mng_write_drop 0
-#define mng_write_dbyk 0
-#define mng_write_ordr 0
-#endif
-#define mng_write_magn 0
-#define mng_write_need 0
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-#define mng_write_mpng 0
-#endif
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-#define mng_write_adat 0
-#define mng_write_ahdr 0
-#endif
-#define mng_write_evnt 0
-#define mng_write_unknown 0
-#endif /* MNG_INCLUDE_WRITE_PROCS */
-
-/* ************************************************************************** */
-
-#endif /* _libmng_chunk_io_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_chunk_prc.c b/src/3rdparty/libmng/libmng_chunk_prc.c
deleted file mode 100644
index e633e7e260..0000000000
--- a/src/3rdparty/libmng/libmng_chunk_prc.c
+++ /dev/null
@@ -1,4452 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_chunk_prc.c copyright (c) 2000-2005 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Chunk initialization & cleanup (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the chunk initialization & cleanup * */
-/* * routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * * */
-/* * 0.9.1 - 07/19/2000 - G.Juyn * */
-/* * - fixed creation-code * */
-/* * * */
-/* * 0.9.2 - 07/31/2000 - G.Juyn * */
-/* * - put add_chunk() inside MNG_INCLUDE_WRITE_PROCS wrapper * */
-/* * 0.9.2 - 08/01/2000 - G.Juyn * */
-/* * - wrapper for add_chunk() changed * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added support for JDAA * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * - added HLAPI function to copy chunks * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 10/04/2002 - G.Juyn * */
-/* * - fixed chunk-storage for evNT chunk * */
-/* * 1.0.5 - 10/17/2002 - G.Juyn * */
-/* * - fixed issue in freeing evNT chunk * */
-/* * * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added MNG_SKIPCHUNK_cHNK footprint optimizations * */
-/* * - added MNG_NO_DELTA_PNG reduction feature * */
-/* * 1.0.6 - 07/14/2003 - G.R-P * */
-/* * - added MNG_NO_LOOP_SIGNALS_SUPPORTED conditional * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * 1.0.6 - 08/17/2003 - G.R-P * */
-/* * - added conditionals around non-VLC chunk support * */
-/* * * */
-/* * 1.0.7 - 03/24/2004 - G.R-P * */
-/* * - fixed SKIPCHUNK_eXPI -> fPRI typo * */
-/* * * */
-/* * 1.0.9 - 09/25/2004 - G.Juyn * */
-/* * - replaced MNG_TWEAK_LARGE_FILES with permanent solution * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKINITFREE * */
-/* * 1.0.9 - 12/06/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKASSIGN * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* * 1.0.10 - 07/30/2005 - G.Juyn * */
-/* * - fixed problem with CLON object during readdisplay() * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_memory.h"
-#include "libmng_chunks.h"
-#include "libmng_chunk_prc.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * General chunk routines * */
-/* * * */
-/* ************************************************************************** */
-
-void mng_add_chunk (mng_datap pData,
- mng_chunkp pChunk)
-{
- if (!pData->pFirstchunk) /* list is still empty ? */
- {
- pData->pFirstchunk = pChunk; /* then this becomes the first */
-
-#ifdef MNG_SUPPORT_WRITE
- if (!pData->iFirstchunkadded)
- {
- pData->iFirstchunkadded = ((mng_chunk_headerp)pChunk)->iChunkname;
-#endif
-
- if (((mng_chunk_headerp)pChunk)->iChunkname == MNG_UINT_IHDR)
- pData->eImagetype = mng_it_png;
- else
-#ifdef MNG_INCLUDE_JNG
- if (((mng_chunk_headerp)pChunk)->iChunkname == MNG_UINT_JHDR)
- pData->eImagetype = mng_it_jng;
- else
-#endif
- pData->eImagetype = mng_it_mng;
-
- pData->eSigtype = pData->eImagetype;
-#ifdef MNG_SUPPORT_WRITE
- }
-#endif
- }
- else
- { /* else we make appropriate links */
- ((mng_chunk_headerp)pChunk)->pPrev = pData->pLastchunk;
- ((mng_chunk_headerp)pData->pLastchunk)->pNext = pChunk;
- }
-
- pData->pLastchunk = pChunk; /* and it's always the last */
-
- return;
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * Chunk specific initialization routines * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
-INIT_CHUNK_HDR (mng_init_general)
-{
- MNG_ALLOC (pData, *ppChunk, ((mng_chunk_headerp)pHeader)->iChunksize);
- MNG_COPY (*ppChunk, pHeader, sizeof (mng_chunk_header));
- return MNG_NOERROR;
-}
-
-#else /* MNG_OPTIMIZE_CHUNKINITFREE */
-
-/* ************************************************************************** */
-
-INIT_CHUNK_HDR (mng_init_ihdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IHDR, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_ihdr));
- ((mng_ihdrp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-INIT_CHUNK_HDR (mng_init_plte)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PLTE, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_plte));
- ((mng_pltep)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PLTE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-INIT_CHUNK_HDR (mng_init_idat)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDAT, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_idat));
- ((mng_idatp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-INIT_CHUNK_HDR (mng_init_iend)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IEND, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_iend));
- ((mng_iendp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-INIT_CHUNK_HDR (mng_init_trns)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_TRNS, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_trns));
- ((mng_trnsp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_TRNS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_gAMA
-INIT_CHUNK_HDR (mng_init_gama)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GAMA, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_gama));
- ((mng_gamap)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GAMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_cHRM
-INIT_CHUNK_HDR (mng_init_chrm)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_CHRM, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_chrm));
- ((mng_chrmp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_CHRM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sRGB
-INIT_CHUNK_HDR (mng_init_srgb)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SRGB, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_srgb));
- ((mng_srgbp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-INIT_CHUNK_HDR (mng_init_iccp)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ICCP, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_iccp));
- ((mng_iccpp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ICCP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tEXt
-INIT_CHUNK_HDR (mng_init_text)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_TEXT, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_text));
- ((mng_textp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_TEXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_zTXt
-INIT_CHUNK_HDR (mng_init_ztxt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ZTXT, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_ztxt));
- ((mng_ztxtp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ZTXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iTXt
-INIT_CHUNK_HDR (mng_init_itxt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ITXT, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_itxt));
- ((mng_itxtp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ITXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_bKGD
-INIT_CHUNK_HDR (mng_init_bkgd)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_BKGD, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_bkgd));
- ((mng_bkgdp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_BKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYs
-INIT_CHUNK_HDR (mng_init_phys)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PHYS, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_phys));
- ((mng_physp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PHYS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sBIT
-INIT_CHUNK_HDR (mng_init_sbit)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SBIT, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_sbit));
- ((mng_sbitp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SBIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sPLT
-INIT_CHUNK_HDR (mng_init_splt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SPLT, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_splt));
- ((mng_spltp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_hIST
-INIT_CHUNK_HDR (mng_init_hist)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_HIST, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_hist));
- ((mng_histp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_HIST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tIME
-INIT_CHUNK_HDR (mng_init_time)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_TIME, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_time));
- ((mng_timep)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_TIME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-INIT_CHUNK_HDR (mng_init_mhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_MHDR, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_mhdr));
- ((mng_mhdrp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_MHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-INIT_CHUNK_HDR (mng_init_mend)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_MEND, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_mend));
- ((mng_mendp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_MEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-INIT_CHUNK_HDR (mng_init_loop)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_LOOP, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_loop));
- ((mng_loopp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_LOOP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-INIT_CHUNK_HDR (mng_init_endl)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ENDL, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_endl));
- ((mng_endlp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ENDL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DEFI
-INIT_CHUNK_HDR (mng_init_defi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_DEFI, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_defi));
- ((mng_defip)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_DEFI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BASI
-INIT_CHUNK_HDR (mng_init_basi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_BASI, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_basi));
- ((mng_basip)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_BASI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLON
-INIT_CHUNK_HDR (mng_init_clon)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_CLON, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_clon));
- ((mng_clonp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_CLON, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-INIT_CHUNK_HDR (mng_init_past)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PAST, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_past));
- ((mng_pastp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PAST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-INIT_CHUNK_HDR (mng_init_disc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_DISC, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_disc));
- ((mng_discp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_DISC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BACK
-INIT_CHUNK_HDR (mng_init_back)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_BACK, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_back));
- ((mng_backp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_BACK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_FRAM
-INIT_CHUNK_HDR (mng_init_fram)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_FRAM, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_fram));
- ((mng_framp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_FRAM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MOVE
-INIT_CHUNK_HDR (mng_init_move)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_MOVE, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_move));
- ((mng_movep)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_MOVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLIP
-INIT_CHUNK_HDR (mng_init_clip)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_CLIP, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_clip));
- ((mng_clipp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_CLIP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SHOW
-INIT_CHUNK_HDR (mng_init_show)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SHOW, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_show));
- ((mng_showp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SHOW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_TERM
-INIT_CHUNK_HDR (mng_init_term)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_TERM, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_term));
- ((mng_termp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_TERM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-INIT_CHUNK_HDR (mng_init_save)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SAVE, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_save));
- ((mng_savep)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SAVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-INIT_CHUNK_HDR (mng_init_seek)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SEEK, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_seek));
- ((mng_seekp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_SEEK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_eXPI
-INIT_CHUNK_HDR (mng_init_expi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_EXPI, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_expi));
- ((mng_expip)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_EXPI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_fPRI
-INIT_CHUNK_HDR (mng_init_fpri)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_FPRI, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_fpri));
- ((mng_fprip)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_FPRI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_nEED
-INIT_CHUNK_HDR (mng_init_need)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_NEED, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_need));
- ((mng_needp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_NEED, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYg
-INIT_CHUNK_HDR (mng_init_phyg)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PHYG, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_phyg));
- ((mng_phygp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PHYG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-INIT_CHUNK_HDR (mng_init_jhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JHDR, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_jhdr));
- ((mng_jhdrp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-INIT_CHUNK_HDR (mng_init_jdaa)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JDAA, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_jdaa));
- ((mng_jdaap)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JDAA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-INIT_CHUNK_HDR (mng_init_jdat)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JDAT, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_jdat));
- ((mng_jdatp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-INIT_CHUNK_HDR (mng_init_jsep)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JSEP, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_jsep));
- ((mng_jsepp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JSEP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-INIT_CHUNK_HDR (mng_init_dhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_DHDR, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_dhdr));
- ((mng_dhdrp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_DHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-INIT_CHUNK_HDR (mng_init_prom)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PROM, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_prom));
- ((mng_promp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PROM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-INIT_CHUNK_HDR (mng_init_ipng)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IPNG, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_ipng));
- ((mng_ipngp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-INIT_CHUNK_HDR (mng_init_pplt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PPLT, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_pplt));
- ((mng_ppltp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_PPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
-INIT_CHUNK_HDR (mng_init_ijng)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IJNG, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_ijng));
- ((mng_ijngp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IJNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-INIT_CHUNK_HDR (mng_init_drop)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_DROP, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_drop));
- ((mng_dropp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_DROP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
-INIT_CHUNK_HDR (mng_init_dbyk)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_DBYK, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_dbyk));
- ((mng_dbykp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_DBYK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-INIT_CHUNK_HDR (mng_init_ordr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ORDR, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_ordr));
- ((mng_ordrp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ORDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-INIT_CHUNK_HDR (mng_init_magn)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_MAGN, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_magn));
- ((mng_magnp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_MAGN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_evNT
-INIT_CHUNK_HDR (mng_init_evnt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_EVNT, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_evnt));
- ((mng_evntp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_EVNT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-INIT_CHUNK_HDR (mng_init_unknown)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_UNKNOWN, MNG_LC_START);
-#endif
-
- MNG_ALLOC (pData, *ppChunk, sizeof (mng_unknown_chunk));
- ((mng_unknown_chunkp)*ppChunk)->sHeader = *((mng_chunk_headerp)pHeader);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_UNKNOWN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_OPTIMIZE_CHUNKINITFREE */
-
-/* ************************************************************************** */
-/* * * */
-/* * Chunk specific cleanup routines * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
-FREE_CHUNK_HDR (mng_free_general)
-{
- MNG_FREEX (pData, pHeader, ((mng_chunk_headerp)pHeader)->iChunksize);
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-FREE_CHUNK_HDR (mng_free_ihdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IHDR, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_ihdr));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-FREE_CHUNK_HDR (mng_free_plte)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PLTE, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_plte));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PLTE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-FREE_CHUNK_HDR (mng_free_idat)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IDAT, MNG_LC_START);
-#endif
-
- if (((mng_idatp)pHeader)->iDatasize)
- MNG_FREEX (pData, ((mng_idatp)pHeader)->pData,
- ((mng_idatp)pHeader)->iDatasize);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_idat));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IDAT, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-FREE_CHUNK_HDR (mng_free_iend)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IEND, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_iend));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-FREE_CHUNK_HDR (mng_free_trns)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_TRNS, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_trns));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_TRNS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_gAMA
-FREE_CHUNK_HDR (mng_free_gama)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_GAMA, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_gama));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_GAMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_cHRM
-FREE_CHUNK_HDR (mng_free_chrm)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_CHRM, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_chrm));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_CHRM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_sRGB
-FREE_CHUNK_HDR (mng_free_srgb)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SRGB, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_srgb));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-FREE_CHUNK_HDR (mng_free_iccp)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ICCP, MNG_LC_START);
-#endif
-
- if (((mng_iccpp)pHeader)->iNamesize)
- MNG_FREEX (pData, ((mng_iccpp)pHeader)->zName,
- ((mng_iccpp)pHeader)->iNamesize + 1);
-
- if (((mng_iccpp)pHeader)->iProfilesize)
- MNG_FREEX (pData, ((mng_iccpp)pHeader)->pProfile,
- ((mng_iccpp)pHeader)->iProfilesize);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_iccp));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ICCP, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tEXt
-FREE_CHUNK_HDR (mng_free_text)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_TEXT, MNG_LC_START);
-#endif
-
- if (((mng_textp)pHeader)->iKeywordsize)
- MNG_FREEX (pData, ((mng_textp)pHeader)->zKeyword,
- ((mng_textp)pHeader)->iKeywordsize + 1);
-
- if (((mng_textp)pHeader)->iTextsize)
- MNG_FREEX (pData, ((mng_textp)pHeader)->zText,
- ((mng_textp)pHeader)->iTextsize + 1);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_text));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_TEXT, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_zTXt
-FREE_CHUNK_HDR (mng_free_ztxt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ZTXT, MNG_LC_START);
-#endif
-
- if (((mng_ztxtp)pHeader)->iKeywordsize)
- MNG_FREEX (pData, ((mng_ztxtp)pHeader)->zKeyword,
- ((mng_ztxtp)pHeader)->iKeywordsize + 1);
-
- if (((mng_ztxtp)pHeader)->iTextsize)
- MNG_FREEX (pData, ((mng_ztxtp)pHeader)->zText,
- ((mng_ztxtp)pHeader)->iTextsize);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_ztxt));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ZTXT, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-#ifndef MNG_SKIPCHUNK_iTXt
-FREE_CHUNK_HDR (mng_free_itxt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ITXT, MNG_LC_START);
-#endif
-
- if (((mng_itxtp)pHeader)->iKeywordsize)
- MNG_FREEX (pData, ((mng_itxtp)pHeader)->zKeyword,
- ((mng_itxtp)pHeader)->iKeywordsize + 1);
-
- if (((mng_itxtp)pHeader)->iLanguagesize)
- MNG_FREEX (pData, ((mng_itxtp)pHeader)->zLanguage,
- ((mng_itxtp)pHeader)->iLanguagesize + 1);
-
- if (((mng_itxtp)pHeader)->iTranslationsize)
- MNG_FREEX (pData, ((mng_itxtp)pHeader)->zTranslation,
- ((mng_itxtp)pHeader)->iTranslationsize + 1);
-
- if (((mng_itxtp)pHeader)->iTextsize)
- MNG_FREEX (pData, ((mng_itxtp)pHeader)->zText,
- ((mng_itxtp)pHeader)->iTextsize);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_itxt));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ITXT, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-FREE_CHUNK_HDR (mng_free_mpng)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MPNG, MNG_LC_START);
-#endif
-
- if (((mng_mpngp)pHeader)->iFramessize)
- MNG_FREEX (pData, ((mng_mpngp)pHeader)->pFrames,
- ((mng_mpngp)pHeader)->iFramessize);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_mpng));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MPNG, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-FREE_CHUNK_HDR (mng_free_adat)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ADAT, MNG_LC_START);
-#endif
-
- if (((mng_adatp)pHeader)->iTilessize)
- MNG_FREEX (pData, ((mng_adatp)pHeader)->pTiles, ((mng_adatp)pHeader)->iTilessize);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_adat));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ADAT, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_bKGD
-FREE_CHUNK_HDR (mng_free_bkgd)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_BKGD, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_bkgd));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_BKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_pHYs
-FREE_CHUNK_HDR (mng_free_phys)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PHYS, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_phys));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PHYS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_sBIT
-FREE_CHUNK_HDR (mng_free_sbit)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SBIT, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_sbit));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SBIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sPLT
-FREE_CHUNK_HDR (mng_free_splt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SPLT, MNG_LC_START);
-#endif
-
- if (((mng_spltp)pHeader)->iNamesize)
- MNG_FREEX (pData, ((mng_spltp)pHeader)->zName,
- ((mng_spltp)pHeader)->iNamesize + 1);
-
- if (((mng_spltp)pHeader)->iEntrycount)
- MNG_FREEX (pData, ((mng_spltp)pHeader)->pEntries,
- ((mng_spltp)pHeader)->iEntrycount *
- (((mng_spltp)pHeader)->iSampledepth * 3 + sizeof (mng_uint16)) );
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_splt));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SPLT, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_hIST
-FREE_CHUNK_HDR (mng_free_hist)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_HIST, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_hist));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_HIST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_tIME
-FREE_CHUNK_HDR (mng_free_time)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_TIME, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_time));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_TIME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-FREE_CHUNK_HDR (mng_free_mhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MHDR, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_mhdr));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-FREE_CHUNK_HDR (mng_free_mend)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MEND, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_mend));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-FREE_CHUNK_HDR (mng_free_loop)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_LOOP, MNG_LC_START);
-#endif
-
-#ifndef MNG_NO_LOOP_SIGNALS_SUPPORTED
- if (((mng_loopp)pHeader)->iCount)
- MNG_FREEX (pData, ((mng_loopp)pHeader)->pSignals,
- ((mng_loopp)pHeader)->iCount * sizeof (mng_uint32) );
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_loop));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_LOOP, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-FREE_CHUNK_HDR (mng_free_endl)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ENDL, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_endl));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ENDL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_DEFI
-FREE_CHUNK_HDR (mng_free_defi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_DEFI, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_defi));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_DEFI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_BASI
-FREE_CHUNK_HDR (mng_free_basi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_BASI, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_basi));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_BASI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_CLON
-FREE_CHUNK_HDR (mng_free_clon)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_CLON, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_clon));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_CLON, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-FREE_CHUNK_HDR (mng_free_past)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PAST, MNG_LC_START);
-#endif
-
- if (((mng_pastp)pHeader)->iCount)
- MNG_FREEX (pData, ((mng_pastp)pHeader)->pSources,
- ((mng_pastp)pHeader)->iCount * sizeof (mng_past_source) );
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_past));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PAST, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-FREE_CHUNK_HDR (mng_free_disc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_DISC, MNG_LC_START);
-#endif
-
- if (((mng_discp)pHeader)->iCount)
- MNG_FREEX (pData, ((mng_discp)pHeader)->pObjectids,
- ((mng_discp)pHeader)->iCount * sizeof (mng_uint16) );
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_disc));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_DISC, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_BACK
-FREE_CHUNK_HDR (mng_free_back)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_BACK, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_back));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_BACK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_FRAM
-FREE_CHUNK_HDR (mng_free_fram)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_FRAM, MNG_LC_START);
-#endif
-
- if (((mng_framp)pHeader)->iNamesize)
- MNG_FREEX (pData, ((mng_framp)pHeader)->zName,
- ((mng_framp)pHeader)->iNamesize + 1);
-
- if (((mng_framp)pHeader)->iCount)
- MNG_FREEX (pData, ((mng_framp)pHeader)->pSyncids,
- ((mng_framp)pHeader)->iCount * sizeof (mng_uint32) );
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_fram));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_FRAM, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_MOVE
-FREE_CHUNK_HDR (mng_free_move)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MOVE, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_move));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MOVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_CLIP
-FREE_CHUNK_HDR (mng_free_clip)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_CLIP, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_clip));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_CLIP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_SHOW
-FREE_CHUNK_HDR (mng_free_show)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SHOW, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_show));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SHOW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_TERM
-FREE_CHUNK_HDR (mng_free_term)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_TERM, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_term));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_TERM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-FREE_CHUNK_HDR (mng_free_save)
-{
- mng_save_entryp pEntry = ((mng_savep)pHeader)->pEntries;
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SAVE, MNG_LC_START);
-#endif
-
- for (iX = 0; iX < ((mng_savep)pHeader)->iCount; iX++)
- {
- if (pEntry->iNamesize)
- MNG_FREEX (pData, pEntry->zName, pEntry->iNamesize);
-
- pEntry = pEntry + sizeof (mng_save_entry);
- }
-
- if (((mng_savep)pHeader)->iCount)
- MNG_FREEX (pData, ((mng_savep)pHeader)->pEntries,
- ((mng_savep)pHeader)->iCount * sizeof (mng_save_entry) );
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_save));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SAVE, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-FREE_CHUNK_HDR (mng_free_seek)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SEEK, MNG_LC_START);
-#endif
-
- if (((mng_seekp)pHeader)->iNamesize)
- MNG_FREEX (pData, ((mng_seekp)pHeader)->zName,
- ((mng_seekp)pHeader)->iNamesize + 1);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_seek));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_SEEK, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_eXPI
-FREE_CHUNK_HDR (mng_free_expi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_EXPI, MNG_LC_START);
-#endif
-
- if (((mng_expip)pHeader)->iNamesize)
- MNG_FREEX (pData, ((mng_expip)pHeader)->zName,
- ((mng_expip)pHeader)->iNamesize + 1);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_expi));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_EXPI, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_fPRI
-FREE_CHUNK_HDR (mng_free_fpri)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_FPRI, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_fpri));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_FPRI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_nEED
-FREE_CHUNK_HDR (mng_free_need)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_NEED, MNG_LC_START);
-#endif
-
- if (((mng_needp)pHeader)->iKeywordssize)
- MNG_FREEX (pData, ((mng_needp)pHeader)->zKeywords,
- ((mng_needp)pHeader)->iKeywordssize + 1);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_need));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_NEED, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_pHYg
-FREE_CHUNK_HDR (mng_free_phyg)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PHYG, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_phyg));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PHYG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifdef MNG_INCLUDE_JNG
-FREE_CHUNK_HDR (mng_free_jhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_JHDR, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_jhdr));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_JHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-FREE_CHUNK_HDR (mng_free_jdaa)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_JDAA, MNG_LC_START);
-#endif
-
- if (((mng_jdaap)pHeader)->iDatasize)
- MNG_FREEX (pData, ((mng_jdaap)pHeader)->pData,
- ((mng_jdaap)pHeader)->iDatasize);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_jdaa));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_JDAA, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-FREE_CHUNK_HDR (mng_free_jdat)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_JDAT, MNG_LC_START);
-#endif
-
- if (((mng_jdatp)pHeader)->iDatasize)
- MNG_FREEX (pData, ((mng_jdatp)pHeader)->pData,
- ((mng_jdatp)pHeader)->iDatasize);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_jdat));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_JDAT, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifdef MNG_INCLUDE_JNG
-FREE_CHUNK_HDR (mng_free_jsep)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_JSEP, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_jsep));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_JSEP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_NO_DELTA_PNG
-FREE_CHUNK_HDR (mng_free_dhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_DHDR, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_dhdr));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_DHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_NO_DELTA_PNG
-FREE_CHUNK_HDR (mng_free_prom)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PROM, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_prom));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PROM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_NO_DELTA_PNG
-FREE_CHUNK_HDR (mng_free_ipng)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IPNG, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_ipng));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_NO_DELTA_PNG
-FREE_CHUNK_HDR (mng_free_pplt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PPLT, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_pplt));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_PPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
-FREE_CHUNK_HDR (mng_free_ijng)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IJNG, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_ijng));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IJNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-FREE_CHUNK_HDR (mng_free_drop)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_DROP, MNG_LC_START);
-#endif
-
- if (((mng_dropp)pHeader)->iCount)
- MNG_FREEX (pData, ((mng_dropp)pHeader)->pChunknames,
- ((mng_dropp)pHeader)->iCount * sizeof (mng_chunkid) );
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_drop));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_DROP, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
-FREE_CHUNK_HDR (mng_free_dbyk)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_DBYK, MNG_LC_START);
-#endif
-
- if (((mng_dbykp)pHeader)->iKeywordssize)
- MNG_FREEX (pData, ((mng_dbykp)pHeader)->zKeywords,
- ((mng_dbykp)pHeader)->iKeywordssize);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_dbyk));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_DBYK, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-FREE_CHUNK_HDR (mng_free_ordr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ORDR, MNG_LC_START);
-#endif
-
- if (((mng_ordrp)pHeader)->iCount)
- MNG_FREEX (pData, ((mng_ordrp)pHeader)->pEntries,
- ((mng_ordrp)pHeader)->iCount * sizeof (mng_ordr_entry) );
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_ordr));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ORDR, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
-#ifndef MNG_SKIPCHUNK_MAGN
-FREE_CHUNK_HDR (mng_free_magn)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MAGN, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pHeader, sizeof (mng_magn));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MAGN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_evNT
-FREE_CHUNK_HDR (mng_free_evnt)
-{
- mng_evnt_entryp pEntry = ((mng_evntp)pHeader)->pEntries;
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_EVNT, MNG_LC_START);
-#endif
-
- for (iX = 0; iX < ((mng_evntp)pHeader)->iCount; iX++)
- {
- if (pEntry->iSegmentnamesize)
- MNG_FREEX (pData, pEntry->zSegmentname, pEntry->iSegmentnamesize+1);
-
- pEntry++;
- }
-
- if (((mng_evntp)pHeader)->iCount)
- MNG_FREEX (pData, ((mng_evntp)pHeader)->pEntries,
- ((mng_evntp)pHeader)->iCount * sizeof (mng_evnt_entry) );
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_evnt));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_EVNT, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-FREE_CHUNK_HDR (mng_free_unknown)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_UNKNOWN, MNG_LC_START);
-#endif
-
- if (((mng_unknown_chunkp)pHeader)->iDatasize)
- MNG_FREEX (pData, ((mng_unknown_chunkp)pHeader)->pData,
- ((mng_unknown_chunkp)pHeader)->iDatasize);
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- MNG_FREEX (pData, pHeader, sizeof (mng_unknown_chunk));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_UNKNOWN, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKINITFREE
- return MNG_NOERROR;
-#else
- return mng_free_general(pData, pHeader);
-#endif
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * Chunk specific copy routines * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_WRITE_PROCS
-
-/* ************************************************************************** */
-
-#ifdef MNG_OPTIMIZE_CHUNKASSIGN
-ASSIGN_CHUNK_HDR (mng_assign_general)
-{
- mng_ptr pSrc = (mng_uint8p)pChunkfrom + sizeof (mng_chunk_header);
- mng_ptr pDst = (mng_uint8p)pChunkto + sizeof (mng_chunk_header);
- mng_size_t iLen = ((mng_chunk_headerp)pChunkfrom)->iChunksize - sizeof (mng_chunk_header);
-
- MNG_COPY (pDst, pSrc, iLen);
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-ASSIGN_CHUNK_HDR (mng_assign_ihdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_IHDR, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_IHDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_ihdrp)pChunkto)->iWidth = ((mng_ihdrp)pChunkfrom)->iWidth;
- ((mng_ihdrp)pChunkto)->iHeight = ((mng_ihdrp)pChunkfrom)->iHeight;
- ((mng_ihdrp)pChunkto)->iBitdepth = ((mng_ihdrp)pChunkfrom)->iBitdepth;
- ((mng_ihdrp)pChunkto)->iColortype = ((mng_ihdrp)pChunkfrom)->iColortype;
- ((mng_ihdrp)pChunkto)->iCompression = ((mng_ihdrp)pChunkfrom)->iCompression;
- ((mng_ihdrp)pChunkto)->iFilter = ((mng_ihdrp)pChunkfrom)->iFilter;
- ((mng_ihdrp)pChunkto)->iInterlace = ((mng_ihdrp)pChunkfrom)->iInterlace;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_IHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-ASSIGN_CHUNK_HDR (mng_assign_plte)
-{
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PLTE, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_PLTE)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_pltep)pChunkto)->bEmpty = ((mng_pltep)pChunkfrom)->bEmpty;
- ((mng_pltep)pChunkto)->iEntrycount = ((mng_pltep)pChunkfrom)->iEntrycount;
-
- for (iX = 0; iX < ((mng_pltep)pChunkto)->iEntrycount; iX++)
- ((mng_pltep)pChunkto)->aEntries [iX] = ((mng_pltep)pChunkfrom)->aEntries [iX];
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PLTE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-ASSIGN_CHUNK_HDR (mng_assign_idat)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_IDAT, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_IDAT)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_idatp)pChunkto)->bEmpty = ((mng_idatp)pChunkfrom)->bEmpty;
- ((mng_idatp)pChunkto)->iDatasize = ((mng_idatp)pChunkfrom)->iDatasize;
-
- if (((mng_idatp)pChunkto)->iDatasize)
- {
- MNG_ALLOC (pData, ((mng_idatp)pChunkto)->pData, ((mng_idatp)pChunkto)->iDatasize);
- MNG_COPY (((mng_idatp)pChunkto)->pData, ((mng_idatp)pChunkfrom)->pData,
- ((mng_idatp)pChunkto)->iDatasize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_IDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-ASSIGN_CHUNK_HDR (mng_assign_iend)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_IEND, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_IEND)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_IEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-ASSIGN_CHUNK_HDR (mng_assign_trns)
-{
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_TRNS, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_tRNS)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_trnsp)pChunkto)->bEmpty = ((mng_trnsp)pChunkfrom)->bEmpty;
- ((mng_trnsp)pChunkto)->bGlobal = ((mng_trnsp)pChunkfrom)->bGlobal;
- ((mng_trnsp)pChunkto)->iType = ((mng_trnsp)pChunkfrom)->iType;
- ((mng_trnsp)pChunkto)->iCount = ((mng_trnsp)pChunkfrom)->iCount;
- ((mng_trnsp)pChunkto)->iGray = ((mng_trnsp)pChunkfrom)->iGray;
- ((mng_trnsp)pChunkto)->iRed = ((mng_trnsp)pChunkfrom)->iRed;
- ((mng_trnsp)pChunkto)->iGreen = ((mng_trnsp)pChunkfrom)->iGreen;
- ((mng_trnsp)pChunkto)->iBlue = ((mng_trnsp)pChunkfrom)->iBlue;
- ((mng_trnsp)pChunkto)->iRawlen = ((mng_trnsp)pChunkfrom)->iRawlen;
-
- for (iX = 0; iX < ((mng_trnsp)pChunkto)->iCount; iX++)
- ((mng_trnsp)pChunkto)->aEntries [iX] = ((mng_trnsp)pChunkfrom)->aEntries [iX];
-
- for (iX = 0; iX < ((mng_trnsp)pChunkto)->iRawlen; iX++)
- ((mng_trnsp)pChunkto)->aRawdata [iX] = ((mng_trnsp)pChunkfrom)->aRawdata [iX];
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_TRNS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_gAMA
-ASSIGN_CHUNK_HDR (mng_assign_gama)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_GAMA, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_gAMA)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_gamap)pChunkto)->bEmpty = ((mng_gamap)pChunkfrom)->bEmpty;
- ((mng_gamap)pChunkto)->iGamma = ((mng_gamap)pChunkfrom)->iGamma;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_GAMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_cHRM
-ASSIGN_CHUNK_HDR (mng_assign_chrm)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_CHRM, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_cHRM)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_chrmp)pChunkto)->bEmpty = ((mng_chrmp)pChunkfrom)->bEmpty;
- ((mng_chrmp)pChunkto)->iWhitepointx = ((mng_chrmp)pChunkfrom)->iWhitepointx;
- ((mng_chrmp)pChunkto)->iWhitepointy = ((mng_chrmp)pChunkfrom)->iWhitepointy;
- ((mng_chrmp)pChunkto)->iRedx = ((mng_chrmp)pChunkfrom)->iRedx;
- ((mng_chrmp)pChunkto)->iRedy = ((mng_chrmp)pChunkfrom)->iRedy;
- ((mng_chrmp)pChunkto)->iGreenx = ((mng_chrmp)pChunkfrom)->iGreenx;
- ((mng_chrmp)pChunkto)->iGreeny = ((mng_chrmp)pChunkfrom)->iGreeny;
- ((mng_chrmp)pChunkto)->iBluex = ((mng_chrmp)pChunkfrom)->iBluex;
- ((mng_chrmp)pChunkto)->iBluey = ((mng_chrmp)pChunkfrom)->iBluey;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_CHRM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_sRGB
-ASSIGN_CHUNK_HDR (mng_assign_srgb)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SRGB, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_sRGB)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_srgbp)pChunkto)->iRenderingintent = ((mng_srgbp)pChunkfrom)->iRenderingintent;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-ASSIGN_CHUNK_HDR (mng_assign_iccp)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ICCP, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_iCCP)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_iccpp)pChunkto)->bEmpty = ((mng_iccpp)pChunkfrom)->bEmpty;
- ((mng_iccpp)pChunkto)->iNamesize = ((mng_iccpp)pChunkfrom)->iNamesize;
- ((mng_iccpp)pChunkto)->iCompression = ((mng_iccpp)pChunkfrom)->iCompression;
- ((mng_iccpp)pChunkto)->iProfilesize = ((mng_iccpp)pChunkfrom)->iProfilesize;
-
- if (((mng_iccpp)pChunkto)->iNamesize)
- {
- MNG_ALLOC (pData, ((mng_iccpp)pChunkto)->zName, ((mng_iccpp)pChunkto)->iNamesize);
- MNG_COPY (((mng_iccpp)pChunkto)->zName, ((mng_iccpp)pChunkfrom)->zName,
- ((mng_iccpp)pChunkto)->iNamesize);
- }
-
- if (((mng_iccpp)pChunkto)->iProfilesize)
- {
- MNG_ALLOC (pData, ((mng_iccpp)pChunkto)->pProfile, ((mng_iccpp)pChunkto)->iProfilesize);
- MNG_COPY (((mng_iccpp)pChunkto)->pProfile, ((mng_iccpp)pChunkfrom)->pProfile,
- ((mng_iccpp)pChunkto)->iProfilesize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ICCP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tEXt
-ASSIGN_CHUNK_HDR (mng_assign_text)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_TEXT, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_tEXt)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_textp)pChunkto)->iKeywordsize = ((mng_textp)pChunkfrom)->iKeywordsize;
- ((mng_textp)pChunkto)->iTextsize = ((mng_textp)pChunkfrom)->iTextsize;
-
- if (((mng_textp)pChunkto)->iKeywordsize)
- {
- MNG_ALLOC (pData, ((mng_itxtp)pChunkto)->zKeyword, ((mng_textp)pChunkto)->iKeywordsize);
- MNG_COPY (((mng_itxtp)pChunkto)->zKeyword, ((mng_textp)pChunkfrom)->zKeyword,
- ((mng_itxtp)pChunkto)->iKeywordsize);
- }
-
- if (((mng_textp)pChunkto)->iTextsize)
- {
- MNG_ALLOC (pData, ((mng_textp)pChunkto)->zText, ((mng_textp)pChunkto)->iTextsize);
- MNG_COPY (((mng_textp)pChunkto)->zText, ((mng_textp)pChunkfrom)->zText,
- ((mng_textp)pChunkto)->iTextsize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_TEXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_zTXt
-ASSIGN_CHUNK_HDR (mng_assign_ztxt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ZTXT, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_zTXt)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_ztxtp)pChunkto)->iKeywordsize = ((mng_ztxtp)pChunkfrom)->iKeywordsize;
- ((mng_ztxtp)pChunkto)->iCompression = ((mng_ztxtp)pChunkfrom)->iCompression;
- ((mng_ztxtp)pChunkto)->iTextsize = ((mng_ztxtp)pChunkfrom)->iTextsize;
-
- if (((mng_ztxtp)pChunkto)->iKeywordsize)
- {
- MNG_ALLOC (pData, ((mng_ztxtp)pChunkto)->zKeyword, ((mng_ztxtp)pChunkto)->iKeywordsize);
- MNG_COPY (((mng_ztxtp)pChunkto)->zKeyword, ((mng_ztxtp)pChunkfrom)->zKeyword,
- ((mng_ztxtp)pChunkto)->iKeywordsize);
- }
-
- if (((mng_ztxtp)pChunkto)->iTextsize)
- {
- MNG_ALLOC (pData, ((mng_ztxtp)pChunkto)->zText, ((mng_ztxtp)pChunkto)->iTextsize);
- MNG_COPY (((mng_ztxtp)pChunkto)->zText, ((mng_ztxtp)pChunkfrom)->zText,
- ((mng_ztxtp)pChunkto)->iTextsize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ZTXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iTXt
-ASSIGN_CHUNK_HDR (mng_assign_itxt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ITXT, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_iTXt)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_itxtp)pChunkto)->iKeywordsize = ((mng_itxtp)pChunkfrom)->iKeywordsize;
- ((mng_itxtp)pChunkto)->iCompressionflag = ((mng_itxtp)pChunkfrom)->iCompressionflag;
- ((mng_itxtp)pChunkto)->iCompressionmethod = ((mng_itxtp)pChunkfrom)->iCompressionmethod;
- ((mng_itxtp)pChunkto)->iLanguagesize = ((mng_itxtp)pChunkfrom)->iLanguagesize;
- ((mng_itxtp)pChunkto)->iTranslationsize = ((mng_itxtp)pChunkfrom)->iTranslationsize;
- ((mng_itxtp)pChunkto)->iTextsize = ((mng_itxtp)pChunkfrom)->iTextsize;
-
- if (((mng_itxtp)pChunkto)->iKeywordsize)
- {
- MNG_ALLOC (pData, ((mng_itxtp)pChunkto)->zKeyword, ((mng_itxtp)pChunkto)->iKeywordsize);
- MNG_COPY (((mng_itxtp)pChunkto)->zKeyword, ((mng_itxtp)pChunkfrom)->zKeyword,
- ((mng_itxtp)pChunkto)->iKeywordsize);
- }
-
- if (((mng_itxtp)pChunkto)->iTextsize)
- {
- MNG_ALLOC (pData, ((mng_itxtp)pChunkto)->zLanguage, ((mng_itxtp)pChunkto)->iLanguagesize);
- MNG_COPY (((mng_itxtp)pChunkto)->zLanguage, ((mng_itxtp)pChunkfrom)->zLanguage,
- ((mng_itxtp)pChunkto)->iLanguagesize);
- }
-
- if (((mng_itxtp)pChunkto)->iTextsize)
- {
- MNG_ALLOC (pData, ((mng_itxtp)pChunkto)->zTranslation, ((mng_itxtp)pChunkto)->iTranslationsize);
- MNG_COPY (((mng_itxtp)pChunkto)->zTranslation, ((mng_itxtp)pChunkfrom)->zTranslation,
- ((mng_itxtp)pChunkto)->iTranslationsize);
- }
-
- if (((mng_itxtp)pChunkto)->iTextsize)
- {
- MNG_ALLOC (pData, ((mng_itxtp)pChunkto)->zText, ((mng_itxtp)pChunkto)->iTextsize);
- MNG_COPY (((mng_itxtp)pChunkto)->zText, ((mng_itxtp)pChunkfrom)->zText,
- ((mng_itxtp)pChunkto)->iTextsize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ITXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_bKGD
-ASSIGN_CHUNK_HDR (mng_assign_bkgd)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_BKGD, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_bKGD)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_bkgdp)pChunkto)->bEmpty = ((mng_bkgdp)pChunkfrom)->bEmpty;
- ((mng_bkgdp)pChunkto)->iType = ((mng_bkgdp)pChunkfrom)->iType;
- ((mng_bkgdp)pChunkto)->iIndex = ((mng_bkgdp)pChunkfrom)->iIndex;
- ((mng_bkgdp)pChunkto)->iGray = ((mng_bkgdp)pChunkfrom)->iGray;
- ((mng_bkgdp)pChunkto)->iRed = ((mng_bkgdp)pChunkfrom)->iRed;
- ((mng_bkgdp)pChunkto)->iGreen = ((mng_bkgdp)pChunkfrom)->iGreen;
- ((mng_bkgdp)pChunkto)->iBlue = ((mng_bkgdp)pChunkfrom)->iBlue;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_BKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_pHYs
-ASSIGN_CHUNK_HDR (mng_assign_phys)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PHYS, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_pHYs)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_physp)pChunkto)->bEmpty = ((mng_physp)pChunkfrom)->bEmpty;
- ((mng_physp)pChunkto)->iSizex = ((mng_physp)pChunkfrom)->iSizex;
- ((mng_physp)pChunkto)->iSizey = ((mng_physp)pChunkfrom)->iSizey;
- ((mng_physp)pChunkto)->iUnit = ((mng_physp)pChunkfrom)->iUnit;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PHYS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_sBIT
-ASSIGN_CHUNK_HDR (mng_assign_sbit)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SBIT, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_sBIT)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_sbitp)pChunkto)->bEmpty = ((mng_sbitp)pChunkfrom)->bEmpty;
- ((mng_sbitp)pChunkto)->iType = ((mng_sbitp)pChunkfrom)->iType;
- ((mng_sbitp)pChunkto)->aBits [0] = ((mng_sbitp)pChunkfrom)->aBits [0];
- ((mng_sbitp)pChunkto)->aBits [1] = ((mng_sbitp)pChunkfrom)->aBits [1];
- ((mng_sbitp)pChunkto)->aBits [2] = ((mng_sbitp)pChunkfrom)->aBits [2];
- ((mng_sbitp)pChunkto)->aBits [3] = ((mng_sbitp)pChunkfrom)->aBits [3];
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SBIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sPLT
-ASSIGN_CHUNK_HDR (mng_assign_splt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SPLT, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_sPLT)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_spltp)pChunkto)->bEmpty = ((mng_spltp)pChunkfrom)->bEmpty;
- ((mng_spltp)pChunkto)->iNamesize = ((mng_spltp)pChunkfrom)->iNamesize;
- ((mng_spltp)pChunkto)->iSampledepth = ((mng_spltp)pChunkfrom)->iSampledepth;
- ((mng_spltp)pChunkto)->iEntrycount = ((mng_spltp)pChunkfrom)->iEntrycount;
- ((mng_spltp)pChunkto)->pEntries = ((mng_spltp)pChunkfrom)->pEntries;
-
- if (((mng_spltp)pChunkto)->iNamesize)
- {
- MNG_ALLOC (pData, ((mng_spltp)pChunkto)->zName, ((mng_spltp)pChunkto)->iNamesize);
- MNG_COPY (((mng_spltp)pChunkto)->zName, ((mng_spltp)pChunkfrom)->zName,
- ((mng_spltp)pChunkto)->iNamesize);
- }
-
- if (((mng_spltp)pChunkto)->iEntrycount)
- {
- mng_uint32 iLen = ((mng_spltp)pChunkto)->iEntrycount *
- (((mng_spltp)pChunkto)->iSampledepth * 3 + sizeof (mng_uint16));
-
- MNG_ALLOC (pData, ((mng_spltp)pChunkto)->pEntries, iLen);
- MNG_COPY (((mng_spltp)pChunkto)->pEntries, ((mng_spltp)pChunkfrom)->pEntries, iLen);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_hIST
-ASSIGN_CHUNK_HDR (mng_assign_hist)
-{
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_HIST, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_hIST)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_histp)pChunkto)->iEntrycount = ((mng_histp)pChunkfrom)->iEntrycount;
-
- for (iX = 0; iX < ((mng_histp)pChunkto)->iEntrycount; iX++)
- ((mng_histp)pChunkto)->aEntries [iX] = ((mng_histp)pChunkfrom)->aEntries [iX];
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_HIST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_tIME
-ASSIGN_CHUNK_HDR (mng_assign_time)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_TIME, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_tIME)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_timep)pChunkto)->iYear = ((mng_timep)pChunkfrom)->iYear;
- ((mng_timep)pChunkto)->iMonth = ((mng_timep)pChunkfrom)->iMonth;
- ((mng_timep)pChunkto)->iDay = ((mng_timep)pChunkfrom)->iDay;
- ((mng_timep)pChunkto)->iHour = ((mng_timep)pChunkfrom)->iHour;
- ((mng_timep)pChunkto)->iMinute = ((mng_timep)pChunkfrom)->iMinute;
- ((mng_timep)pChunkto)->iSecond = ((mng_timep)pChunkfrom)->iSecond;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_TIME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-ASSIGN_CHUNK_HDR (mng_assign_mhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_MHDR, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_mhdrp)pChunkto)->iWidth = ((mng_mhdrp)pChunkfrom)->iWidth;
- ((mng_mhdrp)pChunkto)->iHeight = ((mng_mhdrp)pChunkfrom)->iHeight;
- ((mng_mhdrp)pChunkto)->iTicks = ((mng_mhdrp)pChunkfrom)->iTicks;
- ((mng_mhdrp)pChunkto)->iLayercount = ((mng_mhdrp)pChunkfrom)->iLayercount;
- ((mng_mhdrp)pChunkto)->iFramecount = ((mng_mhdrp)pChunkfrom)->iFramecount;
- ((mng_mhdrp)pChunkto)->iPlaytime = ((mng_mhdrp)pChunkfrom)->iPlaytime;
- ((mng_mhdrp)pChunkto)->iSimplicity = ((mng_mhdrp)pChunkfrom)->iSimplicity;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_MHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-ASSIGN_CHUNK_HDR (mng_assign_mend)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_MEND, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_MEND)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_MEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-ASSIGN_CHUNK_HDR (mng_assign_loop)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_LOOP, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_LOOP)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_loopp)pChunkto)->iLevel = ((mng_loopp)pChunkfrom)->iLevel;
- ((mng_loopp)pChunkto)->iRepeat = ((mng_loopp)pChunkfrom)->iRepeat;
- ((mng_loopp)pChunkto)->iTermination = ((mng_loopp)pChunkfrom)->iTermination;
- ((mng_loopp)pChunkto)->iItermin = ((mng_loopp)pChunkfrom)->iItermin;
- ((mng_loopp)pChunkto)->iItermax = ((mng_loopp)pChunkfrom)->iItermax;
- ((mng_loopp)pChunkto)->iCount = ((mng_loopp)pChunkfrom)->iCount;
-
-#ifndef MNG_NO_LOOP_SIGNALS_SUPPORTED
- if (((mng_loopp)pChunkto)->iCount)
- {
- mng_uint32 iLen = ((mng_loopp)pChunkto)->iCount * sizeof (mng_uint32);
- MNG_ALLOC (pData, ((mng_loopp)pChunkto)->pSignals, iLen);
- MNG_COPY (((mng_loopp)pChunkto)->pSignals, ((mng_loopp)pChunkfrom)->pSignals, iLen);
- }
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_LOOP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-ASSIGN_CHUNK_HDR (mng_assign_endl)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ENDL, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_ENDL)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_endlp)pChunkto)->iLevel = ((mng_endlp)pChunkfrom)->iLevel;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ENDL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_DEFI
-ASSIGN_CHUNK_HDR (mng_assign_defi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_DEFI, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_DEFI)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_defip)pChunkto)->iObjectid = ((mng_defip)pChunkfrom)->iObjectid;
- ((mng_defip)pChunkto)->bHasdonotshow = ((mng_defip)pChunkfrom)->bHasdonotshow;
- ((mng_defip)pChunkto)->iDonotshow = ((mng_defip)pChunkfrom)->iDonotshow;
- ((mng_defip)pChunkto)->bHasconcrete = ((mng_defip)pChunkfrom)->bHasconcrete;
- ((mng_defip)pChunkto)->iConcrete = ((mng_defip)pChunkfrom)->iConcrete;
- ((mng_defip)pChunkto)->bHasloca = ((mng_defip)pChunkfrom)->bHasloca;
- ((mng_defip)pChunkto)->iXlocation = ((mng_defip)pChunkfrom)->iXlocation;
- ((mng_defip)pChunkto)->iYlocation = ((mng_defip)pChunkfrom)->iYlocation;
- ((mng_defip)pChunkto)->bHasclip = ((mng_defip)pChunkfrom)->bHasclip;
- ((mng_defip)pChunkto)->iLeftcb = ((mng_defip)pChunkfrom)->iLeftcb;
- ((mng_defip)pChunkto)->iRightcb = ((mng_defip)pChunkfrom)->iRightcb;
- ((mng_defip)pChunkto)->iTopcb = ((mng_defip)pChunkfrom)->iTopcb;
- ((mng_defip)pChunkto)->iBottomcb = ((mng_defip)pChunkfrom)->iBottomcb;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_DEFI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_BASI
-ASSIGN_CHUNK_HDR (mng_assign_basi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_BASI, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_BASI)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_basip)pChunkto)->iWidth = ((mng_basip)pChunkfrom)->iWidth;
- ((mng_basip)pChunkto)->iHeight = ((mng_basip)pChunkfrom)->iHeight;
- ((mng_basip)pChunkto)->iBitdepth = ((mng_basip)pChunkfrom)->iBitdepth;
- ((mng_basip)pChunkto)->iColortype = ((mng_basip)pChunkfrom)->iColortype;
- ((mng_basip)pChunkto)->iCompression = ((mng_basip)pChunkfrom)->iCompression;
- ((mng_basip)pChunkto)->iFilter = ((mng_basip)pChunkfrom)->iFilter;
- ((mng_basip)pChunkto)->iInterlace = ((mng_basip)pChunkfrom)->iInterlace;
- ((mng_basip)pChunkto)->iRed = ((mng_basip)pChunkfrom)->iRed;
- ((mng_basip)pChunkto)->iGreen = ((mng_basip)pChunkfrom)->iGreen;
- ((mng_basip)pChunkto)->iBlue = ((mng_basip)pChunkfrom)->iBlue;
- ((mng_basip)pChunkto)->iAlpha = ((mng_basip)pChunkfrom)->iAlpha;
- ((mng_basip)pChunkto)->iViewable = ((mng_basip)pChunkfrom)->iViewable;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_BASI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_CLON
-ASSIGN_CHUNK_HDR (mng_assign_clon)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_CLON, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_CLON)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_clonp)pChunkto)->iSourceid = ((mng_clonp)pChunkfrom)->iSourceid;
- ((mng_clonp)pChunkto)->iCloneid = ((mng_clonp)pChunkfrom)->iCloneid;
- ((mng_clonp)pChunkto)->iClonetype = ((mng_clonp)pChunkfrom)->iClonetype;
-#ifdef MNG_OPTIMIZE_CHUNKREADER
- ((mng_clonp)pChunkto)->bHasdonotshow = ((mng_clonp)pChunkfrom)->bHasdonotshow;
-#endif
- ((mng_clonp)pChunkto)->iDonotshow = ((mng_clonp)pChunkfrom)->iDonotshow;
- ((mng_clonp)pChunkto)->iConcrete = ((mng_clonp)pChunkfrom)->iConcrete;
- ((mng_clonp)pChunkto)->bHasloca = ((mng_clonp)pChunkfrom)->bHasloca;
- ((mng_clonp)pChunkto)->iLocationtype = ((mng_clonp)pChunkfrom)->iLocationtype;
- ((mng_clonp)pChunkto)->iLocationx = ((mng_clonp)pChunkfrom)->iLocationx;
- ((mng_clonp)pChunkto)->iLocationy = ((mng_clonp)pChunkfrom)->iLocationy;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_CLON, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-ASSIGN_CHUNK_HDR (mng_assign_past)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PAST, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_PAST)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_pastp)pChunkto)->iDestid = ((mng_pastp)pChunkfrom)->iDestid;
- ((mng_pastp)pChunkto)->iTargettype = ((mng_pastp)pChunkfrom)->iTargettype;
- ((mng_pastp)pChunkto)->iTargetx = ((mng_pastp)pChunkfrom)->iTargetx;
- ((mng_pastp)pChunkto)->iTargety = ((mng_pastp)pChunkfrom)->iTargety;
- ((mng_pastp)pChunkto)->iCount = ((mng_pastp)pChunkfrom)->iCount;
-
- if (((mng_pastp)pChunkto)->iCount)
- {
- mng_uint32 iLen = ((mng_pastp)pChunkto)->iCount * sizeof (mng_past_source);
-
- MNG_ALLOC (pData, ((mng_pastp)pChunkto)->pSources, iLen);
- MNG_COPY (((mng_pastp)pChunkto)->pSources, ((mng_pastp)pChunkfrom)->pSources, iLen);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PAST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-ASSIGN_CHUNK_HDR (mng_assign_disc)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_DISC, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_DISC)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_discp)pChunkto)->iCount = ((mng_discp)pChunkfrom)->iCount;
-
- if (((mng_discp)pChunkto)->iCount)
- {
- mng_uint32 iLen = ((mng_discp)pChunkto)->iCount * sizeof (mng_uint16);
-
- MNG_ALLOC (pData, ((mng_discp)pChunkto)->pObjectids, iLen);
- MNG_COPY (((mng_discp)pChunkto)->pObjectids, ((mng_discp)pChunkfrom)->pObjectids, iLen);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_DISC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_BACK
-ASSIGN_CHUNK_HDR (mng_assign_back)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_BACK, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_BACK)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_backp)pChunkto)->iRed = ((mng_backp)pChunkfrom)->iRed;
- ((mng_backp)pChunkto)->iGreen = ((mng_backp)pChunkfrom)->iGreen;
- ((mng_backp)pChunkto)->iBlue = ((mng_backp)pChunkfrom)->iBlue;
- ((mng_backp)pChunkto)->iMandatory = ((mng_backp)pChunkfrom)->iMandatory;
- ((mng_backp)pChunkto)->iImageid = ((mng_backp)pChunkfrom)->iImageid;
- ((mng_backp)pChunkto)->iTile = ((mng_backp)pChunkfrom)->iTile;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_BACK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_FRAM
-ASSIGN_CHUNK_HDR (mng_assign_fram)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_FRAM, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_FRAM)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_framp)pChunkto)->bEmpty = ((mng_framp)pChunkfrom)->bEmpty;
- ((mng_framp)pChunkto)->iMode = ((mng_framp)pChunkfrom)->iMode;
- ((mng_framp)pChunkto)->iNamesize = ((mng_framp)pChunkfrom)->iNamesize;
- ((mng_framp)pChunkto)->iChangedelay = ((mng_framp)pChunkfrom)->iChangedelay;
- ((mng_framp)pChunkto)->iChangetimeout = ((mng_framp)pChunkfrom)->iChangetimeout;
- ((mng_framp)pChunkto)->iChangeclipping = ((mng_framp)pChunkfrom)->iChangeclipping;
- ((mng_framp)pChunkto)->iChangesyncid = ((mng_framp)pChunkfrom)->iChangesyncid;
- ((mng_framp)pChunkto)->iDelay = ((mng_framp)pChunkfrom)->iDelay;
- ((mng_framp)pChunkto)->iTimeout = ((mng_framp)pChunkfrom)->iTimeout;
- ((mng_framp)pChunkto)->iBoundarytype = ((mng_framp)pChunkfrom)->iBoundarytype;
- ((mng_framp)pChunkto)->iBoundaryl = ((mng_framp)pChunkfrom)->iBoundaryl;
- ((mng_framp)pChunkto)->iBoundaryr = ((mng_framp)pChunkfrom)->iBoundaryr;
- ((mng_framp)pChunkto)->iBoundaryt = ((mng_framp)pChunkfrom)->iBoundaryt;
- ((mng_framp)pChunkto)->iBoundaryb = ((mng_framp)pChunkfrom)->iBoundaryb;
- ((mng_framp)pChunkto)->iCount = ((mng_framp)pChunkfrom)->iCount;
-
- if (((mng_framp)pChunkto)->iNamesize)
- {
- MNG_ALLOC (pData, ((mng_framp)pChunkto)->zName, ((mng_framp)pChunkto)->iNamesize);
- MNG_COPY (((mng_framp)pChunkto)->zName, ((mng_framp)pChunkfrom)->zName,
- ((mng_framp)pChunkto)->iNamesize);
- }
-
- if (((mng_framp)pChunkto)->iCount)
- {
- mng_uint32 iLen = ((mng_framp)pChunkto)->iCount * sizeof (mng_uint32);
-
- MNG_ALLOC (pData, ((mng_framp)pChunkto)->pSyncids, iLen);
- MNG_COPY (((mng_framp)pChunkto)->pSyncids, ((mng_framp)pChunkfrom)->pSyncids, iLen);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_FRAM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_MOVE
-ASSIGN_CHUNK_HDR (mng_assign_move)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_MOVE, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_MOVE)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_movep)pChunkto)->iFirstid = ((mng_movep)pChunkfrom)->iFirstid;
- ((mng_movep)pChunkto)->iLastid = ((mng_movep)pChunkfrom)->iLastid;
- ((mng_movep)pChunkto)->iMovetype = ((mng_movep)pChunkfrom)->iMovetype;
- ((mng_movep)pChunkto)->iMovex = ((mng_movep)pChunkfrom)->iMovex;
- ((mng_movep)pChunkto)->iMovey = ((mng_movep)pChunkfrom)->iMovey;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_MOVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_CLIP
-ASSIGN_CHUNK_HDR (mng_assign_clip)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_CLIP, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_CLIP)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_clipp)pChunkto)->iFirstid = ((mng_clipp)pChunkfrom)->iFirstid;
- ((mng_clipp)pChunkto)->iLastid = ((mng_clipp)pChunkfrom)->iLastid;
- ((mng_clipp)pChunkto)->iCliptype = ((mng_clipp)pChunkfrom)->iCliptype;
- ((mng_clipp)pChunkto)->iClipl = ((mng_clipp)pChunkfrom)->iClipl;
- ((mng_clipp)pChunkto)->iClipr = ((mng_clipp)pChunkfrom)->iClipr;
- ((mng_clipp)pChunkto)->iClipt = ((mng_clipp)pChunkfrom)->iClipt;
- ((mng_clipp)pChunkto)->iClipb = ((mng_clipp)pChunkfrom)->iClipb;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_CLIP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_SHOW
-ASSIGN_CHUNK_HDR (mng_assign_show)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SHOW, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_SHOW)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_showp)pChunkto)->bEmpty = ((mng_showp)pChunkfrom)->bEmpty;
- ((mng_showp)pChunkto)->iFirstid = ((mng_showp)pChunkfrom)->iFirstid;
- ((mng_showp)pChunkto)->iLastid = ((mng_showp)pChunkfrom)->iLastid;
- ((mng_showp)pChunkto)->iMode = ((mng_showp)pChunkfrom)->iMode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SHOW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_TERM
-ASSIGN_CHUNK_HDR (mng_assign_term)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_TERM, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_TERM)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_termp)pChunkto)->iTermaction = ((mng_termp)pChunkfrom)->iTermaction;
- ((mng_termp)pChunkto)->iIteraction = ((mng_termp)pChunkfrom)->iIteraction;
- ((mng_termp)pChunkto)->iDelay = ((mng_termp)pChunkfrom)->iDelay;
- ((mng_termp)pChunkto)->iItermax = ((mng_termp)pChunkfrom)->iItermax;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_TERM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-ASSIGN_CHUNK_HDR (mng_assign_save)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SAVE, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_SAVE)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_savep)pChunkto)->bEmpty = ((mng_savep)pChunkfrom)->bEmpty;
- ((mng_savep)pChunkto)->iOffsettype = ((mng_savep)pChunkfrom)->iOffsettype;
- ((mng_savep)pChunkto)->iCount = ((mng_savep)pChunkfrom)->iCount;
-
- if (((mng_savep)pChunkto)->iCount)
- {
- mng_uint32 iX;
- mng_save_entryp pEntry;
- mng_uint32 iLen = ((mng_savep)pChunkto)->iCount * sizeof (mng_save_entry);
-
- MNG_ALLOC (pData, ((mng_savep)pChunkto)->pEntries, iLen);
- MNG_COPY (((mng_savep)pChunkto)->pEntries, ((mng_savep)pChunkfrom)->pEntries, iLen);
-
- pEntry = ((mng_savep)pChunkto)->pEntries;
-
- for (iX = 0; iX < ((mng_savep)pChunkto)->iCount; iX++)
- {
- if (pEntry->iNamesize)
- {
- mng_pchar pTemp = pEntry->zName;
-
- MNG_ALLOC (pData, pEntry->zName, pEntry->iNamesize);
- MNG_COPY (pEntry->zName, pTemp, pEntry->iNamesize);
- }
- else
- {
- pEntry->zName = MNG_NULL;
- }
-
- pEntry++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SAVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-ASSIGN_CHUNK_HDR (mng_assign_seek)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SEEK, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_SEEK)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_seekp)pChunkto)->iNamesize = ((mng_seekp)pChunkfrom)->iNamesize;
-
- if (((mng_seekp)pChunkto)->iNamesize)
- {
- MNG_ALLOC (pData, ((mng_seekp)pChunkto)->zName, ((mng_seekp)pChunkto)->iNamesize);
- MNG_COPY (((mng_seekp)pChunkto)->zName, ((mng_seekp)pChunkfrom)->zName,
- ((mng_seekp)pChunkto)->iNamesize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_SEEK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_eXPI
-ASSIGN_CHUNK_HDR (mng_assign_expi)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_EXPI, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_eXPI)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_expip)pChunkto)->iSnapshotid = ((mng_expip)pChunkfrom)->iSnapshotid;
- ((mng_expip)pChunkto)->iNamesize = ((mng_expip)pChunkfrom)->iNamesize;
-
- if (((mng_expip)pChunkto)->iNamesize)
- {
- MNG_ALLOC (pData, ((mng_expip)pChunkto)->zName, ((mng_expip)pChunkto)->iNamesize);
- MNG_COPY (((mng_expip)pChunkto)->zName, ((mng_expip)pChunkfrom)->zName,
- ((mng_expip)pChunkto)->iNamesize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_EXPI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_fPRI
-ASSIGN_CHUNK_HDR (mng_assign_fpri)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_FPRI, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_fPRI)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_fprip)pChunkto)->iDeltatype = ((mng_fprip)pChunkfrom)->iDeltatype;
- ((mng_fprip)pChunkto)->iPriority = ((mng_fprip)pChunkfrom)->iPriority;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_FPRI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_nEED
-ASSIGN_CHUNK_HDR (mng_assign_need)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_NEED, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_nEED)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_needp)pChunkto)->iKeywordssize = ((mng_needp)pChunkfrom)->iKeywordssize;
-
- if (((mng_needp)pChunkto)->iKeywordssize)
- {
- MNG_ALLOC (pData, ((mng_needp)pChunkto)->zKeywords, ((mng_needp)pChunkto)->iKeywordssize);
- MNG_COPY (((mng_needp)pChunkto)->zKeywords, ((mng_needp)pChunkfrom)->zKeywords,
- ((mng_needp)pChunkto)->iKeywordssize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_NEED, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_pHYg
-ASSIGN_CHUNK_HDR (mng_assign_phyg)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PHYG, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_pHYg)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_phygp)pChunkto)->bEmpty = ((mng_phygp)pChunkfrom)->bEmpty;
- ((mng_phygp)pChunkto)->iSizex = ((mng_phygp)pChunkfrom)->iSizex;
- ((mng_phygp)pChunkto)->iSizey = ((mng_phygp)pChunkfrom)->iSizey;
- ((mng_phygp)pChunkto)->iUnit = ((mng_phygp)pChunkfrom)->iUnit;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PHYG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifdef MNG_INCLUDE_JNG
-ASSIGN_CHUNK_HDR (mng_assign_jhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_JHDR, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_JHDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_jhdrp)pChunkto)->iWidth = ((mng_jhdrp)pChunkfrom)->iWidth;
- ((mng_jhdrp)pChunkto)->iHeight = ((mng_jhdrp)pChunkfrom)->iHeight;
- ((mng_jhdrp)pChunkto)->iColortype = ((mng_jhdrp)pChunkfrom)->iColortype;
- ((mng_jhdrp)pChunkto)->iImagesampledepth = ((mng_jhdrp)pChunkfrom)->iImagesampledepth;
- ((mng_jhdrp)pChunkto)->iImagecompression = ((mng_jhdrp)pChunkfrom)->iImagecompression;
- ((mng_jhdrp)pChunkto)->iImageinterlace = ((mng_jhdrp)pChunkfrom)->iImageinterlace;
- ((mng_jhdrp)pChunkto)->iAlphasampledepth = ((mng_jhdrp)pChunkfrom)->iAlphasampledepth;
- ((mng_jhdrp)pChunkto)->iAlphacompression = ((mng_jhdrp)pChunkfrom)->iAlphacompression;
- ((mng_jhdrp)pChunkto)->iAlphafilter = ((mng_jhdrp)pChunkfrom)->iAlphafilter;
- ((mng_jhdrp)pChunkto)->iAlphainterlace = ((mng_jhdrp)pChunkfrom)->iAlphainterlace;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_JHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-ASSIGN_CHUNK_HDR (mng_assign_jdaa)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_JDAA, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_JDAA)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_jdaap)pChunkto)->bEmpty = ((mng_jdaap)pChunkfrom)->bEmpty;
- ((mng_jdaap)pChunkto)->iDatasize = ((mng_jdaap)pChunkfrom)->iDatasize;
-
- if (((mng_jdaap)pChunkto)->iDatasize)
- {
- MNG_ALLOC (pData, ((mng_jdaap)pChunkto)->pData, ((mng_jdaap)pChunkto)->iDatasize);
- MNG_COPY (((mng_jdaap)pChunkto)->pData, ((mng_jdaap)pChunkfrom)->pData,
- ((mng_jdaap)pChunkto)->iDatasize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_JDAA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-ASSIGN_CHUNK_HDR (mng_assign_jdat)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_JDAT, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_JDAT)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_jdatp)pChunkto)->bEmpty = ((mng_jdatp)pChunkfrom)->bEmpty;
- ((mng_jdatp)pChunkto)->iDatasize = ((mng_jdatp)pChunkfrom)->iDatasize;
-
- if (((mng_jdatp)pChunkto)->iDatasize)
- {
- MNG_ALLOC (pData, ((mng_jdatp)pChunkto)->pData, ((mng_jdatp)pChunkto)->iDatasize);
- MNG_COPY (((mng_jdatp)pChunkto)->pData, ((mng_jdatp)pChunkfrom)->pData,
- ((mng_jdatp)pChunkto)->iDatasize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_JDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifdef MNG_INCLUDE_JNG
-ASSIGN_CHUNK_HDR (mng_assign_jsep)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_JSEP, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_JSEP)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_JSEP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_NO_DELTA_PNG
-ASSIGN_CHUNK_HDR (mng_assign_dhdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_DHDR, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_DHDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_dhdrp)pChunkto)->iObjectid = ((mng_dhdrp)pChunkfrom)->iObjectid;
- ((mng_dhdrp)pChunkto)->iImagetype = ((mng_dhdrp)pChunkfrom)->iImagetype;
- ((mng_dhdrp)pChunkto)->iDeltatype = ((mng_dhdrp)pChunkfrom)->iDeltatype;
- ((mng_dhdrp)pChunkto)->iBlockwidth = ((mng_dhdrp)pChunkfrom)->iBlockwidth;
- ((mng_dhdrp)pChunkto)->iBlockheight = ((mng_dhdrp)pChunkfrom)->iBlockheight;
- ((mng_dhdrp)pChunkto)->iBlockx = ((mng_dhdrp)pChunkfrom)->iBlockx;
- ((mng_dhdrp)pChunkto)->iBlocky = ((mng_dhdrp)pChunkfrom)->iBlocky;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_DHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_NO_DELTA_PNG
-ASSIGN_CHUNK_HDR (mng_assign_prom)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PROM, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_PROM)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_promp)pChunkto)->iColortype = ((mng_promp)pChunkfrom)->iColortype;
- ((mng_promp)pChunkto)->iSampledepth = ((mng_promp)pChunkfrom)->iSampledepth;
- ((mng_promp)pChunkto)->iFilltype = ((mng_promp)pChunkfrom)->iFilltype;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PROM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_NO_DELTA_PNG
-ASSIGN_CHUNK_HDR (mng_assign_ipng)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_IPNG, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_IPNG)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_IPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_NO_DELTA_PNG
-ASSIGN_CHUNK_HDR (mng_assign_pplt)
-{
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PPLT, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_PPLT)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_ppltp)pChunkto)->iDeltatype = ((mng_ppltp)pChunkfrom)->iDeltatype;
- ((mng_ppltp)pChunkto)->iCount = ((mng_ppltp)pChunkfrom)->iCount;
-
- for (iX = 0; iX < ((mng_ppltp)pChunkto)->iCount; iX++)
- ((mng_ppltp)pChunkto)->aEntries [iX] = ((mng_ppltp)pChunkfrom)->aEntries [iX];
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_PPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
-ASSIGN_CHUNK_HDR (mng_assign_ijng)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_IJNG, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_IJNG)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_IJNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-ASSIGN_CHUNK_HDR (mng_assign_drop)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_DROP, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_DROP)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_dropp)pChunkto)->iCount = ((mng_dropp)pChunkfrom)->iCount;
-
- if (((mng_dropp)pChunkto)->iCount)
- {
- mng_uint32 iLen = ((mng_dropp)pChunkto)->iCount * sizeof (mng_uint32);
-
- MNG_ALLOC (pData, ((mng_dropp)pChunkto)->pChunknames, iLen);
- MNG_COPY (((mng_dropp)pChunkto)->pChunknames, ((mng_dropp)pChunkfrom)->pChunknames, iLen);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_DROP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
-ASSIGN_CHUNK_HDR (mng_assign_dbyk)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_DBYK, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_DBYK)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_dbykp)pChunkto)->iChunkname = ((mng_dbykp)pChunkfrom)->iChunkname;
- ((mng_dbykp)pChunkto)->iPolarity = ((mng_dbykp)pChunkfrom)->iPolarity;
- ((mng_dbykp)pChunkto)->iKeywordssize = ((mng_dbykp)pChunkfrom)->iKeywordssize;
-
- if (((mng_dbykp)pChunkto)->iKeywordssize)
- {
- MNG_ALLOC (pData, ((mng_dbykp)pChunkto)->zKeywords, ((mng_dbykp)pChunkto)->iKeywordssize);
- MNG_COPY (((mng_dbykp)pChunkto)->zKeywords, ((mng_dbykp)pChunkfrom)->zKeywords,
- ((mng_dbykp)pChunkto)->iKeywordssize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_DBYK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-ASSIGN_CHUNK_HDR (mng_assign_ordr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ORDR, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_ORDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_ordrp)pChunkto)->iCount = ((mng_ordrp)pChunkfrom)->iCount;
-
- if (((mng_ordrp)pChunkto)->iCount)
- {
- mng_uint32 iLen = ((mng_ordrp)pChunkto)->iCount * sizeof (mng_ordr_entry);
-
- MNG_ALLOC (pData, ((mng_ordrp)pChunkto)->pEntries, iLen);
- MNG_COPY (((mng_ordrp)pChunkto)->pEntries, ((mng_ordrp)pChunkfrom)->pEntries, iLen);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ORDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKASSIGN
-#ifndef MNG_SKIPCHUNK_MAGN
-ASSIGN_CHUNK_HDR (mng_assign_magn)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_MAGN, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_MAGN)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_magnp)pChunkto)->iFirstid = ((mng_magnp)pChunkfrom)->iFirstid;
- ((mng_magnp)pChunkto)->iLastid = ((mng_magnp)pChunkfrom)->iLastid;
- ((mng_magnp)pChunkto)->iMethodX = ((mng_magnp)pChunkfrom)->iMethodX;
- ((mng_magnp)pChunkto)->iMX = ((mng_magnp)pChunkfrom)->iMX;
- ((mng_magnp)pChunkto)->iMY = ((mng_magnp)pChunkfrom)->iMY;
- ((mng_magnp)pChunkto)->iML = ((mng_magnp)pChunkfrom)->iML;
- ((mng_magnp)pChunkto)->iMR = ((mng_magnp)pChunkfrom)->iMR;
- ((mng_magnp)pChunkto)->iMT = ((mng_magnp)pChunkfrom)->iMT;
- ((mng_magnp)pChunkto)->iMB = ((mng_magnp)pChunkfrom)->iMB;
- ((mng_magnp)pChunkto)->iMethodY = ((mng_magnp)pChunkfrom)->iMethodY;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_MAGN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-ASSIGN_CHUNK_HDR (mng_assign_mpng)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_MPNG, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_mpNG)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_mpngp)pChunkto)->iFramewidth = ((mng_mpngp)pChunkfrom)->iFramewidth;
- ((mng_mpngp)pChunkto)->iFrameheight = ((mng_mpngp)pChunkfrom)->iFrameheight;
- ((mng_mpngp)pChunkto)->iNumplays = ((mng_mpngp)pChunkfrom)->iNumplays;
- ((mng_mpngp)pChunkto)->iTickspersec = ((mng_mpngp)pChunkfrom)->iTickspersec;
- ((mng_mpngp)pChunkto)->iCompressionmethod = ((mng_mpngp)pChunkfrom)->iCompressionmethod;
- ((mng_mpngp)pChunkto)->iFramessize = ((mng_mpngp)pChunkfrom)->iFramessize;
-
- if (((mng_mpngp)pChunkto)->iFramessize)
- {
- MNG_ALLOC (pData, ((mng_mpngp)pChunkto)->pFrames, ((mng_mpngp)pChunkto)->iFramessize);
- MNG_COPY (((mng_mpngp)pChunkto)->pFrames, ((mng_mpngp)pChunkfrom)->pFrames,
- ((mng_mpngp)pChunkto)->iFramessize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_MPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-ASSIGN_CHUNK_HDR (mng_assign_ahdr)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_AHDR, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_ahDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_ahdrp)pChunkto)->iNumframes = ((mng_ahdrp)pChunkfrom)->iNumframes;
- ((mng_ahdrp)pChunkto)->iTickspersec = ((mng_ahdrp)pChunkfrom)->iTickspersec;
- ((mng_ahdrp)pChunkto)->iNumplays = ((mng_ahdrp)pChunkfrom)->iNumplays;
- ((mng_ahdrp)pChunkto)->iTilewidth = ((mng_ahdrp)pChunkfrom)->iTilewidth;
- ((mng_ahdrp)pChunkto)->iTileheight = ((mng_ahdrp)pChunkfrom)->iTileheight;
- ((mng_ahdrp)pChunkto)->iInterlace = ((mng_ahdrp)pChunkfrom)->iInterlace;
- ((mng_ahdrp)pChunkto)->iStillused = ((mng_ahdrp)pChunkfrom)->iStillused;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_AHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-ASSIGN_CHUNK_HDR (mng_assign_adat)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ADAT, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_adAT)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_adatp)pChunkto)->iTilessize = ((mng_adatp)pChunkfrom)->iTilessize;
-
- if (((mng_adatp)pChunkto)->iTilessize)
- {
- MNG_ALLOC (pData, ((mng_adatp)pChunkto)->pTiles, ((mng_adatp)pChunkto)->iTilessize);
- MNG_COPY (((mng_adatp)pChunkto)->pTiles, ((mng_adatp)pChunkfrom)->pTiles,
- ((mng_adatp)pChunkto)->iTilessize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_ADAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_evNT
-ASSIGN_CHUNK_HDR (mng_assign_evnt)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_EVNT, MNG_LC_START);
-#endif
-
- if (((mng_chunk_headerp)pChunkfrom)->iChunkname != MNG_UINT_evNT)
- MNG_ERROR (pData, MNG_WRONGCHUNK); /* ouch */
-
- ((mng_evntp)pChunkto)->iCount = ((mng_evntp)pChunkfrom)->iCount;
-
- if (((mng_evntp)pChunkto)->iCount)
- {
- mng_uint32 iX;
- mng_evnt_entryp pEntry;
- mng_uint32 iLen = ((mng_evntp)pChunkto)->iCount * sizeof (mng_evnt_entry);
-
- MNG_ALLOC (pData, ((mng_evntp)pChunkto)->pEntries, iLen);
- MNG_COPY (((mng_evntp)pChunkto)->pEntries, ((mng_evntp)pChunkfrom)->pEntries, iLen);
-
- pEntry = ((mng_evntp)pChunkto)->pEntries;
-
- for (iX = 0; iX < ((mng_evntp)pChunkto)->iCount; iX++)
- {
- if (pEntry->iSegmentnamesize)
- {
- mng_pchar pTemp = pEntry->zSegmentname;
-
- MNG_ALLOC (pData, pEntry->zSegmentname, pEntry->iSegmentnamesize+1);
- MNG_COPY (pEntry->zSegmentname, pTemp, pEntry->iSegmentnamesize);
- }
- else
- {
- pEntry->zSegmentname = MNG_NULL;
- }
-
- pEntry++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_EVNT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-ASSIGN_CHUNK_HDR (mng_assign_unknown)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_UNKNOWN, MNG_LC_START);
-#endif
-
- ((mng_unknown_chunkp)pChunkto)->iDatasize = ((mng_unknown_chunkp)pChunkfrom)->iDatasize;
-
- if (((mng_unknown_chunkp)pChunkto)->iDatasize)
- {
- MNG_ALLOC (pData, ((mng_unknown_chunkp)pChunkto)->pData, ((mng_unknown_chunkp)pChunkto)->iDatasize);
- MNG_COPY (((mng_unknown_chunkp)pChunkto)->pData, ((mng_unknown_chunkp)pChunkfrom)->pData,
- ((mng_unknown_chunkp)pChunkto)->iDatasize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ASSIGN_UNKNOWN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_WRITE_PROCS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_chunk_prc.h b/src/3rdparty/libmng/libmng_chunk_prc.h
deleted file mode 100644
index 0cf0f3c1d5..0000000000
--- a/src/3rdparty/libmng/libmng_chunk_prc.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_chunk_prc.h copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Chunk initialization & cleanup (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : definition of the chunk initialization & cleanup routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added support for JDAA * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added NO_DELTA_PNG support * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKINITFREE * */
-/* * 1.0.9 - 12/06/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKASSIGN * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_chunk_prc_h_
-#define _libmng_chunk_prc_h_
-
-/* ************************************************************************** */
-
-void mng_add_chunk (mng_datap pData,
- mng_chunkp pChunk);
-
-/* ************************************************************************** */
-
-#define INIT_CHUNK_HDR(n) mng_retcode n (mng_datap pData, \
- mng_chunkp pHeader, \
- mng_chunkp* ppChunk)
-
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
-INIT_CHUNK_HDR (mng_init_general) ;
-#else
-INIT_CHUNK_HDR (mng_init_ihdr) ;
-INIT_CHUNK_HDR (mng_init_plte) ;
-INIT_CHUNK_HDR (mng_init_idat) ;
-INIT_CHUNK_HDR (mng_init_iend) ;
-INIT_CHUNK_HDR (mng_init_trns) ;
-INIT_CHUNK_HDR (mng_init_gama) ;
-INIT_CHUNK_HDR (mng_init_chrm) ;
-INIT_CHUNK_HDR (mng_init_srgb) ;
-INIT_CHUNK_HDR (mng_init_iccp) ;
-INIT_CHUNK_HDR (mng_init_text) ;
-INIT_CHUNK_HDR (mng_init_ztxt) ;
-INIT_CHUNK_HDR (mng_init_itxt) ;
-INIT_CHUNK_HDR (mng_init_bkgd) ;
-INIT_CHUNK_HDR (mng_init_phys) ;
-INIT_CHUNK_HDR (mng_init_sbit) ;
-INIT_CHUNK_HDR (mng_init_splt) ;
-INIT_CHUNK_HDR (mng_init_hist) ;
-INIT_CHUNK_HDR (mng_init_time) ;
-INIT_CHUNK_HDR (mng_init_mhdr) ;
-INIT_CHUNK_HDR (mng_init_mend) ;
-INIT_CHUNK_HDR (mng_init_loop) ;
-INIT_CHUNK_HDR (mng_init_endl) ;
-INIT_CHUNK_HDR (mng_init_defi) ;
-INIT_CHUNK_HDR (mng_init_basi) ;
-INIT_CHUNK_HDR (mng_init_clon) ;
-#ifndef MNG_SKIPCHUNK_PAST
-INIT_CHUNK_HDR (mng_init_past) ;
-#endif
-INIT_CHUNK_HDR (mng_init_disc) ;
-INIT_CHUNK_HDR (mng_init_back) ;
-INIT_CHUNK_HDR (mng_init_fram) ;
-INIT_CHUNK_HDR (mng_init_move) ;
-INIT_CHUNK_HDR (mng_init_clip) ;
-INIT_CHUNK_HDR (mng_init_show) ;
-INIT_CHUNK_HDR (mng_init_term) ;
-INIT_CHUNK_HDR (mng_init_save) ;
-INIT_CHUNK_HDR (mng_init_seek) ;
-INIT_CHUNK_HDR (mng_init_expi) ;
-INIT_CHUNK_HDR (mng_init_fpri) ;
-INIT_CHUNK_HDR (mng_init_need) ;
-INIT_CHUNK_HDR (mng_init_phyg) ;
-#ifdef MNG_INCLUDE_JNG
-INIT_CHUNK_HDR (mng_init_jhdr) ;
-INIT_CHUNK_HDR (mng_init_jdaa) ;
-INIT_CHUNK_HDR (mng_init_jdat) ;
-INIT_CHUNK_HDR (mng_init_jsep) ;
-#endif
-#ifndef MNG_NO_DELTA_PNG
-INIT_CHUNK_HDR (mng_init_dhdr) ;
-INIT_CHUNK_HDR (mng_init_prom) ;
-INIT_CHUNK_HDR (mng_init_ipng) ;
-INIT_CHUNK_HDR (mng_init_pplt) ;
-#ifdef MNG_INCLUDE_JNG
-INIT_CHUNK_HDR (mng_init_ijng) ;
-#endif
-INIT_CHUNK_HDR (mng_init_drop) ;
-INIT_CHUNK_HDR (mng_init_dbyk) ;
-INIT_CHUNK_HDR (mng_init_ordr) ;
-#endif
-INIT_CHUNK_HDR (mng_init_magn) ;
-INIT_CHUNK_HDR (mng_init_evnt) ;
-INIT_CHUNK_HDR (mng_init_unknown) ;
-#endif /* MNG_OPTIMIZE_CHUNKINITFREE */
-
-/* ************************************************************************** */
-
-#define FREE_CHUNK_HDR(n) mng_retcode n (mng_datap pData, \
- mng_chunkp pHeader)
-
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
-FREE_CHUNK_HDR (mng_free_general) ;
-#else /* MNG_OPTIMIZE_CHUNKINITFREE */
-FREE_CHUNK_HDR (mng_free_ihdr) ;
-FREE_CHUNK_HDR (mng_free_plte) ;
-FREE_CHUNK_HDR (mng_free_iend) ;
-FREE_CHUNK_HDR (mng_free_trns) ;
-FREE_CHUNK_HDR (mng_free_gama) ;
-FREE_CHUNK_HDR (mng_free_chrm) ;
-FREE_CHUNK_HDR (mng_free_srgb) ;
-FREE_CHUNK_HDR (mng_free_bkgd) ;
-FREE_CHUNK_HDR (mng_free_phys) ;
-FREE_CHUNK_HDR (mng_free_sbit) ;
-FREE_CHUNK_HDR (mng_free_hist) ;
-FREE_CHUNK_HDR (mng_free_time) ;
-FREE_CHUNK_HDR (mng_free_mhdr) ;
-FREE_CHUNK_HDR (mng_free_mend) ;
-FREE_CHUNK_HDR (mng_free_endl) ;
-FREE_CHUNK_HDR (mng_free_defi) ;
-FREE_CHUNK_HDR (mng_free_basi) ;
-FREE_CHUNK_HDR (mng_free_clon) ;
-FREE_CHUNK_HDR (mng_free_back) ;
-FREE_CHUNK_HDR (mng_free_move) ;
-FREE_CHUNK_HDR (mng_free_clip) ;
-FREE_CHUNK_HDR (mng_free_show) ;
-FREE_CHUNK_HDR (mng_free_term) ;
-FREE_CHUNK_HDR (mng_free_fpri) ;
-FREE_CHUNK_HDR (mng_free_phyg) ;
-#ifdef MNG_INCLUDE_JNG
-FREE_CHUNK_HDR (mng_free_jhdr) ;
-FREE_CHUNK_HDR (mng_free_jsep) ;
-#endif
-#ifndef MNG_NO_DELTA_PNG
-FREE_CHUNK_HDR (mng_free_dhdr) ;
-FREE_CHUNK_HDR (mng_free_prom) ;
-FREE_CHUNK_HDR (mng_free_ipng) ;
-FREE_CHUNK_HDR (mng_free_pplt) ;
-#ifdef MNG_INCLUDE_JNG
-FREE_CHUNK_HDR (mng_free_ijng) ;
-#endif
-#endif
-FREE_CHUNK_HDR (mng_free_magn) ;
-#endif /* MNG_OPTIMIZE_CHUNKINITFREE */
-
-FREE_CHUNK_HDR (mng_free_idat) ;
-FREE_CHUNK_HDR (mng_free_iccp) ;
-FREE_CHUNK_HDR (mng_free_text) ;
-FREE_CHUNK_HDR (mng_free_ztxt) ;
-FREE_CHUNK_HDR (mng_free_itxt) ;
-FREE_CHUNK_HDR (mng_free_splt) ;
-FREE_CHUNK_HDR (mng_free_loop) ;
-#ifndef MNG_SKIPCHUNK_PAST
-FREE_CHUNK_HDR (mng_free_past) ;
-#endif
-FREE_CHUNK_HDR (mng_free_disc) ;
-FREE_CHUNK_HDR (mng_free_fram) ;
-FREE_CHUNK_HDR (mng_free_save) ;
-FREE_CHUNK_HDR (mng_free_seek) ;
-FREE_CHUNK_HDR (mng_free_expi) ;
-FREE_CHUNK_HDR (mng_free_need) ;
-#ifdef MNG_INCLUDE_JNG
-FREE_CHUNK_HDR (mng_free_jdaa) ;
-FREE_CHUNK_HDR (mng_free_jdat) ;
-#endif
-#ifndef MNG_NO_DELTA_PNG
-FREE_CHUNK_HDR (mng_free_drop) ;
-FREE_CHUNK_HDR (mng_free_dbyk) ;
-FREE_CHUNK_HDR (mng_free_ordr) ;
-#endif
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-FREE_CHUNK_HDR (mng_free_mpng) ;
-#endif
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-FREE_CHUNK_HDR (mng_free_adat) ;
-#endif
-FREE_CHUNK_HDR (mng_free_evnt) ;
-FREE_CHUNK_HDR (mng_free_unknown) ;
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_WRITE_PROCS
-
-#define ASSIGN_CHUNK_HDR(n) mng_retcode n (mng_datap pData, \
- mng_chunkp pChunkto, \
- mng_chunkp pChunkfrom)
-
-#ifdef MNG_OPTIMIZE_CHUNKASSIGN
-ASSIGN_CHUNK_HDR (mng_assign_general) ;
-#else /* MNG_OPTIMIZE_CHUNKASSIGN */
-ASSIGN_CHUNK_HDR (mng_assign_ihdr) ;
-ASSIGN_CHUNK_HDR (mng_assign_plte) ;
-ASSIGN_CHUNK_HDR (mng_assign_iend) ;
-ASSIGN_CHUNK_HDR (mng_assign_trns) ;
-ASSIGN_CHUNK_HDR (mng_assign_gama) ;
-ASSIGN_CHUNK_HDR (mng_assign_chrm) ;
-ASSIGN_CHUNK_HDR (mng_assign_srgb) ;
-ASSIGN_CHUNK_HDR (mng_assign_bkgd) ;
-ASSIGN_CHUNK_HDR (mng_assign_phys) ;
-ASSIGN_CHUNK_HDR (mng_assign_sbit) ;
-ASSIGN_CHUNK_HDR (mng_assign_hist) ;
-ASSIGN_CHUNK_HDR (mng_assign_time) ;
-ASSIGN_CHUNK_HDR (mng_assign_mhdr) ;
-ASSIGN_CHUNK_HDR (mng_assign_mend) ;
-ASSIGN_CHUNK_HDR (mng_assign_endl) ;
-ASSIGN_CHUNK_HDR (mng_assign_defi) ;
-ASSIGN_CHUNK_HDR (mng_assign_basi) ;
-ASSIGN_CHUNK_HDR (mng_assign_clon) ;
-ASSIGN_CHUNK_HDR (mng_assign_back) ;
-ASSIGN_CHUNK_HDR (mng_assign_move) ;
-ASSIGN_CHUNK_HDR (mng_assign_clip) ;
-ASSIGN_CHUNK_HDR (mng_assign_show) ;
-ASSIGN_CHUNK_HDR (mng_assign_term) ;
-ASSIGN_CHUNK_HDR (mng_assign_fpri) ;
-ASSIGN_CHUNK_HDR (mng_assign_phyg) ;
-#ifdef MNG_INCLUDE_JNG
-ASSIGN_CHUNK_HDR (mng_assign_jhdr) ;
-ASSIGN_CHUNK_HDR (mng_assign_jsep) ;
-#endif
-#ifndef MNG_NO_DELTA_PNG
-ASSIGN_CHUNK_HDR (mng_assign_dhdr) ;
-ASSIGN_CHUNK_HDR (mng_assign_prom) ;
-ASSIGN_CHUNK_HDR (mng_assign_ipng) ;
-ASSIGN_CHUNK_HDR (mng_assign_pplt) ;
-#ifdef MNG_INCLUDE_JNG
-ASSIGN_CHUNK_HDR (mng_assign_ijng) ;
-#endif
-#endif
-ASSIGN_CHUNK_HDR (mng_assign_magn) ;
-#endif /* MNG_OPTIMIZE_CHUNKASSIGN */
-
-ASSIGN_CHUNK_HDR (mng_assign_idat) ;
-ASSIGN_CHUNK_HDR (mng_assign_iccp) ;
-ASSIGN_CHUNK_HDR (mng_assign_text) ;
-ASSIGN_CHUNK_HDR (mng_assign_ztxt) ;
-ASSIGN_CHUNK_HDR (mng_assign_itxt) ;
-ASSIGN_CHUNK_HDR (mng_assign_splt) ;
-ASSIGN_CHUNK_HDR (mng_assign_loop) ;
-#ifndef MNG_SKIPCHUNK_PAST
-ASSIGN_CHUNK_HDR (mng_assign_past) ;
-#endif
-ASSIGN_CHUNK_HDR (mng_assign_disc) ;
-ASSIGN_CHUNK_HDR (mng_assign_fram) ;
-ASSIGN_CHUNK_HDR (mng_assign_save) ;
-ASSIGN_CHUNK_HDR (mng_assign_seek) ;
-ASSIGN_CHUNK_HDR (mng_assign_need) ;
-ASSIGN_CHUNK_HDR (mng_assign_expi) ;
-#ifdef MNG_INCLUDE_JNG
-ASSIGN_CHUNK_HDR (mng_assign_jdaa) ;
-ASSIGN_CHUNK_HDR (mng_assign_jdat) ;
-#endif
-#ifndef MNG_NO_DELTA_PNG
-ASSIGN_CHUNK_HDR (mng_assign_drop) ;
-ASSIGN_CHUNK_HDR (mng_assign_dbyk) ;
-ASSIGN_CHUNK_HDR (mng_assign_ordr) ;
-#endif
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-ASSIGN_CHUNK_HDR (mng_assign_mpng) ;
-#endif
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-ASSIGN_CHUNK_HDR (mng_assign_ahdr) ;
-ASSIGN_CHUNK_HDR (mng_assign_adat) ;
-#endif
-ASSIGN_CHUNK_HDR (mng_assign_evnt) ;
-ASSIGN_CHUNK_HDR (mng_assign_unknown) ;
-
-/* ************************************************************************** */
-
-#else /* MNG_INCLUDE_WRITE_PROCS */
-#define mng_assign_general 0
-#define mng_assign_ihdr 0
-#define mng_assign_plte 0
-#define mng_assign_idat 0
-#define mng_assign_iend 0
-#define mng_assign_trns 0
-#define mng_assign_gama 0
-#define mng_assign_chrm 0
-#define mng_assign_srgb 0
-#define mng_assign_iccp 0
-#define mng_assign_text 0
-#define mng_assign_ztxt 0
-#define mng_assign_itxt 0
-#define mng_assign_bkgd 0
-#define mng_assign_phys 0
-#define mng_assign_sbit 0
-#define mng_assign_splt 0
-#define mng_assign_hist 0
-#define mng_assign_time 0
-#define mng_assign_mhdr 0
-#define mng_assign_mend 0
-#define mng_assign_loop 0
-#define mng_assign_endl 0
-#define mng_assign_defi 0
-#define mng_assign_basi 0
-#define mng_assign_clon 0
-#ifndef MNG_SKIPCHUNK_PAST
-#define mng_assign_past 0
-#endif
-#define mng_assign_disc 0
-#define mng_assign_back 0
-#define mng_assign_fram 0
-#define mng_assign_move 0
-#define mng_assign_clip 0
-#define mng_assign_show 0
-#define mng_assign_term 0
-#define mng_assign_save 0
-#define mng_assign_seek 0
-#define mng_assign_expi 0
-#define mng_assign_fpri 0
-#define mng_assign_phyg 0
-#ifdef MNG_INCLUDE_JNG
-#define mng_assign_jhdr 0
-#define mng_assign_jdaa 0
-#define mng_assign_jdat 0
-#define mng_assign_jsep 0
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#define mng_assign_dhdr 0
-#define mng_assign_prom 0
-#define mng_assign_ipng 0
-#define mng_assign_pplt 0
-#ifdef MNG_INCLUDE_JNG
-#define mng_assign_ijng 0
-#endif
-#define mng_assign_drop 0
-#define mng_assign_dbyk 0
-#define mng_assign_ordr 0
-#endif
-#define mng_assign_magn 0
-#define mng_assign_need 0
-#define mng_assign_mpng 0
-#define mng_assign_ahdr 0
-#define mng_assign_adat 0
-#define mng_assign_evnt 0
-#define mng_assign_unknown 0
-#endif /* MNG_INCLUDE_WRITE_PROCS */
-
-/* ************************************************************************** */
-
-#endif /* _libmng_chunk_prc_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_chunk_xs.c b/src/3rdparty/libmng/libmng_chunk_xs.c
deleted file mode 100644
index 13114090d6..0000000000
--- a/src/3rdparty/libmng/libmng_chunk_xs.c
+++ /dev/null
@@ -1,7016 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_chunk_xs.c copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : chunk access functions (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the chunk access functions * */
-/* * * */
-/* * changes : 0.5.1 - 05/06/2000 - G.Juyn * */
-/* * - changed and filled iterate-chunk function * */
-/* * 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - fixed calling convention * */
-/* * - added getchunk functions * */
-/* * - added putchunk functions * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - added empty-chunk put-routines * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * 0.5.1 - 05/15/2000 - G.Juyn * */
-/* * - added getimgdata & putimgdata functions * */
-/* * * */
-/* * 0.5.2 - 05/19/2000 - G.Juyn * */
-/* * - B004 - fixed problem with MNG_SUPPORT_WRITE not defined * */
-/* * also for MNG_SUPPORT_WRITE without MNG_INCLUDE_JNG * */
-/* * - Cleaned up some code regarding mixed support * */
-/* * * */
-/* * 0.9.1 - 07/19/2000 - G.Juyn * */
-/* * - fixed creation-code * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * - added function to set simplicity field * */
-/* * - fixed putchunk_unknown() function * */
-/* * * */
-/* * 0.9.3 - 08/07/2000 - G.Juyn * */
-/* * - B111300 - fixup for improved portability * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 10/20/2000 - G.Juyn * */
-/* * - fixed putchunk_plte() to set bEmpty parameter * */
-/* * * */
-/* * 0.9.5 - 01/25/2001 - G.Juyn * */
-/* * - fixed some small compiler warnings (thanks Nikki) * */
-/* * * */
-/* * 1.0.5 - 09/07/2002 - G.Juyn * */
-/* * - B578940 - unimplemented functions return errorcode * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * - added HLAPI function to copy chunks * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - added check for TERM placement during create/write * */
-/* * 1.0.5 - 11/28/2002 - G.Juyn * */
-/* * - fixed definition of iMethodX/Y for MAGN chunk * */
-/* * * */
-/* * 1.0.6 - 05/25/2003 - G.R-P * */
-/* * - added MNG_SKIPCHUNK_cHNK footprint optimizations * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added MNG_NO_DELTA_PNG reduction and more SKIPCHUNK * */
-/* * optimizations * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * 1.0.6 - 08/17/2003 - G.R-P * */
-/* * - added conditionals around non-VLC chunk support * */
-/* * * */
-/* * 1.0.8 - 04/01/2004 - G.Juyn * */
-/* * - added missing get-/put-chunk-jdaa * */
-/* * 1.0.8 - 08/02/2004 - G.Juyn * */
-/* * - added conditional to allow easier writing of large MNG's * */
-/* * * */
-/* * 1.0.9 - 09/17/2004 - G.R-P * */
-/* * - added two more conditionals * */
-/* * 1.0.9 - 09/25/2004 - G.Juyn * */
-/* * - replaced MNG_TWEAK_LARGE_FILES with permanent solution * */
-/* * 1.0.9 - 17/14/2004 - G.Juyn * */
-/* * - fixed PPLT getchunk/putchunk routines * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKINITFREE * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_memory.h"
-#include "libmng_chunks.h"
-#ifdef MNG_OPTIMIZE_CHUNKREADER
-#include "libmng_chunk_descr.h"
-#endif
-#include "libmng_chunk_prc.h"
-#include "libmng_chunk_io.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_ACCESS_CHUNKS
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_iterate_chunks (mng_handle hHandle,
- mng_uint32 iChunkseq,
- mng_iteratechunk fProc)
-{
- mng_uint32 iSeq;
- mng_chunkid iChunkname;
- mng_datap pData;
- mng_chunkp pChunk;
- mng_bool bCont;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_ITERATE_CHUNKS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
- iSeq = 0;
- bCont = MNG_TRUE;
- pChunk = pData->pFirstchunk; /* get the first chunk */
- /* as long as there are some more */
- while ((pChunk) && (bCont)) /* and the app didn't signal a stop */
- {
- if (iSeq >= iChunkseq) /* reached the first target ? */
- { /* then call this and next ones back in... */
- iChunkname = ((mng_chunk_headerp)pChunk)->iChunkname;
- bCont = fProc (hHandle, (mng_handle)pChunk, iChunkname, iSeq);
- }
-
- iSeq++; /* next one */
- pChunk = ((mng_chunk_headerp)pChunk)->pNext;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_ITERATE_CHUNKS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_copy_chunk (mng_handle hHandle,
- mng_handle hChunk,
- mng_handle hHandleOut)
-{
- mng_datap pDataOut;
- mng_chunkp pChunk;
- mng_chunkp pChunkOut;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_COPY_CHUNK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handles */
- MNG_VALIDHANDLE (hHandleOut)
-
- pDataOut = (mng_datap)hHandleOut; /* make outhandle addressable */
- pChunk = (mng_chunkp)hChunk; /* address the chunk */
-
- if (!pDataOut->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pDataOut, MNG_FUNCTIONINVALID)
- /* create a new chunk */
- iRetcode = ((mng_createchunk)((mng_chunk_headerp)pChunk)->fCreate)
- (pDataOut, ((mng_chunk_headerp)pChunk), &pChunkOut);
- if (!iRetcode) /* assign the chunk-specific data */
- iRetcode = ((mng_assignchunk)((mng_chunk_headerp)pChunk)->fAssign)
- (pDataOut, pChunkOut, pChunk);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- mng_add_chunk (pDataOut, pChunkOut); /* and put it in the output-stream */
-
- /* could it be the end of the chain ? */
- if (((mng_chunk_headerp)pChunkOut)->iChunkname == MNG_UINT_IEND)
- {
-#ifdef MNG_INCLUDE_JNG
- if ((pDataOut->iFirstchunkadded == MNG_UINT_IHDR) ||
- (pDataOut->iFirstchunkadded == MNG_UINT_JHDR) )
-#else
- if (pDataOut->iFirstchunkadded == MNG_UINT_IHDR)
-#endif
- pDataOut->bCreating = MNG_FALSE; /* right; this should be the last chunk !!! */
- }
-
- if (((mng_chunk_headerp)pChunkOut)->iChunkname == MNG_UINT_MEND)
- pDataOut->bCreating = MNG_FALSE; /* definitely this should be the last !!! */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_COPY_CHUNK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getchunk_ihdr (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iWidth,
- mng_uint32 *iHeight,
- mng_uint8 *iBitdepth,
- mng_uint8 *iColortype,
- mng_uint8 *iCompression,
- mng_uint8 *iFilter,
- mng_uint8 *iInterlace)
-{
- mng_datap pData;
- mng_ihdrp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_IHDR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_ihdrp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_IHDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iWidth = pChunk->iWidth; /* fill the fields */
- *iHeight = pChunk->iHeight;
- *iBitdepth = pChunk->iBitdepth;
- *iColortype = pChunk->iColortype;
- *iCompression = pChunk->iCompression;
- *iFilter = pChunk->iFilter;
- *iInterlace = pChunk->iInterlace;
-
- /* fill the chunk */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_IHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getchunk_plte (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iCount,
- mng_palette8 *aPalette)
-{
- mng_datap pData;
- mng_pltep pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PLTE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_pltep)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_PLTE)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iCount = pChunk->iEntrycount; /* fill the fields */
-
- MNG_COPY (*aPalette, pChunk->aEntries, sizeof (mng_palette8));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PLTE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getchunk_idat (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iRawlen,
- mng_ptr *pRawdata)
-{
- mng_datap pData;
- mng_idatp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_IDAT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_idatp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_IDAT)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iRawlen = pChunk->iDatasize; /* fill the fields */
- *pRawdata = pChunk->pData;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_IDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getchunk_trns (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_bool *bGlobal,
- mng_uint8 *iType,
- mng_uint32 *iCount,
- mng_uint8arr *aAlphas,
- mng_uint16 *iGray,
- mng_uint16 *iRed,
- mng_uint16 *iGreen,
- mng_uint16 *iBlue,
- mng_uint32 *iRawlen,
- mng_uint8arr *aRawdata)
-{
- mng_datap pData;
- mng_trnsp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_TRNS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_trnsp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_tRNS)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *bGlobal = pChunk->bGlobal;
- *iType = pChunk->iType;
- *iCount = pChunk->iCount;
- *iGray = pChunk->iGray;
- *iRed = pChunk->iRed;
- *iGreen = pChunk->iGreen;
- *iBlue = pChunk->iBlue;
- *iRawlen = pChunk->iRawlen;
-
- MNG_COPY (*aAlphas, pChunk->aEntries, sizeof (mng_uint8arr));
- MNG_COPY (*aRawdata, pChunk->aRawdata, sizeof (mng_uint8arr));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_TRNS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_gAMA
-mng_retcode MNG_DECL mng_getchunk_gama (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iGamma)
-{
- mng_datap pData;
- mng_gamap pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_GAMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_gamap)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_gAMA)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iGamma = pChunk->iGamma;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_GAMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_cHRM
-mng_retcode MNG_DECL mng_getchunk_chrm (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iWhitepointx,
- mng_uint32 *iWhitepointy,
- mng_uint32 *iRedx,
- mng_uint32 *iRedy,
- mng_uint32 *iGreenx,
- mng_uint32 *iGreeny,
- mng_uint32 *iBluex,
- mng_uint32 *iBluey)
-{
- mng_datap pData;
- mng_chrmp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_CHRM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_chrmp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_cHRM)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iWhitepointx = pChunk->iWhitepointx;
- *iWhitepointy = pChunk->iWhitepointy;
- *iRedx = pChunk->iRedx;
- *iRedy = pChunk->iRedy;
- *iGreenx = pChunk->iGreenx;
- *iGreeny = pChunk->iGreeny;
- *iBluex = pChunk->iBluex;
- *iBluey = pChunk->iBluey;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_CHRM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sRGB
-mng_retcode MNG_DECL mng_getchunk_srgb (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint8 *iRenderingintent)
-{
- mng_datap pData;
- mng_srgbp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SRGB, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_srgbp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_sRGB)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iRenderingintent = pChunk->iRenderingintent;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-mng_retcode MNG_DECL mng_getchunk_iccp (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iNamesize,
- mng_pchar *zName,
- mng_uint8 *iCompression,
- mng_uint32 *iProfilesize,
- mng_ptr *pProfile)
-{
- mng_datap pData;
- mng_iccpp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ICCP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_iccpp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_iCCP)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iNamesize = pChunk->iNamesize;
- *zName = pChunk->zName;
- *iCompression = pChunk->iCompression;
- *iProfilesize = pChunk->iProfilesize;
- *pProfile = pChunk->pProfile;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ICCP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tEXt
-mng_retcode MNG_DECL mng_getchunk_text (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iKeywordsize,
- mng_pchar *zKeyword,
- mng_uint32 *iTextsize,
- mng_pchar *zText)
-{
- mng_datap pData;
- mng_textp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_TEXT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_textp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_tEXt)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
- /* fill the fields */
- *iKeywordsize = pChunk->iKeywordsize;
- *zKeyword = pChunk->zKeyword;
- *iTextsize = pChunk->iTextsize;
- *zText = pChunk->zText;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_TEXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_zTXt
-mng_retcode MNG_DECL mng_getchunk_ztxt (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iKeywordsize,
- mng_pchar *zKeyword,
- mng_uint8 *iCompression,
- mng_uint32 *iTextsize,
- mng_pchar *zText)
-{
- mng_datap pData;
- mng_ztxtp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ZTXT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_ztxtp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_zTXt)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
- /* fill the fields */
- *iKeywordsize = pChunk->iKeywordsize;
- *zKeyword = pChunk->zKeyword;
- *iCompression = pChunk->iCompression;
- *iTextsize = pChunk->iTextsize;
- *zText = pChunk->zText;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ZTXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iTXt
-mng_retcode MNG_DECL mng_getchunk_itxt (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iKeywordsize,
- mng_pchar *zKeyword,
- mng_uint8 *iCompressionflag,
- mng_uint8 *iCompressionmethod,
- mng_uint32 *iLanguagesize,
- mng_pchar *zLanguage,
- mng_uint32 *iTranslationsize,
- mng_pchar *zTranslation,
- mng_uint32 *iTextsize,
- mng_pchar *zText)
-{
- mng_datap pData;
- mng_itxtp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ITXT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_itxtp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_iTXt)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
- /* fill the fields */
- *iKeywordsize = pChunk->iKeywordsize;
- *zKeyword = pChunk->zKeyword;
- *iCompressionflag = pChunk->iCompressionflag;
- *iCompressionmethod = pChunk->iCompressionmethod;
- *iLanguagesize = pChunk->iLanguagesize;
- *zLanguage = pChunk->zLanguage;
- *iTranslationsize = pChunk->iTranslationsize;
- *zTranslation = pChunk->zTranslation;
- *iTextsize = pChunk->iTextsize;
- *zText = pChunk->zText;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ITXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_bKGD
-mng_retcode MNG_DECL mng_getchunk_bkgd (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint8 *iType,
- mng_uint8 *iIndex,
- mng_uint16 *iGray,
- mng_uint16 *iRed,
- mng_uint16 *iGreen,
- mng_uint16 *iBlue)
-{
- mng_datap pData;
- mng_bkgdp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_BKGD, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_bkgdp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_bKGD)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iType = pChunk->iType;
- *iIndex = pChunk->iIndex;
- *iGray = pChunk->iGray;
- *iRed = pChunk->iRed;
- *iGreen = pChunk->iGreen;
- *iBlue = pChunk->iBlue;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_BKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYs
-mng_retcode MNG_DECL mng_getchunk_phys (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iSizex,
- mng_uint32 *iSizey,
- mng_uint8 *iUnit)
-{
- mng_datap pData;
- mng_physp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PHYS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_physp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_pHYs)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iSizex = pChunk->iSizex;
- *iSizey = pChunk->iSizey;
- *iUnit = pChunk->iUnit;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PHYS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sBIT
-mng_retcode MNG_DECL mng_getchunk_sbit (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint8 *iType,
- mng_uint8arr4 *aBits)
-{
- mng_datap pData;
- mng_sbitp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SBIT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_sbitp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_sBIT)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty;
- *iType = pChunk->iType;
- (*aBits)[0] = pChunk->aBits[0];
- (*aBits)[1] = pChunk->aBits[1];
- (*aBits)[2] = pChunk->aBits[2];
- (*aBits)[3] = pChunk->aBits[3];
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SBIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sPLT
-mng_retcode MNG_DECL mng_getchunk_splt (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iNamesize,
- mng_pchar *zName,
- mng_uint8 *iSampledepth,
- mng_uint32 *iEntrycount,
- mng_ptr *pEntries)
-{
- mng_datap pData;
- mng_spltp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SPLT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_spltp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_sPLT)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iNamesize = pChunk->iNamesize;
- *zName = pChunk->zName;
- *iSampledepth = pChunk->iSampledepth;
- *iEntrycount = pChunk->iEntrycount;
- *pEntries = pChunk->pEntries;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_hIST
-mng_retcode MNG_DECL mng_getchunk_hist (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iEntrycount,
- mng_uint16arr *aEntries)
-{
- mng_datap pData;
- mng_histp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_HIST, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_histp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_hIST)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iEntrycount = pChunk->iEntrycount; /* fill the fields */
-
- MNG_COPY (*aEntries, pChunk->aEntries, sizeof (mng_uint16arr));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_HIST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tIME
-mng_retcode MNG_DECL mng_getchunk_time (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iYear,
- mng_uint8 *iMonth,
- mng_uint8 *iDay,
- mng_uint8 *iHour,
- mng_uint8 *iMinute,
- mng_uint8 *iSecond)
-{
- mng_datap pData;
- mng_timep pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_TIME, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_timep)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_tIME)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iYear = pChunk->iYear; /* fill the fields */
- *iMonth = pChunk->iMonth;
- *iDay = pChunk->iDay;
- *iHour = pChunk->iHour;
- *iMinute = pChunk->iMinute;
- *iSecond = pChunk->iSecond;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_TIME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getchunk_mhdr (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iWidth,
- mng_uint32 *iHeight,
- mng_uint32 *iTicks,
- mng_uint32 *iLayercount,
- mng_uint32 *iFramecount,
- mng_uint32 *iPlaytime,
- mng_uint32 *iSimplicity)
-{
- mng_datap pData;
- mng_mhdrp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_MHDR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_mhdrp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iWidth = pChunk->iWidth; /* fill the fields */
- *iHeight = pChunk->iHeight;
- *iTicks = pChunk->iTicks;
- *iLayercount = pChunk->iLayercount;
- *iFramecount = pChunk->iFramecount;
- *iPlaytime = pChunk->iPlaytime;
- *iSimplicity = pChunk->iSimplicity;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_MHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-mng_retcode MNG_DECL mng_getchunk_loop (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iLevel,
- mng_uint32 *iRepeat,
- mng_uint8 *iTermination,
- mng_uint32 *iItermin,
- mng_uint32 *iItermax,
- mng_uint32 *iCount,
- mng_uint32p *pSignals)
-{
- mng_datap pData;
- mng_loopp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_LOOP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_loopp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_LOOP)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iLevel = pChunk->iLevel; /* fill teh fields */
- *iRepeat = pChunk->iRepeat;
- *iTermination = pChunk->iTermination;
- *iItermin = pChunk->iItermin;
- *iItermax = pChunk->iItermax;
- *iCount = pChunk->iCount;
- *pSignals = pChunk->pSignals;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_LOOP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getchunk_endl (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iLevel)
-{
- mng_datap pData;
- mng_endlp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ENDL, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_endlp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_ENDL)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iLevel = pChunk->iLevel; /* fill the field */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ENDL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DEFI
-mng_retcode MNG_DECL mng_getchunk_defi (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iObjectid,
- mng_uint8 *iDonotshow,
- mng_uint8 *iConcrete,
- mng_bool *bHasloca,
- mng_int32 *iXlocation,
- mng_int32 *iYlocation,
- mng_bool *bHasclip,
- mng_int32 *iLeftcb,
- mng_int32 *iRightcb,
- mng_int32 *iTopcb,
- mng_int32 *iBottomcb)
-{
- mng_datap pData;
- mng_defip pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_DEFI, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_defip)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_DEFI)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iObjectid = pChunk->iObjectid; /* fill the fields */
- *iDonotshow = pChunk->iDonotshow;
- *iConcrete = pChunk->iConcrete;
- *bHasloca = pChunk->bHasloca;
- *iXlocation = pChunk->iXlocation;
- *iYlocation = pChunk->iYlocation;
- *bHasclip = pChunk->bHasclip;
- *iLeftcb = pChunk->iLeftcb;
- *iRightcb = pChunk->iRightcb;
- *iTopcb = pChunk->iTopcb;
- *iBottomcb = pChunk->iBottomcb;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_DEFI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BASI
-mng_retcode MNG_DECL mng_getchunk_basi (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iWidth,
- mng_uint32 *iHeight,
- mng_uint8 *iBitdepth,
- mng_uint8 *iColortype,
- mng_uint8 *iCompression,
- mng_uint8 *iFilter,
- mng_uint8 *iInterlace,
- mng_uint16 *iRed,
- mng_uint16 *iGreen,
- mng_uint16 *iBlue,
- mng_uint16 *iAlpha,
- mng_uint8 *iViewable)
-{
- mng_datap pData;
- mng_basip pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_BASI, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_basip)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_BASI)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iWidth = pChunk->iWidth; /* fill the fields */
- *iHeight = pChunk->iHeight;
- *iBitdepth = pChunk->iBitdepth;
- *iColortype = pChunk->iColortype;
- *iCompression = pChunk->iCompression;
- *iFilter = pChunk->iFilter;
- *iInterlace = pChunk->iInterlace;
- *iRed = pChunk->iRed;
- *iGreen = pChunk->iGreen;
- *iBlue = pChunk->iBlue;
- *iAlpha = pChunk->iAlpha;
- *iViewable = pChunk->iViewable;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_BASI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLON
-mng_retcode MNG_DECL mng_getchunk_clon (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iSourceid,
- mng_uint16 *iCloneid,
- mng_uint8 *iClonetype,
- mng_uint8 *iDonotshow,
- mng_uint8 *iConcrete,
- mng_bool *bHasloca,
- mng_uint8 *iLocationtype,
- mng_int32 *iLocationx,
- mng_int32 *iLocationy)
-{
- mng_datap pData;
- mng_clonp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_CLON, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_clonp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_CLON)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iSourceid = pChunk->iSourceid; /* fill the fields */
- *iCloneid = pChunk->iCloneid;
- *iClonetype = pChunk->iClonetype;
- *iDonotshow = pChunk->iDonotshow;
- *iConcrete = pChunk->iConcrete;
- *bHasloca = pChunk->bHasloca;
- *iLocationtype = pChunk->iLocationtype;
- *iLocationx = pChunk->iLocationx;
- *iLocationy = pChunk->iLocationy;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_CLON, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode MNG_DECL mng_getchunk_past (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iDestid,
- mng_uint8 *iTargettype,
- mng_int32 *iTargetx,
- mng_int32 *iTargety,
- mng_uint32 *iCount)
-{
- mng_datap pData;
- mng_pastp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PAST, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_pastp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_PAST)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iDestid = pChunk->iDestid; /* fill the fields */
- *iTargettype = pChunk->iTargettype;
- *iTargetx = pChunk->iTargetx;
- *iTargety = pChunk->iTargety;
- *iCount = pChunk->iCount;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PAST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode MNG_DECL mng_getchunk_past_src (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_uint16 *iSourceid,
- mng_uint8 *iComposition,
- mng_uint8 *iOrientation,
- mng_uint8 *iOffsettype,
- mng_int32 *iOffsetx,
- mng_int32 *iOffsety,
- mng_uint8 *iBoundarytype,
- mng_int32 *iBoundaryl,
- mng_int32 *iBoundaryr,
- mng_int32 *iBoundaryt,
- mng_int32 *iBoundaryb)
-{
- mng_datap pData;
- mng_pastp pChunk;
- mng_past_sourcep pEntry;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PAST_SRC, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_pastp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_PAST)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- if (iEntry >= pChunk->iCount) /* valid index ? */
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
- /* address the entry */
- pEntry = pChunk->pSources + iEntry;
-
- *iSourceid = pEntry->iSourceid; /* fill the fields */
- *iComposition = pEntry->iComposition;
- *iOrientation = pEntry->iOrientation;
- *iOffsettype = pEntry->iOffsettype;
- *iOffsetx = pEntry->iOffsetx;
- *iOffsety = pEntry->iOffsety;
- *iBoundarytype = pEntry->iBoundarytype;
- *iBoundaryl = pEntry->iBoundaryl;
- *iBoundaryr = pEntry->iBoundaryr;
- *iBoundaryt = pEntry->iBoundaryt;
- *iBoundaryb = pEntry->iBoundaryb;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PAST_SRC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-mng_retcode MNG_DECL mng_getchunk_disc (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iCount,
- mng_uint16p *pObjectids)
-{
- mng_datap pData;
- mng_discp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_DISC, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_discp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_DISC)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iCount = pChunk->iCount; /* fill the fields */
- *pObjectids = pChunk->pObjectids;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_DISC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BACK
-mng_retcode MNG_DECL mng_getchunk_back (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iRed,
- mng_uint16 *iGreen,
- mng_uint16 *iBlue,
- mng_uint8 *iMandatory,
- mng_uint16 *iImageid,
- mng_uint8 *iTile)
-{
- mng_datap pData;
- mng_backp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_BACK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_backp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_BACK)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iRed = pChunk->iRed; /* fill the fields */
- *iGreen = pChunk->iGreen;
- *iBlue = pChunk->iBlue;
- *iMandatory = pChunk->iMandatory;
- *iImageid = pChunk->iImageid;
- *iTile = pChunk->iTile;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_BACK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_FRAM
-mng_retcode MNG_DECL mng_getchunk_fram (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint8 *iMode,
- mng_uint32 *iNamesize,
- mng_pchar *zName,
- mng_uint8 *iChangedelay,
- mng_uint8 *iChangetimeout,
- mng_uint8 *iChangeclipping,
- mng_uint8 *iChangesyncid,
- mng_uint32 *iDelay,
- mng_uint32 *iTimeout,
- mng_uint8 *iBoundarytype,
- mng_int32 *iBoundaryl,
- mng_int32 *iBoundaryr,
- mng_int32 *iBoundaryt,
- mng_int32 *iBoundaryb,
- mng_uint32 *iCount,
- mng_uint32p *pSyncids)
-{
- mng_datap pData;
- mng_framp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_FRAM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_framp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_FRAM)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iMode = pChunk->iMode;
- *iNamesize = pChunk->iNamesize;
- *zName = pChunk->zName;
- *iChangedelay = pChunk->iChangedelay;
- *iChangetimeout = pChunk->iChangetimeout;
- *iChangeclipping = pChunk->iChangeclipping;
- *iChangesyncid = pChunk->iChangesyncid;
- *iDelay = pChunk->iDelay;
- *iTimeout = pChunk->iTimeout;
- *iBoundarytype = pChunk->iBoundarytype;
- *iBoundaryl = pChunk->iBoundaryl;
- *iBoundaryr = pChunk->iBoundaryr;
- *iBoundaryt = pChunk->iBoundaryt;
- *iBoundaryb = pChunk->iBoundaryb;
- *iCount = pChunk->iCount;
- *pSyncids = pChunk->pSyncids;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_FRAM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MOVE
-mng_retcode MNG_DECL mng_getchunk_move (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iFirstid,
- mng_uint16 *iLastid,
- mng_uint8 *iMovetype,
- mng_int32 *iMovex,
- mng_int32 *iMovey)
-{
- mng_datap pData;
- mng_movep pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_MOVE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_movep)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_MOVE)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iFirstid = pChunk->iFirstid; /* fill the fields */
- *iLastid = pChunk->iLastid;
- *iMovetype = pChunk->iMovetype;
- *iMovex = pChunk->iMovex;
- *iMovey = pChunk->iMovey;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_MOVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLIP
-mng_retcode MNG_DECL mng_getchunk_clip (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iFirstid,
- mng_uint16 *iLastid,
- mng_uint8 *iCliptype,
- mng_int32 *iClipl,
- mng_int32 *iClipr,
- mng_int32 *iClipt,
- mng_int32 *iClipb)
-{
- mng_datap pData;
- mng_clipp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_CLIP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_clipp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_CLIP)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iFirstid = pChunk->iFirstid; /* fill the fields */
- *iLastid = pChunk->iLastid;
- *iCliptype = pChunk->iCliptype;
- *iClipl = pChunk->iClipl;
- *iClipr = pChunk->iClipr;
- *iClipt = pChunk->iClipt;
- *iClipb = pChunk->iClipb;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_CLIP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SHOW
-mng_retcode MNG_DECL mng_getchunk_show (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint16 *iFirstid,
- mng_uint16 *iLastid,
- mng_uint8 *iMode)
-{
- mng_datap pData;
- mng_showp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SHOW, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_showp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_SHOW)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iFirstid = pChunk->iFirstid;
- *iLastid = pChunk->iLastid;
- *iMode = pChunk->iMode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SHOW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_TERM
-mng_retcode MNG_DECL mng_getchunk_term (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iTermaction,
- mng_uint8 *iIteraction,
- mng_uint32 *iDelay,
- mng_uint32 *iItermax)
-{
- mng_datap pData;
- mng_termp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_TERM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_termp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_TERM)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iTermaction = pChunk->iTermaction; /* fill the fields */
- *iIteraction = pChunk->iIteraction;
- *iDelay = pChunk->iDelay;
- *iItermax = pChunk->iItermax;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_TERM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode MNG_DECL mng_getchunk_save (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint8 *iOffsettype,
- mng_uint32 *iCount)
-{
- mng_datap pData;
- mng_savep pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SAVE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_savep)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_SAVE)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iOffsettype = pChunk->iOffsettype;
- *iCount = pChunk->iCount;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SAVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getchunk_save_entry (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_uint8 *iEntrytype,
- mng_uint32arr2 *iOffset,
- mng_uint32arr2 *iStarttime,
- mng_uint32 *iLayernr,
- mng_uint32 *iFramenr,
- mng_uint32 *iNamesize,
- mng_pchar *zName)
-{
- mng_datap pData;
- mng_savep pChunk;
- mng_save_entryp pEntry;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SAVE_ENTRY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_savep)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_SAVE)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- if (iEntry >= pChunk->iCount) /* valid index ? */
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
-
- pEntry = pChunk->pEntries + iEntry; /* address the entry */
- /* fill the fields */
- *iEntrytype = pEntry->iEntrytype;
- (*iOffset)[0] = pEntry->iOffset[0];
- (*iOffset)[1] = pEntry->iOffset[1];
- (*iStarttime)[0] = pEntry->iStarttime[0];
- (*iStarttime)[1] = pEntry->iStarttime[1];
- *iLayernr = pEntry->iLayernr;
- *iFramenr = pEntry->iFramenr;
- *iNamesize = pEntry->iNamesize;
- *zName = pEntry->zName;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SAVE_ENTRY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-mng_retcode MNG_DECL mng_getchunk_seek (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iNamesize,
- mng_pchar *zName)
-{
- mng_datap pData;
- mng_seekp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SEEK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_seekp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_SEEK)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iNamesize = pChunk->iNamesize; /* fill the fields */
- *zName = pChunk->zName;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_SEEK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_eXPI
-mng_retcode MNG_DECL mng_getchunk_expi (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iSnapshotid,
- mng_uint32 *iNamesize,
- mng_pchar *zName)
-{
- mng_datap pData;
- mng_expip pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_EXPI, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_expip)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_eXPI)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iSnapshotid = pChunk->iSnapshotid; /* fill the fields */
- *iNamesize = pChunk->iNamesize;
- *zName = pChunk->zName;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_EXPI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_fPRI
-mng_retcode MNG_DECL mng_getchunk_fpri (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iDeltatype,
- mng_uint8 *iPriority)
-{
- mng_datap pData;
- mng_fprip pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_FPRI, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_fprip)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_fPRI)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iDeltatype = pChunk->iDeltatype; /* fill the fields */
- *iPriority = pChunk->iPriority;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_FPRI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_nEED
-mng_retcode MNG_DECL mng_getchunk_need (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iKeywordssize,
- mng_pchar *zKeywords)
-{
- mng_datap pData;
- mng_needp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_NEED, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_needp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_nEED)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
- /* fill the fields */
- *iKeywordssize = pChunk->iKeywordssize;
- *zKeywords = pChunk->zKeywords;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_NEED, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYg
-mng_retcode MNG_DECL mng_getchunk_phyg (mng_handle hHandle,
- mng_handle hChunk,
- mng_bool *bEmpty,
- mng_uint32 *iSizex,
- mng_uint32 *iSizey,
- mng_uint8 *iUnit)
-{
- mng_datap pData;
- mng_phygp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PHYG, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_phygp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_pHYg)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *bEmpty = pChunk->bEmpty; /* fill the fields */
- *iSizex = pChunk->iSizex;
- *iSizey = pChunk->iSizey;
- *iUnit = pChunk->iUnit;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PHYG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-mng_retcode MNG_DECL mng_getchunk_jhdr (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iWidth,
- mng_uint32 *iHeight,
- mng_uint8 *iColortype,
- mng_uint8 *iImagesampledepth,
- mng_uint8 *iImagecompression,
- mng_uint8 *iImageinterlace,
- mng_uint8 *iAlphasampledepth,
- mng_uint8 *iAlphacompression,
- mng_uint8 *iAlphafilter,
- mng_uint8 *iAlphainterlace)
-{
- mng_datap pData;
- mng_jhdrp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_JHDR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_jhdrp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_JHDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iWidth = pChunk->iWidth; /* fill the fields */
- *iHeight = pChunk->iHeight;
- *iColortype = pChunk->iColortype;
- *iImagesampledepth = pChunk->iImagesampledepth;
- *iImagecompression = pChunk->iImagecompression;
- *iImageinterlace = pChunk->iImageinterlace;
- *iAlphasampledepth = pChunk->iAlphasampledepth;
- *iAlphacompression = pChunk->iAlphacompression;
- *iAlphafilter = pChunk->iAlphafilter;
- *iAlphainterlace = pChunk->iAlphainterlace;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_JHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-mng_retcode MNG_DECL mng_getchunk_jdat (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iRawlen,
- mng_ptr *pRawdata)
-{
- mng_datap pData;
- mng_jdatp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_JDAT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_jdatp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_JDAT)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iRawlen = pChunk->iDatasize; /* fill the fields */
- *pRawdata = pChunk->pData;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_JDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-mng_retcode MNG_DECL mng_getchunk_jdaa (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iRawlen,
- mng_ptr *pRawdata)
-{
- mng_datap pData;
- mng_jdaap pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_JDAA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_jdaap)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_JDAA)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iRawlen = pChunk->iDatasize; /* fill the fields */
- *pRawdata = pChunk->pData;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_JDAA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_getchunk_dhdr (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iObjectid,
- mng_uint8 *iImagetype,
- mng_uint8 *iDeltatype,
- mng_uint32 *iBlockwidth,
- mng_uint32 *iBlockheight,
- mng_uint32 *iBlockx,
- mng_uint32 *iBlocky)
-{
- mng_datap pData;
- mng_dhdrp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_DHDR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_dhdrp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_DHDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iObjectid = pChunk->iObjectid; /* fill the fields */
- *iImagetype = pChunk->iImagetype;
- *iDeltatype = pChunk->iDeltatype;
- *iBlockwidth = pChunk->iBlockwidth;
- *iBlockheight = pChunk->iBlockheight;
- *iBlockx = pChunk->iBlockx;
- *iBlocky = pChunk->iBlocky;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_DHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_getchunk_prom (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iColortype,
- mng_uint8 *iSampledepth,
- mng_uint8 *iFilltype)
-{
- mng_datap pData;
- mng_promp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PROM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_promp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_PROM)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iColortype = pChunk->iColortype; /* fill the fields */
- *iSampledepth = pChunk->iSampledepth;
- *iFilltype = pChunk->iFilltype;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PROM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_getchunk_pplt (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint8 *iDeltatype,
- mng_uint32 *iCount)
-{
- mng_datap pData;
- mng_ppltp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PPLT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_ppltp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_PPLT)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iDeltatype = pChunk->iDeltatype; /* fill the fields */
- *iCount = pChunk->iCount;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_getchunk_pplt_entry (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_uint16 *iRed,
- mng_uint16 *iGreen,
- mng_uint16 *iBlue,
- mng_uint16 *iAlpha,
- mng_bool *bUsed)
-{
- mng_datap pData;
- mng_ppltp pChunk;
- mng_pplt_entryp pEntry;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PPLT_ENTRY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_ppltp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_PPLT)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- if (iEntry >= pChunk->iCount) /* valid index ? */
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
-
- pEntry = &pChunk->aEntries[iEntry]; /* address the entry */
-
- *iRed = pEntry->iRed; /* fill the fields */
- *iGreen = pEntry->iGreen;
- *iBlue = pEntry->iBlue;
- *iAlpha = pEntry->iAlpha;
- *bUsed = pEntry->bUsed;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_PPLT_ENTRY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_getchunk_drop (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iCount,
- mng_chunkidp *pChunknames)
-{
- mng_datap pData;
- mng_dropp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_DROP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_dropp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_DROP)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iCount = pChunk->iCount; /* fill the fields */
- *pChunknames = pChunk->pChunknames;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_DROP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
-mng_retcode MNG_DECL mng_getchunk_dbyk (mng_handle hHandle,
- mng_handle hChunk,
- mng_chunkid *iChunkname,
- mng_uint8 *iPolarity,
- mng_uint32 *iKeywordssize,
- mng_pchar *zKeywords)
-{
- mng_datap pData;
- mng_dbykp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_DBYK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_dbykp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_DBYK)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iChunkname = pChunk->iChunkname; /* fill the fields */
- *iPolarity = pChunk->iPolarity;
- *iKeywordssize = pChunk->iKeywordssize;
- *zKeywords = pChunk->zKeywords;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_DBYK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-mng_retcode MNG_DECL mng_getchunk_ordr (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iCount)
-{
- mng_datap pData;
- mng_ordrp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ORDR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_ordrp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_ORDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iCount = pChunk->iCount; /* fill the field */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ORDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-mng_retcode MNG_DECL mng_getchunk_ordr_entry (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_chunkid *iChunkname,
- mng_uint8 *iOrdertype)
-{
- mng_datap pData;
- mng_ordrp pChunk;
- mng_ordr_entryp pEntry;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ORDR_ENTRY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_ordrp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_ORDR)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- if (iEntry >= pChunk->iCount) /* valid index ? */
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
-
- pEntry = pChunk->pEntries + iEntry; /* address the proper entry */
-
- *iChunkname = pEntry->iChunkname; /* fill the fields */
- *iOrdertype = pEntry->iOrdertype;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_ORDR_ENTRY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-mng_retcode MNG_DECL mng_getchunk_magn (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint16 *iFirstid,
- mng_uint16 *iLastid,
- mng_uint16 *iMethodX,
- mng_uint16 *iMX,
- mng_uint16 *iMY,
- mng_uint16 *iML,
- mng_uint16 *iMR,
- mng_uint16 *iMT,
- mng_uint16 *iMB,
- mng_uint16 *iMethodY)
-{
- mng_datap pData;
- mng_magnp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_MAGN, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_magnp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_MAGN)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iFirstid = pChunk->iFirstid; /* fill the fields */
- *iLastid = pChunk->iLastid;
- *iMethodX = (mng_uint16)pChunk->iMethodX;
- *iMX = pChunk->iMX;
- *iMY = pChunk->iMY;
- *iML = pChunk->iML;
- *iMR = pChunk->iMR;
- *iMT = pChunk->iMT;
- *iMB = pChunk->iMB;
- *iMethodY = (mng_uint16)pChunk->iMethodY;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_MAGN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_mpng (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iFramewidth,
- mng_uint32 *iFrameheight,
- mng_uint16 *iNumplays,
- mng_uint16 *iTickspersec,
- mng_uint8 *iCompressionmethod,
- mng_uint32 *iCount)
-{
- mng_datap pData;
- mng_mpngp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_MPNG, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_mpngp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_mpNG)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
- /* fill the fields */
- *iFramewidth = pChunk->iFramewidth;
- *iFrameheight = pChunk->iFrameheight;
- *iNumplays = pChunk->iNumplays;
- *iTickspersec = pChunk->iTickspersec;
- *iCompressionmethod = pChunk->iCompressionmethod;
- *iCount = pChunk->iFramessize / sizeof (mng_mpng_frame);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_MPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-MNG_EXT mng_retcode MNG_DECL mng_getchunk_mpng_frame (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_uint32 *iX,
- mng_uint32 *iY,
- mng_uint32 *iWidth,
- mng_uint32 *iHeight,
- mng_int32 *iXoffset,
- mng_int32 *iYoffset,
- mng_uint16 *iTicks)
-{
- mng_datap pData;
- mng_mpngp pChunk;
- mng_mpng_framep pFrame;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_MPNG_FRAME, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_mpngp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_mpNG)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
- /* valid index ? */
- if (iEntry >= (pChunk->iFramessize / sizeof (mng_mpng_frame)))
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
-
- pFrame = pChunk->pFrames + iEntry; /* address the entry */
- /* fill the fields */
- *iX = pFrame->iX;
- *iY = pFrame->iY;
- *iWidth = pFrame->iWidth;
- *iHeight = pFrame->iHeight;
- *iXoffset = pFrame->iXoffset;
- *iYoffset = pFrame->iYoffset;
- *iTicks = pFrame->iTicks;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_MPNG_FRAME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_evNT
-mng_retcode MNG_DECL mng_getchunk_evnt (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 *iCount)
-{
- mng_datap pData;
- mng_evntp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_EVNT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_evntp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_evNT)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- *iCount = pChunk->iCount; /* fill the fields */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_EVNT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getchunk_evnt_entry (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iEntry,
- mng_uint8 *iEventtype,
- mng_uint8 *iMasktype,
- mng_int32 *iLeft,
- mng_int32 *iRight,
- mng_int32 *iTop,
- mng_int32 *iBottom,
- mng_uint16 *iObjectid,
- mng_uint8 *iIndex,
- mng_uint32 *iSegmentnamesize,
- mng_pchar *zSegmentname)
-{
- mng_datap pData;
- mng_evntp pChunk;
- mng_evnt_entryp pEntry;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_EVNT_ENTRY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_evntp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.iChunkname != MNG_UINT_evNT)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
-
- if (iEntry >= pChunk->iCount) /* valid index ? */
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
-
- pEntry = pChunk->pEntries + iEntry; /* address the entry */
- /* fill the fields */
- *iEventtype = pEntry->iEventtype;
- *iMasktype = pEntry->iMasktype;
- *iLeft = pEntry->iLeft;
- *iRight = pEntry->iRight;
- *iTop = pEntry->iTop;
- *iBottom = pEntry->iBottom;
- *iObjectid = pEntry->iObjectid;
- *iIndex = pEntry->iIndex;
- *iSegmentnamesize = pEntry->iSegmentnamesize;
- *zSegmentname = pEntry->zSegmentname;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_EVNT_ENTRY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getchunk_unknown (mng_handle hHandle,
- mng_handle hChunk,
- mng_chunkid *iChunkname,
- mng_uint32 *iRawlen,
- mng_ptr *pRawdata)
-{
- mng_datap pData;
- mng_unknown_chunkp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_UNKNOWN, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
- pChunk = (mng_unknown_chunkp)hChunk; /* address the chunk */
-
- if (pChunk->sHeader.fCleanup != mng_free_unknown)
- MNG_ERROR (pData, MNG_WRONGCHUNK) /* ouch */
- /* fill the fields */
- *iChunkname = pChunk->sHeader.iChunkname;
- *iRawlen = pChunk->iDatasize;
- *pRawdata = pChunk->pData;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETCHUNK_UNKNOWN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_WRITE_PROCS
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_TERM
-MNG_LOCAL mng_bool check_term (mng_datap pData,
- mng_chunkid iChunkname)
-{
- mng_chunk_headerp pChunk = (mng_chunk_headerp)pData->pLastchunk;
-
- if (!pChunk) /* nothing added yet ? */
- return MNG_TRUE;
- /* last added chunk is TERM ? */
- if (pChunk->iChunkname != MNG_UINT_TERM)
- return MNG_TRUE;
- /* previous to last is MHDR ? */
- if ((pChunk->pPrev) && (((mng_chunk_headerp)pChunk->pPrev)->iChunkname == MNG_UINT_MHDR))
- return MNG_TRUE;
-
- if (iChunkname == MNG_UINT_SEEK) /* new chunk to be added is SEEK ? */
- return MNG_TRUE;
-
- return MNG_FALSE;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_ihdr (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_IHDR, mng_init_general, mng_free_general, mng_read_ihdr, mng_write_ihdr, mng_assign_general, 0, 0, sizeof(mng_ihdr)};
-#else
- {MNG_UINT_IHDR, mng_init_ihdr, mng_free_ihdr, mng_read_ihdr, mng_write_ihdr, mng_assign_ihdr, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_IHDR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_IHDR))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_ihdr (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_IHDR, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- ((mng_ihdrp)pChunk)->iWidth = iWidth;
- ((mng_ihdrp)pChunk)->iHeight = iHeight;
- ((mng_ihdrp)pChunk)->iBitdepth = iBitdepth;
- ((mng_ihdrp)pChunk)->iColortype = iColortype;
- ((mng_ihdrp)pChunk)->iCompression = iCompression;
- ((mng_ihdrp)pChunk)->iFilter = iFilter;
- ((mng_ihdrp)pChunk)->iInterlace = iInterlace;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_IHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_plte (mng_handle hHandle,
- mng_uint32 iCount,
- mng_palette8 aPalette)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_PLTE, mng_init_general, mng_free_general, mng_read_plte, mng_write_plte, mng_assign_general, 0, 0, sizeof(mng_plte)};
-#else
- {MNG_UINT_PLTE, mng_init_plte, mng_free_plte, mng_read_plte, mng_write_plte, mng_assign_plte, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PLTE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_PLTE))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_plte (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_PLTE, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_pltep)pChunk)->iEntrycount = iCount;
- ((mng_pltep)pChunk)->bEmpty = (mng_bool)(iCount == 0);
-
- MNG_COPY (((mng_pltep)pChunk)->aEntries, aPalette, sizeof (mng_palette8));
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PLTE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_idat (mng_handle hHandle,
- mng_uint32 iRawlen,
- mng_ptr pRawdata)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_IDAT, mng_init_general, mng_free_idat, mng_read_idat, mng_write_idat, mng_assign_idat, 0, 0, sizeof(mng_idat)};
-#else
- {MNG_UINT_IDAT, mng_init_idat, mng_free_idat, mng_read_idat, mng_write_idat, mng_assign_idat, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_IDAT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_IDAT))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_idat (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_IDAT, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_idatp)pChunk)->bEmpty = (mng_bool)(iRawlen == 0);
- ((mng_idatp)pChunk)->iDatasize = iRawlen;
-
- if (iRawlen)
- {
- MNG_ALLOC (pData, ((mng_idatp)pChunk)->pData, iRawlen);
- MNG_COPY (((mng_idatp)pChunk)->pData, pRawdata, iRawlen);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_IDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_iend (mng_handle hHandle)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_IEND, mng_init_general, mng_free_general, mng_read_iend, mng_write_iend, mng_assign_general, 0, 0, sizeof(mng_iend)};
-#else
- {MNG_UINT_IEND, mng_init_iend, mng_free_iend, mng_read_iend, mng_write_iend, mng_assign_iend, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_IEND, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_IEND))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_iend (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_IEND, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_INCLUDE_JNG
- if ((pData->iFirstchunkadded == MNG_UINT_IHDR) ||
- (pData->iFirstchunkadded == MNG_UINT_JHDR) )
-#else
- if (pData->iFirstchunkadded == MNG_UINT_IHDR)
-#endif
- pData->bCreating = MNG_FALSE; /* should be last chunk !!! */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_IEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_trns (mng_handle hHandle,
- mng_bool bEmpty,
- mng_bool bGlobal,
- mng_uint8 iType,
- mng_uint32 iCount,
- mng_uint8arr aAlphas,
- mng_uint16 iGray,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_uint32 iRawlen,
- mng_uint8arr aRawdata)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_tRNS, mng_init_general, mng_free_general, mng_read_trns, mng_write_trns, mng_assign_general, 0, 0, sizeof(mng_trns)};
-#else
- {MNG_UINT_tRNS, mng_init_trns, mng_free_trns, mng_read_trns, mng_write_trns, mng_assign_trns, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_TRNS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_tRNS))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_trns (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_tRNS, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_trnsp)pChunk)->bEmpty = bEmpty;
- ((mng_trnsp)pChunk)->bGlobal = bGlobal;
- ((mng_trnsp)pChunk)->iType = iType;
- ((mng_trnsp)pChunk)->iCount = iCount;
- ((mng_trnsp)pChunk)->iGray = iGray;
- ((mng_trnsp)pChunk)->iRed = iRed;
- ((mng_trnsp)pChunk)->iGreen = iGreen;
- ((mng_trnsp)pChunk)->iBlue = iBlue;
- ((mng_trnsp)pChunk)->iRawlen = iRawlen;
-
- MNG_COPY (((mng_trnsp)pChunk)->aEntries, aAlphas, sizeof (mng_uint8arr));
- MNG_COPY (((mng_trnsp)pChunk)->aRawdata, aRawdata, sizeof (mng_uint8arr));
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_TRNS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_gAMA
-mng_retcode MNG_DECL mng_putchunk_gama (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iGamma)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_gAMA, mng_init_general, mng_free_general, mng_read_gama, mng_write_gama, mng_assign_general, 0, 0, sizeof(mng_gama)};
-#else
- {MNG_UINT_gAMA, mng_init_gama, mng_free_gama, mng_read_gama, mng_write_gama, mng_assign_gama, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_GAMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_gAMA))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_gama (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_gAMA, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_gamap)pChunk)->bEmpty = bEmpty;
- ((mng_gamap)pChunk)->iGamma = iGamma;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_GAMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_cHRM
-mng_retcode MNG_DECL mng_putchunk_chrm (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iWhitepointx,
- mng_uint32 iWhitepointy,
- mng_uint32 iRedx,
- mng_uint32 iRedy,
- mng_uint32 iGreenx,
- mng_uint32 iGreeny,
- mng_uint32 iBluex,
- mng_uint32 iBluey)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_cHRM, mng_init_general, mng_free_general, mng_read_chrm, mng_write_chrm, mng_assign_general, 0, 0, sizeof(mng_chrm)};
-#else
- {MNG_UINT_cHRM, mng_init_chrm, mng_free_chrm, mng_read_chrm, mng_write_chrm, mng_assign_chrm, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_CHRM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_cHRM))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_chrm (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_cHRM, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_chrmp)pChunk)->bEmpty = bEmpty;
- ((mng_chrmp)pChunk)->iWhitepointx = iWhitepointx;
- ((mng_chrmp)pChunk)->iWhitepointy = iWhitepointy;
- ((mng_chrmp)pChunk)->iRedx = iRedx;
- ((mng_chrmp)pChunk)->iRedy = iRedy;
- ((mng_chrmp)pChunk)->iGreenx = iGreenx;
- ((mng_chrmp)pChunk)->iGreeny = iGreeny;
- ((mng_chrmp)pChunk)->iBluex = iBluex;
- ((mng_chrmp)pChunk)->iBluey = iBluey;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_CHRM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sRGB
-mng_retcode MNG_DECL mng_putchunk_srgb (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint8 iRenderingintent)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_sRGB, mng_init_general, mng_free_general, mng_read_srgb, mng_write_srgb, mng_assign_general, 0, 0, sizeof(mng_srgb)};
-#else
- {MNG_UINT_sRGB, mng_init_srgb, mng_free_srgb, mng_read_srgb, mng_write_srgb, mng_assign_srgb, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SRGB, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_sRGB))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_srgb (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_sRGB, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_srgbp)pChunk)->bEmpty = bEmpty;
- ((mng_srgbp)pChunk)->iRenderingintent = iRenderingintent;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-mng_retcode MNG_DECL mng_putchunk_iccp (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iNamesize,
- mng_pchar zName,
- mng_uint8 iCompression,
- mng_uint32 iProfilesize,
- mng_ptr pProfile)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_iCCP, mng_init_general, mng_free_iccp, mng_read_iccp, mng_write_iccp, mng_assign_iccp, 0, 0, sizeof(mng_iccp)};
-#else
- {MNG_UINT_iCCP, mng_init_iccp, mng_free_iccp, mng_read_iccp, mng_write_iccp, mng_assign_iccp, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ICCP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_iCCP))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_iccp (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_iCCP, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_iccpp)pChunk)->bEmpty = bEmpty;
- ((mng_iccpp)pChunk)->iNamesize = iNamesize;
- ((mng_iccpp)pChunk)->iCompression = iCompression;
- ((mng_iccpp)pChunk)->iProfilesize = iProfilesize;
-
- if (iNamesize)
- {
- MNG_ALLOC (pData, ((mng_iccpp)pChunk)->zName, iNamesize + 1);
- MNG_COPY (((mng_iccpp)pChunk)->zName, zName, iNamesize);
- }
-
- if (iProfilesize)
- {
- MNG_ALLOC (pData, ((mng_iccpp)pChunk)->pProfile, iProfilesize);
- MNG_COPY (((mng_iccpp)pChunk)->pProfile, pProfile, iProfilesize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ICCP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tEXt
-mng_retcode MNG_DECL mng_putchunk_text (mng_handle hHandle,
- mng_uint32 iKeywordsize,
- mng_pchar zKeyword,
- mng_uint32 iTextsize,
- mng_pchar zText)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_tEXt, mng_init_general, mng_free_text, mng_read_text, mng_write_text, mng_assign_text, 0, 0, sizeof(mng_text)};
-#else
- {MNG_UINT_tEXt, mng_init_text, mng_free_text, mng_read_text, mng_write_text, mng_assign_text, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_TEXT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_tEXt))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_text (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_tEXt, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_textp)pChunk)->iKeywordsize = iKeywordsize;
- ((mng_textp)pChunk)->iTextsize = iTextsize;
-
- if (iKeywordsize)
- {
- MNG_ALLOC (pData, ((mng_textp)pChunk)->zKeyword, iKeywordsize + 1);
- MNG_COPY (((mng_textp)pChunk)->zKeyword, zKeyword, iKeywordsize);
- }
-
- if (iTextsize)
- {
- MNG_ALLOC (pData, ((mng_textp)pChunk)->zText, iTextsize + 1);
- MNG_COPY (((mng_textp)pChunk)->zText, zText, iTextsize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_TEXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_zTXt
-mng_retcode MNG_DECL mng_putchunk_ztxt (mng_handle hHandle,
- mng_uint32 iKeywordsize,
- mng_pchar zKeyword,
- mng_uint8 iCompression,
- mng_uint32 iTextsize,
- mng_pchar zText)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_zTXt, mng_init_general, mng_free_ztxt, mng_read_ztxt, mng_write_ztxt, mng_assign_ztxt, 0, 0, sizeof(mng_ztxt)};
-#else
- {MNG_UINT_zTXt, mng_init_ztxt, mng_free_ztxt, mng_read_ztxt, mng_write_ztxt, mng_assign_ztxt, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ZTXT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_zTXt))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_ztxt (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_zTXt, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_ztxtp)pChunk)->iKeywordsize = iKeywordsize;
- ((mng_ztxtp)pChunk)->iCompression = iCompression;
- ((mng_ztxtp)pChunk)->iTextsize = iTextsize;
-
- if (iKeywordsize)
- {
- MNG_ALLOC (pData, ((mng_ztxtp)pChunk)->zKeyword, iKeywordsize + 1);
- MNG_COPY (((mng_ztxtp)pChunk)->zKeyword, zKeyword, iKeywordsize);
- }
-
- if (iTextsize)
- {
- MNG_ALLOC (pData, ((mng_ztxtp)pChunk)->zText, iTextsize + 1);
- MNG_COPY (((mng_ztxtp)pChunk)->zText, zText, iTextsize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ZTXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iTXt
-mng_retcode MNG_DECL mng_putchunk_itxt (mng_handle hHandle,
- mng_uint32 iKeywordsize,
- mng_pchar zKeyword,
- mng_uint8 iCompressionflag,
- mng_uint8 iCompressionmethod,
- mng_uint32 iLanguagesize,
- mng_pchar zLanguage,
- mng_uint32 iTranslationsize,
- mng_pchar zTranslation,
- mng_uint32 iTextsize,
- mng_pchar zText)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_iTXt, mng_init_general, mng_free_itxt, mng_read_itxt, mng_write_itxt, mng_assign_itxt, 0, 0, sizeof(mng_itxt)};
-#else
- {MNG_UINT_iTXt, mng_init_itxt, mng_free_itxt, mng_read_itxt, mng_write_itxt, mng_assign_itxt, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ITXT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_iTXt))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_itxt (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_iTXt, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_itxtp)pChunk)->iKeywordsize = iKeywordsize;
- ((mng_itxtp)pChunk)->iCompressionflag = iCompressionflag;
- ((mng_itxtp)pChunk)->iCompressionmethod = iCompressionmethod;
- ((mng_itxtp)pChunk)->iLanguagesize = iLanguagesize;
- ((mng_itxtp)pChunk)->iTranslationsize = iTranslationsize;
- ((mng_itxtp)pChunk)->iTextsize = iTextsize;
-
- if (iKeywordsize)
- {
- MNG_ALLOC (pData, ((mng_itxtp)pChunk)->zKeyword, iKeywordsize + 1);
- MNG_COPY (((mng_itxtp)pChunk)->zKeyword, zKeyword, iKeywordsize);
- }
-
- if (iLanguagesize)
- {
- MNG_ALLOC (pData, ((mng_itxtp)pChunk)->zLanguage, iLanguagesize + 1);
- MNG_COPY (((mng_itxtp)pChunk)->zLanguage, zLanguage, iLanguagesize);
- }
-
- if (iTranslationsize)
- {
- MNG_ALLOC (pData, ((mng_itxtp)pChunk)->zTranslation, iTranslationsize + 1);
- MNG_COPY (((mng_itxtp)pChunk)->zTranslation, zTranslation, iTranslationsize);
- }
-
- if (iTextsize)
- {
- MNG_ALLOC (pData, ((mng_itxtp)pChunk)->zText, iTextsize + 1);
- MNG_COPY (((mng_itxtp)pChunk)->zText, zText, iTextsize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ITXT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_bKGD
-mng_retcode MNG_DECL mng_putchunk_bkgd (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint8 iType,
- mng_uint8 iIndex,
- mng_uint16 iGray,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_bKGD, mng_init_general, mng_free_general, mng_read_bkgd, mng_write_bkgd, mng_assign_general, 0, 0, sizeof(mng_bkgd)};
-#else
- {MNG_UINT_bKGD, mng_init_bkgd, mng_free_bkgd, mng_read_bkgd, mng_write_bkgd, mng_assign_bkgd, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_BKGD, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_bKGD))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_bkgd (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_bKGD, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_bkgdp)pChunk)->bEmpty = bEmpty;
- ((mng_bkgdp)pChunk)->iType = iType;
- ((mng_bkgdp)pChunk)->iIndex = iIndex;
- ((mng_bkgdp)pChunk)->iGray = iGray;
- ((mng_bkgdp)pChunk)->iRed = iRed;
- ((mng_bkgdp)pChunk)->iGreen = iGreen;
- ((mng_bkgdp)pChunk)->iBlue = iBlue;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_BKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYs
-mng_retcode MNG_DECL mng_putchunk_phys (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iSizex,
- mng_uint32 iSizey,
- mng_uint8 iUnit)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_pHYs, mng_init_general, mng_free_general, mng_read_phys, mng_write_phys, mng_assign_general, 0, 0, sizeof(mng_phys)};
-#else
- {MNG_UINT_pHYs, mng_init_phys, mng_free_phys, mng_read_phys, mng_write_phys, mng_assign_phys, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PHYS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_pHYs))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_phys (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_pHYs, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_physp)pChunk)->bEmpty = bEmpty;
- ((mng_physp)pChunk)->iSizex = iSizex;
- ((mng_physp)pChunk)->iSizey = iSizey;
- ((mng_physp)pChunk)->iUnit = iUnit;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PHYS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sBIT
-mng_retcode MNG_DECL mng_putchunk_sbit (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint8 iType,
- mng_uint8arr4 aBits)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_sBIT, mng_init_general, mng_free_general, mng_read_sbit, mng_write_sbit, mng_assign_general, 0, 0, sizeof(mng_sbit)};
-#else
- {MNG_UINT_sBIT, mng_init_sbit, mng_free_sbit, mng_read_sbit, mng_write_sbit, mng_assign_sbit, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SBIT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_sBIT))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_sbit (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_sBIT, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_sbitp)pChunk)->bEmpty = bEmpty;
- ((mng_sbitp)pChunk)->iType = iType;
- ((mng_sbitp)pChunk)->aBits[0] = aBits[0];
- ((mng_sbitp)pChunk)->aBits[1] = aBits[1];
- ((mng_sbitp)pChunk)->aBits[2] = aBits[2];
- ((mng_sbitp)pChunk)->aBits[3] = aBits[3];
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SBIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sPLT
-mng_retcode MNG_DECL mng_putchunk_splt (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iNamesize,
- mng_pchar zName,
- mng_uint8 iSampledepth,
- mng_uint32 iEntrycount,
- mng_ptr pEntries)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_sPLT, mng_init_general, mng_free_splt, mng_read_splt, mng_write_splt, mng_assign_splt, 0, 0, sizeof(mng_splt)};
-#else
- {MNG_UINT_sPLT, mng_init_splt, mng_free_splt, mng_read_splt, mng_write_splt, mng_assign_splt, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SPLT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_sPLT))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_splt (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_sPLT, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_spltp)pChunk)->bEmpty = bEmpty;
- ((mng_spltp)pChunk)->iNamesize = iNamesize;
- ((mng_spltp)pChunk)->iSampledepth = iSampledepth;
- ((mng_spltp)pChunk)->iEntrycount = iEntrycount;
-
- if (iNamesize)
- {
- MNG_ALLOC (pData, ((mng_spltp)pChunk)->zName, iNamesize + 1);
- MNG_COPY (((mng_spltp)pChunk)->zName, zName, iNamesize);
- }
-
- if (iEntrycount)
- {
- mng_uint32 iSize = iEntrycount * ((iSampledepth >> 1) + 2);
-
- MNG_ALLOC (pData, ((mng_spltp)pChunk)->pEntries, iSize);
- MNG_COPY (((mng_spltp)pChunk)->pEntries, pEntries, iSize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_hIST
-mng_retcode MNG_DECL mng_putchunk_hist (mng_handle hHandle,
- mng_uint32 iEntrycount,
- mng_uint16arr aEntries)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_hIST, mng_init_general, mng_free_general, mng_read_hist, mng_write_hist, mng_assign_general, 0, 0, sizeof(mng_hist)};
-#else
- {MNG_UINT_hIST, mng_init_hist, mng_free_hist, mng_read_hist, mng_write_hist, mng_assign_hist, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_HIST, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_hIST))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_hist (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_hIST, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_histp)pChunk)->iEntrycount = iEntrycount;
-
- MNG_COPY (((mng_histp)pChunk)->aEntries, aEntries, sizeof (mng_uint16arr));
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_HIST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tIME
-mng_retcode MNG_DECL mng_putchunk_time (mng_handle hHandle,
- mng_uint16 iYear,
- mng_uint8 iMonth,
- mng_uint8 iDay,
- mng_uint8 iHour,
- mng_uint8 iMinute,
- mng_uint8 iSecond)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_tIME, mng_init_general, mng_free_general, mng_read_time, mng_write_time, mng_assign_general, 0, 0, sizeof(mng_time)};
-#else
- {MNG_UINT_tIME, mng_init_time, mng_free_time, mng_read_time, mng_write_time, mng_assign_time, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_TIME, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_tIME))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_time (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_tIME, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_timep)pChunk)->iYear = iYear;
- ((mng_timep)pChunk)->iMonth = iMonth;
- ((mng_timep)pChunk)->iDay = iDay;
- ((mng_timep)pChunk)->iHour = iHour;
- ((mng_timep)pChunk)->iMinute = iMinute;
- ((mng_timep)pChunk)->iSecond = iSecond;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_TIME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_mhdr (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint32 iTicks,
- mng_uint32 iLayercount,
- mng_uint32 iFramecount,
- mng_uint32 iPlaytime,
- mng_uint32 iSimplicity)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_MHDR, mng_init_general, mng_free_general, mng_read_mhdr, mng_write_mhdr, mng_assign_general, 0, 0, sizeof(mng_mhdr)};
-#else
- {MNG_UINT_MHDR, mng_init_mhdr, mng_free_mhdr, mng_read_mhdr, mng_write_mhdr, mng_assign_mhdr, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MHDR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must be very first! */
- if (pData->iFirstchunkadded != 0)
- MNG_ERROR (pData, MNG_SEQUENCEERROR)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_MHDR))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_mhdr (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_MHDR, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_mhdrp)pChunk)->iWidth = iWidth;
- ((mng_mhdrp)pChunk)->iHeight = iHeight;
- ((mng_mhdrp)pChunk)->iTicks = iTicks;
- ((mng_mhdrp)pChunk)->iLayercount = iLayercount;
- ((mng_mhdrp)pChunk)->iFramecount = iFramecount;
- ((mng_mhdrp)pChunk)->iPlaytime = iPlaytime;
- ((mng_mhdrp)pChunk)->iSimplicity = iSimplicity;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_mend (mng_handle hHandle)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_MEND, mng_init_general, mng_free_general, mng_read_mend, mng_write_mend, mng_assign_general, 0, 0, sizeof(mng_mend)};
-#else
- {MNG_UINT_MEND, mng_init_mend, mng_free_mend, mng_read_mend, mng_write_mend, mng_assign_mend, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MEND, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_MEND))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_mend (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_MEND, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
- pData->bCreating = MNG_FALSE; /* should be last chunk !!! */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-mng_retcode MNG_DECL mng_putchunk_loop (mng_handle hHandle,
- mng_uint8 iLevel,
- mng_uint32 iRepeat,
- mng_uint8 iTermination,
- mng_uint32 iItermin,
- mng_uint32 iItermax,
- mng_uint32 iCount,
- mng_uint32p pSignals)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_LOOP, mng_init_general, mng_free_loop, mng_read_loop, mng_write_loop, mng_assign_loop, 0, 0, sizeof(mng_loop)};
-#else
- {MNG_UINT_LOOP, mng_init_loop, mng_free_loop, mng_read_loop, mng_write_loop, mng_assign_loop, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_LOOP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_LOOP))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_loop (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_LOOP, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_loopp)pChunk)->iLevel = iLevel;
- ((mng_loopp)pChunk)->iRepeat = iRepeat;
- ((mng_loopp)pChunk)->iTermination = iTermination;
- ((mng_loopp)pChunk)->iItermin = iItermin;
- ((mng_loopp)pChunk)->iItermax = iItermax;
- ((mng_loopp)pChunk)->iCount = iCount;
- ((mng_loopp)pChunk)->pSignals = pSignals;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_LOOP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_endl (mng_handle hHandle,
- mng_uint8 iLevel)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_ENDL, mng_init_general, mng_free_general, mng_read_endl, mng_write_endl, mng_assign_general, 0, 0, sizeof(mng_endl)};
-#else
- {MNG_UINT_ENDL, mng_init_endl, mng_free_endl, mng_read_endl, mng_write_endl, mng_assign_endl, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ENDL, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_ENDL))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_endl (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_ENDL, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_endlp)pChunk)->iLevel = iLevel;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ENDL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DEFI
-mng_retcode MNG_DECL mng_putchunk_defi (mng_handle hHandle,
- mng_uint16 iObjectid,
- mng_uint8 iDonotshow,
- mng_uint8 iConcrete,
- mng_bool bHasloca,
- mng_int32 iXlocation,
- mng_int32 iYlocation,
- mng_bool bHasclip,
- mng_int32 iLeftcb,
- mng_int32 iRightcb,
- mng_int32 iTopcb,
- mng_int32 iBottomcb)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_DEFI, mng_init_general, mng_free_general, mng_read_defi, mng_write_defi, mng_assign_general, 0, 0, sizeof(mng_defi)};
-#else
- {MNG_UINT_DEFI, mng_init_defi, mng_free_defi, mng_read_defi, mng_write_defi, mng_assign_defi, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_DEFI, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_DEFI))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_defi (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_DEFI, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_defip)pChunk)->iObjectid = iObjectid;
- ((mng_defip)pChunk)->iDonotshow = iDonotshow;
- ((mng_defip)pChunk)->iConcrete = iConcrete;
- ((mng_defip)pChunk)->bHasloca = bHasloca;
- ((mng_defip)pChunk)->iXlocation = iXlocation;
- ((mng_defip)pChunk)->iYlocation = iYlocation;
- ((mng_defip)pChunk)->bHasclip = bHasclip;
- ((mng_defip)pChunk)->iLeftcb = iLeftcb;
- ((mng_defip)pChunk)->iRightcb = iRightcb;
- ((mng_defip)pChunk)->iTopcb = iTopcb;
- ((mng_defip)pChunk)->iBottomcb = iBottomcb;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_DEFI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BASI
-mng_retcode MNG_DECL mng_putchunk_basi (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_uint16 iAlpha,
- mng_uint8 iViewable)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_BASI, mng_init_general, mng_free_general, mng_read_basi, mng_write_basi, mng_assign_general, 0, 0, sizeof(mng_basi)};
-#else
- {MNG_UINT_BASI, mng_init_basi, mng_free_basi, mng_read_basi, mng_write_basi, mng_assign_basi, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_BASI, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_BASI))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_basi (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_BASI, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_basip)pChunk)->iWidth = iWidth;
- ((mng_basip)pChunk)->iHeight = iHeight;
- ((mng_basip)pChunk)->iBitdepth = iBitdepth;
- ((mng_basip)pChunk)->iColortype = iColortype;
- ((mng_basip)pChunk)->iCompression = iCompression;
- ((mng_basip)pChunk)->iFilter = iFilter;
- ((mng_basip)pChunk)->iInterlace = iInterlace;
- ((mng_basip)pChunk)->iRed = iRed;
- ((mng_basip)pChunk)->iGreen = iGreen;
- ((mng_basip)pChunk)->iBlue = iBlue;
- ((mng_basip)pChunk)->iAlpha = iAlpha;
- ((mng_basip)pChunk)->iViewable = iViewable;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_BASI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLON
-mng_retcode MNG_DECL mng_putchunk_clon (mng_handle hHandle,
- mng_uint16 iSourceid,
- mng_uint16 iCloneid,
- mng_uint8 iClonetype,
- mng_uint8 iDonotshow,
- mng_uint8 iConcrete,
- mng_bool bHasloca,
- mng_uint8 iLocationtype,
- mng_int32 iLocationx,
- mng_int32 iLocationy)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_CLON, mng_init_general, mng_free_general, mng_read_clon, mng_write_clon, mng_assign_general, 0, 0, sizeof(mng_clon)};
-#else
- {MNG_UINT_CLON, mng_init_clon, mng_free_clon, mng_read_clon, mng_write_clon, mng_assign_clon, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_CLON, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_CLON))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_clon (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_CLON, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_clonp)pChunk)->iSourceid = iSourceid;
- ((mng_clonp)pChunk)->iCloneid = iCloneid;
- ((mng_clonp)pChunk)->iClonetype = iClonetype;
- ((mng_clonp)pChunk)->iDonotshow = iDonotshow;
- ((mng_clonp)pChunk)->iConcrete = iConcrete;
- ((mng_clonp)pChunk)->bHasloca = bHasloca;
- ((mng_clonp)pChunk)->iLocationtype = iLocationtype;
- ((mng_clonp)pChunk)->iLocationx = iLocationx;
- ((mng_clonp)pChunk)->iLocationy = iLocationy;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_CLON, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode MNG_DECL mng_putchunk_past (mng_handle hHandle,
- mng_uint16 iDestid,
- mng_uint8 iTargettype,
- mng_int32 iTargetx,
- mng_int32 iTargety,
- mng_uint32 iCount)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_PAST, mng_init_general, mng_free_past, mng_read_past, mng_write_past, mng_assign_past, 0, 0, sizeof(mng_past)};
-#else
- {MNG_UINT_PAST, mng_init_past, mng_free_past, mng_read_past, mng_write_past, mng_assign_past, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PAST, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_PAST))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_past (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_PAST, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_pastp)pChunk)->iDestid = iDestid;
- ((mng_pastp)pChunk)->iTargettype = iTargettype;
- ((mng_pastp)pChunk)->iTargetx = iTargetx;
- ((mng_pastp)pChunk)->iTargety = iTargety;
- ((mng_pastp)pChunk)->iCount = iCount;
-
- if (iCount)
- MNG_ALLOC (pData, ((mng_pastp)pChunk)->pSources, iCount * sizeof (mng_past_source));
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PAST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode MNG_DECL mng_putchunk_past_src (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_uint16 iSourceid,
- mng_uint8 iComposition,
- mng_uint8 iOrientation,
- mng_uint8 iOffsettype,
- mng_int32 iOffsetx,
- mng_int32 iOffsety,
- mng_uint8 iBoundarytype,
- mng_int32 iBoundaryl,
- mng_int32 iBoundaryr,
- mng_int32 iBoundaryt,
- mng_int32 iBoundaryb)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_past_sourcep pEntry;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PAST_SRC, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
-
- pChunk = pData->pLastchunk; /* last one must have been PAST ! */
-
- if (((mng_chunk_headerp)pChunk)->iChunkname != MNG_UINT_PAST)
- MNG_ERROR (pData, MNG_NOCORRCHUNK)
- /* index out of bounds ? */
- if (iEntry >= ((mng_pastp)pChunk)->iCount)
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
- /* address proper entry */
- pEntry = ((mng_pastp)pChunk)->pSources + iEntry;
-
- pEntry->iSourceid = iSourceid; /* fill entry */
- pEntry->iComposition = iComposition;
- pEntry->iOrientation = iOrientation;
- pEntry->iOffsettype = iOffsettype;
- pEntry->iOffsetx = iOffsetx;
- pEntry->iOffsety = iOffsety;
- pEntry->iBoundarytype = iBoundarytype;
- pEntry->iBoundaryl = iBoundaryl;
- pEntry->iBoundaryr = iBoundaryr;
- pEntry->iBoundaryt = iBoundaryt;
- pEntry->iBoundaryb = iBoundaryb;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PAST_SRC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-mng_retcode MNG_DECL mng_putchunk_disc (mng_handle hHandle,
- mng_uint32 iCount,
- mng_uint16p pObjectids)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_DISC, mng_init_general, mng_free_disc, mng_read_disc, mng_write_disc, mng_assign_disc, 0, 0, sizeof(mng_disc)};
-#else
- {MNG_UINT_DISC, mng_init_disc, mng_free_disc, mng_read_disc, mng_write_disc, mng_assign_disc, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_DISC, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_DISC))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_disc (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_DISC, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_discp)pChunk)->iCount = iCount;
-
- if (iCount)
- {
- mng_uint32 iSize = iCount * sizeof (mng_uint32);
-
- MNG_ALLOC (pData, ((mng_discp)pChunk)->pObjectids, iSize);
- MNG_COPY (((mng_discp)pChunk)->pObjectids, pObjectids, iSize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_DISC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BACK
-mng_retcode MNG_DECL mng_putchunk_back (mng_handle hHandle,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_uint8 iMandatory,
- mng_uint16 iImageid,
- mng_uint8 iTile)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_BACK, mng_init_general, mng_free_general, mng_read_back, mng_write_back, mng_assign_general, 0, 0, sizeof(mng_back)};
-#else
- {MNG_UINT_BACK, mng_init_back, mng_free_back, mng_read_back, mng_write_back, mng_assign_back, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_BACK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_BACK))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_back (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_BACK, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_backp)pChunk)->iRed = iRed;
- ((mng_backp)pChunk)->iGreen = iGreen;
- ((mng_backp)pChunk)->iBlue = iBlue;
- ((mng_backp)pChunk)->iMandatory = iMandatory;
- ((mng_backp)pChunk)->iImageid = iImageid;
- ((mng_backp)pChunk)->iTile = iTile;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_BACK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_FRAM
-mng_retcode MNG_DECL mng_putchunk_fram (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint8 iMode,
- mng_uint32 iNamesize,
- mng_pchar zName,
- mng_uint8 iChangedelay,
- mng_uint8 iChangetimeout,
- mng_uint8 iChangeclipping,
- mng_uint8 iChangesyncid,
- mng_uint32 iDelay,
- mng_uint32 iTimeout,
- mng_uint8 iBoundarytype,
- mng_int32 iBoundaryl,
- mng_int32 iBoundaryr,
- mng_int32 iBoundaryt,
- mng_int32 iBoundaryb,
- mng_uint32 iCount,
- mng_uint32p pSyncids)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_FRAM, mng_init_general, mng_free_fram, mng_read_fram, mng_write_fram, mng_assign_fram, 0, 0, sizeof(mng_fram)};
-#else
- {MNG_UINT_FRAM, mng_init_fram, mng_free_fram, mng_read_fram, mng_write_fram, mng_assign_fram, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_FRAM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_FRAM))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_fram (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_FRAM, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_framp)pChunk)->bEmpty = bEmpty;
- ((mng_framp)pChunk)->iMode = iMode;
- ((mng_framp)pChunk)->iNamesize = iNamesize;
- ((mng_framp)pChunk)->iChangedelay = iChangedelay;
- ((mng_framp)pChunk)->iChangetimeout = iChangetimeout;
- ((mng_framp)pChunk)->iChangeclipping = iChangeclipping;
- ((mng_framp)pChunk)->iChangesyncid = iChangesyncid;
- ((mng_framp)pChunk)->iDelay = iDelay;
- ((mng_framp)pChunk)->iTimeout = iTimeout;
- ((mng_framp)pChunk)->iBoundarytype = iBoundarytype;
- ((mng_framp)pChunk)->iBoundaryl = iBoundaryl;
- ((mng_framp)pChunk)->iBoundaryr = iBoundaryr;
- ((mng_framp)pChunk)->iBoundaryt = iBoundaryt;
- ((mng_framp)pChunk)->iBoundaryb = iBoundaryb;
- ((mng_framp)pChunk)->iCount = iCount;
-
- if (iNamesize)
- {
- MNG_ALLOC (pData, ((mng_framp)pChunk)->zName, iNamesize + 1);
- MNG_COPY (((mng_framp)pChunk)->zName, zName, iNamesize);
- }
-
- if (iCount)
- {
- mng_uint32 iSize = iCount * sizeof (mng_uint32);
-
- MNG_ALLOC (pData, ((mng_framp)pChunk)->pSyncids, iSize);
- MNG_COPY (((mng_framp)pChunk)->pSyncids, pSyncids, iSize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_FRAM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MOVE
-mng_retcode MNG_DECL mng_putchunk_move (mng_handle hHandle,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iMovetype,
- mng_int32 iMovex,
- mng_int32 iMovey)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_MOVE, mng_init_general, mng_free_general, mng_read_move, mng_write_move, mng_assign_general, 0, 0, sizeof(mng_move)};
-#else
- {MNG_UINT_MOVE, mng_init_move, mng_free_move, mng_read_move, mng_write_move, mng_assign_move, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MOVE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_MOVE))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_move (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_MOVE, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_movep)pChunk)->iFirstid = iFirstid;
- ((mng_movep)pChunk)->iLastid = iLastid;
- ((mng_movep)pChunk)->iMovetype = iMovetype;
- ((mng_movep)pChunk)->iMovex = iMovex;
- ((mng_movep)pChunk)->iMovey = iMovey;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MOVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLIP
-mng_retcode MNG_DECL mng_putchunk_clip (mng_handle hHandle,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iCliptype,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_CLIP, mng_init_general, mng_free_general, mng_read_clip, mng_write_clip, mng_assign_general, 0, 0, sizeof(mng_clip)};
-#else
- {MNG_UINT_CLIP, mng_init_clip, mng_free_clip, mng_read_clip, mng_write_clip, mng_assign_clip, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_CLIP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_CLIP))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_clip (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_CLIP, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_clipp)pChunk)->iFirstid = iFirstid;
- ((mng_clipp)pChunk)->iLastid = iLastid;
- ((mng_clipp)pChunk)->iCliptype = iCliptype;
- ((mng_clipp)pChunk)->iClipl = iClipl;
- ((mng_clipp)pChunk)->iClipr = iClipr;
- ((mng_clipp)pChunk)->iClipt = iClipt;
- ((mng_clipp)pChunk)->iClipb = iClipb;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_CLIP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SHOW
-mng_retcode MNG_DECL mng_putchunk_show (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iMode)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_SHOW, mng_init_general, mng_free_general, mng_read_show, mng_write_show, mng_assign_general, 0, 0, sizeof(mng_show)};
-#else
- {MNG_UINT_SHOW, mng_init_show, mng_free_show, mng_read_show, mng_write_show, mng_assign_show, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SHOW, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_SHOW))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_show (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_SHOW, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_showp)pChunk)->bEmpty = bEmpty;
- ((mng_showp)pChunk)->iFirstid = iFirstid;
- ((mng_showp)pChunk)->iLastid = iLastid;
- ((mng_showp)pChunk)->iMode = iMode;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SHOW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_TERM
-mng_retcode MNG_DECL mng_putchunk_term (mng_handle hHandle,
- mng_uint8 iTermaction,
- mng_uint8 iIteraction,
- mng_uint32 iDelay,
- mng_uint32 iItermax)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_TERM, mng_init_general, mng_free_general, mng_read_term, mng_write_term, mng_assign_general, 0, 0, sizeof(mng_term)};
-#else
- {MNG_UINT_TERM, mng_init_term, mng_free_term, mng_read_term, mng_write_term, mng_assign_term, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_TERM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_term (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_TERM, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_termp)pChunk)->iTermaction = iTermaction;
- ((mng_termp)pChunk)->iIteraction = iIteraction;
- ((mng_termp)pChunk)->iDelay = iDelay;
- ((mng_termp)pChunk)->iItermax = iItermax;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_TERM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode MNG_DECL mng_putchunk_save (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint8 iOffsettype,
- mng_uint32 iCount)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_SAVE, mng_init_general, mng_free_save, mng_read_save, mng_write_save, mng_assign_save, 0, 0, sizeof(mng_save)};
-#else
- {MNG_UINT_SAVE, mng_init_save, mng_free_save, mng_read_save, mng_write_save, mng_assign_save, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SAVE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_SAVE))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_save (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_SAVE, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_savep)pChunk)->bEmpty = bEmpty;
- ((mng_savep)pChunk)->iOffsettype = iOffsettype;
- ((mng_savep)pChunk)->iCount = iCount;
-
- if (iCount)
- MNG_ALLOC (pData, ((mng_savep)pChunk)->pEntries, iCount * sizeof (mng_save_entry));
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SAVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_save_entry (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_uint8 iEntrytype,
- mng_uint32arr2 iOffset,
- mng_uint32arr2 iStarttime,
- mng_uint32 iLayernr,
- mng_uint32 iFramenr,
- mng_uint32 iNamesize,
- mng_pchar zName)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_save_entryp pEntry;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SAVE_ENTRY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
-
- pChunk = pData->pLastchunk; /* last one must have been SAVE ! */
-
- if (((mng_chunk_headerp)pChunk)->iChunkname != MNG_UINT_SAVE)
- MNG_ERROR (pData, MNG_NOCORRCHUNK)
- /* index out of bounds ? */
- if (iEntry >= ((mng_savep)pChunk)->iCount)
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
- /* address proper entry */
- pEntry = ((mng_savep)pChunk)->pEntries + iEntry;
-
- pEntry->iEntrytype = iEntrytype; /* fill entry */
- pEntry->iOffset[0] = iOffset[0];
- pEntry->iOffset[1] = iOffset[1];
- pEntry->iStarttime[0] = iStarttime[0];
- pEntry->iStarttime[1] = iStarttime[1];
- pEntry->iLayernr = iLayernr;
- pEntry->iFramenr = iFramenr;
- pEntry->iNamesize = iNamesize;
-
- if (iNamesize)
- {
- MNG_ALLOC (pData, pEntry->zName, iNamesize + 1);
- MNG_COPY (pEntry->zName, zName, iNamesize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SAVE_ENTRY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-mng_retcode MNG_DECL mng_putchunk_seek (mng_handle hHandle,
- mng_uint32 iNamesize,
- mng_pchar zName)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_SEEK, mng_init_general, mng_free_seek, mng_read_seek, mng_write_seek, mng_assign_seek, 0, 0, sizeof(mng_seek)};
-#else
- {MNG_UINT_SEEK, mng_init_seek, mng_free_seek, mng_read_seek, mng_write_seek, mng_assign_seek, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SEEK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_SEEK))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_seek (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_SEEK, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_seekp)pChunk)->iNamesize = iNamesize;
-
- if (iNamesize)
- {
- MNG_ALLOC (pData, ((mng_seekp)pChunk)->zName, iNamesize + 1);
- MNG_COPY (((mng_seekp)pChunk)->zName, zName, iNamesize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_SEEK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_eXPI
-mng_retcode MNG_DECL mng_putchunk_expi (mng_handle hHandle,
- mng_uint16 iSnapshotid,
- mng_uint32 iNamesize,
- mng_pchar zName)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_eXPI, mng_init_general, mng_free_expi, mng_read_expi, mng_write_expi, mng_assign_general, 0, 0, sizeof(mng_expi)};
-#else
- {MNG_UINT_eXPI, mng_init_expi, mng_free_expi, mng_read_expi, mng_write_expi, mng_assign_expi, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_EXPI, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_eXPI))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_expi (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_eXPI, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_expip)pChunk)->iSnapshotid = iSnapshotid;
- ((mng_expip)pChunk)->iNamesize = iNamesize;
-
- if (iNamesize)
- {
- MNG_ALLOC (pData, ((mng_expip)pChunk)->zName, iNamesize + 1);
- MNG_COPY (((mng_expip)pChunk)->zName, zName, iNamesize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_EXPI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_fPRI
-mng_retcode MNG_DECL mng_putchunk_fpri (mng_handle hHandle,
- mng_uint8 iDeltatype,
- mng_uint8 iPriority)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_fPRI, mng_init_general, mng_free_general, mng_read_fpri, mng_write_fpri, mng_assign_general, 0, 0, sizeof(mng_fpri)};
-#else
- {MNG_UINT_fPRI, mng_init_fpri, mng_free_fpri, mng_read_fpri, mng_write_fpri, mng_assign_fpri, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_FPRI, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_fPRI))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_fpri (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_fPRI, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_fprip)pChunk)->iDeltatype = iDeltatype;
- ((mng_fprip)pChunk)->iPriority = iPriority;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_FPRI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_nEED
-mng_retcode MNG_DECL mng_putchunk_need (mng_handle hHandle,
- mng_uint32 iKeywordssize,
- mng_pchar zKeywords)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_nEED, mng_init_general, mng_free_need, mng_read_need, mng_write_need, mng_assign_need, 0, 0, sizeof(mng_need)};
-#else
- {MNG_UINT_nEED, mng_init_need, mng_free_need, mng_read_need, mng_write_need, mng_assign_need, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_NEED, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_nEED))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_need (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_nEED, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_needp)pChunk)->iKeywordssize = iKeywordssize;
-
- if (iKeywordssize)
- {
- MNG_ALLOC (pData, ((mng_needp)pChunk)->zKeywords, iKeywordssize + 1);
- MNG_COPY (((mng_needp)pChunk)->zKeywords, zKeywords, iKeywordssize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_NEED, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYg
-mng_retcode MNG_DECL mng_putchunk_phyg (mng_handle hHandle,
- mng_bool bEmpty,
- mng_uint32 iSizex,
- mng_uint32 iSizey,
- mng_uint8 iUnit)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_pHYg, mng_init_general, mng_free_general, mng_read_phyg, mng_write_phyg, mng_assign_general, 0, 0, sizeof(mng_phyg)};
-#else
- {MNG_UINT_pHYg, mng_init_phyg, mng_free_phyg, mng_read_phyg, mng_write_phyg, mng_assign_phyg, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PHYG, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_pHYg))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_phyg (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_pHYg, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_phygp)pChunk)->bEmpty = bEmpty;
- ((mng_phygp)pChunk)->iSizex = iSizex;
- ((mng_phygp)pChunk)->iSizey = iSizey;
- ((mng_phygp)pChunk)->iUnit = iUnit;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PHYG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-mng_retcode MNG_DECL mng_putchunk_jhdr (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iColortype,
- mng_uint8 iImagesampledepth,
- mng_uint8 iImagecompression,
- mng_uint8 iImageinterlace,
- mng_uint8 iAlphasampledepth,
- mng_uint8 iAlphacompression,
- mng_uint8 iAlphafilter,
- mng_uint8 iAlphainterlace)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_JHDR, mng_init_general, mng_free_general, mng_read_jhdr, mng_write_jhdr, mng_assign_general, 0, 0, sizeof(mng_jhdr)};
-#else
- {MNG_UINT_JHDR, mng_init_jhdr, mng_free_jhdr, mng_read_jhdr, mng_write_jhdr, mng_assign_jhdr, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_JHDR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_JHDR))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_jhdr (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_JHDR, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_jhdrp)pChunk)->iWidth = iWidth;
- ((mng_jhdrp)pChunk)->iHeight = iHeight;
- ((mng_jhdrp)pChunk)->iColortype = iColortype;
- ((mng_jhdrp)pChunk)->iImagesampledepth = iImagesampledepth;
- ((mng_jhdrp)pChunk)->iImagecompression = iImagecompression;
- ((mng_jhdrp)pChunk)->iImageinterlace = iImageinterlace;
- ((mng_jhdrp)pChunk)->iAlphasampledepth = iAlphasampledepth;
- ((mng_jhdrp)pChunk)->iAlphacompression = iAlphacompression;
- ((mng_jhdrp)pChunk)->iAlphafilter = iAlphafilter;
- ((mng_jhdrp)pChunk)->iAlphainterlace = iAlphainterlace;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_JHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-mng_retcode MNG_DECL mng_putchunk_jdat (mng_handle hHandle,
- mng_uint32 iRawlen,
- mng_ptr pRawdata)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_JDAT, mng_init_general, mng_free_jdat, mng_read_jdat, mng_write_jdat, mng_assign_jdat, 0, 0, sizeof(mng_jdat)};
-#else
- {MNG_UINT_JDAT, mng_init_jdat, mng_free_jdat, mng_read_jdat, mng_write_jdat, mng_assign_jdat, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_JDAT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR or JHDR first! */
- if ((pData->iFirstchunkadded != MNG_UINT_MHDR) &&
- (pData->iFirstchunkadded != MNG_UINT_JHDR) )
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_JDAT))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_jdat (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_JDAT, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_jdatp)pChunk)->iDatasize = iRawlen;
-
- if (iRawlen)
- {
- MNG_ALLOC (pData, ((mng_jdatp)pChunk)->pData, iRawlen);
- MNG_COPY (((mng_jdatp)pChunk)->pData, pRawdata, iRawlen);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_JDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-mng_retcode MNG_DECL mng_putchunk_jdaa (mng_handle hHandle,
- mng_uint32 iRawlen,
- mng_ptr pRawdata)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_JDAA, mng_init_general, mng_free_jdaa, mng_read_jdaa, mng_write_jdaa, mng_assign_jdaa, 0, 0, sizeof(mng_jdaa)};
-#else
- {MNG_UINT_JDAA, mng_init_jdaa, mng_free_jdaa, mng_read_jdaa, mng_write_jdaa, mng_assign_jdaa, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_JDAA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR or JHDR first! */
- if ((pData->iFirstchunkadded != MNG_UINT_MHDR) &&
- (pData->iFirstchunkadded != MNG_UINT_JHDR) )
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_JDAA))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_jdaa (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_JDAA, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_jdaap)pChunk)->iDatasize = iRawlen;
-
- if (iRawlen)
- {
- MNG_ALLOC (pData, ((mng_jdaap)pChunk)->pData, iRawlen);
- MNG_COPY (((mng_jdaap)pChunk)->pData, pRawdata, iRawlen);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_JDAA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-mng_retcode MNG_DECL mng_putchunk_jsep (mng_handle hHandle)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_JSEP, mng_init_general, mng_free_general, mng_read_jsep, mng_write_jsep, mng_assign_general, 0, 0, sizeof(mng_jsep)};
-#else
- {MNG_UINT_JSEP, mng_init_jsep, mng_free_jsep, mng_read_jsep, mng_write_jsep, mng_assign_jsep, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_JSEP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR or JHDR first! */
- if ((pData->iFirstchunkadded != MNG_UINT_MHDR) &&
- (pData->iFirstchunkadded != MNG_UINT_JHDR) )
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_JSEP))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_jsep (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_JSEP, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_JSEP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_putchunk_dhdr (mng_handle hHandle,
- mng_uint16 iObjectid,
- mng_uint8 iImagetype,
- mng_uint8 iDeltatype,
- mng_uint32 iBlockwidth,
- mng_uint32 iBlockheight,
- mng_uint32 iBlockx,
- mng_uint32 iBlocky)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_DHDR, mng_init_general, mng_free_general, mng_read_dhdr, mng_write_dhdr, mng_assign_general, 0, 0, sizeof(mng_dhdr)};
-#else
- {MNG_UINT_DHDR, mng_init_dhdr, mng_free_dhdr, mng_read_dhdr, mng_write_dhdr, mng_assign_dhdr, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_DHDR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_DHDR))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_dhdr (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_DHDR, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_dhdrp)pChunk)->iObjectid = iObjectid;
- ((mng_dhdrp)pChunk)->iImagetype = iImagetype;
- ((mng_dhdrp)pChunk)->iDeltatype = iDeltatype;
- ((mng_dhdrp)pChunk)->iBlockwidth = iBlockwidth;
- ((mng_dhdrp)pChunk)->iBlockheight = iBlockheight;
- ((mng_dhdrp)pChunk)->iBlockx = iBlockx;
- ((mng_dhdrp)pChunk)->iBlocky = iBlocky;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_DHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_putchunk_prom (mng_handle hHandle,
- mng_uint8 iColortype,
- mng_uint8 iSampledepth,
- mng_uint8 iFilltype)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_PROM, mng_init_general, mng_free_general, mng_read_prom, mng_write_prom, mng_assign_general, 0, 0, sizeof(mng_prom)};
-#else
- {MNG_UINT_PROM, mng_init_prom, mng_free_prom, mng_read_prom, mng_write_prom, mng_assign_prom, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PROM, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_PROM))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_prom (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_PROM, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_promp)pChunk)->iColortype = iColortype;
- ((mng_promp)pChunk)->iSampledepth = iSampledepth;
- ((mng_promp)pChunk)->iFilltype = iFilltype;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PROM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_putchunk_ipng (mng_handle hHandle)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_IPNG, mng_init_general, mng_free_general, mng_read_ipng, mng_write_ipng, mng_assign_general, 0, 0, sizeof(mng_ipng)};
-#else
- {MNG_UINT_IPNG, mng_init_ipng, mng_free_ipng, mng_read_ipng, mng_write_ipng, mng_assign_ipng, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_IPNG, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_IPNG))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_ipng (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_IPNG, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_IPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_putchunk_pplt (mng_handle hHandle,
- mng_uint8 iDeltatype,
- mng_uint32 iCount)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_PPLT, mng_init_general, mng_free_general, mng_read_pplt, mng_write_pplt, mng_assign_general, 0, 0, sizeof(mng_pplt)};
-#else
- {MNG_UINT_PPLT, mng_init_pplt, mng_free_pplt, mng_read_pplt, mng_write_pplt, mng_assign_pplt, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PPLT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_PPLT))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_pplt (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_PPLT, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_ppltp)pChunk)->iDeltatype = iDeltatype;
- ((mng_ppltp)pChunk)->iCount = iCount;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_putchunk_pplt_entry (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_uint16 iAlpha)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_pplt_entryp pEntry;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PPLT_ENTRY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
-
- pChunk = pData->pLastchunk; /* last one must have been PPLT ! */
-
- if (((mng_chunk_headerp)pChunk)->iChunkname != MNG_UINT_PPLT)
- MNG_ERROR (pData, MNG_NOCORRCHUNK)
-
- /* index out of bounds ? */
- if (iEntry >= ((mng_ppltp)pChunk)->iCount)
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
- /* address proper entry */
- pEntry = (mng_pplt_entryp)(((mng_ppltp)pChunk)->aEntries) + iEntry;
-
- pEntry->iRed = (mng_uint8)iRed; /* fill the entry */
- pEntry->iGreen = (mng_uint8)iGreen;
- pEntry->iBlue = (mng_uint8)iBlue;
- pEntry->iAlpha = (mng_uint8)iAlpha;
- pEntry->bUsed = MNG_TRUE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_PPLT_ENTRY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
-mng_retcode MNG_DECL mng_putchunk_ijng (mng_handle hHandle)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_IJNG, mng_init_general, mng_free_general, mng_read_ijng, mng_write_ijng, mng_assign_general, 0, 0, sizeof(mng_ijng)};
-#else
- {MNG_UINT_IJNG, mng_init_ijng, mng_free_ijng, mng_read_ijng, mng_write_ijng, mng_assign_ijng, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_IJNG, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_IJNG))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_ijng (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_IJNG, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_IJNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode MNG_DECL mng_putchunk_drop (mng_handle hHandle,
- mng_uint32 iCount,
- mng_chunkidp pChunknames)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_DROP, mng_init_general, mng_free_drop, mng_read_drop, mng_write_drop, mng_assign_drop, 0, 0, sizeof(mng_drop)};
-#else
- {MNG_UINT_DROP, mng_init_drop, mng_free_drop, mng_read_drop, mng_write_drop, mng_assign_drop, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_DROP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_DROP))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_drop (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_DROP, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_dropp)pChunk)->iCount = iCount;
-
- if (iCount)
- {
- mng_uint32 iSize = iCount * sizeof (mng_chunkid);
-
- MNG_ALLOC (pData, ((mng_dropp)pChunk)->pChunknames, iSize);
- MNG_COPY (((mng_dropp)pChunk)->pChunknames, pChunknames, iSize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_DROP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
-mng_retcode MNG_DECL mng_putchunk_dbyk (mng_handle hHandle,
- mng_chunkid iChunkname,
- mng_uint8 iPolarity,
- mng_uint32 iKeywordssize,
- mng_pchar zKeywords)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_DBYK, mng_init_general, mng_free_dbyk, mng_read_dbyk, mng_write_dbyk, mng_assign_dbyk, 0, 0, sizeof(mng_dbyk)};
-#else
- {MNG_UINT_DBYK, mng_init_dbyk, mng_free_dbyk, mng_read_dbyk, mng_write_dbyk, mng_assign_dbyk, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_DBYK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_DBYK))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_dbyk (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_DBYK, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_dbykp)pChunk)->iChunkname = iChunkname;
- ((mng_dbykp)pChunk)->iPolarity = iPolarity;
- ((mng_dbykp)pChunk)->iKeywordssize = iKeywordssize;
-
- if (iKeywordssize)
- {
- MNG_ALLOC (pData, ((mng_dbykp)pChunk)->zKeywords, iKeywordssize + 1);
- MNG_COPY (((mng_dbykp)pChunk)->zKeywords, zKeywords, iKeywordssize);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_DBYK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-mng_retcode MNG_DECL mng_putchunk_ordr (mng_handle hHandle,
- mng_uint32 iCount)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_ORDR, mng_init_general, mng_free_ordr, mng_read_ordr, mng_write_ordr, mng_assign_ordr, 0, 0, sizeof(mng_ordr)};
-#else
- {MNG_UINT_ORDR, mng_init_ordr, mng_free_ordr, mng_read_ordr, mng_write_ordr, mng_assign_ordr, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ORDR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_ORDR))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_ordr (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_ORDR, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_ordrp)pChunk)->iCount = iCount;
-
- if (iCount)
- MNG_ALLOC (pData, ((mng_ordrp)pChunk)->pEntries, iCount * sizeof (mng_ordr_entry));
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ORDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
-mng_retcode MNG_DECL mng_putchunk_ordr_entry (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_chunkid iChunkname,
- mng_uint8 iOrdertype)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_ordr_entryp pEntry;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ORDR_ENTRY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
-
- pChunk = pData->pLastchunk; /* last one must have been ORDR ! */
-
- if (((mng_chunk_headerp)pChunk)->iChunkname != MNG_UINT_ORDR)
- MNG_ERROR (pData, MNG_NOCORRCHUNK)
- /* index out of bounds ? */
- if (iEntry >= ((mng_ordrp)pChunk)->iCount)
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
- /* address proper entry */
- pEntry = ((mng_ordrp)pChunk)->pEntries + iEntry;
-
- pEntry->iChunkname = iChunkname; /* fill the entry */
- pEntry->iOrdertype = iOrdertype;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_ORDR_ENTRY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-mng_retcode MNG_DECL mng_putchunk_magn (mng_handle hHandle,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint16 iMethodX,
- mng_uint16 iMX,
- mng_uint16 iMY,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint16 iMT,
- mng_uint16 iMB,
- mng_uint16 iMethodY)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_MAGN, mng_init_general, mng_free_general, mng_read_magn, mng_write_magn, mng_assign_general, 0, 0, sizeof(mng_magn)};
-#else
- {MNG_UINT_MAGN, mng_init_magn, mng_free_magn, mng_read_magn, mng_write_magn, mng_assign_magn, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MAGN, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_MAGN))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_magn (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_MAGN, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_magnp)pChunk)->iFirstid = iFirstid;
- ((mng_magnp)pChunk)->iLastid = iLastid;
- ((mng_magnp)pChunk)->iMethodX = (mng_uint8)iMethodX;
- ((mng_magnp)pChunk)->iMX = iMX;
- ((mng_magnp)pChunk)->iMY = iMY;
- ((mng_magnp)pChunk)->iML = iML;
- ((mng_magnp)pChunk)->iMR = iMR;
- ((mng_magnp)pChunk)->iMT = iMT;
- ((mng_magnp)pChunk)->iMB = iMB;
- ((mng_magnp)pChunk)->iMethodY = (mng_uint8)iMethodY;
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MAGN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_mpng (mng_handle hHandle,
- mng_uint32 iFramewidth,
- mng_uint32 iFrameheight,
- mng_uint16 iNumplays,
- mng_uint16 iTickspersec,
- mng_uint8 iCompressionmethod,
- mng_uint32 iCount)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_mpNG, mng_init_general, mng_free_mpng, mng_read_mpng, mng_write_mpng, mng_assign_mpng, 0, 0, sizeof(mng_mpng)};
-#else
- {MNG_UINT_mpNG, mng_init_mpng, mng_free_mpng, mng_read_mpng, mng_write_mpng, mng_assign_mpng, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MPNG, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a IHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_IHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_mpng (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_mpNG, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_mpngp)pChunk)->iFramewidth = iFramewidth;
- ((mng_mpngp)pChunk)->iFrameheight = iFrameheight;
- ((mng_mpngp)pChunk)->iNumplays = iNumplays;
- ((mng_mpngp)pChunk)->iTickspersec = iTickspersec;
- ((mng_mpngp)pChunk)->iCompressionmethod = iCompressionmethod;
- ((mng_mpngp)pChunk)->iFramessize = iCount * sizeof (mng_mpng_frame);
-
- if (iCount)
- MNG_ALLOC (pData, ((mng_mpngp)pChunk)->pFrames, ((mng_mpngp)pChunk)->iFramessize);
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-MNG_EXT mng_retcode MNG_DECL mng_putchunk_mpng_frame (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_uint32 iX,
- mng_uint32 iY,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_int32 iXoffset,
- mng_int32 iYoffset,
- mng_uint16 iTicks)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_mpng_framep pFrame;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MPNG_FRAME, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a IHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_IHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
-
- pChunk = pData->pLastchunk; /* last one must have been mpNG ! */
-
- if (((mng_chunk_headerp)pChunk)->iChunkname != MNG_UINT_mpNG)
- MNG_ERROR (pData, MNG_NOCORRCHUNK)
- /* index out of bounds ? */
- if (iEntry >= (((mng_mpngp)pChunk)->iFramessize / sizeof (mng_mpng_frame)))
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
- /* address proper entry */
- pFrame = ((mng_mpngp)pChunk)->pFrames + iEntry;
- /* fill entry */
- pFrame->iX = iX;
- pFrame->iY = iY;
- pFrame->iWidth = iWidth;
- pFrame->iHeight = iHeight;
- pFrame->iXoffset = iXoffset;
- pFrame->iYoffset = iYoffset;
- pFrame->iTicks = iTicks;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_MPNG_FRAME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_evNT
-mng_retcode MNG_DECL mng_putchunk_evnt (mng_handle hHandle,
- mng_uint32 iCount)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_evNT, mng_init_general, mng_free_evnt, mng_read_evnt, mng_write_evnt, mng_assign_evnt, 0, 0, sizeof(mng_evnt)};
-#else
- {MNG_UINT_evNT, mng_init_evnt, mng_free_evnt, mng_read_evnt, mng_write_evnt, mng_assign_evnt, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_EVNT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, MNG_UINT_evNT))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_evnt (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_evNT, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_evntp)pChunk)->iCount = iCount;
-
- if (iCount)
- MNG_ALLOC (pData, ((mng_evntp)pChunk)->pEntries, iCount * sizeof (mng_evnt_entry));
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_EVNT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_evnt_entry (mng_handle hHandle,
- mng_uint32 iEntry,
- mng_uint8 iEventtype,
- mng_uint8 iMasktype,
- mng_int32 iLeft,
- mng_int32 iRight,
- mng_int32 iTop,
- mng_int32 iBottom,
- mng_uint16 iObjectid,
- mng_uint8 iIndex,
- mng_uint32 iSegmentnamesize,
- mng_pchar zSegmentname)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_evnt_entryp pEntry;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_EVNT_ENTRY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a MHDR first! */
- if (pData->iFirstchunkadded != MNG_UINT_MHDR)
- MNG_ERROR (pData, MNG_NOHEADER)
-
- pChunk = pData->pLastchunk; /* last one must have been evNT ! */
-
- if (((mng_chunk_headerp)pChunk)->iChunkname != MNG_UINT_evNT)
- MNG_ERROR (pData, MNG_NOCORRCHUNK)
- /* index out of bounds ? */
- if (iEntry >= ((mng_evntp)pChunk)->iCount)
- MNG_ERROR (pData, MNG_INVALIDENTRYIX)
- /* address proper entry */
- pEntry = ((mng_evntp)pChunk)->pEntries + iEntry;
- /* fill entry */
- pEntry->iEventtype = iEventtype;
- pEntry->iMasktype = iMasktype;
- pEntry->iLeft = iLeft;
- pEntry->iRight = iRight;
- pEntry->iTop = iTop;
- pEntry->iBottom = iBottom;
- pEntry->iObjectid = iObjectid;
- pEntry->iIndex = iIndex;
- pEntry->iSegmentnamesize = iSegmentnamesize;
-
- if (iSegmentnamesize)
- {
- MNG_ALLOC (pData, pEntry->zSegmentname, iSegmentnamesize + 1);
- MNG_COPY (pEntry->zSegmentname, zSegmentname, iSegmentnamesize);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_EVNT_ENTRY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putchunk_unknown (mng_handle hHandle,
- mng_chunkid iChunkname,
- mng_uint32 iRawlen,
- mng_ptr pRawdata)
-{
- mng_datap pData;
- mng_chunkp pChunk;
- mng_retcode iRetcode;
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_header sChunkheader =
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- {MNG_UINT_HUH, mng_init_general, mng_free_unknown, mng_read_unknown, mng_write_unknown, mng_assign_unknown, 0, 0, sizeof(mng_unknown_chunk)};
-#else
- {MNG_UINT_HUH, mng_init_unknown, mng_free_unknown, mng_read_unknown, mng_write_unknown, mng_assign_unknown, 0, 0};
-#endif
-#else
- mng_chunk_header sChunkheader;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_UNKNOWN, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must have had a header first! */
- if (pData->iFirstchunkadded == 0)
- MNG_ERROR (pData, MNG_NOHEADER)
- /* prevent misplaced TERM ! */
- if (!check_term (pData, iChunkname))
- MNG_ERROR (pData, MNG_TERMSEQERROR)
- /* create the chunk */
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#else
- iRetcode = mng_init_unknown (pData, &sChunkheader, &pChunk);
-#endif
-#else
- mng_get_chunkheader(MNG_UINT_HUH, &sChunkheader);
- iRetcode = mng_init_general (pData, &sChunkheader, &pChunk);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fill the chunk */
- ((mng_unknown_chunkp)pChunk)->sHeader.iChunkname = iChunkname;
- ((mng_unknown_chunkp)pChunk)->iDatasize = iRawlen;
-
- if (iRawlen)
- {
- MNG_ALLOC (pData, ((mng_unknown_chunkp)pChunk)->pData, iRawlen);
- MNG_COPY (((mng_unknown_chunkp)pChunk)->pData, pRawdata, iRawlen);
- }
-
- mng_add_chunk (pData, pChunk); /* add it to the list */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTCHUNK_UNKNOWN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_WRITE_PROCS */
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getimgdata_seq (mng_handle hHandle,
- mng_uint32 iSeqnr,
- mng_uint32 iCanvasstyle,
- mng_getcanvasline fGetcanvasline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETIMGDATA_SEQ, MNG_LC_START);
-#endif
-
-
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETIMGDATA_SEQ, MNG_LC_END);
-#endif
-
- return MNG_FNNOTIMPLEMENTED;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getimgdata_chunkseq (mng_handle hHandle,
- mng_uint32 iSeqnr,
- mng_uint32 iCanvasstyle,
- mng_getcanvasline fGetcanvasline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETIMGDATA_CHUNKSEQ, MNG_LC_START);
-#endif
-
-
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETIMGDATA_CHUNKSEQ, MNG_LC_END);
-#endif
-
- return MNG_FNNOTIMPLEMENTED;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getimgdata_chunk (mng_handle hHandle,
- mng_handle hChunk,
- mng_uint32 iCanvasstyle,
- mng_getcanvasline fGetcanvasline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETIMGDATA_CHUNK, MNG_LC_START);
-#endif
-
-
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETIMGDATA_CHUNK, MNG_LC_END);
-#endif
-
- return MNG_FNNOTIMPLEMENTED;
-}
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_WRITE_PROCS
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_putimgdata_ihdr (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iColortype,
- mng_uint8 iBitdepth,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace,
- mng_uint32 iCanvasstyle,
- mng_getcanvasline fGetcanvasline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTIMGDATA_IHDR, MNG_LC_START);
-#endif
-
-
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTIMGDATA_IHDR, MNG_LC_END);
-#endif
-
- return MNG_FNNOTIMPLEMENTED;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-mng_retcode MNG_DECL mng_putimgdata_jhdr (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iColortype,
- mng_uint8 iBitdepth,
- mng_uint8 iCompression,
- mng_uint8 iInterlace,
- mng_uint8 iAlphaBitdepth,
- mng_uint8 iAlphaCompression,
- mng_uint8 iAlphaFilter,
- mng_uint8 iAlphaInterlace,
- mng_uint32 iCanvasstyle,
- mng_getcanvasline fGetcanvasline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTIMGDATA_JHDR, MNG_LC_START);
-#endif
-
-
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_PUTIMGDATA_JHDR, MNG_LC_END);
-#endif
-
- return MNG_FNNOTIMPLEMENTED;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_updatemngheader (mng_handle hHandle,
- mng_uint32 iFramecount,
- mng_uint32 iLayercount,
- mng_uint32 iPlaytime)
-{
- mng_datap pData;
- mng_chunkp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_UPDATEMNGHEADER, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must be a MNG animation! */
- if ((pData->eImagetype != mng_it_mng) || (pData->iFirstchunkadded != MNG_UINT_MHDR))
- MNG_ERROR (pData, MNG_NOMHDR)
-
- pChunk = pData->pFirstchunk; /* get the first chunk */
- /* and update the variables */
- ((mng_mhdrp)pChunk)->iFramecount = iFramecount;
- ((mng_mhdrp)pChunk)->iLayercount = iLayercount;
- ((mng_mhdrp)pChunk)->iPlaytime = iPlaytime;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_UPDATEMNGHEADER, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle,
- mng_uint32 iSimplicity)
-{
- mng_datap pData;
- mng_chunkp pChunk;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_UPDATEMNGSIMPLICITY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = (mng_datap)hHandle; /* and make it addressable */
-
- if (!pData->bCreating) /* aren't we creating a new file ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID)
- /* must be a MNG animation! */
- if ((pData->eImagetype != mng_it_mng) || (pData->iFirstchunkadded != MNG_UINT_MHDR))
- MNG_ERROR (pData, MNG_NOMHDR)
-
- pChunk = pData->pFirstchunk; /* get the first chunk */
- /* and update the variable */
- ((mng_mhdrp)pChunk)->iSimplicity = iSimplicity;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_UPDATEMNGSIMPLICITY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_WRITE_PROCS */
-
-/* ************************************************************************** */
-
-#endif /* MNG_ACCESS_CHUNKS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
-
-
diff --git a/src/3rdparty/libmng/libmng_chunks.h b/src/3rdparty/libmng/libmng_chunks.h
deleted file mode 100644
index d10bf2dc79..0000000000
--- a/src/3rdparty/libmng/libmng_chunks.h
+++ /dev/null
@@ -1,1026 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_chunks.h copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Chunk structures (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of known chunk structures * */
-/* * * */
-/* * changes : 0.5.1 - 05/04/2000 - G.Juyn * */
-/* * - put in some extra comments * */
-/* * 0.5.1 - 05/06/2000 - G.Juyn * */
-/* * - fixed layout for sBIT, PPLT * */
-/* * 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed write callback definition * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - fixed layout for PPLT again (missed deltatype ?!?) * */
-/* * * */
-/* * 0.5.2 - 05/31/2000 - G.Juyn * */
-/* * - removed useless definition (contributed by Tim Rowley) * */
-/* * 0.5.2 - 06/03/2000 - G.Juyn * */
-/* * - fixed makeup for Linux gcc compile * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 09/10/2000 - G.Juyn * */
-/* * - fixed DEFI behavior * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added JDAA chunk * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - added HLAPI function to copy chunks * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 11/28/2002 - G.Juyn * */
-/* * - fixed definition of iMethodX/Y for MAGN chunk * */
-/* * * */
-/* * 1.0.6 - 05/25/2003 - G.R-P * */
-/* * added MNG_SKIPCHUNK_cHNK footprint optimizations * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * * */
-/* * 1.0.7 - 03/24/2004 - G.R-P * */
-/* * - added conditional around MNG_NO_DELTA_PNG support * */
-/* * * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKINITFREE * */
-/* * 1.0.9 - 12/06/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKREADER * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_chunks_h_
-#define _libmng_chunks_h_
-
-/* ************************************************************************** */
-
-#ifdef MNG_SWAP_ENDIAN
-#define PNG_SIG 0x474e5089L
-#define JNG_SIG 0x474e4a8bL
-#define MNG_SIG 0x474e4d8aL
-#define POST_SIG 0x0a1a0a0dL
-#else
-#define PNG_SIG 0x89504e47L
-#define JNG_SIG 0x8b4a4e47L
-#define MNG_SIG 0x8a4d4e47L
-#define POST_SIG 0x0d0a1a0aL
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_OPTIMIZE_CHUNKREADER
-
-typedef mng_retcode (*mng_f_specialfunc) (mng_datap pData,
- mng_chunkp pChunk,
- mng_uint32* piRawlen,
- mng_uint8p* ppRawdata);
-
-typedef mng_retcode (*mng_c_specialfunc) (mng_datap pData,
- mng_chunkp pChunk);
-
-#define MNG_FIELD_OPTIONAL 0x0001
-#define MNG_FIELD_TERMINATOR 0x0002
-#define MNG_FIELD_REPETITIVE 0x0004
-#define MNG_FIELD_DEFLATED 0x0008
-#define MNG_FIELD_IFIMGTYPES 0x01F0 /* image-type mask */
-#define MNG_FIELD_IFIMGTYPE0 0x0010
-#define MNG_FIELD_IFIMGTYPE2 0x0020
-#define MNG_FIELD_IFIMGTYPE3 0x0040
-#define MNG_FIELD_IFIMGTYPE4 0x0080
-#define MNG_FIELD_IFIMGTYPE6 0x0100
-#define MNG_FIELD_PUTIMGTYPE 0x0200
-#define MNG_FIELD_NOHIGHBIT 0x0400
-#define MNG_FIELD_GROUPMASK 0x7000
-#define MNG_FIELD_GROUP1 0x1000
-#define MNG_FIELD_GROUP2 0x2000
-#define MNG_FIELD_GROUP3 0x3000
-#define MNG_FIELD_GROUP4 0x4000
-#define MNG_FIELD_GROUP5 0x5000
-#define MNG_FIELD_GROUP6 0x6000
-#define MNG_FIELD_GROUP7 0x7000
-#define MNG_FIELD_INT 0x8000
-
-typedef struct { /* chunk-field descriptor */
- mng_f_specialfunc pSpecialfunc;
- mng_uint16 iFlags;
- mng_uint16 iMinvalue;
- mng_uint16 iMaxvalue;
- mng_uint16 iLengthmin;
- mng_uint16 iLengthmax;
- mng_uint16 iOffsetchunk;
- mng_uint16 iOffsetchunkind;
- mng_uint16 iOffsetchunklen;
- } mng_field_descriptor;
-typedef mng_field_descriptor * mng_field_descp;
-
-#define MNG_DESCR_GLOBAL 0x0001
-#define MNG_DESCR_EMPTY 0x0002
-#define MNG_DESCR_EMPTYEMBED 0x0006
-#define MNG_DESCR_EMPTYGLOBAL 0x000A
-
-#define MNG_DESCR_GenHDR 0x0001 /* IHDR/JHDR/BASI/DHDR */
-#define MNG_DESCR_JngHDR 0x0002 /* JHDR/DHDR */
-#define MNG_DESCR_MHDR 0x0004
-#define MNG_DESCR_IHDR 0x0008
-#define MNG_DESCR_JHDR 0x0010
-#define MNG_DESCR_DHDR 0x0020
-#define MNG_DESCR_LOOP 0x0040
-#define MNG_DESCR_PLTE 0x0080
-#define MNG_DESCR_SAVE 0x0100
-
-#define MNG_DESCR_NOIHDR 0x0001
-#define MNG_DESCR_NOJHDR 0x0002
-#define MNG_DESCR_NOBASI 0x0004
-#define MNG_DESCR_NODHDR 0x0008
-#define MNG_DESCR_NOIDAT 0x0010
-#define MNG_DESCR_NOJDAT 0x0020
-#define MNG_DESCR_NOJDAA 0x0040
-#define MNG_DESCR_NOPLTE 0x0080
-#define MNG_DESCR_NOJSEP 0x0100
-#define MNG_DESCR_NOMHDR 0x0200
-#define MNG_DESCR_NOTERM 0x0400
-#define MNG_DESCR_NOLOOP 0x0800
-#define MNG_DESCR_NOSAVE 0x1000
-
-typedef struct { /* chunk descriptor */
- mng_imgtype eImgtype;
- mng_createobjtype eCreateobject;
- mng_uint16 iObjsize;
- mng_uint16 iOffsetempty;
- mng_ptr pObjcleanup;
- mng_ptr pObjprocess;
- mng_c_specialfunc pSpecialfunc;
- mng_field_descp pFielddesc;
- mng_uint16 iFielddesc;
- mng_uint16 iAllowed;
- mng_uint16 iMusthaves;
- mng_uint16 iMustNOThaves;
- } mng_chunk_descriptor;
-typedef mng_chunk_descriptor * mng_chunk_descp;
-
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
-
-/* ************************************************************************** */
-
-typedef mng_retcode (*mng_createchunk) (mng_datap pData,
- mng_chunkp pHeader,
- mng_chunkp* ppChunk);
-
-typedef mng_retcode (*mng_cleanupchunk) (mng_datap pData,
- mng_chunkp pHeader);
-
-typedef mng_retcode (*mng_readchunk) (mng_datap pData,
- mng_chunkp pHeader,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata,
- mng_chunkp* pChunk);
-
-typedef mng_retcode (*mng_writechunk) (mng_datap pData,
- mng_chunkp pChunk);
-
-typedef mng_retcode (*mng_assignchunk) (mng_datap pData,
- mng_chunkp pChunkto,
- mng_chunkp pChunkfrom);
-
-/* ************************************************************************** */
-
-typedef struct { /* generic header */
- mng_chunkid iChunkname;
- mng_createchunk fCreate;
- mng_cleanupchunk fCleanup;
- mng_readchunk fRead;
- mng_writechunk fWrite;
- mng_assignchunk fAssign;
- mng_chunkp pNext; /* for double-linked list */
- mng_chunkp pPrev;
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- mng_size_t iChunksize;
-#endif
-#ifdef MNG_OPTIMIZE_CHUNKREADER
- mng_chunk_descp pChunkdescr;
-#endif
- } mng_chunk_header;
-typedef mng_chunk_header * mng_chunk_headerp;
-
-/* ************************************************************************** */
-
-typedef struct { /* IHDR */
- mng_chunk_header sHeader;
- mng_uint32 iWidth;
- mng_uint32 iHeight;
- mng_uint8 iBitdepth;
- mng_uint8 iColortype;
- mng_uint8 iCompression;
- mng_uint8 iFilter;
- mng_uint8 iInterlace;
- } mng_ihdr;
-typedef mng_ihdr * mng_ihdrp;
-
-/* ************************************************************************** */
-
-typedef struct { /* PLTE */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint32 iEntrycount;
- mng_rgbpaltab aEntries;
- } mng_plte;
-typedef mng_plte * mng_pltep;
-
-/* ************************************************************************** */
-
-typedef struct { /* IDAT */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint32 iDatasize;
- mng_ptr pData;
- } mng_idat;
-typedef mng_idat * mng_idatp;
-
-/* ************************************************************************** */
-
-typedef struct { /* IEND */
- mng_chunk_header sHeader;
- } mng_iend;
-typedef mng_iend * mng_iendp;
-
-/* ************************************************************************** */
-
-typedef struct { /* tRNS */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_bool bGlobal;
- mng_uint8 iType; /* colortype (0,2,3) */
- mng_uint32 iCount;
- mng_uint8arr aEntries;
- mng_uint16 iGray;
- mng_uint16 iRed;
- mng_uint16 iGreen;
- mng_uint16 iBlue;
- mng_uint32 iRawlen;
- mng_uint8arr aRawdata;
- } mng_trns;
-typedef mng_trns * mng_trnsp;
-
-/* ************************************************************************** */
-
-typedef struct { /* gAMA */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint32 iGamma;
- } mng_gama;
-typedef mng_gama * mng_gamap;
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_cHRM
-typedef struct { /* cHRM */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint32 iWhitepointx;
- mng_uint32 iWhitepointy;
- mng_uint32 iRedx;
- mng_uint32 iRedy;
- mng_uint32 iGreenx;
- mng_uint32 iGreeny;
- mng_uint32 iBluex;
- mng_uint32 iBluey;
- } mng_chrm;
-typedef mng_chrm * mng_chrmp;
-#endif
-
-/* ************************************************************************** */
-
-typedef struct { /* sRGB */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint8 iRenderingintent;
- } mng_srgb;
-typedef mng_srgb * mng_srgbp;
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-typedef struct { /* iCCP */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint32 iNamesize;
- mng_pchar zName;
- mng_uint8 iCompression;
- mng_uint32 iProfilesize;
- mng_ptr pProfile;
- } mng_iccp;
-typedef mng_iccp * mng_iccpp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tEXt
-typedef struct { /* tEXt */
- mng_chunk_header sHeader;
- mng_uint32 iKeywordsize;
- mng_pchar zKeyword;
- mng_uint32 iTextsize;
- mng_pchar zText;
- } mng_text;
-typedef mng_text * mng_textp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_zTXt
-typedef struct { /* zTXt */
- mng_chunk_header sHeader;
- mng_uint32 iKeywordsize;
- mng_pchar zKeyword;
- mng_uint8 iCompression;
- mng_uint32 iTextsize;
- mng_pchar zText;
- } mng_ztxt;
-typedef mng_ztxt * mng_ztxtp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iTXt
-typedef struct { /* iTXt */
- mng_chunk_header sHeader;
- mng_uint32 iKeywordsize;
- mng_pchar zKeyword;
- mng_uint8 iCompressionflag;
- mng_uint8 iCompressionmethod;
- mng_uint32 iLanguagesize;
- mng_pchar zLanguage;
- mng_uint32 iTranslationsize;
- mng_pchar zTranslation;
- mng_uint32 iTextsize;
- mng_pchar zText;
- } mng_itxt;
-typedef mng_itxt * mng_itxtp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_bKGD
-typedef struct { /* bKGD */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint8 iType; /* 3=indexed, 0=gray, 2=rgb */
- mng_uint8 iIndex;
- mng_uint16 iGray;
- mng_uint16 iRed;
- mng_uint16 iGreen;
- mng_uint16 iBlue;
- } mng_bkgd;
-typedef mng_bkgd * mng_bkgdp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYs
-typedef struct { /* pHYs */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint32 iSizex;
- mng_uint32 iSizey;
- mng_uint8 iUnit;
- } mng_phys;
-typedef mng_phys * mng_physp;
-#endif
-
-/* ************************************************************************** */
-#ifndef MNG_SKIPCHUNK_sBIT
-
-typedef struct { /* sBIT */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint8 iType; /* colortype (0,2,3,4,6,10,12,14,16) */
- mng_uint8arr4 aBits;
- } mng_sbit;
-typedef mng_sbit * mng_sbitp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sPLT
-typedef struct { /* sPLT */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint32 iNamesize;
- mng_pchar zName;
- mng_uint8 iSampledepth;
- mng_uint32 iEntrycount;
- mng_ptr pEntries;
- } mng_splt;
-typedef mng_splt * mng_spltp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_hIST
-typedef struct { /* hIST */
- mng_chunk_header sHeader;
- mng_uint32 iEntrycount;
- mng_uint16arr aEntries;
- } mng_hist;
-typedef mng_hist * mng_histp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_tIME
-typedef struct { /* tIME */
- mng_chunk_header sHeader;
- mng_uint16 iYear;
- mng_uint8 iMonth;
- mng_uint8 iDay;
- mng_uint8 iHour;
- mng_uint8 iMinute;
- mng_uint8 iSecond;
- } mng_time;
-typedef mng_time * mng_timep;
-#endif
-
-/* ************************************************************************** */
-
-typedef struct { /* MHDR */
- mng_chunk_header sHeader;
- mng_uint32 iWidth;
- mng_uint32 iHeight;
- mng_uint32 iTicks;
- mng_uint32 iLayercount;
- mng_uint32 iFramecount;
- mng_uint32 iPlaytime;
- mng_uint32 iSimplicity;
- } mng_mhdr;
-typedef mng_mhdr * mng_mhdrp;
-
-/* ************************************************************************** */
-
-typedef struct { /* MEND */
- mng_chunk_header sHeader;
- } mng_mend;
-typedef mng_mend * mng_mendp;
-
-/* ************************************************************************** */
-
-typedef struct { /* LOOP */
- mng_chunk_header sHeader;
- mng_uint8 iLevel;
- mng_uint32 iRepeat;
- mng_uint8 iTermination;
- mng_uint32 iItermin;
- mng_uint32 iItermax;
- mng_uint32 iCount;
- mng_uint32p pSignals;
- } mng_loop;
-typedef mng_loop * mng_loopp;
-
-/* ************************************************************************** */
-
-typedef struct { /* ENDL */
- mng_chunk_header sHeader;
- mng_uint8 iLevel;
- } mng_endl;
-typedef mng_endl * mng_endlp;
-
-/* ************************************************************************** */
-
-typedef struct { /* DEFI */
- mng_chunk_header sHeader;
- mng_uint16 iObjectid;
- mng_bool bHasdonotshow;
- mng_uint8 iDonotshow;
- mng_bool bHasconcrete;
- mng_uint8 iConcrete;
- mng_bool bHasloca;
- mng_int32 iXlocation;
- mng_int32 iYlocation;
- mng_bool bHasclip;
- mng_int32 iLeftcb;
- mng_int32 iRightcb;
- mng_int32 iTopcb;
- mng_int32 iBottomcb;
- } mng_defi;
-typedef mng_defi * mng_defip;
-
-/* ************************************************************************** */
-
-typedef struct { /* BASI */
- mng_chunk_header sHeader;
- mng_uint32 iWidth;
- mng_uint32 iHeight;
- mng_uint8 iBitdepth;
- mng_uint8 iColortype;
- mng_uint8 iCompression;
- mng_uint8 iFilter;
- mng_uint8 iInterlace;
- mng_uint16 iRed;
- mng_uint16 iGreen;
- mng_uint16 iBlue;
-#ifdef MNG_OPTIMIZE_CHUNKREADER
- mng_bool bHasalpha;
-#endif
- mng_uint16 iAlpha;
- mng_uint8 iViewable;
- } mng_basi;
-typedef mng_basi * mng_basip;
-
-/* ************************************************************************** */
-
-typedef struct { /* CLON */
- mng_chunk_header sHeader;
- mng_uint16 iSourceid;
- mng_uint16 iCloneid;
- mng_uint8 iClonetype;
-#ifdef MNG_OPTIMIZE_CHUNKREADER
- mng_bool bHasdonotshow;
-#endif
- mng_uint8 iDonotshow;
- mng_uint8 iConcrete;
- mng_bool bHasloca;
- mng_uint8 iLocationtype;
- mng_int32 iLocationx;
- mng_int32 iLocationy;
- } mng_clon;
-typedef mng_clon * mng_clonp;
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-typedef struct { /* PAST source */
- mng_uint16 iSourceid;
- mng_uint8 iComposition;
- mng_uint8 iOrientation;
- mng_uint8 iOffsettype;
- mng_int32 iOffsetx;
- mng_int32 iOffsety;
- mng_uint8 iBoundarytype;
- mng_int32 iBoundaryl;
- mng_int32 iBoundaryr;
- mng_int32 iBoundaryt;
- mng_int32 iBoundaryb;
- } mng_past_source;
-typedef mng_past_source * mng_past_sourcep;
-
-typedef struct { /* PAST */
- mng_chunk_header sHeader;
- mng_uint16 iDestid;
- mng_uint8 iTargettype;
- mng_int32 iTargetx;
- mng_int32 iTargety;
- mng_uint32 iCount;
- mng_past_sourcep pSources;
- } mng_past;
-typedef mng_past * mng_pastp;
-#endif
-
-/* ************************************************************************** */
-
-typedef struct { /* DISC */
- mng_chunk_header sHeader;
- mng_uint32 iCount;
- mng_uint16p pObjectids;
- } mng_disc;
-typedef mng_disc * mng_discp;
-
-/* ************************************************************************** */
-
-typedef struct { /* BACK */
- mng_chunk_header sHeader;
- mng_uint16 iRed;
- mng_uint16 iGreen;
- mng_uint16 iBlue;
- mng_uint8 iMandatory;
- mng_uint16 iImageid;
- mng_uint8 iTile;
- } mng_back;
-typedef mng_back * mng_backp;
-
-/* ************************************************************************** */
-
-typedef struct { /* FRAM */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint8 iMode;
- mng_uint32 iNamesize;
- mng_pchar zName;
- mng_uint8 iChangedelay;
- mng_uint8 iChangetimeout;
- mng_uint8 iChangeclipping;
- mng_uint8 iChangesyncid;
- mng_uint32 iDelay;
- mng_uint32 iTimeout;
- mng_uint8 iBoundarytype;
- mng_int32 iBoundaryl;
- mng_int32 iBoundaryr;
- mng_int32 iBoundaryt;
- mng_int32 iBoundaryb;
- mng_uint32 iCount;
- mng_uint32p pSyncids;
- } mng_fram;
-typedef mng_fram * mng_framp;
-
-/* ************************************************************************** */
-
-typedef struct { /* MOVE */
- mng_chunk_header sHeader;
- mng_uint16 iFirstid;
- mng_uint16 iLastid;
- mng_uint8 iMovetype;
- mng_int32 iMovex;
- mng_int32 iMovey;
- } mng_move;
-typedef mng_move * mng_movep;
-
-/* ************************************************************************** */
-
-typedef struct { /* CLIP */
- mng_chunk_header sHeader;
- mng_uint16 iFirstid;
- mng_uint16 iLastid;
- mng_uint8 iCliptype;
- mng_int32 iClipl;
- mng_int32 iClipr;
- mng_int32 iClipt;
- mng_int32 iClipb;
- } mng_clip;
-typedef mng_clip * mng_clipp;
-
-/* ************************************************************************** */
-
-typedef struct { /* SHOW */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint16 iFirstid;
-#ifdef MNG_OPTIMIZE_CHUNKREADER
- mng_bool bHaslastid;
-#endif
- mng_uint16 iLastid;
- mng_uint8 iMode;
- } mng_show;
-typedef mng_show * mng_showp;
-
-/* ************************************************************************** */
-
-typedef struct { /* TERM */
- mng_chunk_header sHeader;
- mng_uint8 iTermaction;
- mng_uint8 iIteraction;
- mng_uint32 iDelay;
- mng_uint32 iItermax;
- } mng_term;
-typedef mng_term * mng_termp;
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-typedef struct { /* SAVE entry */
- mng_uint8 iEntrytype;
- mng_uint32arr2 iOffset; /* 0=MSI, 1=LSI */
- mng_uint32arr2 iStarttime; /* 0=MSI, 1=LSI */
- mng_uint32 iLayernr;
- mng_uint32 iFramenr;
- mng_uint32 iNamesize;
- mng_pchar zName;
- } mng_save_entry;
-typedef mng_save_entry * mng_save_entryp;
-
-typedef struct { /* SAVE */
- mng_chunk_header sHeader;
- mng_bool bEmpty;
- mng_uint8 iOffsettype;
- mng_uint32 iCount;
- mng_save_entryp pEntries;
- } mng_save;
-typedef mng_save * mng_savep;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-typedef struct { /* SEEK */
- mng_chunk_header sHeader;
- mng_uint32 iNamesize;
- mng_pchar zName;
- } mng_seek;
-typedef mng_seek * mng_seekp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_eXPI
-typedef struct { /* eXPI */
- mng_chunk_header sHeader;
- mng_uint16 iSnapshotid;
- mng_uint32 iNamesize;
- mng_pchar zName;
- } mng_expi;
-typedef mng_expi * mng_expip;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_fPRI
-typedef struct { /* fPRI */
- mng_chunk_header sHeader;
- mng_uint8 iDeltatype;
- mng_uint8 iPriority;
- } mng_fpri;
-typedef mng_fpri * mng_fprip;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_nEED
-typedef struct { /* nEED */
- mng_chunk_header sHeader;
- mng_uint32 iKeywordssize;
- mng_pchar zKeywords;
- } mng_need;
-typedef mng_need * mng_needp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_pHYg
-typedef mng_phys mng_phyg; /* pHYg */
-typedef mng_phyg * mng_phygp;
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-typedef struct { /* JHDR */
- mng_chunk_header sHeader;
- mng_uint32 iWidth;
- mng_uint32 iHeight;
- mng_uint8 iColortype;
- mng_uint8 iImagesampledepth;
- mng_uint8 iImagecompression;
- mng_uint8 iImageinterlace;
- mng_uint8 iAlphasampledepth;
- mng_uint8 iAlphacompression;
- mng_uint8 iAlphafilter;
- mng_uint8 iAlphainterlace;
- } mng_jhdr;
-typedef mng_jhdr * mng_jhdrp;
-
-/* ************************************************************************** */
-
-typedef mng_idat mng_jdaa; /* JDAA */
-typedef mng_jdaa * mng_jdaap;
-
-/* ************************************************************************** */
-
-typedef mng_idat mng_jdat; /* JDAT */
-typedef mng_jdat * mng_jdatp;
-
-/* ************************************************************************** */
-
-typedef struct { /* JSEP */
- mng_chunk_header sHeader;
- } mng_jsep;
-typedef mng_jsep * mng_jsepp;
-
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-
-typedef struct { /* DHDR */
- mng_chunk_header sHeader;
- mng_uint16 iObjectid;
- mng_uint8 iImagetype;
- mng_uint8 iDeltatype;
-#ifdef MNG_OPTIMIZE_CHUNKREADER
- mng_bool bHasblocksize;
-#endif
- mng_uint32 iBlockwidth;
- mng_uint32 iBlockheight;
-#ifdef MNG_OPTIMIZE_CHUNKREADER
- mng_bool bHasblockloc;
-#endif
- mng_uint32 iBlockx;
- mng_uint32 iBlocky;
- } mng_dhdr;
-typedef mng_dhdr * mng_dhdrp;
-
-/* ************************************************************************** */
-
-typedef struct { /* PROM */
- mng_chunk_header sHeader;
- mng_uint8 iColortype;
- mng_uint8 iSampledepth;
- mng_uint8 iFilltype;
- } mng_prom;
-typedef mng_prom * mng_promp;
-
-/* ************************************************************************** */
-
-typedef struct { /* IPNG */
- mng_chunk_header sHeader;
- } mng_ipng;
-typedef mng_ipng *mng_ipngp;
-
-/* ************************************************************************** */
-
-typedef struct { /* PPLT entry */
- mng_uint8 iRed;
- mng_uint8 iGreen;
- mng_uint8 iBlue;
- mng_uint8 iAlpha;
- mng_bool bUsed;
- } mng_pplt_entry;
-typedef mng_pplt_entry * mng_pplt_entryp;
-
-typedef struct { /* PPLT */
- mng_chunk_header sHeader;
- mng_uint8 iDeltatype;
- mng_uint32 iCount;
- mng_pplt_entry aEntries [256];
- } mng_pplt;
-typedef mng_pplt * mng_ppltp;
-
-/* ************************************************************************** */
-
-typedef struct { /* IJNG */
- mng_chunk_header sHeader;
- } mng_ijng;
-typedef mng_ijng *mng_ijngp;
-
-/* ************************************************************************** */
-
-typedef struct { /* DROP */
- mng_chunk_header sHeader;
- mng_uint32 iCount;
- mng_chunkidp pChunknames;
- } mng_drop;
-typedef mng_drop * mng_dropp;
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DBYK
-typedef struct { /* DBYK */
- mng_chunk_header sHeader;
- mng_chunkid iChunkname;
- mng_uint8 iPolarity;
- mng_uint32 iKeywordssize;
- mng_pchar zKeywords;
- } mng_dbyk;
-typedef mng_dbyk * mng_dbykp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_ORDR
-typedef struct { /* ORDR entry */
- mng_chunkid iChunkname;
- mng_uint8 iOrdertype;
- } mng_ordr_entry;
-typedef mng_ordr_entry * mng_ordr_entryp;
-
-typedef struct mng_ordr_struct { /* ORDR */
- mng_chunk_header sHeader;
- mng_uint32 iCount;
- mng_ordr_entryp pEntries;
- } mng_ordr;
-typedef mng_ordr * mng_ordrp;
-#endif
-#endif /* MNG_NO_DELTA_PNG */
-
-/* ************************************************************************** */
-
-typedef struct { /* MAGN */
- mng_chunk_header sHeader;
- mng_uint16 iFirstid;
- mng_uint16 iLastid;
- mng_uint8 iMethodX;
- mng_uint16 iMX;
- mng_uint16 iMY;
- mng_uint16 iML;
- mng_uint16 iMR;
- mng_uint16 iMT;
- mng_uint16 iMB;
- mng_uint8 iMethodY;
- } mng_magn;
-typedef mng_magn * mng_magnp;
-
-/* ************************************************************************** */
-
-typedef struct { /* evNT entry */
- mng_uint8 iEventtype;
- mng_uint8 iMasktype;
- mng_int32 iLeft;
- mng_int32 iRight;
- mng_int32 iTop;
- mng_int32 iBottom;
- mng_uint16 iObjectid;
- mng_uint8 iIndex;
- mng_uint32 iSegmentnamesize;
- mng_pchar zSegmentname;
- } mng_evnt_entry;
-typedef mng_evnt_entry * mng_evnt_entryp;
-
-typedef struct { /* evNT */
- mng_chunk_header sHeader;
- mng_uint32 iCount;
- mng_evnt_entryp pEntries;
- } mng_evnt;
-typedef mng_evnt * mng_evntp;
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-typedef struct { /* mpNG frame */
- mng_uint32 iX;
- mng_uint32 iY;
- mng_uint32 iWidth;
- mng_uint32 iHeight;
- mng_int32 iXoffset;
- mng_int32 iYoffset;
- mng_uint16 iTicks;
- } mng_mpng_frame;
-typedef mng_mpng_frame * mng_mpng_framep;
-
-typedef struct { /* mpNG */
- mng_chunk_header sHeader;
- mng_uint32 iFramewidth;
- mng_uint32 iFrameheight;
- mng_uint16 iNumplays;
- mng_uint16 iTickspersec;
- mng_uint8 iCompressionmethod;
- mng_uint32 iFramessize;
- mng_mpng_framep pFrames;
- } mng_mpng;
-typedef mng_mpng * mng_mpngp;
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-typedef struct { /* ahDR */
- mng_chunk_header sHeader;
- mng_uint32 iNumframes;
- mng_uint32 iTickspersec;
- mng_uint32 iNumplays;
- mng_uint32 iTilewidth;
- mng_uint32 iTileheight;
- mng_uint8 iInterlace;
- mng_uint8 iStillused;
- } mng_ahdr;
-typedef mng_ahdr * mng_ahdrp;
-
-typedef struct { /* adAT tile */
- mng_uint32 iTicks;
- mng_int32 iXoffset;
- mng_int32 iYoffset;
- mng_uint8 iTilesource;
- } mng_adat_tile;
-typedef mng_adat_tile * mng_adat_tilep;
-
-typedef struct { /* adAT */
- mng_chunk_header sHeader;
- mng_uint32 iTilessize;
- mng_adat_tilep pTiles;
- } mng_adat;
-typedef mng_adat * mng_adatp;
-#endif
-
-/* ************************************************************************** */
-
-typedef struct { /* unknown chunk */
- mng_chunk_header sHeader;
- mng_uint32 iDatasize;
- mng_ptr pData;
- } mng_unknown_chunk;
-typedef mng_unknown_chunk * mng_unknown_chunkp;
-
-/* ************************************************************************** */
-
-#endif /* _libmng_chunks_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_cms.c b/src/3rdparty/libmng/libmng_cms.c
deleted file mode 100644
index 999575f66e..0000000000
--- a/src/3rdparty/libmng/libmng_cms.c
+++ /dev/null
@@ -1,758 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_cms.c copyright (c) 2000-2004 G.Juyn * */
-/* * version : 1.0.9 * */
-/* * * */
-/* * purpose : color management routines (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the color management routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/01/2000 - G.Juyn * */
-/* * - B001(105795) - fixed a typo and misconception about * */
-/* * freeing allocated gamma-table. (reported by Marti Maria) * */
-/* * 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/09/2000 - G.Juyn * */
-/* * - filled application-based color-management routines * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - added creatememprofile * */
-/* * - added callback error-reporting support * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * * */
-/* * 0.5.2 - 06/10/2000 - G.Juyn * */
-/* * - fixed some compilation-warnings (contrib Jason Morris) * */
-/* * * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - fixed problem with color-correction for stored images * */
-/* * 0.5.3 - 06/23/2000 - G.Juyn * */
-/* * - fixed problem with incorrect gamma-correction * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/31/2000 - G.Juyn * */
-/* * - fixed sRGB precedence for gamma_only corection * */
-/* * * */
-/* * 0.9.4 - 12/16/2000 - G.Juyn * */
-/* * - fixed mixup of data- & function-pointers (thanks Dimitri)* */
-/* * * */
-/* * 1.0.1 - 03/31/2001 - G.Juyn * */
-/* * - ignore gamma=0 (see png-list for more info) * */
-/* * 1.0.1 - 04/25/2001 - G.Juyn (reported by Gregg Kelly) * */
-/* * - fixed problem with cms profile being created multiple * */
-/* * times when both iCCP & cHRM/gAMA are present * */
-/* * 1.0.1 - 04/25/2001 - G.Juyn * */
-/* * - moved mng_clear_cms to libmng_cms * */
-/* * 1.0.1 - 05/02/2001 - G.Juyn * */
-/* * - added "default" sRGB generation (Thanks Marti!) * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/19/2002 - G.Juyn * */
-/* * - optimized color-correction routines * */
-/* * 1.0.5 - 09/23/2002 - G.Juyn * */
-/* * - added in-memory color-correction of abstract images * */
-/* * 1.0.5 - 11/08/2002 - G.Juyn * */
-/* * - fixed issues in init_app_cms() * */
-/* * * */
-/* * 1.0.6 - 04/11/2003 - G.Juyn * */
-/* * - B719420 - fixed several MNG_APP_CMS problems * */
-/* * 1.0.6 - 07/11/2003 - G. R-P * */
-/* * - added conditional MNG_SKIPCHUNK_cHRM/iCCP * */
-/* * * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_objects.h"
-#include "libmng_cms.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_DISPLAY_PROCS
-
-/* ************************************************************************** */
-/* * * */
-/* * Little CMS helper routines * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_LCMS
-
-#define MNG_CMS_FLAGS 0
-
-/* ************************************************************************** */
-
-void mnglcms_initlibrary ()
-{
- cmsErrorAction (LCMS_ERROR_IGNORE); /* LCMS should ignore errors! */
-}
-
-/* ************************************************************************** */
-
-mng_cmsprof mnglcms_createfileprofile (mng_pchar zFilename)
-{
- return cmsOpenProfileFromFile (zFilename, "r");
-}
-
-/* ************************************************************************** */
-
-mng_cmsprof mnglcms_creatememprofile (mng_uint32 iProfilesize,
- mng_ptr pProfile)
-{
- return cmsOpenProfileFromMem (pProfile, iProfilesize);
-}
-
-/* ************************************************************************** */
-
-mng_cmsprof mnglcms_createsrgbprofile (void)
-{
- cmsCIExyY D65;
- cmsCIExyYTRIPLE Rec709Primaries = {
- {0.6400, 0.3300, 1.0},
- {0.3000, 0.6000, 1.0},
- {0.1500, 0.0600, 1.0}
- };
- LPGAMMATABLE Gamma24[3];
- mng_cmsprof hsRGB;
-
- cmsWhitePointFromTemp(6504, &D65);
- Gamma24[0] = Gamma24[1] = Gamma24[2] = cmsBuildGamma(256, 2.4);
- hsRGB = cmsCreateRGBProfile(&D65, &Rec709Primaries, Gamma24);
- cmsFreeGamma(Gamma24[0]);
-
- return hsRGB;
-}
-
-/* ************************************************************************** */
-
-void mnglcms_freeprofile (mng_cmsprof hProf)
-{
- cmsCloseProfile (hProf);
- return;
-}
-
-/* ************************************************************************** */
-
-void mnglcms_freetransform (mng_cmstrans hTrans)
-{
-/* B001 start */
- cmsDeleteTransform (hTrans);
-/* B001 end */
- return;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_clear_cms (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CLEAR_CMS, MNG_LC_START);
-#endif
-
- if (pData->hTrans) /* transformation still active ? */
- mnglcms_freetransform (pData->hTrans);
-
- pData->hTrans = 0;
-
- if (pData->hProf1) /* file profile still active ? */
- mnglcms_freeprofile (pData->hProf1);
-
- pData->hProf1 = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CLEAR_CMS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_LCMS */
-
-/* ************************************************************************** */
-/* * * */
-/* * Color-management initialization & correction routines * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_LCMS
-
-mng_retcode mng_init_full_cms (mng_datap pData,
- mng_bool bGlobal,
- mng_bool bObject,
- mng_bool bRetrobj)
-{
- mng_cmsprof hProf;
- mng_cmstrans hTrans;
- mng_imagep pImage = MNG_NULL;
- mng_imagedatap pBuf = MNG_NULL;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_FULL_CMS, MNG_LC_START);
-#endif
-
- if (bObject) /* use object if present ? */
- { /* current object ? */
- if ((mng_imagep)pData->pCurrentobj)
- pImage = (mng_imagep)pData->pCurrentobj;
- else /* if not; use object 0 */
- pImage = (mng_imagep)pData->pObjzero;
- }
-
- if (bRetrobj) /* retrieving from an object ? */
- pImage = (mng_imagep)pData->pRetrieveobj;
-
- if (pImage) /* are we using an object ? */
- pBuf = pImage->pImgbuf; /* then address the buffer */
-
- if ((!pBuf) || (!pBuf->bCorrected)) /* is the buffer already corrected ? */
- {
-#ifndef MNG_SKIPCHUNK_iCCP
- if (((pBuf) && (pBuf->bHasICCP)) || ((bGlobal) && (pData->bHasglobalICCP)))
- {
- if (!pData->hProf2) /* output profile not defined ? */
- { /* then assume sRGB !! */
- pData->hProf2 = mnglcms_createsrgbprofile ();
-
- if (!pData->hProf2) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
- }
-
- if ((pBuf) && (pBuf->bHasICCP)) /* generate a profile handle */
- hProf = cmsOpenProfileFromMem (pBuf->pProfile, pBuf->iProfilesize);
- else
- hProf = cmsOpenProfileFromMem (pData->pGlobalProfile, pData->iGlobalProfilesize);
-
- pData->hProf1 = hProf; /* save for future use */
-
- if (!hProf) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pData->bIsRGBA16) /* 16-bit intermediates ? */
- hTrans = cmsCreateTransform (hProf, TYPE_RGBA_16_SE,
- pData->hProf2, TYPE_RGBA_16_SE,
- INTENT_PERCEPTUAL, MNG_CMS_FLAGS);
- else
-#endif
- hTrans = cmsCreateTransform (hProf, TYPE_RGBA_8,
- pData->hProf2, TYPE_RGBA_8,
- INTENT_PERCEPTUAL, MNG_CMS_FLAGS);
-
- pData->hTrans = hTrans; /* save for future use */
-
- if (!hTrans) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOTRANS);
- /* load color-correction routine */
- pData->fCorrectrow = (mng_fptr)mng_correct_full_cms;
-
- return MNG_NOERROR; /* and done */
- }
- else
-#endif
- if (((pBuf) && (pBuf->bHasSRGB)) || ((bGlobal) && (pData->bHasglobalSRGB)))
- {
- mng_uint8 iIntent;
-
- if (pData->bIssRGB) /* sRGB system ? */
- return MNG_NOERROR; /* no conversion required */
-
- if (!pData->hProf3) /* sRGB profile not defined ? */
- { /* then create it implicitly !! */
- pData->hProf3 = mnglcms_createsrgbprofile ();
-
- if (!pData->hProf3) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
- }
-
- hProf = pData->hProf3; /* convert from sRGB profile */
-
- if ((pBuf) && (pBuf->bHasSRGB)) /* determine rendering intent */
- iIntent = pBuf->iRenderingintent;
- else
- iIntent = pData->iGlobalRendintent;
-
- if (pData->bIsRGBA16) /* 16-bit intermediates ? */
- hTrans = cmsCreateTransform (hProf, TYPE_RGBA_16_SE,
- pData->hProf2, TYPE_RGBA_16_SE,
- iIntent, MNG_CMS_FLAGS);
- else
- hTrans = cmsCreateTransform (hProf, TYPE_RGBA_8,
- pData->hProf2, TYPE_RGBA_8,
- iIntent, MNG_CMS_FLAGS);
-
- pData->hTrans = hTrans; /* save for future use */
-
- if (!hTrans) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOTRANS);
- /* load color-correction routine */
- pData->fCorrectrow = (mng_fptr)mng_correct_full_cms;
-
- return MNG_NOERROR; /* and done */
- }
- else
- if ( (((pBuf) && (pBuf->bHasCHRM)) || ((bGlobal) && (pData->bHasglobalCHRM))) &&
- ( ((pBuf) && (pBuf->bHasGAMA) && (pBuf->iGamma > 0)) ||
- ((bGlobal) && (pData->bHasglobalGAMA) && (pData->iGlobalGamma > 0)) ) )
- {
- mng_CIExyY sWhitepoint;
- mng_CIExyYTRIPLE sPrimaries;
- mng_gammatabp pGammatable[3];
- mng_float dGamma;
-
- if (!pData->hProf2) /* output profile not defined ? */
- { /* then assume sRGB !! */
- pData->hProf2 = mnglcms_createsrgbprofile ();
-
- if (!pData->hProf2) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
- }
-
-#ifndef MNG_SKIPCHUNK_cHRM
- if ((pBuf) && (pBuf->bHasCHRM)) /* local cHRM ? */
- {
- sWhitepoint.x = (mng_float)pBuf->iWhitepointx / 100000;
- sWhitepoint.y = (mng_float)pBuf->iWhitepointy / 100000;
- sPrimaries.Red.x = (mng_float)pBuf->iPrimaryredx / 100000;
- sPrimaries.Red.y = (mng_float)pBuf->iPrimaryredy / 100000;
- sPrimaries.Green.x = (mng_float)pBuf->iPrimarygreenx / 100000;
- sPrimaries.Green.y = (mng_float)pBuf->iPrimarygreeny / 100000;
- sPrimaries.Blue.x = (mng_float)pBuf->iPrimarybluex / 100000;
- sPrimaries.Blue.y = (mng_float)pBuf->iPrimarybluey / 100000;
- }
- else
- {
- sWhitepoint.x = (mng_float)pData->iGlobalWhitepointx / 100000;
- sWhitepoint.y = (mng_float)pData->iGlobalWhitepointy / 100000;
- sPrimaries.Red.x = (mng_float)pData->iGlobalPrimaryredx / 100000;
- sPrimaries.Red.y = (mng_float)pData->iGlobalPrimaryredy / 100000;
- sPrimaries.Green.x = (mng_float)pData->iGlobalPrimarygreenx / 100000;
- sPrimaries.Green.y = (mng_float)pData->iGlobalPrimarygreeny / 100000;
- sPrimaries.Blue.x = (mng_float)pData->iGlobalPrimarybluex / 100000;
- sPrimaries.Blue.y = (mng_float)pData->iGlobalPrimarybluey / 100000;
- }
-#endif
-
- sWhitepoint.Y = /* Y component is always 1.0 */
- sPrimaries.Red.Y =
- sPrimaries.Green.Y =
- sPrimaries.Blue.Y = 1.0;
-
- if ((pBuf) && (pBuf->bHasGAMA)) /* get the gamma value */
- dGamma = (mng_float)pBuf->iGamma / 100000;
- else
- dGamma = (mng_float)pData->iGlobalGamma / 100000;
-
- dGamma = pData->dViewgamma / dGamma;
-
- pGammatable [0] = /* and build the lookup tables */
- pGammatable [1] =
- pGammatable [2] = cmsBuildGamma (256, dGamma);
-
- if (!pGammatable [0]) /* enough memory ? */
- MNG_ERRORL (pData, MNG_LCMS_NOMEM);
- /* create the profile */
- hProf = cmsCreateRGBProfile (&sWhitepoint, &sPrimaries, pGammatable);
-
- cmsFreeGamma (pGammatable [0]); /* free the temporary gamma tables ? */
- /* yes! but just the one! */
-
- pData->hProf1 = hProf; /* save for future use */
-
- if (!hProf) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
-
- if (pData->bIsRGBA16) /* 16-bit intermediates ? */
- hTrans = cmsCreateTransform (hProf, TYPE_RGBA_16_SE,
- pData->hProf2, TYPE_RGBA_16_SE,
- INTENT_PERCEPTUAL, MNG_CMS_FLAGS);
- else
- hTrans = cmsCreateTransform (hProf, TYPE_RGBA_8,
- pData->hProf2, TYPE_RGBA_8,
- INTENT_PERCEPTUAL, MNG_CMS_FLAGS);
-
- pData->hTrans = hTrans; /* save for future use */
-
- if (!hTrans) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOTRANS);
- /* load color-correction routine */
- pData->fCorrectrow = (mng_fptr)mng_correct_full_cms;
-
- return MNG_NOERROR; /* and done */
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_FULL_CMS, MNG_LC_END);
-#endif
- /* if we get here, we'll only do gamma */
- return mng_init_gamma_only (pData, bGlobal, bObject, bRetrobj);
-}
-#endif /* MNG_INCLUDE_LCMS */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_LCMS
-mng_retcode mng_correct_full_cms (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CORRECT_FULL_CMS, MNG_LC_START);
-#endif
-
- cmsDoTransform (pData->hTrans, pData->pRGBArow, pData->pRGBArow, pData->iRowsamples);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CORRECT_FULL_CMS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_LCMS */
-
-/* ************************************************************************** */
-
-#if defined(MNG_GAMMA_ONLY) || defined(MNG_FULL_CMS) || defined(MNG_APP_CMS)
-mng_retcode mng_init_gamma_only (mng_datap pData,
- mng_bool bGlobal,
- mng_bool bObject,
- mng_bool bRetrobj)
-{
- mng_float dGamma;
- mng_imagep pImage = MNG_NULL;
- mng_imagedatap pBuf = MNG_NULL;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GAMMA_ONLY, MNG_LC_START);
-#endif
-
- if (bObject) /* use object if present ? */
- { /* current object ? */
- if ((mng_imagep)pData->pCurrentobj)
- pImage = (mng_imagep)pData->pCurrentobj;
- else /* if not; use object 0 */
- pImage = (mng_imagep)pData->pObjzero;
- }
-
- if (bRetrobj) /* retrieving from an object ? */
- pImage = (mng_imagep)pData->pRetrieveobj;
-
- if (pImage) /* are we using an object ? */
- pBuf = pImage->pImgbuf; /* then address the buffer */
-
- if ((!pBuf) || (!pBuf->bCorrected)) /* is the buffer already corrected ? */
- {
- if ((pBuf) && (pBuf->bHasSRGB)) /* get the gamma value */
- dGamma = 0.45455;
- else
- if ((pBuf) && (pBuf->bHasGAMA))
- dGamma = (mng_float)pBuf->iGamma / 100000;
- else
- if ((bGlobal) && (pData->bHasglobalSRGB))
- dGamma = 0.45455;
- else
- if ((bGlobal) && (pData->bHasglobalGAMA))
- dGamma = (mng_float)pData->iGlobalGamma / 100000;
- else
- dGamma = pData->dDfltimggamma;
-
- if (dGamma > 0) /* ignore gamma=0 */
- {
- dGamma = pData->dViewgamma / (dGamma * pData->dDisplaygamma);
-
- if (dGamma != pData->dLastgamma) /* lookup table needs to be computed ? */
- {
- mng_int32 iX;
-
- pData->aGammatab [0] = 0;
-
- for (iX = 1; iX <= 255; iX++)
- pData->aGammatab [iX] = (mng_uint8)(pow (iX / 255.0, dGamma) * 255 + 0.5);
-
- pData->dLastgamma = dGamma; /* keep for next time */
- }
- /* load color-correction routine */
- pData->fCorrectrow = (mng_fptr)mng_correct_gamma_only;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GAMMA_ONLY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_GAMMA_ONLY || MNG_FULL_CMS || MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#if defined(MNG_GAMMA_ONLY) || defined(MNG_FULL_CMS) || defined(MNG_APP_CMS)
-mng_retcode mng_correct_gamma_only (mng_datap pData)
-{
- mng_uint8p pWork;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CORRECT_GAMMA_ONLY, MNG_LC_START);
-#endif
-
- pWork = pData->pRGBArow; /* address intermediate row */
-
- if (pData->bIsRGBA16) /* 16-bit intermediate row ? */
- {
-
-
- /* TODO: 16-bit precision gamma processing */
- /* we'll just do the high-order byte for now */
-
-
- /* convert all samples in the row */
- for (iX = 0; iX < pData->iRowsamples; iX++)
- { /* using the precalculated gamma lookup table */
- *pWork = pData->aGammatab [*pWork];
- *(pWork+2) = pData->aGammatab [*(pWork+2)];
- *(pWork+4) = pData->aGammatab [*(pWork+4)];
-
- pWork += 8;
- }
- }
- else
- { /* convert all samples in the row */
- for (iX = 0; iX < pData->iRowsamples; iX++)
- { /* using the precalculated gamma lookup table */
- *pWork = pData->aGammatab [*pWork];
- *(pWork+1) = pData->aGammatab [*(pWork+1)];
- *(pWork+2) = pData->aGammatab [*(pWork+2)];
-
- pWork += 4;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CORRECT_GAMMA_ONLY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_GAMMA_ONLY || MNG_FULL_CMS || MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#ifdef MNG_APP_CMS
-mng_retcode mng_init_app_cms (mng_datap pData,
- mng_bool bGlobal,
- mng_bool bObject,
- mng_bool bRetrobj)
-{
- mng_imagep pImage = MNG_NULL;
- mng_imagedatap pBuf = MNG_NULL;
- mng_bool bDone = MNG_FALSE;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_APP_CMS, MNG_LC_START);
-#endif
-
- if (bObject) /* use object if present ? */
- { /* current object ? */
- if ((mng_imagep)pData->pCurrentobj)
- pImage = (mng_imagep)pData->pCurrentobj;
- else /* if not; use object 0 */
- pImage = (mng_imagep)pData->pObjzero;
- }
-
- if (bRetrobj) /* retrieving from an object ? */
- pImage = (mng_imagep)pData->pRetrieveobj;
-
- if (pImage) /* are we using an object ? */
- pBuf = pImage->pImgbuf; /* then address the buffer */
-
- if ((!pBuf) || (!pBuf->bCorrected)) /* is the buffer already corrected ? */
- {
-#ifndef MNG_SKIPCHUNK_iCCP
- if ( (pData->fProcessiccp) &&
- (((pBuf) && (pBuf->bHasICCP)) || ((bGlobal) && (pData->bHasglobalICCP))) )
- {
- mng_uint32 iProfilesize;
- mng_ptr pProfile;
-
- if ((pBuf) && (pBuf->bHasICCP)) /* get the right profile */
- {
- iProfilesize = pBuf->iProfilesize;
- pProfile = pBuf->pProfile;
- }
- else
- {
- iProfilesize = pData->iGlobalProfilesize;
- pProfile = pData->pGlobalProfile;
- }
- /* inform the app */
- if (!pData->fProcessiccp ((mng_handle)pData, iProfilesize, pProfile))
- MNG_ERROR (pData, MNG_APPCMSERROR);
- /* load color-correction routine */
- pData->fCorrectrow = (mng_fptr)mng_correct_app_cms;
- bDone = MNG_TRUE;
- }
-#endif
-
- if ( (pData->fProcesssrgb) &&
- (((pBuf) && (pBuf->bHasSRGB)) || ((bGlobal) && (pData->bHasglobalSRGB))) )
- {
- mng_uint8 iIntent;
-
- if ((pBuf) && (pBuf->bHasSRGB)) /* determine rendering intent */
- iIntent = pBuf->iRenderingintent;
- else
- iIntent = pData->iGlobalRendintent;
- /* inform the app */
- if (!pData->fProcesssrgb ((mng_handle)pData, iIntent))
- MNG_ERROR (pData, MNG_APPCMSERROR);
- /* load color-correction routine */
- pData->fCorrectrow = (mng_fptr)mng_correct_app_cms;
- bDone = MNG_TRUE;
- }
-
-#ifndef MNG_SKIPCHUNK_cHRM
- if ( (pData->fProcesschroma) &&
- (((pBuf) && (pBuf->bHasCHRM)) || ((bGlobal) && (pData->bHasglobalCHRM))) )
- {
- mng_uint32 iWhitepointx, iWhitepointy;
- mng_uint32 iPrimaryredx, iPrimaryredy;
- mng_uint32 iPrimarygreenx, iPrimarygreeny;
- mng_uint32 iPrimarybluex, iPrimarybluey;
-
- if ((pBuf) && (pBuf->bHasCHRM)) /* local cHRM ? */
- {
- iWhitepointx = pBuf->iWhitepointx;
- iWhitepointy = pBuf->iWhitepointy;
- iPrimaryredx = pBuf->iPrimaryredx;
- iPrimaryredy = pBuf->iPrimaryredy;
- iPrimarygreenx = pBuf->iPrimarygreenx;
- iPrimarygreeny = pBuf->iPrimarygreeny;
- iPrimarybluex = pBuf->iPrimarybluex;
- iPrimarybluey = pBuf->iPrimarybluey;
- }
- else
- {
- iWhitepointx = pData->iGlobalWhitepointx;
- iWhitepointy = pData->iGlobalWhitepointy;
- iPrimaryredx = pData->iGlobalPrimaryredx;
- iPrimaryredy = pData->iGlobalPrimaryredy;
- iPrimarygreenx = pData->iGlobalPrimarygreenx;
- iPrimarygreeny = pData->iGlobalPrimarygreeny;
- iPrimarybluex = pData->iGlobalPrimarybluex;
- iPrimarybluey = pData->iGlobalPrimarybluey;
- }
- /* inform the app */
- if (!pData->fProcesschroma ((mng_handle)pData, iWhitepointx, iWhitepointy,
- iPrimaryredx, iPrimaryredy,
- iPrimarygreenx, iPrimarygreeny,
- iPrimarybluex, iPrimarybluey))
- MNG_ERROR (pData, MNG_APPCMSERROR);
- /* load color-correction routine */
- pData->fCorrectrow = (mng_fptr)mng_correct_app_cms;
- bDone = MNG_TRUE;
- }
-#endif
-
- if ( (pData->fProcessgamma) &&
- (((pBuf) && (pBuf->bHasGAMA)) || ((bGlobal) && (pData->bHasglobalGAMA))) )
- {
- mng_uint32 iGamma;
-
- if ((pBuf) && (pBuf->bHasGAMA)) /* get the gamma value */
- iGamma = pBuf->iGamma;
- else
- iGamma = pData->iGlobalGamma;
- /* inform the app */
- if (!pData->fProcessgamma ((mng_handle)pData, iGamma))
- { /* app wants us to use internal routines ! */
- iRetcode = mng_init_gamma_only (pData, bGlobal, bObject, bRetrobj);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- else
- { /* load color-correction routine */
- pData->fCorrectrow = (mng_fptr)mng_correct_app_cms;
- }
-
- bDone = MNG_TRUE;
- }
-
- if (!bDone) /* no color-info at all ? */
- {
- /* then use default image gamma ! */
- if (!pData->fProcessgamma ((mng_handle)pData,
- (mng_uint32)((pData->dDfltimggamma * 100000) + 0.5)))
- { /* app wants us to use internal routines ! */
- iRetcode = mng_init_gamma_only (pData, bGlobal, bObject, bRetrobj);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- else
- { /* load color-correction routine */
- pData->fCorrectrow = (mng_fptr)mng_correct_app_cms;
- }
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_APP_CMS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#ifdef MNG_APP_CMS
-mng_retcode mng_correct_app_cms (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CORRECT_APP_CMS, MNG_LC_START);
-#endif
-
- if (pData->fProcessarow) /* let the app do something with our row */
- if (!pData->fProcessarow ((mng_handle)pData, pData->iRowsamples,
- pData->bIsRGBA16, pData->pRGBArow))
- MNG_ERROR (pData, MNG_APPCMSERROR);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CORRECT_APP_CMS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_DISPLAY_PROCS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
-
-
diff --git a/src/3rdparty/libmng/libmng_cms.h b/src/3rdparty/libmng/libmng_cms.h
deleted file mode 100644
index 4459f805f8..0000000000
--- a/src/3rdparty/libmng/libmng_cms.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_cms.h copyright (c) 2000-2003 G.Juyn * */
-/* * version : 1.0.6 * */
-/* * * */
-/* * purpose : color management routines (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of color management routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - added creatememprofile * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 1.0.1 - 04/25/2001 - G.Juyn * */
-/* * - moved mng_clear_cms to libmng_cms * */
-/* * 1.0.1 - 05/02/2001 - G.Juyn * */
-/* * - added "default" sRGB generation (Thanks Marti!) * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/19/2002 - G.Juyn * */
-/* * - optimized color-correction routines * */
-/* * * */
-/* * 1.0.6 - 04/11/2003 - G.Juyn * */
-/* * - B719420 - fixed several MNG_APP_CMS problems * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_cms_h_
-#define _libmng_cms_h_
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_LCMS
-void mnglcms_initlibrary (void);
-mng_cmsprof mnglcms_createfileprofile (mng_pchar zFilename);
-mng_cmsprof mnglcms_creatememprofile (mng_uint32 iProfilesize,
- mng_ptr pProfile );
-mng_cmsprof mnglcms_createsrgbprofile (void);
-void mnglcms_freeprofile (mng_cmsprof hProf );
-void mnglcms_freetransform (mng_cmstrans hTrans );
-
-mng_retcode mng_clear_cms (mng_datap pData );
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_FULL_CMS
-mng_retcode mng_init_full_cms (mng_datap pData,
- mng_bool bGlobal,
- mng_bool bObject,
- mng_bool bRetrobj);
-mng_retcode mng_correct_full_cms (mng_datap pData);
-#endif
-
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-mng_retcode mng_init_gamma_only (mng_datap pData,
- mng_bool bGlobal,
- mng_bool bObject,
- mng_bool bRetrobj);
-mng_retcode mng_correct_gamma_only (mng_datap pData);
-#endif
-
-#ifdef MNG_APP_CMS
-mng_retcode mng_init_app_cms (mng_datap pData,
- mng_bool bGlobal,
- mng_bool bObject,
- mng_bool bRetrobj);
-mng_retcode mng_correct_app_cms (mng_datap pData);
-#endif
-
-/* ************************************************************************** */
-
-#endif /* _libmng_cms_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_conf.h b/src/3rdparty/libmng/libmng_conf.h
deleted file mode 100644
index 8441ee0874..0000000000
--- a/src/3rdparty/libmng/libmng_conf.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_conf.h copyright (c) G.Juyn 2000-2004 * */
-/* * version : 1.0.9 * */
-/* * * */
-/* * purpose : main configuration file * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : The configuration file. Change this to include/exclude * */
-/* * the options you want or do not want in libmng. * */
-/* * * */
-/* * changes : 0.5.2 - 06/02/2000 - G.Juyn * */
-/* * - separated configuration-options into this file * */
-/* * - changed to most likely configuration (?) * */
-/* * 0.5.2 - 06/03/2000 - G.Juyn * */
-/* * - changed options to create a standard so-library * */
-/* * with everything enabled * */
-/* * 0.5.2 - 06/04/2000 - G.Juyn * */
-/* * - changed options to create a standard win32-dll * */
-/* * with everything enabled * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/12/2000 - G.Juyn * */
-/* * - added workaround for faulty PhotoShop iCCP chunk * */
-/* * 0.9.3 - 09/16/2000 - G.Juyn * */
-/* * - removed trace-options from default SO/DLL builds * */
-/* * * */
-/* * 1.0.4 - 06/22/2002 - G.Juyn * */
-/* * - B526138 - returned IJGSRC6B calling convention to * */
-/* * default for MSVC * */
-/* * * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * - added 'supports' call to check function availability * */
-/* * * */
-/* * 1.0.6 - 06/22/2002 - G.R-P * */
-/* * - added MNG_NO_INCLUDE_JNG conditional * */
-/* * - added MNG_SKIPCHUNK_evNT conditional * */
-/* * 1.0.6 - 07/14/2002 - G.R-P * */
-/* * - added MNG_NO_SUPPORT_FUNCQUERY conditional * */
-/* * * */
-/* * 1.0.7 - 03/07/2004 - G.R-P * */
-/* * - added MNG_VERSION_QUERY_SUPPORT_ conditional * */
-/* * * */
-/* * 1.0.9 - 05/12/2004 - G.Juyn * */
-/* * - clearified MNG_BIGENDIAN_SUPPORTED conditional * */
-/* * - added MNG_LITTLEENDIAN_SUPPORTED conditional * */
-/* * * */
-/* ************************************************************************** */
-
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_conf_h_
-#define _libmng_conf_h_
-
-#ifdef MNG_MOZILLA_CFG
-#include "special\mozcfg\mozlibmngconf.h"
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * User-selectable compile-time options * */
-/* * * */
-/* ************************************************************************** */
-
-/* enable exactly one(1) of the MNG-(sub)set selectors */
-/* use this to select which (sub)set of the MNG specification you wish
- to support */
-/* generally you'll want full support as the library provides it automatically
- for you! if you're really strung on memory-requirements you can opt
- to enable less support (but it's just NOT a good idea!) */
-/* NOTE that this isn't actually implemented yet */
-
-#if !defined(MNG_SUPPORT_FULL) && !defined(MNG_SUPPORT_LC) && !defined(MNG_SUPPORT_VLC)
-#define MNG_SUPPORT_FULL
-/* #define MNG_SUPPORT_LC */
-/* #define MNG_SUPPORT_VLC */
-#endif
-
-/* ************************************************************************** */
-
-/* enable JPEG support if required */
-/* use this to enable the JNG support routines */
-/* this requires an external jpeg package;
- currently only IJG's jpgsrc6b is supported! */
-/* NOTE that the IJG code can be either 8- or 12-bit (eg. not both);
- so choose the one you've defined in jconfig.h; if you don't know what
- the heck I'm talking about, just leave it at 8-bit support (thank you!) */
-
-#ifndef MNG_NO_INCLUDE_JNG
-#ifdef MNG_SUPPORT_FULL /* full support includes JNG */
-#define MNG_SUPPORT_IJG6B
-#endif
-
-#ifndef MNG_SUPPORT_IJG6B
-#if defined(MNG_BUILD_SO) || defined(MNG_USE_SO) || defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#define MNG_SUPPORT_IJG6B
-#endif
-#endif
-
-#if defined(MNG_SUPPORT_IJG6B) && !defined(MNG_SUPPORT_JPEG8) && !defined(MNG_SUPPORT_JPEG12)
-#define MNG_SUPPORT_JPEG8
-/* #define MNG_SUPPORT_JPEG12 */
-#endif
-
-/* The following is required to export the IJG routines from the DLL in
- the Windows-standard calling convention;
- currently this only works for Borland C++ !!! */
-
-#if defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#if defined(MNG_SUPPORT_IJG6B) && defined(__BORLANDC__)
-#define MNG_DEFINE_JPEG_STDCALL
-#endif
-#endif
-#endif
-
-/* ************************************************************************** */
-
-/* enable required high-level functions */
-/* use this to select the high-level functions you require */
-/* if you only need to display a MNG, disable write support! */
-/* if you only need to examine a MNG, disable write & display support! */
-/* if you only need to copy a MNG, disable display support! */
-/* if you only need to create a MNG, disable read & display support! */
-/* NOTE that turning all options off will be very unuseful! */
-
-#if !defined(MNG_SUPPORT_READ) && !defined(MNG_SUPPORT_WRITE) && !defined(MNG_SUPPORT_DISPLAY)
-#define MNG_SUPPORT_READ
-#if defined(MNG_BUILD_SO) || defined(MNG_USE_SO) || defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#define MNG_SUPPORT_WRITE
-#endif
-#define MNG_SUPPORT_DISPLAY
-#endif
-
-/* ************************************************************************** */
-
-/* enable chunk access functions */
-/* use this to select whether you need access to the individual chunks */
-/* useful if you want to examine a read MNG (you'll also need MNG_STORE_CHUNKS !)*/
-/* required if you need to create & write a new MNG! */
-
-#ifndef MNG_ACCESS_CHUNKS
-#if defined(MNG_BUILD_SO) || defined(MNG_USE_SO) || defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#define MNG_ACCESS_CHUNKS
-#endif
-#endif
-
-/* ************************************************************************** */
-
-/* enable exactly one(1) of the color-management functionality selectors */
-/* use this to select the level of automatic color support */
-/* MNG_FULL_CMS requires the lcms (little cms) external package ! */
-/* if you want your own app (or the OS) to handle color-management
- select MNG_APP_CMS */
-
-#define MNG_GAMMA_ONLY
-/* #define MNG_FULL_CMS */
-/* #define MNG_APP_CMS */
-
-/* ************************************************************************** */
-
-/* enable automatic dithering */
-/* use this if you need dithering support to convert high-resolution
- images to a low-resolution output-device */
-/* NOTE that this is not supported yet */
-
-/* #define MNG_AUTO_DITHER */
-
-/* ************************************************************************** */
-
-/* enable whether chunks should be stored for reference later */
-/* use this if you need to examine the chunks of a MNG you have read,
- or (re-)write a MNG you have read */
-/* turn this off if you want to reduce memory-consumption */
-
-#ifndef MNG_STORE_CHUNKS
-#if defined(MNG_BUILD_SO) || defined(MNG_USE_SO) || defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#define MNG_STORE_CHUNKS
-#endif
-#endif
-
-/* ************************************************************************** */
-
-/* enable internal memory management (if your compiler supports it) */
-/* use this if your compiler supports the 'standard' memory functions
- (calloc & free), and you want the library to use these functions and not
- bother your app with memory-callbacks */
-
-/* #define MNG_INTERNAL_MEMMNGMT */
-
-/* ************************************************************************** */
-
-/* enable internal tracing-functionality (manual debugging purposes) */
-/* use this if you have trouble location bugs or problems */
-/* NOTE that you'll need to specify the trace callback function! */
-
-/* #define MNG_SUPPORT_TRACE */
-
-/* ************************************************************************** */
-
-/* enable extended error- and trace-telltaling */
-/* use this if you need explanatory messages with errors and/or tracing */
-
-#if !defined(MNG_ERROR_TELLTALE) && !defined(MNG_TRACE_TELLTALE)
-#if defined(MNG_BUILD_SO) || defined(MNG_USE_SO) || defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#define MNG_ERROR_TELLTALE
-#define MNG_TRACE_TELLTALE
-#endif
-#endif
-
-/* ************************************************************************** */
-
-/* enable BIG/LITTLE endian optimizations */
-/* enable BIG if you're on an architecture that supports big-endian reads
- and writes that aren't word-aligned */
-/* according to reliable sources this only works for PowerPC (bigendian mode)
- and 680x0 */
-/* enable LITTLE if you're on an architecture that supports little-endian */
-/* when in doubt leave both off !!! */
-
-/* #define MNG_BIGENDIAN_SUPPORTED */
-/* #define MNG_LITTLEENDIAN_SUPPORTED */
-
-/* ************************************************************************** */
-/* enable 'version' functions */
-#if !defined(MNG_VERSION_QUERY_SUPPORT) && \
- !defined(MNG_NO_VERSION_QUERY_SUPPORT)
-#define MNG_VERSION_QUERY_SUPPORT
-#endif
-
-/* enable 'supports' function */
-/* use this if you need to query the availability of functions at runtime;
- useful for apps that dynamically load the library and that need specific
- functions */
-
-#if !defined(MNG_NO_SUPPORT_FUNCQUERY) && !defined(MNG_SUPPORT_FUNCQUERY)
-#if defined(MNG_BUILD_SO) || defined(MNG_USE_SO) || \
- defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#define MNG_SUPPORT_FUNCQUERY
-#endif
-#endif
-
-/* ************************************************************************** */
-
-/* enable dynamic MNG features */
-/* use this if you would like to have dynamic support for specifically
- designed MNGs; eg. this is useful for 'rollover' effects such as common
- on the world wide web */
-
-#ifndef MNG_SUPPORT_DYNAMICMNG
-#if defined(MNG_BUILD_SO) || defined(MNG_USE_SO) || defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#define MNG_SUPPORT_DYNAMICMNG
-#endif
-#endif
-#ifndef MNG_SUPPORT_DYNAMICMNG
-#ifndef MNG_SKIPCHUNK_evNT
-#define MNG_SKIPCHUNK_evNT
-#endif
-#endif
-
-#ifdef MNG_INCLUDE_JNG
-#ifndef MNG_NO_ACCESS_JPEG
-#ifndef MNG_ACCESS_JPEG
-#define MNG_ACCESS_JPEG
-#endif
-#endif
-#endif
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifndef MNG_NO_ACCESS_ZLIB
-#ifndef MNG_ACCESS_ZLIB
-#define MNG_ACCESS_ZLIB
-#endif
-#endif
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * End of user-selectable compile-time options * */
-/* * * */
-/* ************************************************************************** */
-
-#endif /* _libmng_conf_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_data.h b/src/3rdparty/libmng/libmng_data.h
deleted file mode 100644
index 6a007632d5..0000000000
--- a/src/3rdparty/libmng/libmng_data.h
+++ /dev/null
@@ -1,1032 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_data.h copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : main data structure definition * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the library main data structure * */
-/* * * */
-/* * changes : 0.5.1 - 05/04/2000 - G.Juyn * */
-/* * - added CRC table to main structure (for thread-safety) * */
-/* * 0.5.1 - 05/06/2000 - G.Juyn * */
-/* * - added iPLTEentries for checking hIST-length * */
-/* * 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed palette definition to exported palette-type * */
-/* * - removed frozen indicator * */
-/* * - added create/write indicators * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/13/2000 - G.Juyn * */
-/* * - added eMNGma hack (will be removed in 1.0.0 !!!) * */
-/* * - added TERM animation object pointer (easier reference) * */
-/* * - added saved-data structure for SAVE/SEEK processing * */
-/* * * */
-/* * 0.5.2 - 05/18/2000 - G.Juyn * */
-/* * - added fields for JNG support (IJG-based) * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - changed global tRNS definition * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - added delta-image fields * */
-/* * 0.5.2 - 06/01/2000 - G.Juyn * */
-/* * - added internal delta-image processing callbacks * */
-/* * 0.5.2 - 06/02/2000 - G.Juyn * */
-/* * - changed SWAP_ENDIAN to BIGENDIAN_SUPPORTED * */
-/* * (contributed by Tim Rowley) * */
-/* * - added getalphaline callback for RGB8_A8 canvasstyle * */
-/* * 0.5.2 - 06/06/2000 - G.Juyn * */
-/* * - added parameter for delayed buffer-processing * */
-/* * * */
-/* * 0.5.3 - 06/16/2000 - G.Juyn * */
-/* * - added update-region parms for refresh calback * */
-/* * - added Needrefresh parameter * */
-/* * 0.5.3 - 06/17/2000 - G.Juyn * */
-/* * - added Deltaimmediate parm for faster delta-processing * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - added Speed parameter to facilitate testing * */
-/* * - added Imagelevel parameter for processtext callback * */
-/* * 0.5.3 - 06/26/2000 - G.Juyn * */
-/* * - changed userdata variable to mng_ptr * */
-/* * * */
-/* * 0.9.1 - 07/07/2000 - G.Juyn * */
-/* * - added variables for go_xxxx processing * */
-/* * 0.9.1 - 07/08/2000 - G.Juyn * */
-/* * - added variables for improved timing support * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - added callbacks for SAVE/SEEK processing * */
-/* * - added variable for NEEDSECTIONWAIT breaks * */
-/* * - added variable for freeze & reset processing * */
-/* * 0.9.1 - 07/17/2000 - G.Juyn * */
-/* * - fixed suspension-buffering for 32K+ chunks * */
-/* * * */
-/* * 0.9.2 - 07/29/2000 - G.Juyn * */
-/* * - removed Nextbackxxx fields (no longer used) * */
-/* * 0.9.2 - 07/31/2000 - G.Juyn * */
-/* * - fixed wrapping of suspension parameters * */
-/* * 0.9.2 - 08/04/2000 - G.Juyn * */
-/* * - B111096 - fixed large-buffer read-suspension * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * 0.9.3 - 09/10/2000 - G.Juyn * */
-/* * - fixed DEFI behavior * */
-/* * 0.9.3 - 10/10/2000 - G.Juyn * */
-/* * - added support for alpha-depth prediction * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - added support for nEED * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added optional support for bKGD for PNG images * */
-/* * - added support for JDAA * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - added callback to process non-critical unknown chunks * */
-/* * - fixed support for bKGD * */
-/* * 0.9.3 - 10/19/2000 - G.Juyn * */
-/* * - implemented delayed delta-processing * */
-/* * 0.9.4 - 12/16/2000 - G.Juyn * */
-/* * - fixed mixup of data- & function-pointers (thanks Dimitri)* */
-/* * * */
-/* * 1.0.1 - 02/08/2001 - G.Juyn * */
-/* * - added MEND processing callback * */
-/* * 1.0.1 - 02/13/2001 - G.Juyn * */
-/* * - fixed first FRAM_MODE=4 timing problem * */
-/* * * */
-/* * 1.0.2 - 06/23/2001 - G.Juyn * */
-/* * - added optimization option for MNG-video playback * */
-/* * - added processterm callback * */
-/* * 1.0.2 - 06/25/2001 - G.Juyn * */
-/* * - added option to turn off progressive refresh * */
-/* * * */
-/* * 1.0.5 - 07/08/2002 - G.Juyn * */
-/* * - B578572 - removed eMNGma hack (thanks Dimitri!) * */
-/* * 1.0.5 - 07/16/2002 - G.Juyn * */
-/* * - B581625 - large chunks fail with suspension reads * */
-/* * 1.0.5 - 08/15/2002 - G.Juyn * */
-/* * - completed PROM support * */
-/* * 1.0.5 - 09/15/2002 - G.Juyn * */
-/* * - fixed LOOP iteration=0 special case * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - finished support for BACK image & tiling * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - added another fix for misplaced TERM chunk * */
-/* * - completed support for condition=2 in TERM chunk * */
-/* * 1.0.5 - 10/20/2002 - G.Juyn * */
-/* * - fixed processing for multiple objects in MAGN * */
-/* * - fixed display of visible target of PAST operation * */
-/* * 1.0.5 - 11/07/2002 - G.Juyn * */
-/* * - added support to get totals after mng_read() * */
-/* * 1.0.5 - 24/02/2003 - G.Juyn * */
-/* * - B683152 - libjpeg suspension not always honored correctly* */
-/* * * */
-/* * 1.0.6 - 04/11/2003 - G.Juyn * */
-/* * - B719420 - fixed several MNG_APP_CMS problems * */
-/* * 1.0.6 - 07/05/2003 - G. R-P * */
-/* * - optionally use zlib's crc32() function * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added SKIPCHUNK conditionals around PAST chunk support * */
-/* * 1.0.6 - 08/17/2003 - G.R-P * */
-/* * - added iPNGdepth member to pData structure * */
-/* * * */
-/* * 1.0.7 - 03/10/2004 - G.R-P * */
-/* * - added conditionals around openstream/closestream * */
-/* * 1.0.7 - 03/24/2004 - G.R-P * */
-/* * - added more SKIPCHUNK conditionals * */
-/* * * */
-/* * 1.0.8 - 04/02/2004 - G.Juyn * */
-/* * - added CRC existence & checking flags * */
-/* * 1.0.8 - 04/10/2004 - G.Juyn * */
-/* * - added data-push mechanisms for specialized decoders * */
-/* * * */
-/* * 1.0.9 - 12/11/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_DISPLAYCALLS * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_data_h_
-#define _libmng_data_h_
-
-/* ************************************************************************** */
-
-#define MNG_MAGIC 0x52530a0aL
-
-/* ************************************************************************** */
-/* * * */
-/* * Internal structures * */
-/* * * */
-/* ************************************************************************** */
-
-typedef mng_palette8 mng_rgbpaltab;
-
-/* ************************************************************************** */
-/* * * */
-/* * The saved_data structure * */
-/* * * */
-/* * This contains the saved data after a SAVE chunk has been processed. * */
-/* * The data is saved from the main data structure during SAVE processing, * */
-/* * and restored to the main data structure during SEEK processing. * */
-/* * * */
-/* ************************************************************************** */
-
-typedef struct mng_savedata_struct {
-
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
- mng_bool bHasglobalPLTE; /* global PLTE chunk processed */
- mng_bool bHasglobalTRNS; /* global tRNS chunk processed */
- mng_bool bHasglobalGAMA; /* global gAMA chunk processed */
- mng_bool bHasglobalCHRM; /* global cHRM chunk processed */
- mng_bool bHasglobalSRGB; /* global sRGB chunk processed */
- mng_bool bHasglobalICCP; /* global iCCP chunk processed */
- mng_bool bHasglobalBKGD; /* global bKGD chunk processed */
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-#ifdef MNG_SUPPORT_DISPLAY
- mng_uint16 iBACKred; /* BACK fields */
- mng_uint16 iBACKgreen;
- mng_uint16 iBACKblue;
- mng_uint8 iBACKmandatory;
- mng_uint16 iBACKimageid;
- mng_uint8 iBACKtile;
-
- mng_uint8 iFRAMmode; /* FRAM fields (global) */
- mng_uint32 iFRAMdelay;
- mng_uint32 iFRAMtimeout;
- mng_bool bFRAMclipping;
- mng_int32 iFRAMclipl;
- mng_int32 iFRAMclipr;
- mng_int32 iFRAMclipt;
- mng_int32 iFRAMclipb;
-
- mng_uint32 iGlobalPLTEcount; /* global PLTE fields */
- mng_rgbpaltab aGlobalPLTEentries;
-
- mng_uint32 iGlobalTRNSrawlen; /* global tRNS fields */
- mng_uint8arr aGlobalTRNSrawdata;
-
- mng_uint32 iGlobalGamma; /* global gAMA fields */
-
-#ifndef MNG_SKIPCHUNK_cHRM
- mng_uint32 iGlobalWhitepointx; /* global cHRM fields */
- mng_uint32 iGlobalWhitepointy;
- mng_uint32 iGlobalPrimaryredx;
- mng_uint32 iGlobalPrimaryredy;
- mng_uint32 iGlobalPrimarygreenx;
- mng_uint32 iGlobalPrimarygreeny;
- mng_uint32 iGlobalPrimarybluex;
- mng_uint32 iGlobalPrimarybluey;
-#endif
-
- mng_uint8 iGlobalRendintent; /* global sRGB fields */
-
- mng_uint32 iGlobalProfilesize; /* global iCCP fields */
- mng_ptr pGlobalProfile;
-
- mng_uint16 iGlobalBKGDred; /* global bKGD fields */
- mng_uint16 iGlobalBKGDgreen;
- mng_uint16 iGlobalBKGDblue;
-#endif /* MNG_SUPPORT_DISPLAY */
-
- } mng_savedata;
-
-typedef mng_savedata * mng_savedatap;
-
-/* ************************************************************************** */
-/* * * */
-/* * Internal buffer structure for data push mechanisms * */
-/* * * */
-/* ************************************************************************** */
-
-typedef struct {
- mng_ptr pNext; /* for linked list */
- mng_ptr pData; /* used for chunks & data */
- mng_uint32 iLength;
- mng_bool bOwned;
- mng_uint8p pDatanext; /* only used for data */
- mng_uint32 iRemaining;
- } mng_pushdata;
-typedef mng_pushdata * mng_pushdatap;
-
-/* ************************************************************************** */
-/* * * */
-/* * The main libmng data structure * */
-/* * * */
-/* * The handle used in all functions points to this structure which * */
-/* * contains all volatile data necessary to process the network graphic. * */
-/* * * */
-/* ************************************************************************** */
-
-typedef struct mng_data_struct {
-
- mng_uint32 iMagic; /* magic number to validate
- a given handle */
- mng_ptr pUserdata; /* application workdata */
-
- mng_imgtype eSigtype; /* image information */
- mng_imgtype eImagetype; /* initially zeroed */
- mng_uint32 iWidth; /* filled after header is processed */
- mng_uint32 iHeight;
- mng_uint32 iTicks; /* these only after MHDR */
- mng_uint32 iLayercount;
- mng_uint32 iFramecount;
- mng_uint32 iPlaytime;
- mng_uint32 iSimplicity;
- mng_uint8 iAlphadepth; /* indicates expected alpha-depth */
-
- mng_uint32 iImagelevel; /* level of image inside a stream */
-
- mng_uint32 iCanvasstyle; /* layout of the drawing-canvas */
- mng_uint32 iBkgdstyle; /* layout of the background-canvas */
-
- mng_int8 iMagnify; /* magnification factor (not used yet) */
- mng_uint32 iOffsetx; /* x-offset for extremely large image */
- mng_uint32 iOffsety; /* y-offset for extremely large image */
- mng_uint32 iCanvaswidth; /* real canvas size */
- mng_uint32 iCanvasheight; /* must be set by processheader callback */
-
- mng_uint16 iBGred; /* default background color */
- mng_uint16 iBGgreen; /* initially "black" */
- mng_uint16 iBGblue;
- mng_bool bUseBKGD; /* preferred use of bKGD for PNG */
-
- mng_bool bIssRGB; /* indicates sRGB system */
-
-#ifdef MNG_FULL_CMS /* little CMS variables */
- mng_cmsprof hProf1; /* image input profile */
- mng_cmsprof hProf2; /* default output profile */
- mng_cmsprof hProf3; /* default sRGB profile */
- mng_cmstrans hTrans; /* current transformation handle */
-#endif
-
- mng_float dViewgamma; /* gamma calculation variables */
- mng_float dDisplaygamma; /* initially set for sRGB conditions */
- mng_float dDfltimggamma;
-
- mng_bool bStorechunks; /* switch for storing chunkdata */
- mng_bool bSectionbreaks; /* indicate NEEDSECTIONWAIT breaks */
- mng_bool bCacheplayback; /* switch to cache playback info */
- mng_bool bDoProgressive; /* progressive refresh for large images */
- mng_uint32 iCrcmode; /* CRC existence & checking flags */
-
- mng_speedtype iSpeed; /* speed-modifier for animations */
-
- mng_uint32 iMaxwidth; /* maximum canvas size */
- mng_uint32 iMaxheight; /* initially set to 1024 x 1024 */
-
- mng_int32 iErrorcode; /* error reporting fields */
- mng_int8 iSeverity;
- mng_int32 iErrorx1;
- mng_int32 iErrorx2;
- mng_pchar zErrortext;
-
- mng_memalloc fMemalloc; /* callback pointers */
- mng_memfree fMemfree; /* initially nulled */
- mng_releasedata fReleasedata;
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- mng_openstream fOpenstream;
- mng_closestream fClosestream;
-#endif
- mng_readdata fReaddata;
- mng_writedata fWritedata;
- mng_errorproc fErrorproc;
- mng_traceproc fTraceproc;
- mng_processheader fProcessheader;
- mng_processtext fProcesstext;
- mng_processsave fProcesssave;
- mng_processseek fProcessseek;
- mng_processneed fProcessneed;
- mng_processmend fProcessmend;
- mng_processunknown fProcessunknown;
- mng_processterm fProcessterm;
- mng_getcanvasline fGetcanvasline;
- mng_getbkgdline fGetbkgdline;
- mng_getalphaline fGetalphaline;
- mng_refresh fRefresh;
- mng_gettickcount fGettickcount;
- mng_settimer fSettimer;
- mng_processgamma fProcessgamma;
- mng_processchroma fProcesschroma;
- mng_processsrgb fProcesssrgb;
- mng_processiccp fProcessiccp;
- mng_processarow fProcessarow;
-
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
-#ifndef MNG_NO_OLD_VERSIONS
- mng_bool bPreDraft48; /* flags ancient style draft */
-#endif
-
- mng_chunkid iChunkname; /* read/write-state variables */
- mng_uint32 iChunkseq;
- mng_chunkp pFirstchunk; /* double-linked list of */
- mng_chunkp pLastchunk; /* stored chunk-structures */
-
- mng_bool bHasheader; /* first header chunk processed */
- mng_bool bHasMHDR; /* inside a MHDR-MEND sequence */
- mng_bool bHasIHDR; /* inside a IHDR-IEND sequence */
- mng_bool bHasBASI; /* inside a BASI-IEND sequence */
- mng_bool bHasDHDR; /* inside a DHDR-IEND sequence */
-#ifdef MNG_INCLUDE_JNG
- mng_bool bHasJHDR; /* inside a JHDR-IEND sequence */
- mng_bool bHasJSEP; /* passed the JSEP separator */
- mng_bool bHasJDAA; /* at least 1 JDAA processed */
- mng_bool bHasJDAT; /* at least 1 JDAT processed */
-#endif
- mng_bool bHasPLTE; /* PLTE chunk processed */
- mng_bool bHasTRNS; /* tRNS chunk processed */
- mng_bool bHasGAMA; /* gAMA chunk processed */
- mng_bool bHasCHRM; /* cHRM chunk processed */
- mng_bool bHasSRGB; /* sRGB chunk processed */
- mng_bool bHasICCP; /* iCCP chunk processed */
- mng_bool bHasBKGD; /* bKGD chunk processed */
- mng_bool bHasIDAT; /* at least 1 IDAT processed */
-
- mng_bool bHasSAVE; /* SAVE chunk processed */
- mng_bool bHasBACK; /* BACK chunk processed */
- mng_bool bHasFRAM; /* FRAM chunk processed */
- mng_bool bHasTERM; /* TERM chunk processed */
- mng_bool bHasLOOP; /* at least 1 LOOP open */
-
- mng_bool bHasglobalPLTE; /* global PLTE chunk processed */
- mng_bool bHasglobalTRNS; /* global tRNS chunk processed */
- mng_bool bHasglobalGAMA; /* global gAMA chunk processed */
- mng_bool bHasglobalCHRM; /* global cHRM chunk processed */
- mng_bool bHasglobalSRGB; /* global sRGB chunk processed */
- mng_bool bHasglobalICCP; /* global iCCP chunk processed */
- mng_bool bHasglobalBKGD; /* global bKGD chunk processed */
-
- mng_uint32 iDatawidth; /* IHDR/BASI/DHDR fields */
- mng_uint32 iDataheight; /* valid if inside IHDR-IEND, */
- mng_uint8 iBitdepth; /* BASI-IEND or DHDR-IEND */
- mng_uint8 iColortype;
- mng_uint8 iCompression;
- mng_uint8 iFilter;
- mng_uint8 iInterlace;
-
- mng_uint32 iPLTEcount; /* PLTE fields */
-
-#ifdef MNG_INCLUDE_JNG
- mng_uint8 iJHDRcolortype; /* JHDR fields */
- mng_uint8 iJHDRimgbitdepth; /* valid if inside JHDR-IEND */
- mng_uint8 iJHDRimgcompression;
- mng_uint8 iJHDRimginterlace;
- mng_uint8 iJHDRalphabitdepth;
- mng_uint8 iJHDRalphacompression;
- mng_uint8 iJHDRalphafilter;
- mng_uint8 iJHDRalphainterlace;
-#endif
-
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-#ifdef MNG_SUPPORT_READ
- mng_bool bReading; /* read processing variables */
- mng_bool bHavesig;
- mng_bool bEOF;
- mng_uint32 iReadbufsize;
- mng_uint8p pReadbuf;
-
- mng_uint32 iLargebufsize; /* temp for very large chunks */
- mng_uint8p pLargebuf;
-
- mng_uint32 iSuspendtime; /* tickcount at last suspension */
- mng_bool bSuspended; /* input-reading has been suspended;
- we're expecting a call to
- mng_read_resume! */
- mng_uint8 iSuspendpoint; /* indicates at which point the flow
- was broken to suspend input-reading */
-
- mng_bool bSuspensionmode; /* I/O-suspension variables */
- mng_uint32 iSuspendbufsize;
- mng_uint8p pSuspendbuf;
- mng_uint8p pSuspendbufnext;
- mng_uint32 iSuspendbufleft;
- mng_uint32 iChunklen; /* chunk length */
- mng_uint8p pReadbufnext; /* 32K+ suspension-processing */
- mng_uint8p pLargebufnext;
-
- mng_pushdatap pFirstpushchunk; /* variables for push mechanisms */
- mng_pushdatap pLastpushchunk;
- mng_pushdatap pFirstpushdata;
- mng_pushdatap pLastpushdata;
-#endif /* MNG_SUPPORT_READ */
-
-#ifdef MNG_SUPPORT_WRITE
- mng_bool bCreating; /* create/write processing variables */
- mng_bool bWriting;
- mng_chunkid iFirstchunkadded;
- mng_uint32 iWritebufsize;
- mng_uint8p pWritebuf;
-#endif
-
-#ifdef MNG_SUPPORT_DISPLAY
- mng_bool bDisplaying; /* display-state variables */
- mng_bool bFramedone;
- mng_uint32 iFrameseq;
- mng_uint32 iLayerseq;
- mng_uint32 iFrametime; /* millisecs */
-
- mng_uint32 iTotalframes; /* end-totals after mng_read() */
- mng_uint32 iTotallayers;
- mng_uint32 iTotalplaytime; /* millisecs */
-
- mng_bool bSkipping; /* LOOP iteration=0 */
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
- mng_bool bDynamic; /* MNG is dynamic (eg. has events) */
- mng_bool bRunningevent; /* currently processing an event */
- mng_bool bStopafterseek; /* stop after next SEEK */
- mng_int32 iEventx; /* X/Y of current event */
- mng_int32 iEventy;
- mng_objectp pLastmousemove; /* last event triggered */
-#endif
-
- mng_uint32 iRequestframe; /* go_xxxx variables */
- mng_uint32 iRequestlayer;
- mng_uint32 iRequesttime;
- mng_bool bSearching;
-
- mng_bool bRestorebkgd; /* flags restore required before IDAT/JDAT */
-
- mng_uint32 iRuntime; /* millisecs since start */
- mng_uint32 iSynctime; /* tickcount at last framesync */
- mng_uint32 iStarttime; /* tickcount at start */
- mng_uint32 iEndtime; /* tickcount at end */
- mng_bool bRunning; /* animation is active */
- mng_bool bTimerset; /* the timer has been set;
- we're expecting a call to
- mng_display_resume! */
- mng_uint8 iBreakpoint; /* indicates at which point the
- flow was broken to run the timer */
- mng_bool bSectionwait; /* indicates a section break */
- mng_bool bFreezing; /* indicates app requested a freeze */
- mng_bool bResetting; /* indicates app requested a reset */
- mng_bool bNeedrefresh; /* indicates screen-refresh is needed */
- mng_bool bMisplacedTERM; /* indicates TERM is out of place */
- mng_bool bOnlyfirstframe; /* show first frame after TERM and stop */
- mng_uint32 iFramesafterTERM; /* determines frame-count after TERM */
- mng_objectp pCurrentobj; /* current "object" */
- mng_objectp pCurraniobj; /* current animation object
- "to be"/"being" processed */
- mng_objectp pTermaniobj; /* TERM animation object */
- mng_uint32 iIterations; /* TERM/MEND iteration count */
- mng_objectp pObjzero; /* "on-the-fly" image (object = 0) */
- mng_objectp pLastclone; /* last clone */
- mng_objectp pStoreobj; /* current store object for row routines */
- mng_objectp pStorebuf; /* current store object-buffer for row routines */
- mng_objectp pRetrieveobj; /* current retrieve object for row routines */
- mng_savedatap pSavedata; /* pointer to saved data (after SAVE) */
-
- mng_uint32 iUpdateleft; /* update region for refresh */
- mng_uint32 iUpdateright;
- mng_uint32 iUpdatetop;
- mng_uint32 iUpdatebottom;
-
- mng_int8 iPass; /* current interlacing pass;
- negative value means no interlace */
- mng_int32 iRow; /* current row counter */
- mng_int32 iRowinc; /* row increment for this pass */
- mng_int32 iCol; /* current starting column */
- mng_int32 iColinc; /* column increment for this pass */
- mng_int32 iRowsamples; /* nr. of samples in current workrow */
- mng_int32 iSamplemul; /* needed to calculate rowsize */
- mng_int32 iSampleofs; /* from rowsamples */
- mng_int32 iSamplediv;
- mng_int32 iRowsize; /* size of actual data in work row */
- mng_int32 iRowmax; /* maximum size of data in work row */
- mng_int32 iFilterofs; /* offset to filter-byte in work row */
- mng_int32 iPixelofs; /* offset to pixel-bytes in work row */
- mng_uint32 iLevel0; /* leveling variables */
- mng_uint32 iLevel1;
- mng_uint32 iLevel2;
- mng_uint32 iLevel3;
- mng_uint8p pWorkrow; /* working row of pixel-data */
- mng_uint8p pPrevrow; /* previous row of pixel-data */
- mng_uint8p pRGBArow; /* intermediate row of RGBA8 or RGBA16 data */
- mng_bool bIsRGBA16; /* indicates intermediate row is RGBA16 */
- mng_bool bIsOpaque; /* indicates intermediate row is fully opaque */
- mng_int32 iFilterbpp; /* bpp index for filtering routines */
-
- mng_int32 iSourcel; /* variables for showing objects */
- mng_int32 iSourcer;
- mng_int32 iSourcet;
- mng_int32 iSourceb;
- mng_int32 iDestl;
- mng_int32 iDestr;
- mng_int32 iDestt;
- mng_int32 iDestb;
-
- mng_objectp pFirstimgobj; /* double-linked list of */
- mng_objectp pLastimgobj; /* image-object structures */
- mng_objectp pFirstaniobj; /* double-linked list of */
- mng_objectp pLastaniobj; /* animation-object structures */
-#ifdef MNG_SUPPORT_DYNAMICMNG
- mng_objectp pFirstevent; /* double-linked list of */
- mng_objectp pLastevent; /* event-object structures */
-#endif
-
-#if defined(MNG_GAMMA_ONLY) || defined(MNG_FULL_CMS) || defined(MNG_APP_CMS)
- mng_uint8 aGammatab[256]; /* precomputed gamma lookup table */
- mng_float dLastgamma; /* last gamma used to compute table */
-#endif
-
- mng_fptr fDisplayrow; /* internal callback to display an
- uncompressed/unfiltered/
- color-corrected row */
- mng_fptr fRestbkgdrow; /* internal callback for restore-
- background processing of a row */
- mng_fptr fCorrectrow; /* internal callback to color-correct an
- uncompressed/unfiltered row */
- mng_fptr fRetrieverow; /* internal callback to retrieve an
- uncompressed/unfiltered row of data */
- mng_fptr fStorerow; /* internal callback to store an
- uncompressed/unfiltered row of data */
- mng_fptr fProcessrow; /* internal callback to process an
- uncompressed row of data */
- mng_fptr fDifferrow; /* internal callback to perform
- added filter leveling and
- differing on an unfiltered row */
- mng_fptr fScalerow; /* internal callback to scale a
- delta-row to the bitdepth of its target */
- mng_fptr fDeltarow; /* internal callback to execute a
- delta-row onto a target */
-#ifndef MNG_SKIPCHUNK_PAST
- mng_fptr fFliprow; /* internal callback to flip a row of pixels
- left<->right for a PAST operation */
- mng_fptr fTilerow; /* internal callback to tile a row of pixels
- during a PAST operation */
-#endif
- mng_fptr fInitrowproc; /* internal callback to initialize
- the row processing */
-
- mng_uint16 iDEFIobjectid; /* DEFI fields */
- mng_bool bDEFIhasdonotshow;
- mng_uint8 iDEFIdonotshow;
- mng_bool bDEFIhasconcrete;
- mng_uint8 iDEFIconcrete;
- mng_bool bDEFIhasloca;
- mng_int32 iDEFIlocax;
- mng_int32 iDEFIlocay;
- mng_bool bDEFIhasclip;
- mng_int32 iDEFIclipl;
- mng_int32 iDEFIclipr;
- mng_int32 iDEFIclipt;
- mng_int32 iDEFIclipb;
-
- mng_uint16 iBACKred; /* BACK fields */
- mng_uint16 iBACKgreen;
- mng_uint16 iBACKblue;
- mng_uint8 iBACKmandatory;
- mng_uint16 iBACKimageid;
- mng_uint8 iBACKtile;
-
- mng_int32 iBackimgoffsx; /* temp variables for restore_bkgd */
- mng_int32 iBackimgoffsy;
- mng_uint32 iBackimgwidth;
- mng_uint32 iBackimgheight;
-
-#ifndef MNG_SKIPCHUNK_FRAM
- mng_uint8 iFRAMmode; /* FRAM fields (global) */
- mng_uint32 iFRAMdelay;
- mng_uint32 iFRAMtimeout;
- mng_bool bFRAMclipping;
- mng_int32 iFRAMclipl;
- mng_int32 iFRAMclipr;
- mng_int32 iFRAMclipt;
- mng_int32 iFRAMclipb;
-
- mng_uint8 iFramemode; /* current subframe variables */
- mng_uint32 iFramedelay;
- mng_uint32 iFrametimeout;
- mng_bool bFrameclipping;
- mng_int32 iFrameclipl;
- mng_int32 iFrameclipr;
- mng_int32 iFrameclipt;
- mng_int32 iFrameclipb;
-
- mng_uint32 iNextdelay; /* delay *after* next image */
-
- mng_bool bForcedelay;
- mng_uint32 iAccumdelay;
-#endif
-
-#ifndef MNG_SKIPCHUNK_SHOW
- mng_uint8 iSHOWmode; /* SHOW fields */
- mng_uint16 iSHOWfromid;
- mng_uint16 iSHOWtoid;
- mng_uint16 iSHOWnextid;
- mng_int16 iSHOWskip;
-#endif
-
- mng_uint32 iGlobalPLTEcount; /* global PLTE fields */
- mng_rgbpaltab aGlobalPLTEentries;
-
- mng_uint32 iGlobalTRNSrawlen; /* global tRNS fields */
- mng_uint8arr aGlobalTRNSrawdata;
-
- mng_uint32 iGlobalGamma; /* global gAMA fields */
-
-#ifndef MNG_SKIPCHUNK_cHRM
- mng_uint32 iGlobalWhitepointx; /* global cHRM fields */
- mng_uint32 iGlobalWhitepointy;
- mng_uint32 iGlobalPrimaryredx;
- mng_uint32 iGlobalPrimaryredy;
- mng_uint32 iGlobalPrimarygreenx;
- mng_uint32 iGlobalPrimarygreeny;
- mng_uint32 iGlobalPrimarybluex;
- mng_uint32 iGlobalPrimarybluey;
-#endif
-
- mng_uint8 iGlobalRendintent; /* global sRGB fields */
-
-#ifndef MNG_SKIPCHUNK_iCCP
- mng_uint32 iGlobalProfilesize; /* global iCCP fields */
- mng_ptr pGlobalProfile;
-#endif
-
- mng_uint16 iGlobalBKGDred; /* global bKGD fields */
- mng_uint16 iGlobalBKGDgreen;
- mng_uint16 iGlobalBKGDblue;
-
- mng_ptr pDeltaImage; /* delta-image fields */
- mng_uint8 iDeltaImagetype;
-#endif /* MNG_SUPPORT_DISPLAY */
- mng_uint8 iDeltatype; /* need this one in read processing !! */
-#ifdef MNG_SUPPORT_DISPLAY
- mng_uint32 iDeltaBlockwidth;
- mng_uint32 iDeltaBlockheight;
- mng_uint32 iDeltaBlockx;
- mng_uint32 iDeltaBlocky;
- mng_bool bDeltaimmediate;
-
- mng_fptr fDeltagetrow; /* internal delta-proc callbacks */
- mng_fptr fDeltaaddrow;
- mng_fptr fDeltareplacerow;
- mng_fptr fDeltaputrow;
-
-#ifndef MNG_SKIPCHUNK_PROM
- mng_fptr fPromoterow; /* internal PROM fields */
- mng_fptr fPromBitdepth;
- mng_ptr pPromBuf;
- mng_uint8 iPromColortype;
- mng_uint8 iPromBitdepth;
- mng_uint8 iPromFilltype;
- mng_uint32 iPromWidth;
- mng_ptr pPromSrc;
- mng_ptr pPromDst;
-#endif
-
-#ifndef MNG_SKIPCHUNK_MAGN
- mng_uint16 iMAGNfromid;
- mng_uint16 iMAGNcurrentid;
- mng_uint16 iMAGNtoid;
-#endif
-
-#ifndef MNG_SKIPCHUNK_PAST
- mng_uint16 iPASTid;
- mng_int32 iPastx; /* target x/y of last PAST */
- mng_int32 iPasty;
-#endif
-
- mng_objectp pLastseek; /* last processed ani_seek object */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- mng_objectp pMPNG; /* mpNG object if available */
-#endif
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
- mng_objectp pANG; /* ANG object if available */
-#endif
-
-#endif /* MNG_SUPPORT_DISPLAY */
-
-#ifdef MNG_INCLUDE_ZLIB
- z_stream sZlib; /* zlib (de)compression variables */
-
- mng_int32 iZlevel; /* zlib compression parameters */
- mng_int32 iZmethod;
- mng_int32 iZwindowbits;
- mng_int32 iZmemlevel;
- mng_int32 iZstrategy;
-
- mng_uint32 iMaxIDAT; /* maximum size of IDAT data */
-
- mng_bool bInflating; /* indicates "inflate" in progress */
- mng_bool bDeflating; /* indicates "deflate" in progress */
-#endif /* MNG_INCLUDE_ZLIB */
-
-#ifdef MNG_INCLUDE_JNG
- mngjpeg_dctmethod eJPEGdctmethod; /* IJG compression variables */
- mng_int32 iJPEGquality;
- mng_int32 iJPEGsmoothing;
- mng_bool bJPEGcompressprogr;
- mng_bool bJPEGcompressopt;
-
- mng_uint32 iMaxJDAT; /* maximum size of JDAT/JDAA data */
-
- mngjpeg_compp pJPEGcinfo; /* compression structure */
- mngjpeg_errorp pJPEGcerr; /* error-manager compress */
-
- mngjpeg_decompp pJPEGdinfo; /* decompression structure (JDAT) */
- mngjpeg_errorp pJPEGderr; /* error-manager decompress (JDAT) */
- mngjpeg_sourcep pJPEGdsrc; /* source-manager decompress (JDAT) */
-
- mngjpeg_decompp pJPEGdinfo2; /* decompression structure (JDAA) */
- mngjpeg_errorp pJPEGderr2; /* error-manager decompress (JDAA) */
- mngjpeg_sourcep pJPEGdsrc2; /* source-manager decompress (JDAA) */
-
- mng_uint8p pJPEGbuf; /* buffer for JPEG (de)compression (JDAT) */
- mng_uint32 iJPEGbufmax; /* allocated space for buffer (JDAT) */
- mng_uint8p pJPEGcurrent; /* current pointer into buffer (JDAT) */
- mng_uint32 iJPEGbufremain; /* remaining bytes in buffer (JDAT) */
- mng_uint32 iJPEGtoskip; /* bytes to skip on next input-block (JDAT) */
-
- mng_uint8p pJPEGbuf2; /* buffer for JPEG (de)compression (JDAA) */
- mng_uint32 iJPEGbufmax2; /* allocated space for buffer (JDAA) */
- mng_uint8p pJPEGcurrent2; /* current pointer into buffer (JDAA) */
- mng_uint32 iJPEGbufremain2; /* remaining bytes in buffer (JDAA) */
- mng_uint32 iJPEGtoskip2; /* bytes to skip on next input-block (JDAA) */
-
- mng_uint8p pJPEGrow; /* buffer for a JPEG row of samples (JDAT) */
- mng_uint32 iJPEGrowlen;
-
- mng_uint8p pJPEGrow2; /* buffer for a JPEG row of samples (JDAA) */
- mng_uint32 iJPEGrowlen2;
-
- mng_bool bJPEGcompress; /* indicates "compress" initialized */
-
- mng_bool bJPEGdecompress; /* indicates "decompress" initialized (JDAT) */
- mng_bool bJPEGhasheader; /* indicates "readheader" succeeded (JDAT) */
- mng_bool bJPEGdecostarted; /* indicates "decompress" started (JDAT) */
- mng_bool bJPEGscanstarted; /* indicates "first scan" started (JDAT) */
- mng_bool bJPEGscanending; /* indicates "finish_output" suspended (JDAT) */
- mng_bool bJPEGprogressive; /* indicates a progressive image (JDAT) */
-
- mng_bool bJPEGdecompress2; /* indicates "decompress" initialized (JDAA) */
- mng_bool bJPEGhasheader2; /* indicates "readheader" succeeded (JDAA) */
- mng_bool bJPEGdecostarted2; /* indicates "decompress" started (JDAA) */
- mng_bool bJPEGscanstarted2; /* indicates "first scan" started (JDAA) */
- mng_bool bJPEGprogressive2; /* indicates a progressive image (JDAA) */
-
- mng_fptr fStorerow2; /* internal callback to store an
- uncompressed/unfiltered row of JPEG-data (JDAT) */
-
- mng_fptr fStorerow3; /* internal callback to store an
- uncompressed/unfiltered row of JPEG-data (JDAA) */
-
- mng_uint32 iJPEGrow; /* row-number for current JPEG row */
- mng_uint32 iJPEGalpharow; /* nr. of rows filled with alpha */
- mng_uint32 iJPEGrgbrow; /* nr. of rows filled with 'color'-info */
- mng_uint32 iJPEGdisprow; /* nr. of rows already displayed "on-the-fly" */
-
-#if defined(MNG_USE_SETJMP) && defined (MNG_INCLUDE_IJG6B)
- jmp_buf sErrorbuf; /* setjmp/longjmp buffer (error-recovery) */
-#endif
-
-#endif /* MNG_INCLUDE_JNG */
-
-#ifndef MNG_USE_ZLIB_CRC
- mng_uint32 aCRCtable [256]; /* CRC prefab table */
- mng_bool bCRCcomputed; /* "has been built" indicator */
-#endif
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- png_imgtype ePng_imgtype;
-#endif
-
-#if defined(MNG_NO_1_2_4BIT_SUPPORT) || defined(MNG_NO_16BIT_SUPPORT)
- mng_uint8 iPNGdepth; /* Real input depth */
- mng_uint8 iPNGmult;
-#endif
-
-#ifdef MNG_OPTIMIZE_DISPLAYCALLS
- mng_uint32 iRawlen; /* temp vars for display processing */
- mng_uint8p pRawdata;
-#ifndef MNG_SKIPCHUNK_BASI
- mng_uint16 iBASIred;
- mng_uint16 iBASIgreen;
- mng_uint16 iBASIblue;
- mng_bool bBASIhasalpha;
- mng_uint16 iBASIalpha;
- mng_uint8 iBASIviewable;
-#endif
-#ifndef MNG_SKIPCHUNK_CLON
- mng_uint16 iCLONsourceid;
- mng_uint16 iCLONcloneid;
- mng_uint8 iCLONclonetype;
- mng_bool bCLONhasdonotshow;
- mng_uint8 iCLONdonotshow;
- mng_uint8 iCLONconcrete;
- mng_bool bCLONhasloca;
- mng_uint8 iCLONlocationtype;
- mng_int32 iCLONlocationx;
- mng_int32 iCLONlocationy;
-#endif
-#ifndef MNG_SKIPCHUNK_DISC
- mng_uint32 iDISCcount;
- mng_uint16p pDISCids;
-#endif
-#ifndef MNG_SKIPCHUNK_FRAM
- mng_uint8 iTempFramemode;
- mng_uint8 iTempChangedelay;
- mng_uint32 iTempDelay;
- mng_uint8 iTempChangetimeout;
- mng_uint32 iTempTimeout;
- mng_uint8 iTempChangeclipping;
- mng_uint8 iTempCliptype;
- mng_int32 iTempClipl;
- mng_int32 iTempClipr;
- mng_int32 iTempClipt;
- mng_int32 iTempClipb;
-#endif
-#ifndef MNG_SKIPCHUNK_MOVE
- mng_uint16 iMOVEfromid;
- mng_uint16 iMOVEtoid;
- mng_uint8 iMOVEmovetype;
- mng_int32 iMOVEmovex;
- mng_int32 iMOVEmovey;
-#endif
-#ifndef MNG_SKIPCHUNK_CLIP
- mng_uint16 iCLIPfromid;
- mng_uint16 iCLIPtoid;
- mng_uint8 iCLIPcliptype;
- mng_int32 iCLIPclipl;
- mng_int32 iCLIPclipr;
- mng_int32 iCLIPclipt;
- mng_int32 iCLIPclipb;
-#endif
-#ifndef MNG_NO_DELTA_PNG
- mng_uint16 iDHDRobjectid;
- mng_uint8 iDHDRimagetype;
- mng_uint8 iDHDRdeltatype;
- mng_uint32 iDHDRblockwidth;
- mng_uint32 iDHDRblockheight;
- mng_uint32 iDHDRblockx;
- mng_uint32 iDHDRblocky;
- mng_uint8 iPROMbitdepth;
- mng_uint8 iPROMcolortype;
- mng_uint8 iPROMfilltype;
- mng_uint8 iPPLTtype;
- mng_uint32 iPPLTcount;
- mng_palette8ep paPPLTindexentries;
- mng_uint8p paPPLTalphaentries;
- mng_uint8p paPPLTusedentries;
-#endif
-#ifndef MNG_SKIPCHUNK_MAGN
- mng_uint16 iMAGNfirstid;
- mng_uint16 iMAGNlastid;
- mng_uint8 iMAGNmethodX;
- mng_uint16 iMAGNmX;
- mng_uint16 iMAGNmY;
- mng_uint16 iMAGNmL;
- mng_uint16 iMAGNmR;
- mng_uint16 iMAGNmT;
- mng_uint16 iMAGNmB;
- mng_uint8 iMAGNmethodY;
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
- mng_uint16 iPASTtargetid;
- mng_uint8 iPASTtargettype;
- mng_int32 iPASTtargetx;
- mng_int32 iPASTtargety;
- mng_uint32 iPASTcount;
- mng_ptr pPASTsources;
-#endif
-#endif /* MNG_OPTIMIZE_DISPLAYCALLS */
-
- } mng_data;
-
-typedef mng_data * mng_datap;
-
-/* ************************************************************************** */
-/* * * */
-/* * Internal Callback-Function prototypes * */
-/* * * */
-/* ************************************************************************** */
-
-typedef mng_retcode(*mng_displayrow) (mng_datap pData);
-typedef mng_retcode(*mng_restbkgdrow) (mng_datap pData);
-typedef mng_retcode(*mng_correctrow) (mng_datap pData);
-typedef mng_retcode(*mng_retrieverow) (mng_datap pData);
-typedef mng_retcode(*mng_storerow) (mng_datap pData);
-typedef mng_retcode(*mng_processrow) (mng_datap pData);
-typedef mng_retcode(*mng_initrowproc) (mng_datap pData);
-typedef mng_retcode(*mng_differrow) (mng_datap pData);
-typedef mng_retcode(*mng_scalerow) (mng_datap pData);
-typedef mng_retcode(*mng_deltarow) (mng_datap pData);
-typedef mng_retcode(*mng_promoterow) (mng_datap pData);
-typedef mng_retcode(*mng_fliprow) (mng_datap pData);
-typedef mng_retcode(*mng_tilerow) (mng_datap pData);
-
-typedef mng_uint8 (*mng_bitdepth_8) (mng_uint8 iB);
-typedef mng_uint16 (*mng_bitdepth_16) (mng_uint8 iB);
-
-typedef mng_retcode(*mng_magnify_x) (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p iSrcline,
- mng_uint8p iDstline);
-typedef mng_retcode(*mng_magnify_y) (mng_datap pData,
- mng_int32 iM,
- mng_int32 iS,
- mng_uint32 iWidth,
- mng_uint8p iSrcline1,
- mng_uint8p iSrcline2,
- mng_uint8p iDstline);
-
-/* ************************************************************************** */
-/* * * */
-/* * Routines for swapping byte-order from and to graphic files * */
-/* * (This code is adapted from the libpng package) * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_BIGENDIAN_SUPPORTED
-mng_uint32 mng_get_uint32 (mng_uint8p pBuf);
-mng_int32 mng_get_int32 (mng_uint8p pBuf);
-mng_uint16 mng_get_uint16 (mng_uint8p pBuf);
-void mng_put_uint32 (mng_uint8p pBuf,
- mng_uint32 i);
-void mng_put_int32 (mng_uint8p pBuf,
- mng_int32 i);
-void mng_put_uint16 (mng_uint8p pBuf,
- mng_uint16 i);
-#else /* MNG_BIGENDIAN_SUPPORTED */
-#define mng_get_uint32(P) *(mng_uint32p)(P)
-#define mng_get_int32(P) *(mng_int32p)(P)
-#define mng_get_uint16(P) *(mng_uint16p)(P)
-#define mng_put_uint32(P,I) *(mng_uint32p)(P) = (I)
-#define mng_put_int32(P,I) *(mng_int32p)(P) = (I)
-#define mng_put_uint16(P,I) *(mng_uint16p)(P) = (I)
-#endif /* MNG_BIGENDIAN_SUPPORTED */
-
-/* ************************************************************************** */
-/* * * */
-/* * Some handy(?) macro definitions * */
-/* * * */
-/* ************************************************************************** */
-
-#define MAX_COORD(a, b) (((a) > (b)) ? (a) : (b))
-#define MIN_COORD(a, b) (((a) < (b)) ? (a) : (b))
-
-/* ************************************************************************** */
-
-#endif /* _libmng_data_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_display.c b/src/3rdparty/libmng/libmng_display.c
deleted file mode 100644
index 81c2484b54..0000000000
--- a/src/3rdparty/libmng/libmng_display.c
+++ /dev/null
@@ -1,7140 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_display.c copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Display management (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the display management routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - added callback error-reporting support * */
-/* * - fixed frame_delay misalignment * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - added sanity check for frozen status * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * 0.5.1 - 05/13/2000 - G.Juyn * */
-/* * - changed display_mend to reset state to initial or SAVE * */
-/* * - added eMNGma hack (will be removed in 1.0.0 !!!) * */
-/* * - added TERM animation object pointer (easier reference) * */
-/* * - added process_save & process_seek routines * */
-/* * 0.5.1 - 05/14/2000 - G.Juyn * */
-/* * - added save_state and restore_state for SAVE/SEEK/TERM * */
-/* * processing * */
-/* * * */
-/* * 0.5.2 - 05/20/2000 - G.Juyn * */
-/* * - added JNG support (JHDR/JDAT) * */
-/* * 0.5.2 - 05/23/2000 - G.Juyn * */
-/* * - fixed problem with DEFI clipping * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - added delta-image support (DHDR,PROM,IPNG,IJNG) * */
-/* * 0.5.2 - 05/31/2000 - G.Juyn * */
-/* * - fixed pointer confusion (contributed by Tim Rowley) * */
-/* * 0.5.2 - 06/03/2000 - G.Juyn * */
-/* * - fixed makeup for Linux gcc compile * */
-/* * 0.5.2 - 06/05/2000 - G.Juyn * */
-/* * - added support for RGB8_A8 canvasstyle * */
-/* * 0.5.2 - 06/09/2000 - G.Juyn * */
-/* * - fixed timer-handling to run with Mozilla (Tim Rowley) * */
-/* * 0.5.2 - 06/10/2000 - G.Juyn * */
-/* * - fixed some compilation-warnings (contrib Jason Morris) * */
-/* * * */
-/* * 0.5.3 - 06/12/2000 - G.Juyn * */
-/* * - fixed display of stored JNG images * */
-/* * 0.5.3 - 06/13/2000 - G.Juyn * */
-/* * - fixed problem with BASI-IEND as object 0 * */
-/* * 0.5.3 - 06/16/2000 - G.Juyn * */
-/* * - changed progressive-display processing * */
-/* * 0.5.3 - 06/17/2000 - G.Juyn * */
-/* * - changed delta-image processing * */
-/* * 0.5.3 - 06/20/2000 - G.Juyn * */
-/* * - fixed some minor stuff * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - added speed-modifier to timing routine * */
-/* * 0.5.3 - 06/22/2000 - G.Juyn * */
-/* * - added support for PPLT chunk processing * */
-/* * 0.5.3 - 06/29/2000 - G.Juyn * */
-/* * - swapped refresh parameters * */
-/* * * */
-/* * 0.9.0 - 06/30/2000 - G.Juyn * */
-/* * - changed refresh parameters to 'x,y,width,height' * */
-/* * * */
-/* * 0.9.1 - 07/07/2000 - G.Juyn * */
-/* * - implemented support for freeze/reset/resume & go_xxxx * */
-/* * 0.9.1 - 07/08/2000 - G.Juyn * */
-/* * - added support for improved timing * */
-/* * 0.9.1 - 07/14/2000 - G.Juyn * */
-/* * - changed EOF processing behavior * */
-/* * - fixed TERM delay processing * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - fixed freeze & reset processing * */
-/* * 0.9.1 - 07/16/2000 - G.Juyn * */
-/* * - fixed storage of images during mng_read() * */
-/* * - fixed support for mng_display() after mng_read() * */
-/* * 0.9.1 - 07/24/2000 - G.Juyn * */
-/* * - fixed reading of still-images * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/07/2000 - G.Juyn * */
-/* * - B111300 - fixup for improved portability * */
-/* * 0.9.3 - 08/21/2000 - G.Juyn * */
-/* * - fixed TERM processing delay of 0 msecs * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 09/10/2000 - G.Juyn * */
-/* * - fixed problem with no refresh after TERM * */
-/* * - fixed DEFI behavior * */
-/* * 0.9.3 - 09/16/2000 - G.Juyn * */
-/* * - fixed timing & refresh behavior for single PNG/JNG * */
-/* * 0.9.3 - 09/19/2000 - G.Juyn * */
-/* * - refixed timing & refresh behavior for single PNG/JNG * */
-/* * 0.9.3 - 10/02/2000 - G.Juyn * */
-/* * - fixed timing again (this is getting boring...) * */
-/* * - refixed problem with no refresh after TERM * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added JDAA chunk * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - fixed support for bKGD * */
-/* * 0.9.3 - 10/18/2000 - G.Juyn * */
-/* * - fixed delta-processing behavior * */
-/* * 0.9.3 - 10/19/2000 - G.Juyn * */
-/* * - added storage for pixel-/alpha-sampledepth for delta's * */
-/* * 0.9.3 - 10/27/2000 - G.Juyn * */
-/* * - fixed separate read() & display() processing * */
-/* * * */
-/* * 0.9.4 - 10/31/2000 - G.Juyn * */
-/* * - fixed possible loop in display_resume() (Thanks Vova!) * */
-/* * 0.9.4 - 11/20/2000 - G.Juyn * */
-/* * - fixed unwanted repetition in mng_readdisplay() * */
-/* * 0.9.4 - 11/24/2000 - G.Juyn * */
-/* * - moved restore of object 0 to libmng_display * */
-/* * - added restore of object 0 to TERM processing !!! * */
-/* * - fixed TERM delay processing * */
-/* * - fixed TERM end processing (count = 0) * */
-/* * 0.9.4 - 12/16/2000 - G.Juyn * */
-/* * - fixed mixup of data- & function-pointers (thanks Dimitri)* */
-/* * 0.9.4 - 1/18/2001 - G.Juyn * */
-/* * - removed test filter-methods 1 & 65 * */
-/* * - set default level-set for filtertype=64 to all zeroes * */
-/* * * */
-/* * 0.9.5 - 1/20/2001 - G.Juyn * */
-/* * - fixed compiler-warnings Mozilla (thanks Tim) * */
-/* * 0.9.5 - 1/23/2001 - G.Juyn * */
-/* * - fixed timing-problem with switching framing_modes * */
-/* * * */
-/* * 1.0.1 - 02/08/2001 - G.Juyn * */
-/* * - added MEND processing callback * */
-/* * 1.0.1 - 02/13/2001 - G.Juyn * */
-/* * - fixed first FRAM_MODE=4 timing problem * */
-/* * 1.0.1 - 04/21/2001 - G.Juyn * */
-/* * - fixed memory-leak for JNGs with alpha (Thanks Gregg!) * */
-/* * - added BGRA8 canvas with premultiplied alpha * */
-/* * * */
-/* * 1.0.2 - 06/25/2001 - G.Juyn * */
-/* * - fixed memory-leak with delta-images (Thanks Michael!) * */
-/* * * */
-/* * 1.0.5 - 08/15/2002 - G.Juyn * */
-/* * - completed PROM support * */
-/* * - completed delta-image support * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/13/2002 - G.Juyn * */
-/* * - fixed read/write of MAGN chunk * */
-/* * 1.0.5 - 09/15/2002 - G.Juyn * */
-/* * - fixed LOOP iteration=0 special case * */
-/* * 1.0.5 - 09/19/2002 - G.Juyn * */
-/* * - fixed color-correction for restore-background handling * */
-/* * - optimized restore-background for bKGD cases * */
-/* * - cleaned up some old stuff * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - finished support for BACK image & tiling * */
-/* * - added support for PAST * */
-/* * 1.0.5 - 09/22/2002 - G.Juyn * */
-/* * - added bgrx8 canvas (filler byte) * */
-/* * 1.0.5 - 10/05/2002 - G.Juyn * */
-/* * - fixed dropping mix of frozen/unfrozen objects * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - added proposed change in handling of TERM- & if-delay * */
-/* * - added another fix for misplaced TERM chunk * */
-/* * - completed support for condition=2 in TERM chunk * */
-/* * 1.0.5 - 10/18/2002 - G.Juyn * */
-/* * - fixed clipping-problem with BACK tiling (Thanks Sakura!) * */
-/* * 1.0.5 - 10/20/2002 - G.Juyn * */
-/* * - fixed processing for multiple objects in MAGN * */
-/* * - fixed display of visible target of PAST operation * */
-/* * 1.0.5 - 10/30/2002 - G.Juyn * */
-/* * - modified TERM/MEND processing for max(1, TERM_delay, * */
-/* * interframe_delay) * */
-/* * 1.0.5 - 11/04/2002 - G.Juyn * */
-/* * - fixed layer- & frame-counting during read() * */
-/* * - fixed goframe/golayer/gotime processing * */
-/* * 1.0.5 - 01/19/2003 - G.Juyn * */
-/* * - B654627 - fixed SEGV when no gettickcount callback * */
-/* * - B664383 - fixed typo * */
-/* * - finalized changes in TERM/final_delay to elected proposal* */
-/* * * */
-/* * 1.0.6 - 05/11/2003 - G. Juyn * */
-/* * - added conditionals around canvas update routines * */
-/* * 1.0.6 - 05/25/2003 - G.R-P * */
-/* * - added MNG_SKIPCHUNK_cHNK footprint optimizations * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added conditionals around some JNG-supporting code * */
-/* * - added conditionals around 16-bit supporting code * */
-/* * - reversed some loops to use decrementing counter * */
-/* * - combined init functions into one function * */
-/* * 1.0.6 - 07/10/2003 - G.R-P * */
-/* * - replaced nested switches with simple init setup function * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * 1.0.6 - 08/17/2003 - G.R-P * */
-/* * - added conditionals around non-VLC chunk support * */
-/* * * */
-/* * 1.0.7 - 11/27/2003 - R.A * */
-/* * - added CANVAS_RGB565 and CANVAS_BGR565 * */
-/* * 1.0.7 - 12/06/2003 - R.A * */
-/* * - added CANVAS_RGBA565 and CANVAS_BGRA565 * */
-/* * 1.0.7 - 01/25/2004 - J.S * */
-/* * - added premultiplied alpha canvas' for RGBA, ARGB, ABGR * */
-/* * * */
-/* * 1.0.8 - 03/31/2004 - G.Juyn * */
-/* * - fixed problem with PAST usage where source > dest * */
-/* * 1.0.8 - 05/04/2004 - G.R-P. * */
-/* * - fixed misplaced 16-bit conditionals * */
-/* * * */
-/* * 1.0.9 - 09/18/2004 - G.R-P. * */
-/* * - revised some SKIPCHUNK conditionals * */
-/* * 1.0.9 - 10/10/2004 - G.R-P. * */
-/* * - added MNG_NO_1_2_4BIT_SUPPORT * */
-/* * 1.0.9 - 10/14/2004 - G.Juyn * */
-/* * - added bgr565_a8 canvas-style (thanks to J. Elvander) * */
-/* * 1.0.9 - 12/11/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_DISPLAYCALLS * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* * 1.0.10 - 07/06/2005 - G.R-P. * */
-/* * - added more SKIPCHUNK conditionals * */
-/* * 1.0.10 - 12/28/2005 - G.R-P. * */
-/* * - added missing SKIPCHUNK_MAGN conditional * */
-/* * 1.0.10 - 03/07/2006 - (thanks to W. Manthey) * */
-/* * - added CANVAS_RGB555 and CANVAS_BGR555 * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - fixed several compiler warnings * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_chunks.h"
-#include "libmng_objects.h"
-#include "libmng_object_prc.h"
-#include "libmng_memory.h"
-#include "libmng_zlib.h"
-#include "libmng_jpeg.h"
-#include "libmng_cms.h"
-#include "libmng_pixels.h"
-#include "libmng_display.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_DISPLAY_PROCS
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode set_delay (mng_datap pData,
- mng_uint32 iInterval)
-{
- if (!iInterval) /* at least 1 msec please! */
- iInterval = 1;
-
- if (pData->bRunning) /* only when really displaying */
- if (!pData->fSettimer ((mng_handle)pData, iInterval))
- MNG_ERROR (pData, MNG_APPTIMERERROR);
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
- if ((!pData->bDynamic) || (pData->bRunning))
-#else
- if (pData->bRunning)
-#endif
- pData->bTimerset = MNG_TRUE; /* and indicate so */
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_uint32 calculate_delay (mng_datap pData,
- mng_uint32 iDelay)
-{
- mng_uint32 iTicks = pData->iTicks;
- mng_uint32 iWaitfor = 1; /* default non-MNG delay */
-
- if (!iTicks) /* tick_count not specified ? */
- if (pData->eImagetype == mng_it_mng)
- iTicks = 1000;
-
- if (iTicks)
- {
- switch (pData->iSpeed) /* honor speed modifier */
- {
- case mng_st_fast :
- {
- iWaitfor = (mng_uint32)(( 500 * iDelay) / iTicks);
- break;
- }
- case mng_st_slow :
- {
- iWaitfor = (mng_uint32)((3000 * iDelay) / iTicks);
- break;
- }
- case mng_st_slowest :
- {
- iWaitfor = (mng_uint32)((8000 * iDelay) / iTicks);
- break;
- }
- default :
- {
- iWaitfor = (mng_uint32)((1000 * iDelay) / iTicks);
- }
- }
- }
-
- return iWaitfor;
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * Progressive display refresh - does the call to the refresh callback * */
-/* * and sets the timer to allow the app to perform the actual refresh to * */
-/* * the screen (eg. process its main message-loop) * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_display_progressive_refresh (mng_datap pData,
- mng_uint32 iInterval)
-{
- { /* let the app refresh first ? */
- if ((pData->bRunning) && (!pData->bSkipping) &&
- (pData->iUpdatetop < pData->iUpdatebottom) && (pData->iUpdateleft < pData->iUpdateright))
- {
- if (!pData->fRefresh (((mng_handle)pData),
- pData->iUpdateleft, pData->iUpdatetop,
- pData->iUpdateright - pData->iUpdateleft,
- pData->iUpdatebottom - pData->iUpdatetop))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- pData->iUpdateleft = 0; /* reset update-region */
- pData->iUpdateright = 0;
- pData->iUpdatetop = 0;
- pData->iUpdatebottom = 0; /* reset refreshneeded indicator */
- pData->bNeedrefresh = MNG_FALSE;
- /* interval requested ? */
- if ((!pData->bFreezing) && (iInterval))
- { /* setup the timer */
- mng_retcode iRetcode = set_delay (pData, iInterval);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
- }
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * Generic display routines * */
-/* * * */
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode interframe_delay (mng_datap pData)
-{
- mng_uint32 iWaitfor = 0;
- mng_uint32 iInterval;
- mng_uint32 iRuninterval;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INTERFRAME_DELAY, MNG_LC_START);
-#endif
-
- {
-#ifndef MNG_SKIPCHUNK_FRAM
- if (pData->iFramedelay > 0 || pData->bForcedelay) /* real delay ? */
- { /* let the app refresh first ? */
- pData->bForcedelay = MNG_FALSE;
- if ((pData->bRunning) && (!pData->bSkipping) &&
- (pData->iUpdatetop < pData->iUpdatebottom) && (pData->iUpdateleft < pData->iUpdateright))
- if (!pData->fRefresh (((mng_handle)pData),
- pData->iUpdateleft, pData->iUpdatetop,
- pData->iUpdateright - pData->iUpdateleft,
- pData->iUpdatebottom - pData->iUpdatetop))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- pData->iUpdateleft = 0; /* reset update-region */
- pData->iUpdateright = 0;
- pData->iUpdatetop = 0;
- pData->iUpdatebottom = 0; /* reset refreshneeded indicator */
- pData->bNeedrefresh = MNG_FALSE;
-
-#ifndef MNG_SKIPCHUNK_TERM
- if (pData->bOnlyfirstframe) /* only processing first frame after TERM ? */
- {
- pData->iFramesafterTERM++;
- /* did we do a frame yet ? */
- if (pData->iFramesafterTERM > 1)
- { /* then that's it; just stop right here ! */
- pData->pCurraniobj = MNG_NULL;
- pData->bRunning = MNG_FALSE;
-
- return MNG_NOERROR;
- }
- }
-#endif
-
- if (pData->fGettickcount)
- { /* get current tickcount */
- pData->iRuntime = pData->fGettickcount ((mng_handle)pData);
- /* calculate interval since last sync-point */
- if (pData->iRuntime < pData->iSynctime)
- iRuninterval = pData->iRuntime + ~pData->iSynctime + 1;
- else
- iRuninterval = pData->iRuntime - pData->iSynctime;
- /* calculate actual run-time */
- if (pData->iRuntime < pData->iStarttime)
- pData->iRuntime = pData->iRuntime + ~pData->iStarttime + 1;
- else
- pData->iRuntime = pData->iRuntime - pData->iStarttime;
- }
- else
- {
- iRuninterval = 0;
- }
-
- iWaitfor = calculate_delay (pData, pData->iFramedelay);
-
- if (iWaitfor > iRuninterval) /* delay necessary ? */
- iInterval = iWaitfor - iRuninterval;
- else
- iInterval = 1; /* force app to process messageloop */
- /* set the timer ? */
- if (((pData->bRunning) || (pData->bSearching) || (pData->bReading)) &&
- (!pData->bSkipping))
- {
- iRetcode = set_delay (pData, iInterval);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
-
- if (!pData->bSkipping) /* increase frametime in advance */
- pData->iFrametime = pData->iFrametime + iWaitfor;
- /* setup for next delay */
- pData->iFramedelay = pData->iNextdelay;
- pData->iAccumdelay += pData->iFramedelay;
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INTERFRAME_DELAY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL void set_display_routine (mng_datap pData)
-{ /* actively running ? */
- if (((pData->bRunning) || (pData->bSearching)) && (!pData->bSkipping))
- {
- switch (pData->iCanvasstyle) /* determine display routine */
- {
-#ifndef MNG_SKIPCANVAS_RGB8
- case MNG_CANVAS_RGB8 : { pData->fDisplayrow = (mng_fptr)mng_display_rgb8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_RGBA8
- case MNG_CANVAS_RGBA8 : { pData->fDisplayrow = (mng_fptr)mng_display_rgba8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_RGBA8_PM
- case MNG_CANVAS_RGBA8_PM: { pData->fDisplayrow = (mng_fptr)mng_display_rgba8_pm; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_ARGB8
- case MNG_CANVAS_ARGB8 : { pData->fDisplayrow = (mng_fptr)mng_display_argb8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_ARGB8_PM
- case MNG_CANVAS_ARGB8_PM: { pData->fDisplayrow = (mng_fptr)mng_display_argb8_pm; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_RGB8_A8
- case MNG_CANVAS_RGB8_A8 : { pData->fDisplayrow = (mng_fptr)mng_display_rgb8_a8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGR8
- case MNG_CANVAS_BGR8 : { pData->fDisplayrow = (mng_fptr)mng_display_bgr8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGRX8
- case MNG_CANVAS_BGRX8 : { pData->fDisplayrow = (mng_fptr)mng_display_bgrx8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGRA8
- case MNG_CANVAS_BGRA8 : { pData->fDisplayrow = (mng_fptr)mng_display_bgra8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGRA8_PM
- case MNG_CANVAS_BGRA8_PM: { pData->fDisplayrow = (mng_fptr)mng_display_bgra8_pm; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_ABGR8
- case MNG_CANVAS_ABGR8 : { pData->fDisplayrow = (mng_fptr)mng_display_abgr8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_ABGR8_PM
- case MNG_CANVAS_ABGR8_PM: { pData->fDisplayrow = (mng_fptr)mng_display_abgr8_pm; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_RGB565
- case MNG_CANVAS_RGB565 : { pData->fDisplayrow = (mng_fptr)mng_display_rgb565; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_RGBA565
- case MNG_CANVAS_RGBA565 : { pData->fDisplayrow = (mng_fptr)mng_display_rgba565; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGR565
- case MNG_CANVAS_BGR565 : { pData->fDisplayrow = (mng_fptr)mng_display_bgr565; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGRA565
- case MNG_CANVAS_BGRA565 : { pData->fDisplayrow = (mng_fptr)mng_display_bgra565; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGR565_A8
- case MNG_CANVAS_BGR565_A8 : { pData->fDisplayrow = (mng_fptr)mng_display_bgr565_a8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_RGB555
- case MNG_CANVAS_RGB555 : { pData->fDisplayrow = (mng_fptr)mng_display_rgb555; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGR555
- case MNG_CANVAS_BGR555 : { pData->fDisplayrow = (mng_fptr)mng_display_bgr555; break; }
-#endif
-
-#ifndef MNG_NO_16BIT_SUPPORT
-/* case MNG_CANVAS_RGB16 : { pData->fDisplayrow = (mng_fptr)mng_display_rgb16; break; } */
-/* case MNG_CANVAS_RGBA16 : { pData->fDisplayrow = (mng_fptr)mng_display_rgba16; break; } */
-/* case MNG_CANVAS_ARGB16 : { pData->fDisplayrow = (mng_fptr)mng_display_argb16; break; } */
-/* case MNG_CANVAS_BGR16 : { pData->fDisplayrow = (mng_fptr)mng_display_bgr16; break; } */
-/* case MNG_CANVAS_BGRA16 : { pData->fDisplayrow = (mng_fptr)mng_display_bgra16; break; } */
-/* case MNG_CANVAS_ABGR16 : { pData->fDisplayrow = (mng_fptr)mng_display_abgr16; break; } */
-#endif
-/* case MNG_CANVAS_INDEX8 : { pData->fDisplayrow = (mng_fptr)mng_display_index8; break; } */
-/* case MNG_CANVAS_INDEXA8 : { pData->fDisplayrow = (mng_fptr)mng_display_indexa8; break; } */
-/* case MNG_CANVAS_AINDEX8 : { pData->fDisplayrow = (mng_fptr)mng_display_aindex8; break; } */
-/* case MNG_CANVAS_GRAY8 : { pData->fDisplayrow = (mng_fptr)mng_display_gray8; break; } */
-/* case MNG_CANVAS_AGRAY8 : { pData->fDisplayrow = (mng_fptr)mng_display_agray8; break; } */
-/* case MNG_CANVAS_GRAYA8 : { pData->fDisplayrow = (mng_fptr)mng_display_graya8; break; } */
-#ifndef MNG_NO_16BIT_SUPPORT
-/* case MNG_CANVAS_GRAY16 : { pData->fDisplayrow = (mng_fptr)mng_display_gray16; break; } */
-/* case MNG_CANVAS_GRAYA16 : { pData->fDisplayrow = (mng_fptr)mng_display_graya16; break; } */
-/* case MNG_CANVAS_AGRAY16 : { pData->fDisplayrow = (mng_fptr)mng_display_agray16; break; } */
-#endif
-/* case MNG_CANVAS_DX15 : { pData->fDisplayrow = (mng_fptr)mng_display_dx15; break; } */
-/* case MNG_CANVAS_DX16 : { pData->fDisplayrow = (mng_fptr)mng_display_dx16; break; } */
- }
- }
-
- return;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode load_bkgdlayer (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_LOAD_BKGDLAYER, MNG_LC_START);
-#endif
- /* actively running ? */
- if (((pData->bRunning) || (pData->bSearching)) && (!pData->bSkipping))
- {
- mng_int32 iY;
- mng_retcode iRetcode;
- mng_bool bColorcorr = MNG_FALSE;
- /* save values */
- mng_int32 iDestl = pData->iDestl;
- mng_int32 iDestr = pData->iDestr;
- mng_int32 iDestt = pData->iDestt;
- mng_int32 iDestb = pData->iDestb;
- mng_int32 iSourcel = pData->iSourcel;
- mng_int32 iSourcer = pData->iSourcer;
- mng_int32 iSourcet = pData->iSourcet;
- mng_int32 iSourceb = pData->iSourceb;
- mng_int8 iPass = pData->iPass;
- mng_int32 iRow = pData->iRow;
- mng_int32 iRowinc = pData->iRowinc;
- mng_int32 iCol = pData->iCol;
- mng_int32 iColinc = pData->iColinc;
- mng_int32 iRowsamples = pData->iRowsamples;
- mng_int32 iRowsize = pData->iRowsize;
- mng_uint8p pPrevrow = pData->pPrevrow;
- mng_uint8p pRGBArow = pData->pRGBArow;
- mng_bool bIsRGBA16 = pData->bIsRGBA16;
- mng_bool bIsOpaque = pData->bIsOpaque;
- mng_fptr fCorrectrow = pData->fCorrectrow;
- mng_fptr fDisplayrow = pData->fDisplayrow;
- mng_fptr fRetrieverow = pData->fRetrieverow;
- mng_objectp pCurrentobj = pData->pCurrentobj;
- mng_objectp pRetrieveobj = pData->pRetrieveobj;
-
- pData->iDestl = 0; /* determine clipping region */
- pData->iDestt = 0;
- pData->iDestr = pData->iWidth;
- pData->iDestb = pData->iHeight;
-
-#ifndef MNG_SKIPCHUNK_FRAM
- if (pData->bFrameclipping) /* frame clipping specified ? */
- {
- pData->iDestl = MAX_COORD (pData->iDestl, pData->iFrameclipl);
- pData->iDestt = MAX_COORD (pData->iDestt, pData->iFrameclipt);
- pData->iDestr = MIN_COORD (pData->iDestr, pData->iFrameclipr);
- pData->iDestb = MIN_COORD (pData->iDestb, pData->iFrameclipb);
- }
-#endif
- /* anything to clear ? */
- if ((pData->iDestr >= pData->iDestl) && (pData->iDestb >= pData->iDestt))
- {
- pData->iPass = -1; /* these are the object's dimensions now */
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iWidth;
- pData->iRowsize = pData->iRowsamples << 2;
- pData->bIsRGBA16 = MNG_FALSE; /* let's keep it simple ! */
- pData->bIsOpaque = MNG_TRUE;
-
- pData->iSourcel = 0; /* source relative to destination */
- pData->iSourcer = pData->iDestr - pData->iDestl;
- pData->iSourcet = 0;
- pData->iSourceb = pData->iDestb - pData->iDestt;
-
- set_display_routine (pData); /* determine display routine */
- /* default restore using preset BG color */
- pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_bgcolor;
-
-#ifndef MNG_SKIPCHUNK_bKGD
- if (((pData->eImagetype == mng_it_png) || (pData->eImagetype == mng_it_jng)) &&
- (pData->bUseBKGD))
- { /* prefer bKGD in PNG/JNG */
- if (!pData->pCurrentobj)
- pData->pCurrentobj = pData->pObjzero;
-
- if (((mng_imagep)pData->pCurrentobj)->pImgbuf->bHasBKGD)
- {
- pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_bkgd;
- bColorcorr = MNG_TRUE;
- }
- }
-#endif
-
- if (pData->fGetbkgdline) /* background-canvas-access callback set ? */
- {
- switch (pData->iBkgdstyle)
- {
-#ifndef MNG_SKIPCANVAS_RGB8
- case MNG_CANVAS_RGB8 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_rgb8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGR8
- case MNG_CANVAS_BGR8 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_bgr8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGRX8
- case MNG_CANVAS_BGRX8 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_bgrx8; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_BGR565
- case MNG_CANVAS_BGR565 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_bgr565; break; }
-#endif
-#ifndef MNG_SKIPCANVAS_RGB565
- case MNG_CANVAS_RGB565 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_rgb565; break; }
-#endif
-#ifndef MNG_NO_16BIT_SUPPORT
- /* case MNG_CANVAS_RGB16 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_rgb16; break; } */
- /* case MNG_CANVAS_BGR16 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_bgr16; break; } */
-#endif
- /* case MNG_CANVAS_INDEX8 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_index8; break; } */
- /* case MNG_CANVAS_GRAY8 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_gray8; break; } */
-#ifndef MNG_NO_16BIT_SUPPORT
- /* case MNG_CANVAS_GRAY16 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_gray16; break; } */
-#endif
- /* case MNG_CANVAS_DX15 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_dx15; break; } */
- /* case MNG_CANVAS_DX16 : { pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_dx16; break; } */
- }
- }
-
-#ifndef MNG_SKIPCHUNK_BACK
- if (pData->bHasBACK)
- { /* background image ? */
- if ((pData->iBACKmandatory & 0x02) && (pData->iBACKimageid))
- {
- pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_backcolor;
- bColorcorr = MNG_TRUE;
- }
- else /* background color ? */
- if (pData->iBACKmandatory & 0x01)
- {
- pData->fRestbkgdrow = (mng_fptr)mng_restore_bkgd_backcolor;
- bColorcorr = MNG_TRUE;
- }
- }
-#endif
-
- pData->fCorrectrow = MNG_NULL; /* default no color-correction */
-
- if (bColorcorr) /* do we have to do color-correction ? */
- {
-#ifdef MNG_NO_CMS
- iRetcode = MNG_NOERROR;
-#else
-#if defined(MNG_FULL_CMS) /* determine color-management routine */
- iRetcode = mng_init_full_cms (pData, MNG_TRUE, MNG_FALSE, MNG_FALSE);
-#elif defined(MNG_GAMMA_ONLY)
- iRetcode = mng_init_gamma_only (pData, MNG_TRUE, MNG_FALSE, MNG_FALSE);
-#elif defined(MNG_APP_CMS)
- iRetcode = mng_init_app_cms (pData, MNG_TRUE, MNG_FALSE, MNG_FALSE);
-#endif
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif /* MNG_NO_CMS */
- }
- /* get a temporary row-buffer */
- MNG_ALLOC (pData, pData->pRGBArow, pData->iRowsize);
-
- iY = pData->iDestt; /* this is where we start */
- iRetcode = MNG_NOERROR; /* so far, so good */
-
- while ((!iRetcode) && (iY < pData->iDestb))
- { /* restore a background row */
- iRetcode = ((mng_restbkgdrow)pData->fRestbkgdrow) (pData);
- /* color correction ? */
- if ((!iRetcode) && (pData->fCorrectrow))
- iRetcode = ((mng_correctrow)pData->fCorrectrow) (pData);
-
- if (!iRetcode) /* so... display it */
- iRetcode = ((mng_displayrow)pData->fDisplayrow) (pData);
-
- if (!iRetcode)
- iRetcode = mng_next_row (pData);
-
- iY++; /* and next line */
- }
- /* drop the temporary row-buffer */
- MNG_FREE (pData, pData->pRGBArow, pData->iRowsize);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#if defined(MNG_FULL_CMS) /* cleanup cms stuff */
- if (bColorcorr) /* did we do color-correction ? */
- {
- iRetcode = mng_clear_cms (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif
-#ifndef MNG_SKIPCHUNK_BACK
- /* background image ? */
- if ((pData->bHasBACK) && (pData->iBACKmandatory & 0x02) && (pData->iBACKimageid))
- {
- mng_imagep pImage;
- /* let's find that object then */
- pData->pRetrieveobj = mng_find_imageobject (pData, pData->iBACKimageid);
- pImage = (mng_imagep)pData->pRetrieveobj;
- /* exists, viewable and visible ? */
- if ((pImage) && (pImage->bViewable) && (pImage->bVisible))
- { /* will it fall within the target region ? */
- if ((pImage->iPosx < pData->iDestr) && (pImage->iPosy < pData->iDestb) &&
- ((pData->iBACKtile) ||
- ((pImage->iPosx + (mng_int32)pImage->pImgbuf->iWidth >= pData->iDestl) &&
- (pImage->iPosy + (mng_int32)pImage->pImgbuf->iHeight >= pData->iDestt) )) &&
- ((!pImage->bClipped) ||
- ((pImage->iClipl <= pImage->iClipr) && (pImage->iClipt <= pImage->iClipb) &&
- (pImage->iClipl < pData->iDestr) && (pImage->iClipr >= pData->iDestl) &&
- (pImage->iClipt < pData->iDestb) && (pImage->iClipb >= pData->iDestt) )))
- { /* right; we've got ourselves something to do */
- if (pImage->bClipped) /* clip output region with image's clipping region ? */
- {
- if (pImage->iClipl > pData->iDestl)
- pData->iDestl = pImage->iClipl;
- if (pImage->iClipr < pData->iDestr)
- pData->iDestr = pImage->iClipr;
- if (pImage->iClipt > pData->iDestt)
- pData->iDestt = pImage->iClipt;
- if (pImage->iClipb < pData->iDestb)
- pData->iDestb = pImage->iClipb;
- }
- /* image offset does some extra clipping too ! */
- if (pImage->iPosx > pData->iDestl)
- pData->iDestl = pImage->iPosx;
- if (pImage->iPosy > pData->iDestt)
- pData->iDestt = pImage->iPosy;
-
- if (!pData->iBACKtile) /* without tiling further clipping is needed */
- {
- if (pImage->iPosx + (mng_int32)pImage->pImgbuf->iWidth < pData->iDestr)
- pData->iDestr = pImage->iPosx + (mng_int32)pImage->pImgbuf->iWidth;
- if (pImage->iPosy + (mng_int32)pImage->pImgbuf->iHeight < pData->iDestb)
- pData->iDestb = pImage->iPosy + (mng_int32)pImage->pImgbuf->iHeight;
- }
-
- pData->iSourcel = 0; /* source relative to destination */
- pData->iSourcer = pData->iDestr - pData->iDestl;
- pData->iSourcet = 0;
- pData->iSourceb = pData->iDestb - pData->iDestt;
- /* 16-bit background ? */
-
-#ifdef MNG_NO_16BIT_SUPPORT
- pData->bIsRGBA16 = MNG_FALSE;
-#else
- pData->bIsRGBA16 = (mng_bool)(pImage->pImgbuf->iBitdepth > 8);
-#endif
- /* let restore routine know the offsets !!! */
- pData->iBackimgoffsx = pImage->iPosx;
- pData->iBackimgoffsy = pImage->iPosy;
- pData->iBackimgwidth = pImage->pImgbuf->iWidth;
- pData->iBackimgheight = pImage->pImgbuf->iHeight;
- pData->iRow = 0; /* start at the top again !! */
- /* determine background object retrieval routine */
- switch (pImage->pImgbuf->iColortype)
- {
- case 0 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g8;
-
- pData->bIsOpaque = (mng_bool)(!pImage->pImgbuf->bHasTRNS);
- break;
- }
-
- case 2 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb8;
-
- pData->bIsOpaque = (mng_bool)(!pImage->pImgbuf->bHasTRNS);
- break;
- }
-
- case 3 : { pData->fRetrieverow = (mng_fptr)mng_retrieve_idx8;
- pData->bIsOpaque = (mng_bool)(!pImage->pImgbuf->bHasTRNS);
- break;
- }
-
- case 4 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
-
- case 6 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
-
- case 8 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g8;
-
- pData->bIsOpaque = MNG_TRUE;
- break;
- }
-
- case 10 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb8;
-
- pData->bIsOpaque = MNG_TRUE;
- break;
- }
-
- case 12 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
-
- case 14 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
- }
-
-#ifdef MNG_NO_CMS
- iRetcode = MNG_NOERROR;
-#else
-#if defined(MNG_FULL_CMS) /* determine color-management routine */
- iRetcode = mng_init_full_cms (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#elif defined(MNG_GAMMA_ONLY)
- iRetcode = mng_init_gamma_only (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#elif defined(MNG_APP_CMS)
- iRetcode = mng_init_app_cms (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#endif
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif /* MNG_NO_CMS */
- /* get temporary row-buffers */
- MNG_ALLOC (pData, pData->pPrevrow, pData->iRowsize);
- MNG_ALLOC (pData, pData->pRGBArow, pData->iRowsize);
-
- iY = pData->iDestt; /* this is where we start */
- iRetcode = MNG_NOERROR; /* so far, so good */
-
- while ((!iRetcode) && (iY < pData->iDestb))
- { /* restore a background row */
- iRetcode = mng_restore_bkgd_backimage (pData);
- /* color correction ? */
- if ((!iRetcode) && (pData->fCorrectrow))
- iRetcode = ((mng_correctrow)pData->fCorrectrow) (pData);
-
- if (!iRetcode) /* so... display it */
- iRetcode = ((mng_displayrow)pData->fDisplayrow) (pData);
-
- if (!iRetcode)
- iRetcode = mng_next_row (pData);
-
- iY++; /* and next line */
- }
- /* drop temporary row-buffers */
- MNG_FREE (pData, pData->pRGBArow, pData->iRowsize);
- MNG_FREE (pData, pData->pPrevrow, pData->iRowsize);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#if defined(MNG_FULL_CMS) /* cleanup cms stuff */
- iRetcode = mng_clear_cms (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif
- }
- }
- }
-#endif
- }
-
- pData->iDestl = iDestl; /* restore values */
- pData->iDestr = iDestr;
- pData->iDestt = iDestt;
- pData->iDestb = iDestb;
- pData->iSourcel = iSourcel;
- pData->iSourcer = iSourcer;
- pData->iSourcet = iSourcet;
- pData->iSourceb = iSourceb;
- pData->iPass = iPass;
- pData->iRow = iRow;
- pData->iRowinc = iRowinc;
- pData->iCol = iCol;
- pData->iColinc = iColinc;
- pData->iRowsamples = iRowsamples;
- pData->iRowsize = iRowsize;
- pData->pPrevrow = pPrevrow;
- pData->pRGBArow = pRGBArow;
- pData->bIsRGBA16 = bIsRGBA16;
- pData->bIsOpaque = bIsOpaque;
- pData->fCorrectrow = fCorrectrow;
- pData->fDisplayrow = fDisplayrow;
- pData->fRetrieverow = fRetrieverow;
- pData->pCurrentobj = pCurrentobj;
- pData->pRetrieveobj = pRetrieveobj;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_LOAD_BKGDLAYER, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode clear_canvas (mng_datap pData)
-{
- mng_int32 iY;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CLEAR_CANVAS, MNG_LC_START);
-#endif
-
- pData->iDestl = 0; /* clipping region is full canvas! */
- pData->iDestt = 0;
- pData->iDestr = pData->iWidth;
- pData->iDestb = pData->iHeight;
-
- pData->iSourcel = 0; /* source is same as destination */
- pData->iSourcer = pData->iWidth;
- pData->iSourcet = 0;
- pData->iSourceb = pData->iHeight;
-
- pData->iPass = -1; /* these are the object's dimensions now */
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iWidth;
- pData->iRowsize = pData->iRowsamples << 2;
- pData->bIsRGBA16 = MNG_FALSE; /* let's keep it simple ! */
- pData->bIsOpaque = MNG_TRUE;
-
- set_display_routine (pData); /* determine display routine */
- /* get a temporary row-buffer */
- /* it's transparent black by default!! */
- MNG_ALLOC (pData, pData->pRGBArow, pData->iRowsize);
-
- iY = pData->iDestt; /* this is where we start */
- iRetcode = MNG_NOERROR; /* so far, so good */
-
- while ((!iRetcode) && (iY < pData->iDestb))
- { /* clear a row then */
- iRetcode = ((mng_displayrow)pData->fDisplayrow) (pData);
-
- if (!iRetcode)
- iRetcode = mng_next_row (pData); /* adjust variables for next row */
-
- iY++; /* and next line */
- }
- /* drop the temporary row-buffer */
- MNG_FREE (pData, pData->pRGBArow, pData->iRowsize);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CLEAR_CANVAS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode next_frame (mng_datap pData,
- mng_uint8 iFramemode,
- mng_uint8 iChangedelay,
- mng_uint32 iDelay,
- mng_uint8 iChangetimeout,
- mng_uint32 iTimeout,
- mng_uint8 iChangeclipping,
- mng_uint8 iCliptype,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb)
-{
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_NEXT_FRAME, MNG_LC_START);
-#endif
-
- if (!pData->iBreakpoint) /* no previous break here ? */
- {
-#ifndef MNG_SKIPCHUNK_FRAM
- mng_uint8 iOldmode = pData->iFramemode;
- /* interframe delay required ? */
- if ((iOldmode == 2) || (iOldmode == 4))
- {
- if ((pData->iFrameseq) && (iFramemode != 1) && (iFramemode != 3))
- iRetcode = interframe_delay (pData);
- else
- pData->iFramedelay = pData->iNextdelay;
- }
- else
- { /* delay before inserting background layer? */
- if ((pData->bFramedone) && (iFramemode == 4))
- iRetcode = interframe_delay (pData);
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* now we'll assume we're in the next frame! */
- if (iFramemode) /* save the new framing mode ? */
- {
- pData->iFRAMmode = iFramemode;
- pData->iFramemode = iFramemode;
- }
- else /* reload default */
- pData->iFramemode = pData->iFRAMmode;
-
- if (iChangedelay) /* delay changed ? */
- {
- pData->iNextdelay = iDelay; /* for *after* next subframe */
-
- if ((iOldmode == 2) || (iOldmode == 4))
- pData->iFramedelay = pData->iFRAMdelay;
-
- if (iChangedelay == 2) /* also overall ? */
- pData->iFRAMdelay = iDelay;
- }
- else
- { /* reload default */
- pData->iNextdelay = pData->iFRAMdelay;
- }
-
- if (iChangetimeout) /* timeout changed ? */
- { /* for next subframe */
- pData->iFrametimeout = iTimeout;
-
- if ((iChangetimeout == 2) || /* also overall ? */
- (iChangetimeout == 4) ||
- (iChangetimeout == 6) ||
- (iChangetimeout == 8))
- pData->iFRAMtimeout = iTimeout;
- }
- else /* reload default */
- pData->iFrametimeout = pData->iFRAMtimeout;
-
- if (iChangeclipping) /* clipping changed ? */
- {
- pData->bFrameclipping = MNG_TRUE;
-
- if (!iCliptype) /* absolute ? */
- {
- pData->iFrameclipl = iClipl;
- pData->iFrameclipr = iClipr;
- pData->iFrameclipt = iClipt;
- pData->iFrameclipb = iClipb;
- }
- else /* relative */
- {
- pData->iFrameclipl = pData->iFrameclipl + iClipl;
- pData->iFrameclipr = pData->iFrameclipr + iClipr;
- pData->iFrameclipt = pData->iFrameclipt + iClipt;
- pData->iFrameclipb = pData->iFrameclipb + iClipb;
- }
-
- if (iChangeclipping == 2) /* also overall ? */
- {
- pData->bFRAMclipping = MNG_TRUE;
-
- if (!iCliptype) /* absolute ? */
- {
- pData->iFRAMclipl = iClipl;
- pData->iFRAMclipr = iClipr;
- pData->iFRAMclipt = iClipt;
- pData->iFRAMclipb = iClipb;
- }
- else /* relative */
- {
- pData->iFRAMclipl = pData->iFRAMclipl + iClipl;
- pData->iFRAMclipr = pData->iFRAMclipr + iClipr;
- pData->iFRAMclipt = pData->iFRAMclipt + iClipt;
- pData->iFRAMclipb = pData->iFRAMclipb + iClipb;
- }
- }
- }
- else
- { /* reload defaults */
- pData->bFrameclipping = pData->bFRAMclipping;
- pData->iFrameclipl = pData->iFRAMclipl;
- pData->iFrameclipr = pData->iFRAMclipr;
- pData->iFrameclipt = pData->iFRAMclipt;
- pData->iFrameclipb = pData->iFRAMclipb;
- }
-#endif
- }
-
- if (!pData->bTimerset) /* timer still off ? */
- {
- if (
-#ifndef MNG_SKIPCHUNK_FRAM
- (pData->iFramemode == 4) || /* insert background layer after a new frame */
-#endif
- (!pData->iLayerseq)) /* and certainly before the very first layer */
- iRetcode = load_bkgdlayer (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pData->iFrameseq++; /* count the frame ! */
- pData->bFramedone = MNG_TRUE; /* and indicate we've done one */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_NEXT_FRAME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode next_layer (mng_datap pData)
-{
- mng_imagep pImage;
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_NEXT_LAYER, MNG_LC_START);
-#endif
-
-#ifndef MNG_SKIPCHUNK_FRAM
- if (!pData->iBreakpoint) /* no previous break here ? */
- { /* interframe delay required ? */
- if ((pData->eImagetype == mng_it_mng) && (pData->iLayerseq) &&
- ((pData->iFramemode == 1) || (pData->iFramemode == 3)))
- iRetcode = interframe_delay (pData);
- else
- pData->iFramedelay = pData->iNextdelay;
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif
-
- if (!pData->bTimerset) /* timer still off ? */
- {
- if (!pData->iLayerseq) /* restore background for the very first layer ? */
- { /* wait till IDAT/JDAT for PNGs & JNGs !!! */
- if ((pData->eImagetype == mng_it_png) || (pData->eImagetype == mng_it_jng))
- pData->bRestorebkgd = MNG_TRUE;
- else
- { /* for MNG we do it right away */
- iRetcode = load_bkgdlayer (pData);
- pData->iLayerseq++; /* and it counts as a layer then ! */
- }
- }
-#ifndef MNG_SKIPCHUNK_FRAM
- else
- if (pData->iFramemode == 3) /* restore background for each layer ? */
- iRetcode = load_bkgdlayer (pData);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* processing a delta-image ? */
- pImage = (mng_imagep)pData->pDeltaImage;
- else
-#endif
- pImage = (mng_imagep)pData->pCurrentobj;
-
- if (!pImage) /* not an active object ? */
- pImage = (mng_imagep)pData->pObjzero;
- /* determine display rectangle */
- pData->iDestl = MAX_COORD ((mng_int32)0, pImage->iPosx);
- pData->iDestt = MAX_COORD ((mng_int32)0, pImage->iPosy);
- /* is it a valid buffer ? */
- if ((pImage->pImgbuf->iWidth) && (pImage->pImgbuf->iHeight))
- {
- pData->iDestr = MIN_COORD ((mng_int32)pData->iWidth,
- pImage->iPosx + (mng_int32)pImage->pImgbuf->iWidth );
- pData->iDestb = MIN_COORD ((mng_int32)pData->iHeight,
- pImage->iPosy + (mng_int32)pImage->pImgbuf->iHeight);
- }
- else /* it's a single image ! */
- {
- pData->iDestr = MIN_COORD ((mng_int32)pData->iWidth,
- (mng_int32)pData->iDatawidth );
- pData->iDestb = MIN_COORD ((mng_int32)pData->iHeight,
- (mng_int32)pData->iDataheight);
- }
-
-#ifndef MNG_SKIPCHUNK_FRAM
- if (pData->bFrameclipping) /* frame clipping specified ? */
- {
- pData->iDestl = MAX_COORD (pData->iDestl, pData->iFrameclipl);
- pData->iDestt = MAX_COORD (pData->iDestt, pData->iFrameclipt);
- pData->iDestr = MIN_COORD (pData->iDestr, pData->iFrameclipr);
- pData->iDestb = MIN_COORD (pData->iDestb, pData->iFrameclipb);
- }
-#endif
-
- if (pImage->bClipped) /* is the image clipped itself ? */
- {
- pData->iDestl = MAX_COORD (pData->iDestl, pImage->iClipl);
- pData->iDestt = MAX_COORD (pData->iDestt, pImage->iClipt);
- pData->iDestr = MIN_COORD (pData->iDestr, pImage->iClipr);
- pData->iDestb = MIN_COORD (pData->iDestb, pImage->iClipb);
- }
- /* determine source starting point */
- pData->iSourcel = MAX_COORD ((mng_int32)0, pData->iDestl - pImage->iPosx);
- pData->iSourcet = MAX_COORD ((mng_int32)0, pData->iDestt - pImage->iPosy);
-
- if ((pImage->pImgbuf->iWidth) && (pImage->pImgbuf->iHeight))
- { /* and maximum size */
- pData->iSourcer = MIN_COORD ((mng_int32)pImage->pImgbuf->iWidth,
- pData->iSourcel + pData->iDestr - pData->iDestl);
- pData->iSourceb = MIN_COORD ((mng_int32)pImage->pImgbuf->iHeight,
- pData->iSourcet + pData->iDestb - pData->iDestt);
- }
- else /* it's a single image ! */
- {
- pData->iSourcer = pData->iSourcel + pData->iDestr - pData->iDestl;
- pData->iSourceb = pData->iSourcet + pData->iDestb - pData->iDestt;
- }
-
- pData->iLayerseq++; /* count the layer ! */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_NEXT_LAYER, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_display_image (mng_datap pData,
- mng_imagep pImage,
- mng_bool bLayeradvanced)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_IMAGE, MNG_LC_START);
-#endif
- /* actively running ? */
-#ifndef MNG_SKIPCHUNK_MAGN
- if (((pData->bRunning) || (pData->bSearching)) && (!pData->bSkipping))
- {
- if ( (!pData->iBreakpoint) && /* needs magnification ? */
- ( (pImage->iMAGN_MethodX) || (pImage->iMAGN_MethodY) ) )
- {
- iRetcode = mng_magnify_imageobject (pData, pImage);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
-#endif
-
- pData->pRetrieveobj = pImage; /* so retrieve-row and color-correction can find it */
-
- if (!bLayeradvanced) /* need to advance the layer ? */
- {
- mng_imagep pSave = pData->pCurrentobj;
- pData->pCurrentobj = pImage;
- next_layer (pData); /* advance to next layer */
- pData->pCurrentobj = pSave;
- }
- /* need to restore the background ? */
- if ((!pData->bTimerset) && (pData->bRestorebkgd))
- {
- mng_imagep pSave = pData->pCurrentobj;
- pData->pCurrentobj = pImage;
- pData->bRestorebkgd = MNG_FALSE;
- iRetcode = load_bkgdlayer (pData);
- pData->pCurrentobj = pSave;
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pData->iLayerseq++; /* and it counts as a layer then ! */
- }
- /* actively running ? */
- if (((pData->bRunning) || (pData->bSearching)) && (!pData->bSkipping))
- {
- if (!pData->bTimerset) /* all systems still go ? */
- {
- pData->iBreakpoint = 0; /* let's make absolutely sure... */
- /* anything to display ? */
- if ((pData->iDestr >= pData->iDestl) && (pData->iDestb >= pData->iDestt))
- {
- mng_int32 iY;
-
- set_display_routine (pData); /* determine display routine */
- /* and image-buffer retrieval routine */
- switch (pImage->pImgbuf->iColortype)
- {
- case 0 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g8;
-
- pData->bIsOpaque = (mng_bool)(!pImage->pImgbuf->bHasTRNS);
- break;
- }
-
- case 2 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb8;
-
- pData->bIsOpaque = (mng_bool)(!pImage->pImgbuf->bHasTRNS);
- break;
- }
-
-
- case 3 : { pData->fRetrieverow = (mng_fptr)mng_retrieve_idx8;
- pData->bIsOpaque = (mng_bool)(!pImage->pImgbuf->bHasTRNS);
- break;
- }
-
-
- case 4 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
-
-
- case 6 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
-
- case 8 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g8;
-
- pData->bIsOpaque = MNG_TRUE;
- break;
- }
-
- case 10 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb8;
-
- pData->bIsOpaque = MNG_TRUE;
- break;
- }
-
-
- case 12 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
-
-
- case 14 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
-
- }
-
- pData->iPass = -1; /* these are the object's dimensions now */
- pData->iRow = pData->iSourcet;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pImage->pImgbuf->iWidth;
- pData->iRowsize = pData->iRowsamples << 2;
- pData->bIsRGBA16 = MNG_FALSE;
- /* adjust for 16-bit object ? */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pImage->pImgbuf->iBitdepth > 8)
- {
- pData->bIsRGBA16 = MNG_TRUE;
- pData->iRowsize = pData->iRowsamples << 3;
- }
-#endif
-
- pData->fCorrectrow = MNG_NULL; /* default no color-correction */
-
-#ifdef MNG_NO_CMS
- iRetcode = MNG_NOERROR;
-#else
-#if defined(MNG_FULL_CMS) /* determine color-management routine */
- iRetcode = mng_init_full_cms (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#elif defined(MNG_GAMMA_ONLY)
- iRetcode = mng_init_gamma_only (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#elif defined(MNG_APP_CMS)
- iRetcode = mng_init_app_cms (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#endif
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif /* MNG_NO_CMS */
- /* get a temporary row-buffer */
- MNG_ALLOC (pData, pData->pRGBArow, pData->iRowsize);
-
- iY = pData->iSourcet; /* this is where we start */
-
- while ((!iRetcode) && (iY < pData->iSourceb))
- { /* get a row */
- iRetcode = ((mng_retrieverow)pData->fRetrieverow) (pData);
- /* color correction ? */
- if ((!iRetcode) && (pData->fCorrectrow))
- iRetcode = ((mng_correctrow)pData->fCorrectrow) (pData);
-
- if (!iRetcode) /* so... display it */
- iRetcode = ((mng_displayrow)pData->fDisplayrow) (pData);
-
- if (!iRetcode) /* adjust variables for next row */
- iRetcode = mng_next_row (pData);
-
- iY++; /* and next line */
- }
- /* drop the temporary row-buffer */
- MNG_FREE (pData, pData->pRGBArow, pData->iRowsize);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#if defined(MNG_FULL_CMS) /* cleanup cms stuff */
- iRetcode = mng_clear_cms (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif
- }
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_IMAGE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* whehehe, this is good ! */
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_execute_delta_image (mng_datap pData,
- mng_imagep pTarget,
- mng_imagep pDelta)
-{
- mng_imagedatap pBuftarget = pTarget->pImgbuf;
- mng_imagedatap pBufdelta = pDelta->pImgbuf;
- mng_uint32 iY;
- mng_retcode iRetcode;
- mng_ptr pSaveRGBA;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_EXECUTE_DELTA_IMAGE, MNG_LC_START);
-#endif
- /* actively running ? */
- if (((pData->bRunning) || (pData->bSearching)) && (!pData->bSkipping))
- {
- if (pBufdelta->bHasPLTE) /* palette in delta ? */
- {
- mng_uint32 iX;
- /* new palette larger than old one ? */
- if ((!pBuftarget->bHasPLTE) || (pBuftarget->iPLTEcount < pBufdelta->iPLTEcount))
- pBuftarget->iPLTEcount = pBufdelta->iPLTEcount;
- /* it's definitely got a PLTE now */
- pBuftarget->bHasPLTE = MNG_TRUE;
-
- for (iX = 0; iX < pBufdelta->iPLTEcount; iX++)
- {
- pBuftarget->aPLTEentries[iX].iRed = pBufdelta->aPLTEentries[iX].iRed;
- pBuftarget->aPLTEentries[iX].iGreen = pBufdelta->aPLTEentries[iX].iGreen;
- pBuftarget->aPLTEentries[iX].iBlue = pBufdelta->aPLTEentries[iX].iBlue;
- }
- }
-
- if (pBufdelta->bHasTRNS) /* cheap transparency in delta ? */
- {
- switch (pData->iColortype) /* drop it into the target */
- {
- case 0: { /* gray */
- pBuftarget->iTRNSgray = pBufdelta->iTRNSgray;
- pBuftarget->iTRNSred = 0;
- pBuftarget->iTRNSgreen = 0;
- pBuftarget->iTRNSblue = 0;
- pBuftarget->iTRNScount = 0;
- break;
- }
- case 2: { /* rgb */
- pBuftarget->iTRNSgray = 0;
- pBuftarget->iTRNSred = pBufdelta->iTRNSred;
- pBuftarget->iTRNSgreen = pBufdelta->iTRNSgreen;
- pBuftarget->iTRNSblue = pBufdelta->iTRNSblue;
- pBuftarget->iTRNScount = 0;
- break;
- }
- case 3: { /* indexed */
- pBuftarget->iTRNSgray = 0;
- pBuftarget->iTRNSred = 0;
- pBuftarget->iTRNSgreen = 0;
- pBuftarget->iTRNSblue = 0;
- /* existing range smaller than new one ? */
- if ((!pBuftarget->bHasTRNS) || (pBuftarget->iTRNScount < pBufdelta->iTRNScount))
- pBuftarget->iTRNScount = pBufdelta->iTRNScount;
-
- MNG_COPY (pBuftarget->aTRNSentries, pBufdelta->aTRNSentries, pBufdelta->iTRNScount);
- break;
- }
- }
-
- pBuftarget->bHasTRNS = MNG_TRUE; /* tell it it's got a tRNS now */
- }
-
-#ifndef MNG_SKIPCHUNK_bKGD
- if (pBufdelta->bHasBKGD) /* bkgd in source ? */
- { /* drop it onto the target */
- pBuftarget->bHasBKGD = MNG_TRUE;
- pBuftarget->iBKGDindex = pBufdelta->iBKGDindex;
- pBuftarget->iBKGDgray = pBufdelta->iBKGDgray;
- pBuftarget->iBKGDred = pBufdelta->iBKGDred;
- pBuftarget->iBKGDgreen = pBufdelta->iBKGDgreen;
- pBuftarget->iBKGDblue = pBufdelta->iBKGDblue;
- }
-#endif
-
- if (pBufdelta->bHasGAMA) /* gamma in source ? */
- {
- pBuftarget->bHasGAMA = MNG_TRUE; /* drop it onto the target */
- pBuftarget->iGamma = pBufdelta->iGamma;
- }
-
-#ifndef MNG_SKIPCHUNK_cHRM
- if (pBufdelta->bHasCHRM) /* chroma in delta ? */
- { /* drop it onto the target */
- pBuftarget->bHasCHRM = MNG_TRUE;
- pBuftarget->iWhitepointx = pBufdelta->iWhitepointx;
- pBuftarget->iWhitepointy = pBufdelta->iWhitepointy;
- pBuftarget->iPrimaryredx = pBufdelta->iPrimaryredx;
- pBuftarget->iPrimaryredy = pBufdelta->iPrimaryredy;
- pBuftarget->iPrimarygreenx = pBufdelta->iPrimarygreenx;
- pBuftarget->iPrimarygreeny = pBufdelta->iPrimarygreeny;
- pBuftarget->iPrimarybluex = pBufdelta->iPrimarybluex;
- pBuftarget->iPrimarybluey = pBufdelta->iPrimarybluey;
- }
-#endif
-
-#ifndef MNG_SKIPCHUNK_sRGB
- if (pBufdelta->bHasSRGB) /* sRGB in delta ? */
- { /* drop it onto the target */
- pBuftarget->bHasSRGB = MNG_TRUE;
- pBuftarget->iRenderingintent = pBufdelta->iRenderingintent;
- }
-#endif
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pBufdelta->bHasICCP) /* ICC profile in delta ? */
- {
- pBuftarget->bHasICCP = MNG_TRUE; /* drop it onto the target */
-
- if (pBuftarget->pProfile) /* profile existed ? */
- MNG_FREEX (pData, pBuftarget->pProfile, pBuftarget->iProfilesize);
- /* allocate a buffer & copy it */
- MNG_ALLOC (pData, pBuftarget->pProfile, pBufdelta->iProfilesize);
- MNG_COPY (pBuftarget->pProfile, pBufdelta->pProfile, pBufdelta->iProfilesize);
- /* store its length as well */
- pBuftarget->iProfilesize = pBufdelta->iProfilesize;
- }
-#endif
- /* need to execute delta pixels ? */
- if ((!pData->bDeltaimmediate) && (pData->iDeltatype != MNG_DELTATYPE_NOCHANGE))
- {
- pData->fScalerow = MNG_NULL; /* not needed by default */
-
- switch (pBufdelta->iBitdepth) /* determine scaling routine */
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- switch (pBuftarget->iBitdepth)
- {
- case 2 : { pData->fScalerow = (mng_fptr)mng_scale_g1_g2; break; }
- case 4 : { pData->fScalerow = (mng_fptr)mng_scale_g1_g4; break; }
-
- case 8 : { pData->fScalerow = (mng_fptr)mng_scale_g1_g8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fScalerow = (mng_fptr)mng_scale_g1_g16; break; }
-#endif
- }
- break;
- }
-
- case 2 : {
- switch (pBuftarget->iBitdepth)
- {
- case 1 : { pData->fScalerow = (mng_fptr)mng_scale_g2_g1; break; }
- case 4 : { pData->fScalerow = (mng_fptr)mng_scale_g2_g4; break; }
- case 8 : { pData->fScalerow = (mng_fptr)mng_scale_g2_g8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fScalerow = (mng_fptr)mng_scale_g2_g16; break; }
-#endif
- }
- break;
- }
-
- case 4 : {
- switch (pBuftarget->iBitdepth)
- {
- case 1 : { pData->fScalerow = (mng_fptr)mng_scale_g4_g1; break; }
- case 2 : { pData->fScalerow = (mng_fptr)mng_scale_g4_g2; break; }
- case 8 : { pData->fScalerow = (mng_fptr)mng_scale_g4_g8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fScalerow = (mng_fptr)mng_scale_g4_g16; break; }
-#endif
- }
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
-
- case 8 : {
- switch (pBufdelta->iColortype)
- {
- case 0 : ;
- case 3 : ;
- case 8 : {
- switch (pBuftarget->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : { pData->fScalerow = (mng_fptr)mng_scale_g8_g1; break; }
- case 2 : { pData->fScalerow = (mng_fptr)mng_scale_g8_g2; break; }
- case 4 : { pData->fScalerow = (mng_fptr)mng_scale_g8_g4; break; }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fScalerow = (mng_fptr)mng_scale_g8_g16; break; }
-#endif
- }
- break;
- }
- case 2 : ;
- case 10 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuftarget->iBitdepth == 16)
- pData->fScalerow = (mng_fptr)mng_scale_rgb8_rgb16;
-#endif
- break;
- }
- case 4 : ;
- case 12 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuftarget->iBitdepth == 16)
- pData->fScalerow = (mng_fptr)mng_scale_ga8_ga16;
-#endif
- break;
- }
- case 6 : ;
- case 14 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuftarget->iBitdepth == 16)
- pData->fScalerow = (mng_fptr)mng_scale_rgba8_rgba16;
-#endif
- break;
- }
- }
- break;
- }
-
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- switch (pBufdelta->iColortype)
- {
- case 0 : ;
- case 3 : ;
- case 8 : {
- switch (pBuftarget->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : { pData->fScalerow = (mng_fptr)mng_scale_g16_g1; break; }
- case 2 : { pData->fScalerow = (mng_fptr)mng_scale_g16_g2; break; }
- case 4 : { pData->fScalerow = (mng_fptr)mng_scale_g16_g4; break; }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : { pData->fScalerow = (mng_fptr)mng_scale_g16_g8; break; }
- }
- break;
- }
- case 2 : ;
- case 10 : {
- if (pBuftarget->iBitdepth == 8)
- pData->fScalerow = (mng_fptr)mng_scale_rgb16_rgb8;
- break;
- }
- case 4 : ;
- case 12 : {
- if (pBuftarget->iBitdepth == 8)
- pData->fScalerow = (mng_fptr)mng_scale_ga16_ga8;
- break;
- }
- case 6 : ;
- case 14 : {
- if (pBuftarget->iBitdepth == 8)
- pData->fScalerow = (mng_fptr)mng_scale_rgba16_rgba8;
- break;
- }
- }
- break;
- }
-#endif
-
- }
-
- pData->fDeltarow = MNG_NULL; /* let's assume there's nothing to do */
-
- switch (pBuftarget->iColortype) /* determine delta processing routine */
- {
- case 0 : ;
- case 8 : { /* gray */
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- if ((pBufdelta->iColortype == 0) || (pBufdelta->iColortype == 3) ||
- (pBufdelta->iColortype == 8))
- {
- switch (pBuftarget->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : { pData->fDeltarow = (mng_fptr)mng_delta_g1_g1; break; }
- case 2 : { pData->fDeltarow = (mng_fptr)mng_delta_g2_g2; break; }
- case 4 : { pData->fDeltarow = (mng_fptr)mng_delta_g4_g4; break; }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : { pData->fDeltarow = (mng_fptr)mng_delta_g8_g8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fDeltarow = (mng_fptr)mng_delta_g16_g16; break; }
-#endif
- }
- }
- }
-
- break;
- }
-
- case 2 : ;
- case 10 : { /* rgb */
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- if ((pBufdelta->iColortype == 2) || (pBufdelta->iColortype == 10))
- {
- switch (pBuftarget->iBitdepth)
- {
- case 8 : { pData->fDeltarow = (mng_fptr)mng_delta_rgb8_rgb8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fDeltarow = (mng_fptr)mng_delta_rgb16_rgb16; break; }
-#endif
- }
- }
- }
-
- break;
- }
-
- case 3 : { /* indexed; abuse gray routines */
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- if ((pBufdelta->iColortype == 0) || (pBufdelta->iColortype == 3))
- {
- switch (pBuftarget->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : { pData->fDeltarow = (mng_fptr)mng_delta_g1_g1; break; }
- case 2 : { pData->fDeltarow = (mng_fptr)mng_delta_g2_g2; break; }
- case 4 : { pData->fDeltarow = (mng_fptr)mng_delta_g4_g4; break; }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : { pData->fDeltarow = (mng_fptr)mng_delta_g8_g8; break; }
- }
- }
- }
-
- break;
- }
-
- case 4 : ;
- case 12 : { /* gray + alpha */
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- if ((pBufdelta->iColortype == 4) || (pBufdelta->iColortype == 12))
- {
- switch (pBuftarget->iBitdepth)
- {
- case 8 : { pData->fDeltarow = (mng_fptr)mng_delta_ga8_ga8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fDeltarow = (mng_fptr)mng_delta_ga16_ga16; break; }
-#endif
- }
- }
- }
- else
- if ((pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORREPLACE) )
- {
- if ((pBufdelta->iColortype == 0) || (pBufdelta->iColortype == 3) ||
- (pBufdelta->iColortype == 8))
- {
- switch (pBuftarget->iBitdepth)
- {
- case 8 : { pData->fDeltarow = (mng_fptr)mng_delta_ga8_g8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fDeltarow = (mng_fptr)mng_delta_ga16_g16; break; }
-#endif
- }
- }
- }
- else
- if ((pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAREPLACE) )
- {
- if ((pBufdelta->iColortype == 0) || (pBufdelta->iColortype == 3))
- {
- switch (pBuftarget->iBitdepth)
- {
- case 8 : { pData->fDeltarow = (mng_fptr)mng_delta_ga8_a8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fDeltarow = (mng_fptr)mng_delta_ga16_a16; break; }
-#endif
- }
- }
- }
-
- break;
- }
-
- case 6 : ;
- case 14 : { /* rgb + alpha */
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- if ((pBufdelta->iColortype == 6) || (pBufdelta->iColortype == 14))
- {
- switch (pBuftarget->iBitdepth)
- {
- case 8 : { pData->fDeltarow = (mng_fptr)mng_delta_rgba8_rgba8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fDeltarow = (mng_fptr)mng_delta_rgba16_rgba16; break; }
-#endif
- }
- }
- }
- else
- if ((pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORREPLACE) )
- {
- if ((pBufdelta->iColortype == 2) || (pBufdelta->iColortype == 10))
- {
- switch (pBuftarget->iBitdepth)
- {
- case 8 : { pData->fDeltarow = (mng_fptr)mng_delta_rgba8_rgb8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fDeltarow = (mng_fptr)mng_delta_rgba16_rgb16; break; }
-#endif
- }
- }
- }
- else
- if ((pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAREPLACE) )
- {
- if ((pBufdelta->iColortype == 0) || (pBufdelta->iColortype == 3))
- {
- switch (pBuftarget->iBitdepth)
- {
- case 8 : { pData->fDeltarow = (mng_fptr)mng_delta_rgba8_a8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fDeltarow = (mng_fptr)mng_delta_rgba16_a16; break; }
-#endif
- }
- }
- }
-
- break;
- }
-
- }
-
- if (pData->fDeltarow) /* do we need to take action ? */
- {
- pData->iPass = -1; /* setup row dimensions and stuff */
- pData->iRow = pData->iDeltaBlocky;
- pData->iRowinc = 1;
- pData->iCol = pData->iDeltaBlockx;
- pData->iColinc = 1;
- pData->iRowsamples = pBufdelta->iWidth;
- pData->iRowsize = pBuftarget->iRowsize;
- /* indicate where to retrieve & where to store */
- pData->pRetrieveobj = (mng_objectp)pDelta;
- pData->pStoreobj = (mng_objectp)pTarget;
-
- pSaveRGBA = pData->pRGBArow; /* save current temp-buffer! */
- /* get a temporary row-buffer */
- MNG_ALLOC (pData, pData->pRGBArow, (pBufdelta->iRowsize << 1));
-
- iY = 0; /* this is where we start */
- iRetcode = MNG_NOERROR; /* still oke for now */
-
- while ((!iRetcode) && (iY < pBufdelta->iHeight))
- { /* get a row */
- mng_uint8p pWork = pBufdelta->pImgdata + (iY * pBufdelta->iRowsize);
-
- MNG_COPY (pData->pRGBArow, pWork, pBufdelta->iRowsize);
-
- if (pData->fScalerow) /* scale it (if necessary) */
- iRetcode = ((mng_scalerow)pData->fScalerow) (pData);
-
- if (!iRetcode) /* and... execute it */
- iRetcode = ((mng_deltarow)pData->fDeltarow) (pData);
-
- if (!iRetcode) /* adjust variables for next row */
- iRetcode = mng_next_row (pData);
-
- iY++; /* and next line */
- }
- /* drop the temporary row-buffer */
- MNG_FREE (pData, pData->pRGBArow, (pBufdelta->iRowsize << 1));
- pData->pRGBArow = pSaveRGBA; /* restore saved temp-buffer! */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
- else
- MNG_ERROR (pData, MNG_INVALIDDELTA);
-
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_EXECUTE_DELTA_IMAGE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_DELTA_PNG */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-MNG_LOCAL mng_retcode save_state (mng_datap pData)
-{
- mng_savedatap pSave;
- mng_imagep pImage;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SAVE_STATE, MNG_LC_START);
-#endif
-
- if (pData->pSavedata) /* sanity check */
- MNG_ERROR (pData, MNG_INTERNALERROR);
- /* get a buffer for saving */
- MNG_ALLOC (pData, pData->pSavedata, sizeof (mng_savedata));
-
- pSave = pData->pSavedata; /* address it more directly */
- /* and copy global data from the main struct */
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
- pSave->bHasglobalPLTE = pData->bHasglobalPLTE;
- pSave->bHasglobalTRNS = pData->bHasglobalTRNS;
- pSave->bHasglobalGAMA = pData->bHasglobalGAMA;
- pSave->bHasglobalCHRM = pData->bHasglobalCHRM;
- pSave->bHasglobalSRGB = pData->bHasglobalSRGB;
- pSave->bHasglobalICCP = pData->bHasglobalICCP;
- pSave->bHasglobalBKGD = pData->bHasglobalBKGD;
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-#ifndef MNG_SKIPCHUNK_BACK
- pSave->iBACKred = pData->iBACKred;
- pSave->iBACKgreen = pData->iBACKgreen;
- pSave->iBACKblue = pData->iBACKblue;
- pSave->iBACKmandatory = pData->iBACKmandatory;
- pSave->iBACKimageid = pData->iBACKimageid;
- pSave->iBACKtile = pData->iBACKtile;
-#endif
-
-#ifndef MNG_SKIPCHUNK_FRAM
- pSave->iFRAMmode = pData->iFRAMmode;
- pSave->iFRAMdelay = pData->iFRAMdelay;
- pSave->iFRAMtimeout = pData->iFRAMtimeout;
- pSave->bFRAMclipping = pData->bFRAMclipping;
- pSave->iFRAMclipl = pData->iFRAMclipl;
- pSave->iFRAMclipr = pData->iFRAMclipr;
- pSave->iFRAMclipt = pData->iFRAMclipt;
- pSave->iFRAMclipb = pData->iFRAMclipb;
-#endif
-
- pSave->iGlobalPLTEcount = pData->iGlobalPLTEcount;
-
- MNG_COPY (pSave->aGlobalPLTEentries, pData->aGlobalPLTEentries, sizeof (mng_rgbpaltab));
-
- pSave->iGlobalTRNSrawlen = pData->iGlobalTRNSrawlen;
- MNG_COPY (pSave->aGlobalTRNSrawdata, pData->aGlobalTRNSrawdata, 256);
-
- pSave->iGlobalGamma = pData->iGlobalGamma;
-
-#ifndef MNG_SKIPCHUNK_cHRM
- pSave->iGlobalWhitepointx = pData->iGlobalWhitepointx;
- pSave->iGlobalWhitepointy = pData->iGlobalWhitepointy;
- pSave->iGlobalPrimaryredx = pData->iGlobalPrimaryredx;
- pSave->iGlobalPrimaryredy = pData->iGlobalPrimaryredy;
- pSave->iGlobalPrimarygreenx = pData->iGlobalPrimarygreenx;
- pSave->iGlobalPrimarygreeny = pData->iGlobalPrimarygreeny;
- pSave->iGlobalPrimarybluex = pData->iGlobalPrimarybluex;
- pSave->iGlobalPrimarybluey = pData->iGlobalPrimarybluey;
-#endif
-
-#ifndef MNG_SKIPCHUNK_sRGB
- pSave->iGlobalRendintent = pData->iGlobalRendintent;
-#endif
-
-#ifndef MNG_SKIPCHUNK_iCCP
- pSave->iGlobalProfilesize = pData->iGlobalProfilesize;
-
- if (pSave->iGlobalProfilesize) /* has a profile ? */
- { /* then copy that ! */
- MNG_ALLOC (pData, pSave->pGlobalProfile, pSave->iGlobalProfilesize);
- MNG_COPY (pSave->pGlobalProfile, pData->pGlobalProfile, pSave->iGlobalProfilesize);
- }
-#endif
-
-#ifndef MNG_SKIPCHUNK_bKGD
- pSave->iGlobalBKGDred = pData->iGlobalBKGDred;
- pSave->iGlobalBKGDgreen = pData->iGlobalBKGDgreen;
- pSave->iGlobalBKGDblue = pData->iGlobalBKGDblue;
-#endif
-
- /* freeze current image objects */
- pImage = (mng_imagep)pData->pFirstimgobj;
-
- while (pImage)
- { /* freeze the object AND its buffer */
- pImage->bFrozen = MNG_TRUE;
- pImage->pImgbuf->bFrozen = MNG_TRUE;
- /* neeeext */
- pImage = (mng_imagep)pImage->sHeader.pNext;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SAVE_STATE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_reset_objzero (mng_datap pData)
-{
- mng_imagep pImage = (mng_imagep)pData->pObjzero;
- mng_retcode iRetcode = mng_reset_object_details (pData, pImage, 0, 0, 0,
- 0, 0, 0, 0, MNG_TRUE);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pImage->bVisible = MNG_TRUE;
- pImage->bViewable = MNG_TRUE;
- pImage->iPosx = 0;
- pImage->iPosy = 0;
- pImage->bClipped = MNG_FALSE;
- pImage->iClipl = 0;
- pImage->iClipr = 0;
- pImage->iClipt = 0;
- pImage->iClipb = 0;
-#ifndef MNG_SKIPCHUNK_MAGN
- pImage->iMAGN_MethodX = 0;
- pImage->iMAGN_MethodY = 0;
- pImage->iMAGN_MX = 0;
- pImage->iMAGN_MY = 0;
- pImage->iMAGN_ML = 0;
- pImage->iMAGN_MR = 0;
- pImage->iMAGN_MT = 0;
- pImage->iMAGN_MB = 0;
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode restore_state (mng_datap pData)
-{
-#ifndef MNG_SKIPCHUNK_SAVE
- mng_savedatap pSave;
-#endif
- mng_imagep pImage;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_STATE, MNG_LC_START);
-#endif
- /* restore object 0 status !!! */
- iRetcode = mng_reset_objzero (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* fresh cycle; fake no frames done yet */
- pData->bFramedone = MNG_FALSE;
-
-#ifndef MNG_SKIPCHUNK_SAVE
- if (pData->pSavedata) /* do we have a saved state ? */
- {
- pSave = pData->pSavedata; /* address it more directly */
- /* and copy it back to the main struct */
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
- pData->bHasglobalPLTE = pSave->bHasglobalPLTE;
- pData->bHasglobalTRNS = pSave->bHasglobalTRNS;
- pData->bHasglobalGAMA = pSave->bHasglobalGAMA;
- pData->bHasglobalCHRM = pSave->bHasglobalCHRM;
- pData->bHasglobalSRGB = pSave->bHasglobalSRGB;
- pData->bHasglobalICCP = pSave->bHasglobalICCP;
- pData->bHasglobalBKGD = pSave->bHasglobalBKGD;
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-#ifndef MNG_SKIPCHUNK_BACK
- pData->iBACKred = pSave->iBACKred;
- pData->iBACKgreen = pSave->iBACKgreen;
- pData->iBACKblue = pSave->iBACKblue;
- pData->iBACKmandatory = pSave->iBACKmandatory;
- pData->iBACKimageid = pSave->iBACKimageid;
- pData->iBACKtile = pSave->iBACKtile;
-#endif
-
-#ifndef MNG_SKIPCHUNK_FRAM
- pData->iFRAMmode = pSave->iFRAMmode;
-/* pData->iFRAMdelay = pSave->iFRAMdelay; */
- pData->iFRAMtimeout = pSave->iFRAMtimeout;
- pData->bFRAMclipping = pSave->bFRAMclipping;
- pData->iFRAMclipl = pSave->iFRAMclipl;
- pData->iFRAMclipr = pSave->iFRAMclipr;
- pData->iFRAMclipt = pSave->iFRAMclipt;
- pData->iFRAMclipb = pSave->iFRAMclipb;
- /* NOOOOOOOOOOOO */
-/* pData->iFramemode = pSave->iFRAMmode;
- pData->iFramedelay = pSave->iFRAMdelay;
- pData->iFrametimeout = pSave->iFRAMtimeout;
- pData->bFrameclipping = pSave->bFRAMclipping;
- pData->iFrameclipl = pSave->iFRAMclipl;
- pData->iFrameclipr = pSave->iFRAMclipr;
- pData->iFrameclipt = pSave->iFRAMclipt;
- pData->iFrameclipb = pSave->iFRAMclipb; */
-
-/* pData->iNextdelay = pSave->iFRAMdelay; */
- pData->iNextdelay = pData->iFramedelay;
-#endif
-
- pData->iGlobalPLTEcount = pSave->iGlobalPLTEcount;
- MNG_COPY (pData->aGlobalPLTEentries, pSave->aGlobalPLTEentries, sizeof (mng_rgbpaltab));
-
- pData->iGlobalTRNSrawlen = pSave->iGlobalTRNSrawlen;
- MNG_COPY (pData->aGlobalTRNSrawdata, pSave->aGlobalTRNSrawdata, 256);
-
- pData->iGlobalGamma = pSave->iGlobalGamma;
-
-#ifndef MNG_SKIPCHUNK_cHRM
- pData->iGlobalWhitepointx = pSave->iGlobalWhitepointx;
- pData->iGlobalWhitepointy = pSave->iGlobalWhitepointy;
- pData->iGlobalPrimaryredx = pSave->iGlobalPrimaryredx;
- pData->iGlobalPrimaryredy = pSave->iGlobalPrimaryredy;
- pData->iGlobalPrimarygreenx = pSave->iGlobalPrimarygreenx;
- pData->iGlobalPrimarygreeny = pSave->iGlobalPrimarygreeny;
- pData->iGlobalPrimarybluex = pSave->iGlobalPrimarybluex;
- pData->iGlobalPrimarybluey = pSave->iGlobalPrimarybluey;
-#endif
-
- pData->iGlobalRendintent = pSave->iGlobalRendintent;
-
-#ifndef MNG_SKIPCHUNK_iCCP
- pData->iGlobalProfilesize = pSave->iGlobalProfilesize;
-
- if (pData->iGlobalProfilesize) /* has a profile ? */
- { /* then copy that ! */
- MNG_ALLOC (pData, pData->pGlobalProfile, pData->iGlobalProfilesize);
- MNG_COPY (pData->pGlobalProfile, pSave->pGlobalProfile, pData->iGlobalProfilesize);
- }
-#endif
-
-#ifndef MNG_SKIPCHUNK_bKGD
- pData->iGlobalBKGDred = pSave->iGlobalBKGDred;
- pData->iGlobalBKGDgreen = pSave->iGlobalBKGDgreen;
- pData->iGlobalBKGDblue = pSave->iGlobalBKGDblue;
-#endif
- }
- else /* no saved-data; so reset the lot */
-#endif /* SKIPCHUNK_SAVE */
- {
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
- pData->bHasglobalPLTE = MNG_FALSE;
- pData->bHasglobalTRNS = MNG_FALSE;
- pData->bHasglobalGAMA = MNG_FALSE;
- pData->bHasglobalCHRM = MNG_FALSE;
- pData->bHasglobalSRGB = MNG_FALSE;
- pData->bHasglobalICCP = MNG_FALSE;
- pData->bHasglobalBKGD = MNG_FALSE;
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-#ifndef MNG_SKIPCHUNK_TERM
- if (!pData->bMisplacedTERM) /* backward compatible ugliness !!! */
- {
- pData->iBACKred = 0;
- pData->iBACKgreen = 0;
- pData->iBACKblue = 0;
- pData->iBACKmandatory = 0;
- pData->iBACKimageid = 0;
- pData->iBACKtile = 0;
- }
-#endif
-
-#ifndef MNG_SKIPCHUNK_FRAM
- pData->iFRAMmode = 1;
-/* pData->iFRAMdelay = 1; */
- pData->iFRAMtimeout = 0x7fffffffl;
- pData->bFRAMclipping = MNG_FALSE;
- pData->iFRAMclipl = 0;
- pData->iFRAMclipr = 0;
- pData->iFRAMclipt = 0;
- pData->iFRAMclipb = 0;
- /* NOOOOOOOOOOOO */
-/* pData->iFramemode = 1;
- pData->iFramedelay = 1;
- pData->iFrametimeout = 0x7fffffffl;
- pData->bFrameclipping = MNG_FALSE;
- pData->iFrameclipl = 0;
- pData->iFrameclipr = 0;
- pData->iFrameclipt = 0;
- pData->iFrameclipb = 0; */
-
-/* pData->iNextdelay = 1; */
- pData->iNextdelay = pData->iFramedelay;
-#endif
-
- pData->iGlobalPLTEcount = 0;
-
- pData->iGlobalTRNSrawlen = 0;
-
- pData->iGlobalGamma = 0;
-
-#ifndef MNG_SKIPCHUNK_cHRM
- pData->iGlobalWhitepointx = 0;
- pData->iGlobalWhitepointy = 0;
- pData->iGlobalPrimaryredx = 0;
- pData->iGlobalPrimaryredy = 0;
- pData->iGlobalPrimarygreenx = 0;
- pData->iGlobalPrimarygreeny = 0;
- pData->iGlobalPrimarybluex = 0;
- pData->iGlobalPrimarybluey = 0;
-#endif
-
- pData->iGlobalRendintent = 0;
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pData->iGlobalProfilesize) /* free a previous profile ? */
- MNG_FREE (pData, pData->pGlobalProfile, pData->iGlobalProfilesize);
-
- pData->iGlobalProfilesize = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_bKGD
- pData->iGlobalBKGDred = 0;
- pData->iGlobalBKGDgreen = 0;
- pData->iGlobalBKGDblue = 0;
-#endif
- }
-
-#ifndef MNG_SKIPCHUNK_TERM
- if (!pData->bMisplacedTERM) /* backward compatible ugliness !!! */
- {
- pImage = (mng_imagep)pData->pFirstimgobj;
- /* drop un-frozen image objects */
- while (pImage)
- {
- mng_imagep pNext = (mng_imagep)pImage->sHeader.pNext;
-
- if (!pImage->bFrozen) /* is it un-frozen ? */
- {
- mng_imagep pPrev = (mng_imagep)pImage->sHeader.pPrev;
-
- if (pPrev) /* unlink it */
- pPrev->sHeader.pNext = pNext;
- else
- pData->pFirstimgobj = pNext;
-
- if (pNext)
- pNext->sHeader.pPrev = pPrev;
- else
- pData->pLastimgobj = pPrev;
-
- if (pImage->pImgbuf->bFrozen) /* buffer frozen ? */
- {
- if (pImage->pImgbuf->iRefcount < 2)
- MNG_ERROR (pData, MNG_INTERNALERROR);
- /* decrease ref counter */
- pImage->pImgbuf->iRefcount--;
- /* just cleanup the object then */
- MNG_FREEX (pData, pImage, sizeof (mng_image));
- }
- else
- { /* free the image buffer */
- iRetcode = mng_free_imagedataobject (pData, pImage->pImgbuf);
- /* and cleanup the object */
- MNG_FREEX (pData, pImage, sizeof (mng_image));
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
-
- pImage = pNext; /* neeeext */
- }
- }
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_STATE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * General display processing routine * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_process_display (mng_datap pData)
-{
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY, MNG_LC_START);
-#endif
-
- if (!pData->iBreakpoint) /* not broken previously ? */
- {
- if ((pData->iRequestframe) || (pData->iRequestlayer) || (pData->iRequesttime))
- {
- pData->bSearching = MNG_TRUE; /* indicate we're searching */
-
- iRetcode = clear_canvas (pData); /* make the canvas virgin black ?!? */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* let's start from the top, shall we */
- pData->pCurraniobj = pData->pFirstaniobj;
- }
- }
-
- do /* process the objects */
- {
- if (pData->bSearching) /* clear timer-flag when searching !!! */
- pData->bTimerset = MNG_FALSE;
- /* do we need to finish something first ? */
- if ((pData->iBreakpoint) && (pData->iBreakpoint < 99))
- {
- switch (pData->iBreakpoint) /* return to broken display routine */
- {
-#ifndef MNG_SKIPCHUNK_FRAM
- case 1 : { iRetcode = mng_process_display_fram2 (pData); break; }
-#endif
-#ifndef MNG_SKIPCHUNK_SHOW
- case 3 : ; /* same as 4 !!! */
- case 4 : { iRetcode = mng_process_display_show (pData); break; }
-#endif
-#ifndef MNG_SKIPCHUNK_CLON
- case 5 : { iRetcode = mng_process_display_clon2 (pData); break; }
-#endif
-#ifndef MNG_SKIPCHUNK_MAGN
- case 9 : { iRetcode = mng_process_display_magn2 (pData); break; }
- case 10 : { iRetcode = mng_process_display_mend2 (pData); break; }
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
- case 11 : { iRetcode = mng_process_display_past2 (pData); break; }
-#endif
- default : MNG_ERROR (pData, MNG_INTERNALERROR);
- }
- }
- else
- {
- if (pData->pCurraniobj)
- iRetcode = ((mng_object_headerp)pData->pCurraniobj)->fProcess (pData, pData->pCurraniobj);
- }
-
- if (!pData->bTimerset) /* reset breakpoint flag ? */
- pData->iBreakpoint = 0;
- /* can we advance to next object ? */
- if ((!iRetcode) && (pData->pCurraniobj) &&
- (!pData->bTimerset) && (!pData->bSectionwait))
- {
- pData->pCurraniobj = ((mng_object_headerp)pData->pCurraniobj)->pNext;
- /* MEND processing to be done ? */
- if ((pData->eImagetype == mng_it_mng) && (!pData->pCurraniobj))
- iRetcode = mng_process_display_mend (pData);
-
- if (!pData->pCurraniobj) /* refresh after last image ? */
- pData->bNeedrefresh = MNG_TRUE;
- }
-
- if (pData->bSearching) /* are we looking for something ? */
- {
- if ((pData->iRequestframe) && (pData->iRequestframe <= pData->iFrameseq))
- {
- pData->iRequestframe = 0; /* found the frame ! */
- pData->bSearching = MNG_FALSE;
- }
- else
- if ((pData->iRequestlayer) && (pData->iRequestlayer <= pData->iLayerseq))
- {
- pData->iRequestlayer = 0; /* found the layer ! */
- pData->bSearching = MNG_FALSE;
- }
- else
- if ((pData->iRequesttime) && (pData->iRequesttime <= pData->iFrametime))
- {
- pData->iRequesttime = 0; /* found the playtime ! */
- pData->bSearching = MNG_FALSE;
- }
- }
- } /* until error or a break or no more objects */
- while ((!iRetcode) && (pData->pCurraniobj) &&
- (((pData->bRunning) && (!pData->bTimerset)) || (pData->bSearching)) &&
- (!pData->bSectionwait) && (!pData->bFreezing));
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* refresh needed ? */
- if ((!pData->bTimerset) && (pData->bNeedrefresh))
- {
- iRetcode = mng_display_progressive_refresh (pData, 1);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- /* timer break ? */
- if ((pData->bTimerset) && (!pData->iBreakpoint))
- pData->iBreakpoint = 99;
- else
- if (!pData->bTimerset)
- pData->iBreakpoint = 0; /* reset if no timer break */
-
- if ((!pData->bTimerset) && (!pData->pCurraniobj))
- pData->bRunning = MNG_FALSE; /* all done now ! */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * Chunk display processing routines * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
-png_imgtype mng_png_imgtype(mng_uint8 colortype, mng_uint8 bitdepth)
-{
- png_imgtype ret;
- switch (bitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1:
- {
- png_imgtype imgtype[]={png_g1,png_none,png_none,png_idx1};
- ret=imgtype[colortype];
- break;
- }
- case 2:
- {
- png_imgtype imgtype[]={png_g2,png_none,png_none,png_idx2};
- ret=imgtype[colortype];
- break;
- }
- case 4:
- {
- png_imgtype imgtype[]={png_g4,png_none,png_none,png_idx4};
- ret=imgtype[colortype];
- break;
- }
-#endif
- case 8:
- {
- png_imgtype imgtype[]={png_g8,png_none,png_rgb8,png_idx8,png_ga8,
- png_none,png_rgba8};
- ret=imgtype[colortype];
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16:
- {
- png_imgtype imgtype[]={png_g16,png_none,png_rgb16,png_none,png_ga16,
- png_none,png_rgba16};
- ret=imgtype[colortype];
- break;
- }
-#endif
- default:
- ret=png_none;
- break;
- }
- return (ret);
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_INIT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_display_ihdr (mng_datap pData)
-{ /* address the current "object" if any */
- mng_imagep pImage = (mng_imagep)pData->pCurrentobj;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_IHDR, MNG_LC_START);
-#endif
-
- if (!pData->bHasDHDR)
- {
- pData->fInitrowproc = MNG_NULL; /* do nothing by default */
- pData->fDisplayrow = MNG_NULL;
- pData->fCorrectrow = MNG_NULL;
- pData->fStorerow = MNG_NULL;
- pData->fProcessrow = MNG_NULL;
- pData->fDifferrow = MNG_NULL;
- pData->pStoreobj = MNG_NULL;
- }
-
- if (!pData->iBreakpoint) /* not previously broken ? */
- {
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* is a delta-image ? */
- {
- if (pData->iDeltatype == MNG_DELTATYPE_REPLACE)
- iRetcode = mng_reset_object_details (pData, (mng_imagep)pData->pDeltaImage,
- pData->iDatawidth, pData->iDataheight,
- pData->iBitdepth, pData->iColortype,
- pData->iCompression, pData->iFilter,
- pData->iInterlace, MNG_TRUE);
- else
- if ((pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iPixelsampledepth = pData->iBitdepth;
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iAlphasampledepth = pData->iBitdepth;
- }
- else
- if ((pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAREPLACE) )
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iAlphasampledepth = pData->iBitdepth;
- else
- if ((pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORREPLACE) )
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iPixelsampledepth = pData->iBitdepth;
-
- if (!iRetcode)
- { /* process immediately if bitdepth & colortype are equal */
- pData->bDeltaimmediate =
- (mng_bool)((pData->iBitdepth == ((mng_imagep)pData->pDeltaImage)->pImgbuf->iBitdepth ) &&
- (pData->iColortype == ((mng_imagep)pData->pDeltaImage)->pImgbuf->iColortype) );
- /* be sure to reset object 0 */
- iRetcode = mng_reset_object_details (pData, (mng_imagep)pData->pObjzero,
- pData->iDatawidth, pData->iDataheight,
- pData->iBitdepth, pData->iColortype,
- pData->iCompression, pData->iFilter,
- pData->iInterlace, MNG_TRUE);
- }
- }
- else
-#endif
- {
- if (pImage) /* update object buffer ? */
- iRetcode = mng_reset_object_details (pData, pImage,
- pData->iDatawidth, pData->iDataheight,
- pData->iBitdepth, pData->iColortype,
- pData->iCompression, pData->iFilter,
- pData->iInterlace, MNG_TRUE);
- else
- iRetcode = mng_reset_object_details (pData, (mng_imagep)pData->pObjzero,
- pData->iDatawidth, pData->iDataheight,
- pData->iBitdepth, pData->iColortype,
- pData->iCompression, pData->iFilter,
- pData->iInterlace, MNG_TRUE);
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
-#ifndef MNG_NO_DELTA_PNG
- if (!pData->bHasDHDR)
-#endif
- {
- if (pImage) /* real object ? */
- pData->pStoreobj = pImage; /* tell the row routines */
- else /* otherwise use object 0 */
- pData->pStoreobj = pData->pObjzero;
-
-#if !defined(MNG_INCLUDE_MPNG_PROPOSAL) && !defined(MNG_INCLUDE_ANG_PROPOSAL)
- if ( /* display "on-the-fly" ? */
-#ifndef MNG_SKIPCHUNK_MAGN
- (((mng_imagep)pData->pStoreobj)->iMAGN_MethodX == 0) &&
- (((mng_imagep)pData->pStoreobj)->iMAGN_MethodY == 0) &&
-#endif
- ( (pData->eImagetype == mng_it_png ) ||
- (((mng_imagep)pData->pStoreobj)->bVisible) ) )
- {
- next_layer (pData); /* that's a new layer then ! */
-
- if (pData->bTimerset) /* timer break ? */
- pData->iBreakpoint = 2;
- else
- {
- pData->iBreakpoint = 0;
- /* anything to display ? */
- if ((pData->iDestr > pData->iDestl) && (pData->iDestb > pData->iDestt))
- set_display_routine (pData); /* then determine display routine */
- }
- }
-#endif
- }
-
- if (!pData->bTimerset) /* no timer break ? */
- {
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- pData->fInitrowproc = (mng_fptr)mng_init_rowproc;
- pData->ePng_imgtype=mng_png_imgtype(pData->iColortype,pData->iBitdepth);
-#else
- switch (pData->iColortype) /* determine row initialization routine */
- {
- case 0 : { /* gray */
- switch (pData->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g1_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g1_i;
-
- break;
- }
- case 2 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g2_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g2_i;
-
- break;
- }
- case 4 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g4_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g4_i;
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- case 2 : { /* rgb */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgb8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgb8_i;
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgb16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgb16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- case 3 : { /* indexed */
- switch (pData->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx1_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx1_i;
-
- break;
- }
- case 2 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx2_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx2_i;
-
- break;
- }
- case 4 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx4_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx4_i;
-
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx8_i;
-
- break;
- }
- }
-
- break;
- }
- case 4 : { /* gray+alpha */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_ga8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_ga8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_ga16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_ga16_i;
- break;
- }
-#endif
- }
-
- break;
- }
- case 6 : { /* rgb+alpha */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgba8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgba8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgba16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgba16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- }
-#endif /* MNG_OPTIMIZE_FOOTPRINT_INIT */
-
- pData->iFilterofs = 0; /* determine filter characteristics */
- pData->iLevel0 = 0; /* default levels */
- pData->iLevel1 = 0;
- pData->iLevel2 = 0;
- pData->iLevel3 = 0;
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- {
- switch (pData->iColortype)
- {
- case 0 : {
- if (pData->iBitdepth <= 8)
- pData->iFilterofs = 1;
- else
- pData->iFilterofs = 2;
-
- break;
- }
- case 2 : {
- if (pData->iBitdepth <= 8)
- pData->iFilterofs = 3;
- else
- pData->iFilterofs = 6;
-
- break;
- }
- case 3 : {
- pData->iFilterofs = 1;
- break;
- }
- case 4 : {
- if (pData->iBitdepth <= 8)
- pData->iFilterofs = 2;
- else
- pData->iFilterofs = 4;
-
- break;
- }
- case 6 : {
- if (pData->iBitdepth <= 8)
- pData->iFilterofs = 4;
- else
- pData->iFilterofs = 8;
-
- break;
- }
- }
- }
-#endif
-
-#ifdef FILTER193 /* no adaptive filtering ? */
- if (pData->iFilter == MNG_FILTER_NOFILTER)
- pData->iPixelofs = pData->iFilterofs;
- else
-#endif
- pData->iPixelofs = pData->iFilterofs + 1;
-
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_IHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-mng_retcode mng_process_display_mpng (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MPNG, MNG_LC_START);
-#endif
-
- pData->iAlphadepth = 8; /* assume transparency !! */
-
- if (pData->fProcessheader) /* inform the app (creating the output canvas) ? */
- {
- pData->iWidth = ((mng_mpng_objp)pData->pMPNG)->iFramewidth;
- pData->iHeight = ((mng_mpng_objp)pData->pMPNG)->iFrameheight;
-
- if (!pData->fProcessheader (((mng_handle)pData), pData->iWidth, pData->iHeight))
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
-
- next_layer (pData); /* first mPNG layer then ! */
- pData->bTimerset = MNG_FALSE;
- pData->iBreakpoint = 0;
-
- if ((pData->iDestr > pData->iDestl) && (pData->iDestb > pData->iDestt))
- set_display_routine (pData); /* then determine display routine */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-mng_retcode mng_process_display_ang (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_ANG, MNG_LC_START);
-#endif
-
- if (pData->fProcessheader) /* inform the app (creating the output canvas) ? */
- {
- if (!pData->fProcessheader (((mng_handle)pData), pData->iWidth, pData->iHeight))
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
-
- next_layer (pData); /* first mPNG layer then ! */
- pData->bTimerset = MNG_FALSE;
- pData->iBreakpoint = 0;
-
- if ((pData->iDestr > pData->iDestl) && (pData->iDestb > pData->iDestt))
- set_display_routine (pData); /* then determine display routine */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_ANG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_idat (mng_datap pData,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata)
-#else
-mng_retcode mng_process_display_idat (mng_datap pData)
-#endif
-{
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_IDAT, MNG_LC_START);
-#endif
-
-#if defined(MNG_INCLUDE_MPNG_PROPOSAL) || defined(MNG_INCLUDE_ANG_PROPOSAL)
- if ((pData->eImagetype == mng_it_png) && (pData->iLayerseq <= 0))
- {
- if (pData->fProcessheader) /* inform the app (creating the output canvas) ? */
- if (!pData->fProcessheader (((mng_handle)pData), pData->iWidth, pData->iHeight))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- next_layer (pData); /* first regular PNG layer then ! */
- pData->bTimerset = MNG_FALSE;
- pData->iBreakpoint = 0;
-
- if ((pData->iDestr > pData->iDestl) && (pData->iDestb > pData->iDestt))
- set_display_routine (pData); /* then determine display routine */
- }
-#endif
-
- if (pData->bRestorebkgd) /* need to restore the background ? */
- {
- pData->bRestorebkgd = MNG_FALSE;
- iRetcode = load_bkgdlayer (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pData->iLayerseq++; /* and it counts as a layer then ! */
- }
-
- if (pData->fInitrowproc) /* need to initialize row processing? */
- {
- iRetcode = ((mng_initrowproc)pData->fInitrowproc) (pData);
- pData->fInitrowproc = MNG_NULL; /* only call this once !!! */
- }
-
- if ((!iRetcode) && (!pData->bInflating))
- /* initialize inflate */
- iRetcode = mngzlib_inflateinit (pData);
-
- if (!iRetcode) /* all ok? then inflate, my man */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mngzlib_inflaterows (pData, iRawlen, pRawdata);
-#else
- iRetcode = mngzlib_inflaterows (pData, pData->iRawlen, pData->pRawdata);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_IDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_display_iend (mng_datap pData)
-{
- mng_retcode iRetcode, iRetcode2;
- mng_bool bDodisplay = MNG_FALSE;
- mng_bool bMagnify = MNG_FALSE;
- mng_bool bCleanup = (mng_bool)(pData->iBreakpoint != 0);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_IEND, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_JNG /* progressive+alpha JNG can be displayed now */
- if ( (pData->bHasJHDR ) &&
- ( (pData->bJPEGprogressive) || (pData->bJPEGprogressive2)) &&
- ( (pData->eImagetype == mng_it_jng ) ||
- (((mng_imagep)pData->pStoreobj)->bVisible) ) &&
- ( (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA) ) )
- bDodisplay = MNG_TRUE;
-#endif
-
-#ifndef MNG_SKIPCHUNK_MAGN
- if ( (pData->pStoreobj) && /* on-the-fly magnification ? */
- ( (((mng_imagep)pData->pStoreobj)->iMAGN_MethodX) ||
- (((mng_imagep)pData->pStoreobj)->iMAGN_MethodY) ) )
- bMagnify = MNG_TRUE;
-#endif
-
- if ((pData->bHasBASI) || /* was it a BASI stream */
- (bDodisplay) || /* or should we display the JNG */
-#ifndef MNG_SKIPCHUNK_MAGN
- (bMagnify) || /* or should we magnify it */
-#endif
- /* or did we get broken here last time ? */
- ((pData->iBreakpoint) && (pData->iBreakpoint != 8)))
- {
- mng_imagep pImage = (mng_imagep)pData->pCurrentobj;
-
- if (!pImage) /* or was it object 0 ? */
- pImage = (mng_imagep)pData->pObjzero;
- /* display it now then ? */
- if ((pImage->bVisible) && (pImage->bViewable))
- { /* ok, so do it */
- iRetcode = mng_display_image (pData, pImage, bDodisplay);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (pData->bTimerset) /* timer break ? */
- pData->iBreakpoint = 6;
- }
- }
-#ifndef MNG_NO_DELTA_PNG
- else
- if ((pData->bHasDHDR) || /* was it a DHDR stream */
- (pData->iBreakpoint == 8)) /* or did we get broken here last time ? */
- {
- mng_imagep pImage = (mng_imagep)pData->pDeltaImage;
-
- if (!pData->iBreakpoint)
- { /* perform the delta operations needed */
- iRetcode = mng_execute_delta_image (pData, pImage, (mng_imagep)pData->pObjzero);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- /* display it now then ? */
- if ((pImage->bVisible) && (pImage->bViewable))
- { /* ok, so do it */
- iRetcode = mng_display_image (pData, pImage, MNG_FALSE);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (pData->bTimerset) /* timer break ? */
- pData->iBreakpoint = 8;
- }
- }
-#endif
-
- if (!pData->bTimerset) /* can we continue ? */
- {
- pData->iBreakpoint = 0; /* clear this flag now ! */
-
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- if (pData->eImagetype == mng_it_mpng)
- {
- pData->pCurraniobj = pData->pFirstaniobj;
- } else
-#endif
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
- if (pData->eImagetype == mng_it_ang)
- {
- pData->pCurraniobj = pData->pFirstaniobj;
- } else
-#endif
- { /* cleanup object 0 */
- mng_reset_object_details (pData, (mng_imagep)pData->pObjzero,
- 0, 0, 0, 0, 0, 0, 0, MNG_TRUE);
- }
-
- if (pData->bInflating) /* if we've been inflating */
- { /* cleanup row-processing, */
- iRetcode = mng_cleanup_rowproc (pData);
- /* also cleanup inflate! */
- iRetcode2 = mngzlib_inflatefree (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- if (iRetcode2)
- return iRetcode2;
- }
-
-#ifdef MNG_INCLUDE_JNG
- if (pData->bJPEGdecompress) /* if we've been decompressing JDAT */
- { /* cleanup row-processing, */
- iRetcode = mng_cleanup_rowproc (pData);
- /* also cleanup decompress! */
- iRetcode2 = mngjpeg_decompressfree (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- if (iRetcode2)
- return iRetcode2;
- }
-
- if (pData->bJPEGdecompress2) /* if we've been decompressing JDAA */
- { /* cleanup row-processing, */
- iRetcode = mng_cleanup_rowproc (pData);
- /* also cleanup decompress! */
- iRetcode2 = mngjpeg_decompressfree2 (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- if (iRetcode2)
- return iRetcode2;
- }
-#endif
-
- if (bCleanup) /* if we got broken last time we need to cleanup */
- {
- pData->bHasIHDR = MNG_FALSE; /* IEND signals the end for most ... */
- pData->bHasBASI = MNG_FALSE;
- pData->bHasDHDR = MNG_FALSE;
-#ifdef MNG_INCLUDE_JNG
- pData->bHasJHDR = MNG_FALSE;
- pData->bHasJSEP = MNG_FALSE;
- pData->bHasJDAA = MNG_FALSE;
- pData->bHasJDAT = MNG_FALSE;
-#endif
- pData->bHasPLTE = MNG_FALSE;
- pData->bHasTRNS = MNG_FALSE;
- pData->bHasGAMA = MNG_FALSE;
- pData->bHasCHRM = MNG_FALSE;
- pData->bHasSRGB = MNG_FALSE;
- pData->bHasICCP = MNG_FALSE;
- pData->bHasBKGD = MNG_FALSE;
- pData->bHasIDAT = MNG_FALSE;
- }
- /* if the image was displayed on the fly, */
- /* we'll have to make the app refresh */
- if ((pData->eImagetype != mng_it_mng) && (pData->fDisplayrow))
- pData->bNeedrefresh = MNG_TRUE;
-
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_IEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-/* change in the MNG spec with regards to TERM delay & interframe_delay
- as proposed by Adam M. Costello (option 4) and finalized by official vote
- during december 2002 / check the 'mng-list' archives for more details */
-
-mng_retcode mng_process_display_mend (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MEND, MNG_LC_START);
-#endif
-
- pData->bForcedelay = pData->iAccumdelay ? MNG_FALSE : MNG_TRUE;
- pData->iAccumdelay = 0;
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
- if (pData->bStopafterseek) /* need to stop after this ? */
- {
- pData->bFreezing = MNG_TRUE; /* stop processing on this one */
- pData->bRunningevent = MNG_FALSE;
- pData->bStopafterseek = MNG_FALSE;
- pData->bNeedrefresh = MNG_TRUE; /* make sure the last bit is displayed ! */
- }
-#endif
-
-#ifndef MNG_SKIPCHUNK_TERM
- /* TERM processed ? */
- if ((pData->bDisplaying) && (pData->bRunning) &&
- (pData->bHasTERM) && (pData->pTermaniobj))
- {
- mng_retcode iRetcode;
- mng_ani_termp pTERM;
- /* get the right animation object ! */
- pTERM = (mng_ani_termp)pData->pTermaniobj;
-
- pData->iIterations++; /* increase iteration count */
-
- switch (pTERM->iTermaction) /* determine what to do! */
- {
- case 0 : { /* show last frame indefinitly */
- break; /* piece of cake, that is... */
- }
-
- case 1 : { /* cease displaying anything */
- /* max(1, TERM delay, interframe_delay) */
-#ifndef MNG_SKIPCHUNK_FRAM
- if (pTERM->iDelay > pData->iFramedelay)
- pData->iFramedelay = pTERM->iDelay;
- if (!pData->iFramedelay)
- pData->iFramedelay = 1;
-#endif
-
- iRetcode = interframe_delay (pData);
- /* no interframe_delay? then fake it */
- if ((!iRetcode) && (!pData->bTimerset))
- iRetcode = set_delay (pData, 1);
-
- if (iRetcode)
- return iRetcode;
-
- pData->iBreakpoint = 10;
- break;
- }
-
- case 2 : { /* show first image after TERM */
- iRetcode = restore_state (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* notify the app ? */
- if (pData->fProcessmend)
- if (!pData->fProcessmend ((mng_handle)pData, pData->iIterations, 0))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- /* show first frame after TERM chunk */
- pData->pCurraniobj = pTERM;
- pData->bOnlyfirstframe = MNG_TRUE;
- pData->iFramesafterTERM = 0;
-
- /* max(1, TERM delay, interframe_delay) */
-#ifndef MNG_SKIPCHUNK_FRAM
- if (pTERM->iDelay > pData->iFramedelay)
- pData->iFramedelay = pTERM->iDelay;
- if (!pData->iFramedelay)
- pData->iFramedelay = 1;
-#endif
-
- break;
- }
-
- case 3 : { /* repeat */
- if ((pTERM->iItermax) && (pTERM->iItermax < 0x7FFFFFFF))
- pTERM->iItermax--;
-
- if (pTERM->iItermax) /* go back to TERM ? */
- { /* restore to initial or SAVE state */
- iRetcode = restore_state (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* notify the app ? */
- if (pData->fProcessmend)
- if (!pData->fProcessmend ((mng_handle)pData,
- pData->iIterations, pTERM->iItermax))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- /* restart from TERM chunk */
- pData->pCurraniobj = pTERM;
-
- if (pTERM->iDelay) /* set the delay (?) */
- {
- /* max(1, TERM delay, interframe_delay) */
-#ifndef MNG_SKIPCHUNK_FRAM
- if (pTERM->iDelay > pData->iFramedelay)
- pData->iFramedelay = pTERM->iDelay;
- if (!pData->iFramedelay)
- pData->iFramedelay = 1;
-#endif
-
- pData->bNeedrefresh = MNG_TRUE;
- }
- }
- else
- {
- switch (pTERM->iIteraction)
- {
- case 0 : { /* show last frame indefinitly */
- break; /* piece of cake, that is... */
- }
-
- case 1 : { /* cease displaying anything */
- /* max(1, TERM delay, interframe_delay) */
-#ifndef MNG_SKIPCHUNK_FRAM
- if (pTERM->iDelay > pData->iFramedelay)
- pData->iFramedelay = pTERM->iDelay;
- if (!pData->iFramedelay)
- pData->iFramedelay = 1;
-#endif
-
- iRetcode = interframe_delay (pData);
- /* no interframe_delay? then fake it */
- if ((!iRetcode) && (!pData->bTimerset))
- iRetcode = set_delay (pData, 1);
-
- if (iRetcode)
- return iRetcode;
-
- pData->iBreakpoint = 10;
- break;
- }
-
- case 2 : { /* show first image after TERM */
- iRetcode = restore_state (pData);
- /* on error bail out */
- if (iRetcode)
- return iRetcode;
- /* notify the app ? */
- if (pData->fProcessmend)
- if (!pData->fProcessmend ((mng_handle)pData,
- pData->iIterations, 0))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- /* show first frame after TERM chunk */
- pData->pCurraniobj = pTERM;
- pData->bOnlyfirstframe = MNG_TRUE;
- pData->iFramesafterTERM = 0;
- /* max(1, TERM delay, interframe_delay) */
-#ifndef MNG_SKIPCHUNK_FRAM
- if (pTERM->iDelay > pData->iFramedelay)
- pData->iFramedelay = pTERM->iDelay;
- if (!pData->iFramedelay)
- pData->iFramedelay = 1;
-#endif
-
- break;
- }
- }
- }
-
- break;
- }
- }
- }
-#endif /* MNG_SKIPCHUNK_TERM */
- /* just reading ? */
- if ((!pData->bDisplaying) && (pData->bReading))
- if (pData->fProcessmend) /* inform the app ? */
- if (!pData->fProcessmend ((mng_handle)pData, 0, 0))
- MNG_ERROR (pData, MNG_APPMISCERROR);
-
- if (!pData->pCurraniobj) /* always let the app refresh at the end ! */
- pData->bNeedrefresh = MNG_TRUE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_display_mend2 (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MEND, MNG_LC_START);
-#endif
-
-#ifndef MNG_SKIPCHUNK_FRAM
- pData->bFrameclipping = MNG_FALSE; /* nothing to do but restore the app background */
-#endif
- load_bkgdlayer (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MEND, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DEFI
-mng_retcode mng_process_display_defi (mng_datap pData)
-{
- mng_imagep pImage;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_DEFI, MNG_LC_START);
-#endif
-
- if (!pData->iDEFIobjectid) /* object id=0 ? */
- {
- pImage = (mng_imagep)pData->pObjzero;
-
- if (pData->bDEFIhasdonotshow)
- pImage->bVisible = (mng_bool)(pData->iDEFIdonotshow == 0);
-
- if (pData->bDEFIhasloca)
- {
- pImage->iPosx = pData->iDEFIlocax;
- pImage->iPosy = pData->iDEFIlocay;
- }
-
- if (pData->bDEFIhasclip)
- {
- pImage->bClipped = pData->bDEFIhasclip;
- pImage->iClipl = pData->iDEFIclipl;
- pImage->iClipr = pData->iDEFIclipr;
- pImage->iClipt = pData->iDEFIclipt;
- pImage->iClipb = pData->iDEFIclipb;
- }
-
- pData->pCurrentobj = 0; /* not a real object ! */
- }
- else
- { /* already exists ? */
- pImage = (mng_imagep)mng_find_imageobject (pData, pData->iDEFIobjectid);
-
- if (!pImage) /* if not; create new */
- {
- mng_retcode iRetcode = mng_create_imageobject (pData, pData->iDEFIobjectid,
- (mng_bool)(pData->iDEFIconcrete == 1),
- (mng_bool)(pData->iDEFIdonotshow == 0),
- MNG_FALSE, 0, 0, 0, 0, 0, 0, 0,
- pData->iDEFIlocax, pData->iDEFIlocay,
- pData->bDEFIhasclip,
- pData->iDEFIclipl, pData->iDEFIclipr,
- pData->iDEFIclipt, pData->iDEFIclipb,
- &pImage);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- else
- { /* exists; then set new info */
- if (pData->bDEFIhasdonotshow)
- pImage->bVisible = (mng_bool)(pData->iDEFIdonotshow == 0);
-
- pImage->bViewable = MNG_FALSE;
-
- if (pData->bDEFIhasloca)
- {
- pImage->iPosx = pData->iDEFIlocax;
- pImage->iPosy = pData->iDEFIlocay;
- }
-
- if (pData->bDEFIhasclip)
- {
- pImage->bClipped = pData->bDEFIhasclip;
- pImage->iClipl = pData->iDEFIclipl;
- pImage->iClipr = pData->iDEFIclipr;
- pImage->iClipt = pData->iDEFIclipt;
- pImage->iClipb = pData->iDEFIclipb;
- }
-
- if (pData->bDEFIhasconcrete)
- pImage->pImgbuf->bConcrete = (mng_bool)(pData->iDEFIconcrete == 1);
- }
-
- pData->pCurrentobj = pImage; /* others may want to know this */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_DEFI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BASI
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_basi (mng_datap pData,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_bool bHasalpha,
- mng_uint16 iAlpha,
- mng_uint8 iViewable)
-#else
-mng_retcode mng_process_display_basi (mng_datap pData)
-#endif
-{ /* address the current "object" if any */
- mng_imagep pImage = (mng_imagep)pData->pCurrentobj;
- mng_uint8p pWork;
- mng_uint32 iX;
- mng_imagedatap pBuf;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_BASI, MNG_LC_START);
-#endif
-
- if (!pImage) /* or is it an "on-the-fly" image ? */
- pImage = (mng_imagep)pData->pObjzero;
- /* address the object-buffer */
- pBuf = pImage->pImgbuf;
-
- pData->fDisplayrow = MNG_NULL; /* do nothing by default */
- pData->fCorrectrow = MNG_NULL;
- pData->fStorerow = MNG_NULL;
- pData->fProcessrow = MNG_NULL;
- /* set parms now that they're known */
- iRetcode = mng_reset_object_details (pData, pImage, pData->iDatawidth,
- pData->iDataheight, pData->iBitdepth,
- pData->iColortype, pData->iCompression,
- pData->iFilter, pData->iInterlace, MNG_FALSE);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* save the viewable flag */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pImage->bViewable = (mng_bool)(iViewable == 1);
-#else
- pImage->bViewable = (mng_bool)(pData->iBASIviewable == 1);
-#endif
- pBuf->bViewable = pImage->bViewable;
- pData->pStoreobj = pImage; /* let row-routines know which object */
-
- pWork = pBuf->pImgdata; /* fill the object-buffer with the specified
- "color" sample */
- switch (pData->iColortype) /* depending on color_type & bit_depth */
- {
- case 0 : { /* gray */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth == 16)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iDatawidth * pData->iDataheight;
- iX > 0;iX--)
-#else
- for (iX = 0; iX < pData->iDatawidth * pData->iDataheight; iX++)
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- mng_put_uint16 (pWork, iRed);
-#else
- mng_put_uint16 (pWork, pData->iBASIred);
-#endif
- pWork += 2;
- }
- }
- else
-#endif
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iDatawidth * pData->iDataheight;
- iX > 0;iX--)
-#else
- for (iX = 0; iX < pData->iDatawidth * pData->iDataheight; iX++)
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- *pWork = (mng_uint8)iRed;
-#else
- *pWork = (mng_uint8)pData->iBASIred;
-#endif
- pWork++;
- }
- }
- /* force tRNS ? */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if ((bHasalpha) && (!iAlpha))
-#else
- if ((pData->bBASIhasalpha) && (!pData->iBASIalpha))
-#endif
- {
- pBuf->bHasTRNS = MNG_TRUE;
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pBuf->iTRNSgray = iRed;
-#else
- pBuf->iTRNSgray = pData->iBASIred;
-#endif
- }
-
- break;
- }
-
- case 2 : { /* rgb */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth == 16)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iDatawidth * pData->iDataheight;
- iX > 0;iX--)
-#else
- for (iX = 0; iX < pData->iDatawidth * pData->iDataheight; iX++)
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- mng_put_uint16 (pWork, iRed );
- mng_put_uint16 (pWork+2, iGreen);
- mng_put_uint16 (pWork+4, iBlue );
-#else
- mng_put_uint16 (pWork, pData->iBASIred );
- mng_put_uint16 (pWork+2, pData->iBASIgreen);
- mng_put_uint16 (pWork+4, pData->iBASIblue );
-#endif
- pWork += 6;
- }
- }
- else
-#endif
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iDatawidth * pData->iDataheight;
- iX > 0;iX--)
-#else
- for (iX = 0; iX < pData->iDatawidth * pData->iDataheight; iX++)
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- *pWork = (mng_uint8)iRed;
- *(pWork+1) = (mng_uint8)iGreen;
- *(pWork+2) = (mng_uint8)iBlue;
-#else
- *pWork = (mng_uint8)pData->iBASIred;
- *(pWork+1) = (mng_uint8)pData->iBASIgreen;
- *(pWork+2) = (mng_uint8)pData->iBASIblue;
-#endif
- pWork += 3;
- }
- }
- /* force tRNS ? */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if ((bHasalpha) && (!iAlpha))
-#else
- if ((pData->bBASIhasalpha) && (!pData->iBASIalpha))
-#endif
- {
- pBuf->bHasTRNS = MNG_TRUE;
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pBuf->iTRNSred = iRed;
- pBuf->iTRNSgreen = iGreen;
- pBuf->iTRNSblue = iBlue;
-#else
- pBuf->iTRNSred = pData->iBASIred;
- pBuf->iTRNSgreen = pData->iBASIgreen;
- pBuf->iTRNSblue = pData->iBASIblue;
-#endif
- }
-
- break;
- }
-
- case 3 : { /* indexed */
- pBuf->bHasPLTE = MNG_TRUE;
-
- switch (pData->iBitdepth)
- {
- case 1 : { pBuf->iPLTEcount = 2; break; }
- case 2 : { pBuf->iPLTEcount = 4; break; }
- case 4 : { pBuf->iPLTEcount = 16; break; }
- case 8 : { pBuf->iPLTEcount = 256; break; }
- default : { pBuf->iPLTEcount = 1; break; }
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pBuf->aPLTEentries [0].iRed = (mng_uint8)iRed;
- pBuf->aPLTEentries [0].iGreen = (mng_uint8)iGreen;
- pBuf->aPLTEentries [0].iBlue = (mng_uint8)iBlue;
-#else
- pBuf->aPLTEentries [0].iRed = (mng_uint8)pData->iBASIred;
- pBuf->aPLTEentries [0].iGreen = (mng_uint8)pData->iBASIgreen;
- pBuf->aPLTEentries [0].iBlue = (mng_uint8)pData->iBASIblue;
-#endif
-
- for (iX = 1; iX < pBuf->iPLTEcount; iX++)
- {
- pBuf->aPLTEentries [iX].iRed = 0;
- pBuf->aPLTEentries [iX].iGreen = 0;
- pBuf->aPLTEentries [iX].iBlue = 0;
- }
- /* force tRNS ? */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if ((bHasalpha) && (iAlpha < 255))
-#else
- if ((pData->bBASIhasalpha) && (pData->iBASIalpha < 255))
-#endif
- {
- pBuf->bHasTRNS = MNG_TRUE;
- pBuf->iTRNScount = 1;
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pBuf->aTRNSentries [0] = (mng_uint8)iAlpha;
-#else
- pBuf->aTRNSentries [0] = (mng_uint8)pData->iBASIalpha;
-#endif
- }
-
- break;
- }
-
- case 4 : { /* gray+alpha */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth == 16)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iDatawidth * pData->iDataheight;
- iX > 0;iX--)
-#else
- for (iX = 0; iX < pData->iDatawidth * pData->iDataheight; iX++)
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- mng_put_uint16 (pWork, iRed);
- mng_put_uint16 (pWork+2, iAlpha);
-#else
- mng_put_uint16 (pWork, pData->iBASIred);
- mng_put_uint16 (pWork+2, pData->iBASIalpha);
-#endif
- pWork += 4;
- }
- }
- else
-#endif
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iDatawidth * pData->iDataheight;
- iX > 0;iX--)
-#else
- for (iX = 0; iX < pData->iDatawidth * pData->iDataheight; iX++)
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- *pWork = (mng_uint8)iRed;
- *(pWork+1) = (mng_uint8)iAlpha;
-#else
- *pWork = (mng_uint8)pData->iBASIred;
- *(pWork+1) = (mng_uint8)pData->iBASIalpha;
-#endif
- pWork += 2;
- }
- }
-
- break;
- }
-
- case 6 : { /* rgb+alpha */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth == 16)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iDatawidth * pData->iDataheight;
- iX > 0;iX--)
-#else
- for (iX = 0; iX < pData->iDatawidth * pData->iDataheight; iX++)
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- mng_put_uint16 (pWork, iRed);
- mng_put_uint16 (pWork+2, iGreen);
- mng_put_uint16 (pWork+4, iBlue);
- mng_put_uint16 (pWork+6, iAlpha);
-#else
- mng_put_uint16 (pWork, pData->iBASIred);
- mng_put_uint16 (pWork+2, pData->iBASIgreen);
- mng_put_uint16 (pWork+4, pData->iBASIblue);
- mng_put_uint16 (pWork+6, pData->iBASIalpha);
-#endif
- pWork += 8;
- }
- }
- else
-#endif
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iDatawidth * pData->iDataheight;
- iX > 0;iX--)
-#else
- for (iX = 0; iX < pData->iDatawidth * pData->iDataheight; iX++)
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- *pWork = (mng_uint8)iRed;
- *(pWork+1) = (mng_uint8)iGreen;
- *(pWork+2) = (mng_uint8)iBlue;
- *(pWork+3) = (mng_uint8)iAlpha;
-#else
- *pWork = (mng_uint8)pData->iBASIred;
- *(pWork+1) = (mng_uint8)pData->iBASIgreen;
- *(pWork+2) = (mng_uint8)pData->iBASIblue;
- *(pWork+3) = (mng_uint8)pData->iBASIalpha;
-#endif
- pWork += 4;
- }
- }
-
- break;
- }
-
- }
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- pData->fInitrowproc = (mng_fptr)mng_init_rowproc;
- pData->ePng_imgtype=mng_png_imgtype(pData->iColortype,pData->iBitdepth);
-#else
- switch (pData->iColortype) /* determine row initialization routine */
- { /* just to accomodate IDAT if it arrives */
- case 0 : { /* gray */
- switch (pData->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g1_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g1_i;
-
- break;
- }
- case 2 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g2_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g2_i;
-
- break;
- }
- case 4 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g4_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g4_i;
-
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- case 2 : { /* rgb */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgb8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgb8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgb16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgb16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- case 3 : { /* indexed */
- switch (pData->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx1_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx1_i;
-
- break;
- }
- case 2 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx2_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx2_i;
-
- break;
- }
- case 4 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx4_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx4_i;
-
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx8_i;
-
- break;
- }
- }
-
- break;
- }
- case 4 : { /* gray+alpha */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_ga8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_ga8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_ga16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_ga16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- case 6 : { /* rgb+alpha */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgba8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgba8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgba16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgba16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- }
-#endif /* MNG_OPTIMIZE_FOOTPRINT_INIT */
-
- pData->iFilterofs = 0; /* determine filter characteristics */
- pData->iLevel0 = 0; /* default levels */
- pData->iLevel1 = 0;
- pData->iLevel2 = 0;
- pData->iLevel3 = 0;
-
-#ifdef FILTER192
- if (pData->iFilter == 0xC0) /* leveling & differing ? */
- {
- switch (pData->iColortype)
- {
- case 0 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth <= 8)
-#endif
- pData->iFilterofs = 1;
-#ifndef MNG_NO_16BIT_SUPPORT
- else
- pData->iFilterofs = 2;
-#endif
-
- break;
- }
- case 2 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth <= 8)
-#endif
- pData->iFilterofs = 3;
-#ifndef MNG_NO_16BIT_SUPPORT
- else
- pData->iFilterofs = 6;
-#endif
-
- break;
- }
- case 3 : {
- pData->iFilterofs = 1;
- break;
- }
- case 4 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth <= 8)
-#endif
- pData->iFilterofs = 2;
-#ifndef MNG_NO_16BIT_SUPPORT
- else
- pData->iFilterofs = 4;
-#endif
-
- break;
- }
- case 6 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pData->iBitdepth <= 8)
-#endif
- pData->iFilterofs = 4;
-#ifndef MNG_NO_16BIT_SUPPORT
- else
- pData->iFilterofs = 8;
-#endif
-
- break;
- }
- }
- }
-#endif
-
-#ifdef FILTER193
- if (pData->iFilter == 0xC1) /* no adaptive filtering ? */
- pData->iPixelofs = pData->iFilterofs;
- else
-#endif
- pData->iPixelofs = pData->iFilterofs + 1;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_BASI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLON
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_clon (mng_datap pData,
- mng_uint16 iSourceid,
- mng_uint16 iCloneid,
- mng_uint8 iClonetype,
- mng_bool bHasdonotshow,
- mng_uint8 iDonotshow,
- mng_uint8 iConcrete,
- mng_bool bHasloca,
- mng_uint8 iLocationtype,
- mng_int32 iLocationx,
- mng_int32 iLocationy)
-#else
-mng_retcode mng_process_display_clon (mng_datap pData)
-#endif
-{
- mng_imagep pSource, pClone;
- mng_bool bVisible, bAbstract;
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_CLON, MNG_LC_START);
-#endif
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- /* locate the source object first */
- pSource = mng_find_imageobject (pData, iSourceid);
- /* check if the clone exists */
- pClone = mng_find_imageobject (pData, iCloneid);
-#else
- /* locate the source object first */
- pSource = mng_find_imageobject (pData, pData->iCLONsourceid);
- /* check if the clone exists */
- pClone = mng_find_imageobject (pData, pData->iCLONcloneid);
-#endif
-
- if (!pSource) /* source must exist ! */
- MNG_ERROR (pData, MNG_OBJECTUNKNOWN);
-
- if (pClone) /* clone must not exist ! */
- MNG_ERROR (pData, MNG_OBJECTEXISTS);
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (bHasdonotshow) /* DoNotShow flag filled ? */
- bVisible = (mng_bool)(iDonotshow == 0);
- else
- bVisible = pSource->bVisible;
-#else
- if (pData->bCLONhasdonotshow) /* DoNotShow flag filled ? */
- bVisible = (mng_bool)(pData->iCLONdonotshow == 0);
- else
- bVisible = pSource->bVisible;
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- bAbstract = (mng_bool)(iConcrete == 1);
-#else
- bAbstract = (mng_bool)(pData->iCLONconcrete == 1);
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- switch (iClonetype) /* determine action to take */
- {
- case 0 : { /* full clone */
- iRetcode = mng_clone_imageobject (pData, iCloneid, MNG_FALSE,
- bVisible, bAbstract, bHasloca,
- iLocationtype, iLocationx, iLocationy,
- pSource, &pClone);
- break;
- }
-
- case 1 : { /* partial clone */
- iRetcode = mng_clone_imageobject (pData, iCloneid, MNG_TRUE,
- bVisible, bAbstract, bHasloca,
- iLocationtype, iLocationx, iLocationy,
- pSource, &pClone);
- break;
- }
-
- case 2 : { /* renumber object */
- iRetcode = mng_renum_imageobject (pData, pSource, iCloneid,
- bVisible, bAbstract, bHasloca,
- iLocationtype, iLocationx, iLocationy);
- pClone = pSource;
- break;
- }
-
- }
-#else
- switch (pData->iCLONclonetype) /* determine action to take */
- {
- case 0 : { /* full clone */
- iRetcode = mng_clone_imageobject (pData, pData->iCLONcloneid, MNG_FALSE,
- bVisible, bAbstract,
- pData->bCLONhasloca, pData->iCLONlocationtype,
- pData->iCLONlocationx, pData->iCLONlocationy,
- pSource, &pClone);
- break;
- }
-
- case 1 : { /* partial clone */
- iRetcode = mng_clone_imageobject (pData, pData->iCLONcloneid, MNG_TRUE,
- bVisible, bAbstract,
- pData->bCLONhasloca, pData->iCLONlocationtype,
- pData->iCLONlocationx, pData->iCLONlocationy,
- pSource, &pClone);
- break;
- }
-
- case 2 : { /* renumber object */
- iRetcode = mng_renum_imageobject (pData, pSource, pData->iCLONcloneid,
- bVisible, bAbstract,
- pData->bCLONhasloca, pData->iCLONlocationtype,
- pData->iCLONlocationx, pData->iCLONlocationy);
- pClone = pSource;
- break;
- }
-
- }
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- /* display on the fly ? */
- if ((pClone->bViewable) && (pClone->bVisible))
- {
- pData->pLastclone = pClone; /* remember in case of timer break ! */
- /* display it */
- mng_display_image (pData, pClone, MNG_FALSE);
-
- if (pData->bTimerset) /* timer break ? */
- pData->iBreakpoint = 5;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_CLON, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_display_clon2 (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_CLON, MNG_LC_START);
-#endif
- /* only called after timer break ! */
- mng_display_image (pData, (mng_imagep)pData->pLastclone, MNG_FALSE);
- pData->iBreakpoint = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_CLON, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_disc (mng_datap pData,
- mng_uint32 iCount,
- mng_uint16p pIds)
-#else
-mng_retcode mng_process_display_disc (mng_datap pData)
-#endif
-{
- mng_uint32 iX;
- mng_imagep pImage;
- mng_uint32 iRetcode;
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_DISC, MNG_LC_START);
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (iCount) /* specific list ? */
-#else
- if (pData->iDISCcount) /* specific list ? */
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- mng_uint16p pWork = pIds;
-#else
- mng_uint16p pWork = pData->pDISCids;
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifdef MNG_DECREMENT_LOOPS /* iterate the list */
- for (iX = iCount; iX > 0; iX--)
-#else
- for (iX = 0; iX < iCount; iX++)
-#endif
-#else
-#ifdef MNG_DECREMENT_LOOPS /* iterate the list */
- for (iX = pData->iDISCcount; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iDISCcount; iX++)
-#endif
-#endif
- {
- pImage = mng_find_imageobject (pData, *pWork++);
-
- if (pImage) /* found the object ? */
- { /* then drop it */
- iRetcode = mng_free_imageobject (pData, pImage);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
- }
- else /* empty: drop all un-frozen objects */
- {
- mng_imagep pNext = (mng_imagep)pData->pFirstimgobj;
-
- while (pNext) /* any left ? */
- {
- pImage = pNext;
- pNext = pImage->sHeader.pNext;
-
- if (!pImage->bFrozen) /* not frozen ? */
- { /* then drop it */
- iRetcode = mng_free_imageobject (pData, pImage);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_DISC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_FRAM
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_fram (mng_datap pData,
- mng_uint8 iFramemode,
- mng_uint8 iChangedelay,
- mng_uint32 iDelay,
- mng_uint8 iChangetimeout,
- mng_uint32 iTimeout,
- mng_uint8 iChangeclipping,
- mng_uint8 iCliptype,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb)
-#else
-mng_retcode mng_process_display_fram (mng_datap pData)
-#endif
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_FRAM, MNG_LC_START);
-#endif
- /* advance a frame then */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = next_frame (pData, iFramemode, iChangedelay, iDelay,
- iChangetimeout, iTimeout, iChangeclipping,
- iCliptype, iClipl, iClipr, iClipt, iClipb);
-#else
- iRetcode = next_frame (pData, pData->iTempFramemode, pData->iTempChangedelay,
- pData->iTempDelay, pData->iTempChangetimeout,
- pData->iTempTimeout, pData->iTempChangeclipping,
- pData->iTempCliptype, pData->iTempClipl, pData->iTempClipr,
- pData->iTempClipt, pData->iTempClipb);
-#endif
-
- if (pData->bTimerset) /* timer break ? */
- pData->iBreakpoint = 1;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_FRAM, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_display_fram2 (mng_datap pData)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_FRAM, MNG_LC_START);
-#endif
- /* again; after the break */
- iRetcode = next_frame (pData, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
- pData->iBreakpoint = 0; /* not again! */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_FRAM, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MOVE
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_move (mng_datap pData,
- mng_uint16 iFromid,
- mng_uint16 iToid,
- mng_uint8 iMovetype,
- mng_int32 iMovex,
- mng_int32 iMovey)
-#else
-mng_retcode mng_process_display_move (mng_datap pData)
-#endif
-{
- mng_uint16 iX;
- mng_imagep pImage;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MOVE, MNG_LC_START);
-#endif
- /* iterate the list */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- for (iX = iFromid; iX <= iToid; iX++)
-#else
- for (iX = pData->iMOVEfromid; iX <= pData->iMOVEtoid; iX++)
-#endif
- {
- if (!iX) /* object id=0 ? */
- pImage = (mng_imagep)pData->pObjzero;
- else
- pImage = mng_find_imageobject (pData, iX);
-
- if (pImage) /* object exists ? */
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- switch (iMovetype)
-#else
- switch (pData->iMOVEmovetype)
-#endif
- {
- case 0 : { /* absolute */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pImage->iPosx = iMovex;
- pImage->iPosy = iMovey;
-#else
- pImage->iPosx = pData->iMOVEmovex;
- pImage->iPosy = pData->iMOVEmovey;
-#endif
- break;
- }
- case 1 : { /* relative */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pImage->iPosx = pImage->iPosx + iMovex;
- pImage->iPosy = pImage->iPosy + iMovey;
-#else
- pImage->iPosx = pImage->iPosx + pData->iMOVEmovex;
- pImage->iPosy = pImage->iPosy + pData->iMOVEmovey;
-#endif
- break;
- }
- }
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MOVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLIP
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_clip (mng_datap pData,
- mng_uint16 iFromid,
- mng_uint16 iToid,
- mng_uint8 iCliptype,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb)
-#else
-mng_retcode mng_process_display_clip (mng_datap pData)
-#endif
-{
- mng_uint16 iX;
- mng_imagep pImage;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_CLIP, MNG_LC_START);
-#endif
- /* iterate the list */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- for (iX = iFromid; iX <= iToid; iX++)
-#else
- for (iX = pData->iCLIPfromid; iX <= pData->iCLIPtoid; iX++)
-#endif
- {
- if (!iX) /* object id=0 ? */
- pImage = (mng_imagep)pData->pObjzero;
- else
- pImage = mng_find_imageobject (pData, iX);
-
- if (pImage) /* object exists ? */
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- switch (iCliptype)
-#else
- switch (pData->iCLIPcliptype)
-#endif
- {
- case 0 : { /* absolute */
- pImage->bClipped = MNG_TRUE;
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pImage->iClipl = iClipl;
- pImage->iClipr = iClipr;
- pImage->iClipt = iClipt;
- pImage->iClipb = iClipb;
-#else
- pImage->iClipl = pData->iCLIPclipl;
- pImage->iClipr = pData->iCLIPclipr;
- pImage->iClipt = pData->iCLIPclipt;
- pImage->iClipb = pData->iCLIPclipb;
-#endif
- break;
- }
- case 1 : { /* relative */
- pImage->bClipped = MNG_TRUE;
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pImage->iClipl = pImage->iClipl + iClipl;
- pImage->iClipr = pImage->iClipr + iClipr;
- pImage->iClipt = pImage->iClipt + iClipt;
- pImage->iClipb = pImage->iClipb + iClipb;
-#else
- pImage->iClipl = pImage->iClipl + pData->iCLIPclipl;
- pImage->iClipr = pImage->iClipr + pData->iCLIPclipr;
- pImage->iClipt = pImage->iClipt + pData->iCLIPclipt;
- pImage->iClipb = pImage->iClipb + pData->iCLIPclipb;
-#endif
- break;
- }
- }
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_CLIP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SHOW
-mng_retcode mng_process_display_show (mng_datap pData)
-{
- mng_int16 iX, iS, iFrom, iTo;
- mng_imagep pImage;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_SHOW, MNG_LC_START);
-#endif
-
- /* TODO: optimization for the cases where "abs (iTo - iFrom)" is rather high;
- especially where ((iFrom==1) && (iTo==65535)); eg. an empty SHOW !!! */
-
- if (pData->iBreakpoint == 3) /* previously broken during cycle-mode ? */
- {
- pImage = mng_find_imageobject (pData, pData->iSHOWnextid);
-
- if (pImage) /* still there ? */
- mng_display_image (pData, pImage, MNG_FALSE);
-
- pData->iBreakpoint = 0; /* let's not go through this again! */
- }
- else
- {
- if (pData->iBreakpoint) /* previously broken at other point ? */
- { /* restore last parms */
- iFrom = (mng_int16)pData->iSHOWfromid;
- iTo = (mng_int16)pData->iSHOWtoid;
- iX = (mng_int16)pData->iSHOWnextid;
- iS = (mng_int16)pData->iSHOWskip;
- }
- else
- { /* regular sequence ? */
- if (pData->iSHOWtoid >= pData->iSHOWfromid)
- iS = 1;
- else /* reverse sequence ! */
- iS = -1;
-
- iFrom = (mng_int16)pData->iSHOWfromid;
- iTo = (mng_int16)pData->iSHOWtoid;
- iX = iFrom;
-
- pData->iSHOWfromid = (mng_uint16)iFrom;
- pData->iSHOWtoid = (mng_uint16)iTo;
- pData->iSHOWskip = iS;
- }
- /* cycle mode ? */
- if ((pData->iSHOWmode == 6) || (pData->iSHOWmode == 7))
- {
- mng_uint16 iTrigger = 0;
- mng_uint16 iFound = 0;
- mng_uint16 iPass = 0;
- mng_imagep pFound = 0;
-
- do
- {
- iPass++; /* lets prevent endless loops when there
- are no potential candidates in the list! */
-
- if (iS > 0) /* forward ? */
- {
- for (iX = iFrom; iX <= iTo; iX += iS)
- {
- pImage = mng_find_imageobject (pData, (mng_uint16)iX);
-
- if (pImage) /* object exists ? */
- {
- if (iFound) /* already found a candidate ? */
- pImage->bVisible = MNG_FALSE;
- else
- if (iTrigger) /* found the trigger ? */
- {
- pImage->bVisible = MNG_TRUE;
- iFound = iX;
- pFound = pImage;
- }
- else
- if (pImage->bVisible) /* ok, this is the trigger */
- {
- pImage->bVisible = MNG_FALSE;
- iTrigger = iX;
- }
- }
- }
- }
- else
- {
- for (iX = iFrom; iX >= iTo; iX += iS)
- {
- pImage = mng_find_imageobject (pData, (mng_uint16)iX);
-
- if (pImage) /* object exists ? */
- {
- if (iFound) /* already found a candidate ? */
- pImage->bVisible = MNG_FALSE;
- else
- if (iTrigger) /* found the trigger ? */
- {
- pImage->bVisible = MNG_TRUE;
- iFound = iX;
- pFound = pImage;
- }
- else
- if (pImage->bVisible) /* ok, this is the trigger */
- {
- pImage->bVisible = MNG_FALSE;
- iTrigger = iX;
- }
- }
- }
- }
-
- if (!iTrigger) /* did not find a trigger ? */
- iTrigger = 1; /* then fake it so the first image
- gets nominated */
- } /* cycle back to beginning ? */
- while ((iPass < 2) && (iTrigger) && (!iFound));
-
- pData->iBreakpoint = 0; /* just a sanity precaution */
- /* display it ? */
- if ((pData->iSHOWmode == 6) && (pFound))
- {
- mng_display_image (pData, pFound, MNG_FALSE);
-
- if (pData->bTimerset) /* timer set ? */
- {
- pData->iBreakpoint = 3;
- pData->iSHOWnextid = iFound; /* save it for after the break */
- }
- }
- }
- else
- {
- do
- {
- pImage = mng_find_imageobject (pData, iX);
-
- if (pImage) /* object exists ? */
- {
- if (pData->iBreakpoint) /* did we get broken last time ? */
- { /* could only happen in the display routine */
- mng_display_image (pData, pImage, MNG_FALSE);
- pData->iBreakpoint = 0; /* only once inside this loop please ! */
- }
- else
- {
- switch (pData->iSHOWmode) /* do what ? */
- {
- case 0 : {
- pImage->bVisible = MNG_TRUE;
- mng_display_image (pData, pImage, MNG_FALSE);
- break;
- }
- case 1 : {
- pImage->bVisible = MNG_FALSE;
- break;
- }
- case 2 : {
- if (pImage->bVisible)
- mng_display_image (pData, pImage, MNG_FALSE);
- break;
- }
- case 3 : {
- pImage->bVisible = MNG_TRUE;
- break;
- }
- case 4 : {
- pImage->bVisible = (mng_bool)(!pImage->bVisible);
- if (pImage->bVisible)
- mng_display_image (pData, pImage, MNG_FALSE);
- break;
- }
- case 5 : {
- pImage->bVisible = (mng_bool)(!pImage->bVisible);
- }
- }
- }
- }
-
- if (!pData->bTimerset) /* next ? */
- iX += iS;
-
- } /* continue ? */
- while ((!pData->bTimerset) && (((iS > 0) && (iX <= iTo)) ||
- ((iS < 0) && (iX >= iTo)) ));
-
- if (pData->bTimerset) /* timer set ? */
- {
- pData->iBreakpoint = 4;
- pData->iSHOWnextid = iX; /* save for next time */
- }
- else
- pData->iBreakpoint = 0;
-
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_SHOW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode mng_process_display_save (mng_datap pData)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_SAVE, MNG_LC_START);
-#endif
-
- iRetcode = save_state (pData); /* save the current state */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_SAVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-mng_retcode mng_process_display_seek (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_SEEK, MNG_LC_START);
-#endif
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
- if (pData->bStopafterseek) /* need to stop after this SEEK ? */
- {
- pData->bFreezing = MNG_TRUE; /* stop processing on this one */
- pData->bRunningevent = MNG_FALSE;
- pData->bStopafterseek = MNG_FALSE;
- pData->bNeedrefresh = MNG_TRUE; /* make sure the last bit is displayed ! */
- }
- else
-#endif
- { /* restore the initial or SAVE state */
- mng_retcode iRetcode = restore_state (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
- /* stop after next SEEK ? */
- if ((pData->bDynamic) || (pData->bRunningevent))
- pData->bStopafterseek = MNG_TRUE;
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_SEEK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-mng_retcode mng_process_display_jhdr (mng_datap pData)
-{ /* address the current "object" if any */
- mng_imagep pImage = (mng_imagep)pData->pCurrentobj;
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_JHDR, MNG_LC_START);
-#endif
-
- if (!pData->bHasDHDR)
- {
- pData->fInitrowproc = MNG_NULL; /* do nothing by default */
- pData->fDisplayrow = MNG_NULL;
- pData->fCorrectrow = MNG_NULL;
- pData->fStorerow = MNG_NULL;
- pData->fProcessrow = MNG_NULL;
- pData->fDifferrow = MNG_NULL;
- pData->fStorerow2 = MNG_NULL;
- pData->fStorerow3 = MNG_NULL;
-
- pData->pStoreobj = MNG_NULL; /* initialize important work-parms */
-
- pData->iJPEGrow = 0;
- pData->iJPEGalpharow = 0;
- pData->iJPEGrgbrow = 0;
- pData->iRowmax = 0; /* so init_rowproc does the right thing ! */
- }
-
- if (!pData->iBreakpoint) /* not previously broken ? */
- {
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* delta-image ? */
- {
- if (pData->iDeltatype == MNG_DELTATYPE_REPLACE)
- {
- iRetcode = mng_reset_object_details (pData, (mng_imagep)pData->pDeltaImage,
- pData->iDatawidth, pData->iDataheight,
- pData->iJHDRimgbitdepth, pData->iJHDRcolortype,
- pData->iJHDRalphacompression, pData->iJHDRalphafilter,
- pData->iJHDRalphainterlace, MNG_TRUE);
-
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iAlphabitdepth = pData->iJHDRalphabitdepth;
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iJHDRcompression = pData->iJHDRimgcompression;
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iJHDRinterlace = pData->iJHDRimginterlace;
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iAlphasampledepth = pData->iJHDRalphabitdepth;
- }
- else
- if ((pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iPixelsampledepth = pData->iJHDRimgbitdepth;
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iAlphasampledepth = pData->iJHDRalphabitdepth;
- }
- else
- if ((pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAREPLACE) )
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iAlphasampledepth = pData->iJHDRalphabitdepth;
- else
- if ((pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORADD ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORREPLACE) )
- ((mng_imagep)pData->pDeltaImage)->pImgbuf->iPixelsampledepth = pData->iJHDRimgbitdepth;
-
- }
- else
-#endif /* MNG_NO_DELTA_PNG */
- {
- if (pImage) /* update object buffer ? */
- {
- iRetcode = mng_reset_object_details (pData, pImage,
- pData->iDatawidth, pData->iDataheight,
- pData->iJHDRimgbitdepth, pData->iJHDRcolortype,
- pData->iJHDRalphacompression, pData->iJHDRalphafilter,
- pData->iJHDRalphainterlace, MNG_TRUE);
-
- pImage->pImgbuf->iAlphabitdepth = pData->iJHDRalphabitdepth;
- pImage->pImgbuf->iJHDRcompression = pData->iJHDRimgcompression;
- pImage->pImgbuf->iJHDRinterlace = pData->iJHDRimginterlace;
- pImage->pImgbuf->iAlphasampledepth = pData->iJHDRalphabitdepth;
- }
- else /* update object 0 */
- {
- iRetcode = mng_reset_object_details (pData, (mng_imagep)pData->pObjzero,
- pData->iDatawidth, pData->iDataheight,
- pData->iJHDRimgbitdepth, pData->iJHDRcolortype,
- pData->iJHDRalphacompression, pData->iJHDRalphafilter,
- pData->iJHDRalphainterlace, MNG_TRUE);
-
- ((mng_imagep)pData->pObjzero)->pImgbuf->iAlphabitdepth = pData->iJHDRalphabitdepth;
- ((mng_imagep)pData->pObjzero)->pImgbuf->iJHDRcompression = pData->iJHDRimgcompression;
- ((mng_imagep)pData->pObjzero)->pImgbuf->iJHDRinterlace = pData->iJHDRimginterlace;
- ((mng_imagep)pData->pObjzero)->pImgbuf->iAlphasampledepth = pData->iJHDRalphabitdepth;
- }
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
- if (!pData->bHasDHDR)
- { /* we're always storing a JPEG */
- if (pImage) /* real object ? */
- pData->pStoreobj = pImage; /* tell the row routines */
- else /* otherwise use object 0 */
- pData->pStoreobj = pData->pObjzero;
- /* display "on-the-fly" ? */
- if (
-#ifndef MNG_SKIPCHUNK_MAGN
- ( ((mng_imagep)pData->pStoreobj)->iMAGN_MethodX == 0) &&
- ( ((mng_imagep)pData->pStoreobj)->iMAGN_MethodY == 0) &&
-#endif
- ( (pData->eImagetype == mng_it_jng ) ||
- (((mng_imagep)pData->pStoreobj)->bVisible) ) )
- {
- next_layer (pData); /* that's a new layer then ! */
-
- pData->iBreakpoint = 0;
-
- if (pData->bTimerset) /* timer break ? */
- pData->iBreakpoint = 7;
- else
- if (pData->bRunning) /* still running ? */
- { /* anything to display ? */
- if ((pData->iDestr > pData->iDestl) && (pData->iDestb > pData->iDestt))
- {
- set_display_routine (pData); /* then determine display routine */
- /* display from the object we store in */
- pData->pRetrieveobj = pData->pStoreobj;
- }
- }
- }
- }
-
- if (!pData->bTimerset) /* no timer break ? */
- { /* default row initialization ! */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- pData->ePng_imgtype=png_none;
-#endif
- pData->fInitrowproc = (mng_fptr)mng_init_rowproc;
-
- if ((!pData->bHasDHDR) || (pData->iDeltatype == MNG_DELTATYPE_REPLACE))
- { /* 8-bit JPEG ? */
- if (pData->iJHDRimgbitdepth == 8)
- { /* intermediate row is 8-bit deep */
- pData->bIsRGBA16 = MNG_FALSE;
- pData->iRowsamples = pData->iDatawidth;
-
- switch (pData->iJHDRcolortype) /* determine pixel processing routines */
- {
- case MNG_COLORTYPE_JPEGGRAY :
- {
- pData->fStorerow2 = (mng_fptr)mng_store_jpeg_g8;
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g8;
- pData->bIsOpaque = MNG_TRUE;
- break;
- }
- case MNG_COLORTYPE_JPEGCOLOR :
- {
- pData->fStorerow2 = (mng_fptr)mng_store_jpeg_rgb8;
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb8;
- pData->bIsOpaque = MNG_TRUE;
- break;
- }
- case MNG_COLORTYPE_JPEGGRAYA :
- {
- pData->fStorerow2 = (mng_fptr)mng_store_jpeg_ga8;
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga8;
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
- case MNG_COLORTYPE_JPEGCOLORA :
- {
- pData->fStorerow2 = (mng_fptr)mng_store_jpeg_rgba8;
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba8;
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
- }
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else
- {
- pData->bIsRGBA16 = MNG_TRUE; /* intermediate row is 16-bit deep */
-
- /* TODO: 12-bit JPEG */
- /* TODO: 8- + 12-bit JPEG (eg. type=20) */
-
- }
-#endif
- /* possible IDAT alpha-channel ? */
- if (pData->iJHDRalphacompression == MNG_COMPRESSION_DEFLATE)
- {
- /* determine alpha processing routine */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- pData->fInitrowproc = (mng_fptr)mng_init_rowproc;
-#endif
- switch (pData->iJHDRalphabitdepth)
- {
-#ifndef MNG_OPTIMIZE_FOOTPRINT_INIT
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : { pData->fInitrowproc = (mng_fptr)mng_init_jpeg_a1_ni; break; }
- case 2 : { pData->fInitrowproc = (mng_fptr)mng_init_jpeg_a2_ni; break; }
- case 4 : { pData->fInitrowproc = (mng_fptr)mng_init_jpeg_a4_ni; break; }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : { pData->fInitrowproc = (mng_fptr)mng_init_jpeg_a8_ni; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fInitrowproc = (mng_fptr)mng_init_jpeg_a16_ni; break; }
-#endif
-#else
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : { pData->ePng_imgtype = png_jpeg_a1; break; }
- case 2 : { pData->ePng_imgtype = png_jpeg_a2; break; }
- case 4 : { pData->ePng_imgtype = png_jpeg_a4; break; }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : { pData->ePng_imgtype = png_jpeg_a8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->ePng_imgtype = png_jpeg_a16; break; }
-#endif
-#endif
- }
- }
- else /* possible JDAA alpha-channel ? */
- if (pData->iJHDRalphacompression == MNG_COMPRESSION_BASELINEJPEG)
- { /* 8-bit JPEG ? */
- if (pData->iJHDRimgbitdepth == 8)
- {
- if (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA)
- pData->fStorerow3 = (mng_fptr)mng_store_jpeg_g8_alpha;
- else
- if (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA)
- pData->fStorerow3 = (mng_fptr)mng_store_jpeg_rgb8_alpha;
- }
- else
- {
- /* TODO: 12-bit JPEG with 8-bit JDAA */
- }
- }
- /* initialize JPEG library */
- iRetcode = mngjpeg_initialize (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- else
- { /* must be alpha add/replace !! */
- if ((pData->iDeltatype != MNG_DELTATYPE_BLOCKALPHAADD ) &&
- (pData->iDeltatype != MNG_DELTATYPE_BLOCKALPHAREPLACE) )
- MNG_ERROR (pData, MNG_INVDELTATYPE);
- /* determine alpha processing routine */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- pData->fInitrowproc = (mng_fptr)mng_init_rowproc;
-#endif
- switch (pData->iJHDRalphabitdepth)
- {
-#ifndef MNG_OPTIMIZE_FOOTPRINT_INIT
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : { pData->fInitrowproc = (mng_fptr)mng_init_g1_ni; break; }
- case 2 : { pData->fInitrowproc = (mng_fptr)mng_init_g2_ni; break; }
- case 4 : { pData->fInitrowproc = (mng_fptr)mng_init_g4_ni; break; }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : { pData->fInitrowproc = (mng_fptr)mng_init_g8_ni; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fInitrowproc = (mng_fptr)mng_init_g16_ni; break; }
-#endif
-#else
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : { pData->ePng_imgtype = png_jpeg_a1; break; }
- case 2 : { pData->ePng_imgtype = png_jpeg_a2; break; }
- case 4 : { pData->ePng_imgtype = png_jpeg_a4; break; }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : { pData->ePng_imgtype = png_jpeg_a8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->ePng_imgtype = png_jpeg_a16; break; }
-#endif
-#endif /* MNG_OPTIMIZE_FOOTPRINT_INIT */
- }
- }
-
- pData->iFilterofs = 0; /* determine filter characteristics */
- pData->iLevel0 = 0; /* default levels */
- pData->iLevel1 = 0;
- pData->iLevel2 = 0;
- pData->iLevel3 = 0;
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iJHDRalphafilter == 0xC0)
- {
- if (pData->iJHDRalphabitdepth <= 8)
- pData->iFilterofs = 1;
- else
- pData->iFilterofs = 2;
-
- }
-#endif
-#ifdef FILTER193 /* no adaptive filtering ? */
- if (pData->iJHDRalphafilter == 0xC1)
- pData->iPixelofs = pData->iFilterofs;
- else
-#endif
- pData->iPixelofs = pData->iFilterofs + 1;
-
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_JHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_jdaa (mng_datap pData,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata)
-#else
-mng_retcode mng_process_display_jdaa (mng_datap pData)
-#endif
-{
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_JDAA, MNG_LC_START);
-#endif
-
- if (!pData->bJPEGdecompress2) /* if we're not decompressing already */
- {
- if (pData->fInitrowproc) /* initialize row-processing? */
- {
- iRetcode = ((mng_initrowproc)pData->fInitrowproc) (pData);
- pData->fInitrowproc = MNG_NULL; /* only call this once !!! */
- }
-
- if (!iRetcode) /* initialize decompress */
- iRetcode = mngjpeg_decompressinit2 (pData);
- }
-
- if (!iRetcode) /* all ok? then decompress, my man */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mngjpeg_decompressdata2 (pData, iRawlen, pRawdata);
-#else
- iRetcode = mngjpeg_decompressdata2 (pData, pData->iRawlen, pData->pRawdata);
-#endif
-
- if (iRetcode)
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_JDAA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_jdat (mng_datap pData,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata)
-#else
-mng_retcode mng_process_display_jdat (mng_datap pData)
-#endif
-{
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_JDAT, MNG_LC_START);
-#endif
-
- if (pData->bRestorebkgd) /* need to restore the background ? */
- {
- pData->bRestorebkgd = MNG_FALSE;
- iRetcode = load_bkgdlayer (pData);
-
- pData->iLayerseq++; /* and it counts as a layer then ! */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
- if (!pData->bJPEGdecompress) /* if we're not decompressing already */
- {
- if (pData->fInitrowproc) /* initialize row-processing? */
- {
- iRetcode = ((mng_initrowproc)pData->fInitrowproc) (pData);
- pData->fInitrowproc = MNG_NULL; /* only call this once !!! */
- }
-
- if (!iRetcode) /* initialize decompress */
- iRetcode = mngjpeg_decompressinit (pData);
- }
-
- if (!iRetcode) /* all ok? then decompress, my man */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mngjpeg_decompressdata (pData, iRawlen, pRawdata);
-#else
- iRetcode = mngjpeg_decompressdata (pData, pData->iRawlen, pData->pRawdata);
-#endif
-
- if (iRetcode)
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_JDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_dhdr (mng_datap pData,
- mng_uint16 iObjectid,
- mng_uint8 iImagetype,
- mng_uint8 iDeltatype,
- mng_uint32 iBlockwidth,
- mng_uint32 iBlockheight,
- mng_uint32 iBlockx,
- mng_uint32 iBlocky)
-#else
-mng_retcode mng_process_display_dhdr (mng_datap pData)
-#endif
-{
- mng_imagep pImage;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_DHDR, MNG_LC_START);
-#endif
-
- pData->fInitrowproc = MNG_NULL; /* do nothing by default */
- pData->fDisplayrow = MNG_NULL;
- pData->fCorrectrow = MNG_NULL;
- pData->fStorerow = MNG_NULL;
- pData->fProcessrow = MNG_NULL;
- pData->pStoreobj = MNG_NULL;
-
- pData->fDeltagetrow = MNG_NULL;
- pData->fDeltaaddrow = MNG_NULL;
- pData->fDeltareplacerow = MNG_NULL;
- pData->fDeltaputrow = MNG_NULL;
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pImage = mng_find_imageobject (pData, iObjectid);
-#else
- pImage = mng_find_imageobject (pData, pData->iDHDRobjectid);
-#endif
-
- if (pImage) /* object exists ? */
- {
- if (pImage->pImgbuf->bConcrete) /* is it concrete ? */
- { /* previous magnification to be done ? */
-#ifndef MNG_SKIPCHUNK_MAGN
- if ((pImage->iMAGN_MethodX) || (pImage->iMAGN_MethodY))
- {
- iRetcode = mng_magnify_imageobject (pData, pImage);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif
- /* save delta fields */
- pData->pDeltaImage = (mng_ptr)pImage;
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pData->iDeltaImagetype = iImagetype;
- pData->iDeltatype = iDeltatype;
- pData->iDeltaBlockwidth = iBlockwidth;
- pData->iDeltaBlockheight = iBlockheight;
- pData->iDeltaBlockx = iBlockx;
- pData->iDeltaBlocky = iBlocky;
-#else
- pData->iDeltaImagetype = pData->iDHDRimagetype;
- pData->iDeltatype = pData->iDHDRdeltatype;
- pData->iDeltaBlockwidth = pData->iDHDRblockwidth;
- pData->iDeltaBlockheight = pData->iDHDRblockheight;
- pData->iDeltaBlockx = pData->iDHDRblockx;
- pData->iDeltaBlocky = pData->iDHDRblocky;
-#endif
- /* restore target-object fields */
- pData->iDatawidth = pImage->pImgbuf->iWidth;
- pData->iDataheight = pImage->pImgbuf->iHeight;
- pData->iBitdepth = pImage->pImgbuf->iBitdepth;
- pData->iColortype = pImage->pImgbuf->iColortype;
- pData->iCompression = pImage->pImgbuf->iCompression;
- pData->iFilter = pImage->pImgbuf->iFilter;
- pData->iInterlace = pImage->pImgbuf->iInterlace;
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if ((iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD ) ||
- (iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- pData->iBitdepth = pImage->pImgbuf->iPixelsampledepth;
- else
- if ((iDeltatype == MNG_DELTATYPE_BLOCKALPHAADD ) ||
- (iDeltatype == MNG_DELTATYPE_BLOCKALPHAREPLACE) )
- pData->iBitdepth = pImage->pImgbuf->iAlphasampledepth;
- else
- if ((iDeltatype == MNG_DELTATYPE_BLOCKCOLORADD ) ||
- (iDeltatype == MNG_DELTATYPE_BLOCKCOLORREPLACE) )
- pData->iBitdepth = pImage->pImgbuf->iPixelsampledepth;
-#else
- if ((pData->iDHDRdeltatype == MNG_DELTATYPE_BLOCKPIXELADD ) ||
- (pData->iDHDRdeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- pData->iBitdepth = pImage->pImgbuf->iPixelsampledepth;
- else
- if ((pData->iDHDRdeltatype == MNG_DELTATYPE_BLOCKALPHAADD ) ||
- (pData->iDHDRdeltatype == MNG_DELTATYPE_BLOCKALPHAREPLACE) )
- pData->iBitdepth = pImage->pImgbuf->iAlphasampledepth;
- else
- if ((pData->iDHDRdeltatype == MNG_DELTATYPE_BLOCKCOLORADD ) ||
- (pData->iDHDRdeltatype == MNG_DELTATYPE_BLOCKCOLORREPLACE) )
- pData->iBitdepth = pImage->pImgbuf->iPixelsampledepth;
-#endif
-
-#ifdef MNG_INCLUDE_JNG
- pData->iJHDRimgbitdepth = pImage->pImgbuf->iBitdepth;
- pData->iJHDRcolortype = pImage->pImgbuf->iColortype;
- pData->iJHDRimgcompression = pImage->pImgbuf->iJHDRcompression;
- pData->iJHDRimginterlace = pImage->pImgbuf->iJHDRinterlace;
- pData->iJHDRalphacompression = pImage->pImgbuf->iCompression;
- pData->iJHDRalphafilter = pImage->pImgbuf->iFilter;
- pData->iJHDRalphainterlace = pImage->pImgbuf->iInterlace;
- pData->iJHDRalphabitdepth = pImage->pImgbuf->iAlphabitdepth;
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- /* block size specified ? */
- if (iDeltatype != MNG_DELTATYPE_NOCHANGE)
- { /* block entirely within target ? */
- if (iDeltatype != MNG_DELTATYPE_REPLACE)
- {
- if (((iBlockx + iBlockwidth ) > pData->iDatawidth ) ||
- ((iBlocky + iBlockheight) > pData->iDataheight) )
- MNG_ERROR (pData, MNG_INVALIDBLOCK);
- }
-
- pData->iDatawidth = iBlockwidth;
- pData->iDataheight = iBlockheight;
- }
-#else
- /* block size specified ? */
- if (pData->iDHDRdeltatype != MNG_DELTATYPE_NOCHANGE)
- { /* block entirely within target ? */
- if (pData->iDHDRdeltatype != MNG_DELTATYPE_REPLACE)
- {
- if (((pData->iDHDRblockx + pData->iDHDRblockwidth ) > pData->iDatawidth ) ||
- ((pData->iDHDRblocky + pData->iDHDRblockheight) > pData->iDataheight) )
- MNG_ERROR (pData, MNG_INVALIDBLOCK);
- }
-
- pData->iDatawidth = pData->iDHDRblockwidth;
- pData->iDataheight = pData->iDHDRblockheight;
- }
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- switch (iDeltatype) /* determine nr of delta-channels */
-#else
- switch (pData->iDHDRdeltatype) /* determine nr of delta-channels */
-#endif
- {
- case MNG_DELTATYPE_BLOCKALPHAADD : ;
- case MNG_DELTATYPE_BLOCKALPHAREPLACE :
- {
-#ifdef MNG_INCLUDE_JNG
- if ((pData->iColortype == MNG_COLORTYPE_GRAYA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA) )
- {
- pData->iColortype = MNG_COLORTYPE_GRAY;
- pData->iJHDRcolortype = MNG_COLORTYPE_JPEGGRAY;
- }
- else
- if ((pData->iColortype == MNG_COLORTYPE_RGBA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA) )
- {
- pData->iColortype = MNG_COLORTYPE_GRAY;
- pData->iJHDRcolortype = MNG_COLORTYPE_JPEGGRAY;
- }
-#else
- if (pData->iColortype == MNG_COLORTYPE_GRAYA)
- pData->iColortype = MNG_COLORTYPE_GRAY;
- else
- if (pData->iColortype == MNG_COLORTYPE_RGBA)
- pData->iColortype = MNG_COLORTYPE_GRAY;
-#endif
- else /* target has no alpha; that sucks! */
- MNG_ERROR (pData, MNG_TARGETNOALPHA);
-
- break;
- }
-
- case MNG_DELTATYPE_BLOCKCOLORADD : ;
- case MNG_DELTATYPE_BLOCKCOLORREPLACE :
- {
-#ifdef MNG_INCLUDE_JNG
- if ((pData->iColortype == MNG_COLORTYPE_GRAYA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA) )
- {
- pData->iColortype = MNG_COLORTYPE_GRAY;
- pData->iJHDRcolortype = MNG_COLORTYPE_JPEGGRAY;
- }
- else
- if ((pData->iColortype == MNG_COLORTYPE_RGBA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA) )
- {
- pData->iColortype = MNG_COLORTYPE_RGB;
- pData->iJHDRcolortype = MNG_COLORTYPE_JPEGCOLOR;
- }
-#else
- if (pData->iColortype == MNG_COLORTYPE_GRAYA)
- pData->iColortype = MNG_COLORTYPE_GRAY;
- else
- if (pData->iColortype == MNG_COLORTYPE_RGBA)
- pData->iColortype = MNG_COLORTYPE_RGB;
-#endif
- else /* target has no alpha; that sucks! */
- MNG_ERROR (pData, MNG_TARGETNOALPHA);
-
- break;
- }
-
- }
- /* full image replace ? */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (iDeltatype == MNG_DELTATYPE_REPLACE)
-#else
- if (pData->iDHDRdeltatype == MNG_DELTATYPE_REPLACE)
-#endif
- {
- iRetcode = mng_reset_object_details (pData, pImage,
- pData->iDatawidth, pData->iDataheight,
- pData->iBitdepth, pData->iColortype,
- pData->iCompression, pData->iFilter,
- pData->iInterlace, MNG_FALSE);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pData->pStoreobj = pImage; /* and store straight into this object */
- }
- else
- {
- mng_imagedatap pBufzero, pBuf;
- /* we store in object 0 and process it later */
- pData->pStoreobj = pData->pObjzero;
- /* make sure to initialize object 0 then */
- iRetcode = mng_reset_object_details (pData, (mng_imagep)pData->pObjzero,
- pData->iDatawidth, pData->iDataheight,
- pData->iBitdepth, pData->iColortype,
- pData->iCompression, pData->iFilter,
- pData->iInterlace, MNG_TRUE);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pBuf = pImage->pImgbuf; /* copy possible palette & cheap transparency */
- pBufzero = ((mng_imagep)pData->pObjzero)->pImgbuf;
-
- pBufzero->bHasPLTE = pBuf->bHasPLTE;
- pBufzero->bHasTRNS = pBuf->bHasTRNS;
-
- if (pBufzero->bHasPLTE) /* copy palette ? */
- {
- mng_uint32 iX;
-
- pBufzero->iPLTEcount = pBuf->iPLTEcount;
-
- for (iX = 0; iX < pBuf->iPLTEcount; iX++)
- {
- pBufzero->aPLTEentries [iX].iRed = pBuf->aPLTEentries [iX].iRed;
- pBufzero->aPLTEentries [iX].iGreen = pBuf->aPLTEentries [iX].iGreen;
- pBufzero->aPLTEentries [iX].iBlue = pBuf->aPLTEentries [iX].iBlue;
- }
- }
-
- if (pBufzero->bHasTRNS) /* copy cheap transparency ? */
- {
- pBufzero->iTRNSgray = pBuf->iTRNSgray;
- pBufzero->iTRNSred = pBuf->iTRNSred;
- pBufzero->iTRNSgreen = pBuf->iTRNSgreen;
- pBufzero->iTRNSblue = pBuf->iTRNSblue;
- pBufzero->iTRNScount = pBuf->iTRNScount;
-
- MNG_COPY (pBufzero->aTRNSentries, pBuf->aTRNSentries,
- sizeof (pBufzero->aTRNSentries));
- }
- /* process immediately if bitdepth & colortype are equal */
- pData->bDeltaimmediate =
- (mng_bool)((pData->bDisplaying) && (!pData->bSkipping) &&
- ((pData->bRunning) || (pData->bSearching)) &&
- (pData->iBitdepth == ((mng_imagep)pData->pDeltaImage)->pImgbuf->iBitdepth ) &&
- (pData->iColortype == ((mng_imagep)pData->pDeltaImage)->pImgbuf->iColortype) );
- }
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- pData->fInitrowproc = (mng_fptr)mng_init_rowproc;
- pData->ePng_imgtype = mng_png_imgtype (pData->iColortype, pData->iBitdepth);
-#else
- switch (pData->iColortype) /* determine row initialization routine */
- {
- case 0 : { /* gray */
- switch (pData->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g1_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g1_i;
-
- break;
- }
- case 2 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g2_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g2_i;
-
- break;
- }
- case 4 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g4_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g4_i;
-
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_g16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_g16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- case 2 : { /* rgb */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgb8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgb8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgb16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgb16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- case 3 : { /* indexed */
- switch (pData->iBitdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx1_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx1_i;
-
- break;
- }
- case 2 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx2_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx2_i;
-
- break;
- }
- case 4 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx4_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx4_i;
-
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_idx8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_idx8_i;
-
- break;
- }
- }
-
- break;
- }
- case 4 : { /* gray+alpha */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_ga8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_ga8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_ga16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_ga16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- case 6 : { /* rgb+alpha */
- switch (pData->iBitdepth)
- {
- case 8 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgba8_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgba8_i;
-
- break;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : {
- if (!pData->iInterlace)
- pData->fInitrowproc = (mng_fptr)mng_init_rgba16_ni;
- else
- pData->fInitrowproc = (mng_fptr)mng_init_rgba16_i;
-
- break;
- }
-#endif
- }
-
- break;
- }
- }
-#endif /* MNG_OPTIMIZE_FOOTPRINT_INIT */
- }
- else
- MNG_ERROR (pData, MNG_OBJNOTCONCRETE);
-
- }
- else
- MNG_ERROR (pData, MNG_OBJECTUNKNOWN);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_DHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_prom (mng_datap pData,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iFilltype)
-#else
-mng_retcode mng_process_display_prom (mng_datap pData)
-#endif
-{
- mng_imagep pImage;
- mng_imagedatap pBuf;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_PROM, MNG_LC_START);
-#endif
-
- if (!pData->pDeltaImage) /* gotta have this now! */
- MNG_ERROR (pData, MNG_INVALIDDELTA);
-
- pImage = (mng_imagep)pData->pDeltaImage;
- pBuf = pImage->pImgbuf;
- /* can't demote bitdepth! */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (iBitdepth < pBuf->iBitdepth)
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if ( ((pBuf->iColortype == MNG_COLORTYPE_GRAY ) &&
- (iColortype != MNG_COLORTYPE_GRAY ) &&
- (iColortype != MNG_COLORTYPE_GRAYA ) &&
- (iColortype != MNG_COLORTYPE_RGB ) &&
- (iColortype != MNG_COLORTYPE_RGBA ) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_GRAYA ) &&
- (iColortype != MNG_COLORTYPE_GRAYA ) &&
- (iColortype != MNG_COLORTYPE_RGBA ) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_RGB ) &&
- (iColortype != MNG_COLORTYPE_RGB ) &&
- (iColortype != MNG_COLORTYPE_RGBA ) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_RGBA ) &&
- (iColortype != MNG_COLORTYPE_RGBA ) ) ||
-#ifdef MNG_INCLUDE_JNG
- ((pBuf->iColortype == MNG_COLORTYPE_JPEGGRAY ) &&
- (iColortype != MNG_COLORTYPE_JPEGGRAY ) &&
- (iColortype != MNG_COLORTYPE_JPEGCOLOR ) &&
- (iColortype != MNG_COLORTYPE_JPEGGRAYA ) &&
- (iColortype != MNG_COLORTYPE_JPEGCOLORA) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_JPEGCOLOR ) &&
- (iColortype != MNG_COLORTYPE_JPEGCOLOR ) &&
- (iColortype != MNG_COLORTYPE_JPEGCOLORA) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_JPEGGRAYA ) &&
- (iColortype != MNG_COLORTYPE_JPEGGRAYA ) &&
- (iColortype != MNG_COLORTYPE_JPEGCOLORA) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_JPEGCOLORA) &&
- (iColortype != MNG_COLORTYPE_JPEGCOLORA) ) ||
-#endif
- ((pBuf->iColortype == MNG_COLORTYPE_INDEXED ) &&
- (iColortype != MNG_COLORTYPE_INDEXED ) &&
- (iColortype != MNG_COLORTYPE_RGB ) &&
- (iColortype != MNG_COLORTYPE_RGBA ) ) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
- iRetcode = mng_promote_imageobject (pData, pImage, iBitdepth, iColortype, iFilltype);
-#else
- if (pData->iPROMbitdepth < pBuf->iBitdepth)
- MNG_ERROR (pData, MNG_INVALIDBITDEPTH);
-
- if ( ((pBuf->iColortype == MNG_COLORTYPE_GRAY ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_GRAY ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_GRAYA ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_RGB ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_RGBA ) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_GRAYA ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_GRAYA ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_RGBA ) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_RGB ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_RGB ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_RGBA ) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_RGBA ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_RGBA ) ) ||
-#ifdef MNG_INCLUDE_JNG
- ((pBuf->iColortype == MNG_COLORTYPE_JPEGGRAY ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_JPEGGRAY ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_JPEGCOLOR ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_JPEGGRAYA ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_JPEGCOLORA) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_JPEGCOLOR ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_JPEGCOLOR ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_JPEGCOLORA) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_JPEGGRAYA ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_JPEGGRAYA ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_JPEGCOLORA) ) ||
- ((pBuf->iColortype == MNG_COLORTYPE_JPEGCOLORA) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_JPEGCOLORA) ) ||
-#endif
- ((pBuf->iColortype == MNG_COLORTYPE_INDEXED ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_INDEXED ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_RGB ) &&
- (pData->iPROMcolortype != MNG_COLORTYPE_RGBA ) ) )
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
- iRetcode = mng_promote_imageobject (pData, pImage, pData->iPROMbitdepth,
- pData->iPROMcolortype, pData->iPROMfilltype);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_PROM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_process_display_ipng (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_IPNG, MNG_LC_START);
-#endif
- /* indicate it for what it is now */
- pData->iDeltaImagetype = MNG_IMAGETYPE_PNG;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_IPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
-mng_retcode mng_process_display_ijng (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_IJNG, MNG_LC_START);
-#endif
- /* indicate it for what it is now */
- pData->iDeltaImagetype = MNG_IMAGETYPE_JNG;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_IJNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_pplt (mng_datap pData,
- mng_uint8 iType,
- mng_uint32 iCount,
- mng_palette8ep paIndexentries,
- mng_uint8p paAlphaentries,
- mng_uint8p paUsedentries)
-#else
-mng_retcode mng_process_display_pplt (mng_datap pData)
-#endif
-{
- mng_uint32 iX;
- mng_imagep pImage = (mng_imagep)pData->pObjzero;
- mng_imagedatap pBuf = pImage->pImgbuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_PPLT, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iX = iCount;
-#else
- iX = pData->iPPLTcount;
-#endif
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- switch (iType)
-#else
- switch (pData->iPPLTtype)
-#endif
- {
- case MNG_DELTATYPE_REPLACERGB :
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (; iX > 0;iX--)
-#else
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- for (iX = 0; iX < iCount; iX++)
-#else
- for (iX = 0; iX < pData->iPPLTcount; iX++)
-#endif
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (paUsedentries [iX])
- {
- pBuf->aPLTEentries [iX].iRed = paIndexentries [iX].iRed;
- pBuf->aPLTEentries [iX].iGreen = paIndexentries [iX].iGreen;
- pBuf->aPLTEentries [iX].iBlue = paIndexentries [iX].iBlue;
- }
-#else
- if (pData->paPPLTusedentries [iX])
- {
- pBuf->aPLTEentries [iX].iRed = pData->paPPLTindexentries [iX].iRed;
- pBuf->aPLTEentries [iX].iGreen = pData->paPPLTindexentries [iX].iGreen;
- pBuf->aPLTEentries [iX].iBlue = pData->paPPLTindexentries [iX].iBlue;
- }
-#endif
- }
-
- break;
- }
- case MNG_DELTATYPE_DELTARGB :
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (; iX > 0;iX--)
-#else
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- for (iX = 0; iX < iCount; iX++)
-#else
- for (iX = 0; iX < pData->iPPLTcount; iX++)
-#endif
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (paUsedentries [iX])
- {
- pBuf->aPLTEentries [iX].iRed =
- (mng_uint8)(pBuf->aPLTEentries [iX].iRed +
- paIndexentries [iX].iRed );
- pBuf->aPLTEentries [iX].iGreen =
- (mng_uint8)(pBuf->aPLTEentries [iX].iGreen +
- paIndexentries [iX].iGreen);
- pBuf->aPLTEentries [iX].iBlue =
- (mng_uint8)(pBuf->aPLTEentries [iX].iBlue +
- paIndexentries [iX].iBlue );
- }
-#else
- if (pData->paPPLTusedentries [iX])
- {
- pBuf->aPLTEentries [iX].iRed =
- (mng_uint8)(pBuf->aPLTEentries [iX].iRed +
- pData->paPPLTindexentries [iX].iRed );
- pBuf->aPLTEentries [iX].iGreen =
- (mng_uint8)(pBuf->aPLTEentries [iX].iGreen +
- pData->paPPLTindexentries [iX].iGreen);
- pBuf->aPLTEentries [iX].iBlue =
- (mng_uint8)(pBuf->aPLTEentries [iX].iBlue +
- pData->paPPLTindexentries [iX].iBlue );
- }
-#endif
- }
-
- break;
- }
- case MNG_DELTATYPE_REPLACEALPHA :
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (; iX > 0;iX--)
-#else
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- for (iX = 0; iX < iCount; iX++)
-#else
- for (iX = 0; iX < pData->iPPLTcount; iX++)
-#endif
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (paUsedentries [iX])
- pBuf->aTRNSentries [iX] = paAlphaentries [iX];
- }
-#else
- if (pData->paPPLTusedentries [iX])
- pBuf->aTRNSentries [iX] = pData->paPPLTalphaentries [iX];
- }
-#endif
-
- break;
- }
- case MNG_DELTATYPE_DELTAALPHA :
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (; iX > 0;iX--)
-#else
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- for (iX = 0; iX < iCount; iX++)
-#else
- for (iX = 0; iX < pData->iPPLTcount; iX++)
-#endif
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (paUsedentries [iX])
- pBuf->aTRNSentries [iX] =
- (mng_uint8)(pBuf->aTRNSentries [iX] +
- paAlphaentries [iX]);
-#else
- if (pData->paPPLTusedentries [iX])
- pBuf->aTRNSentries [iX] =
- (mng_uint8)(pBuf->aTRNSentries [iX] +
- pData->paPPLTalphaentries [iX]);
-#endif
- }
-
- break;
- }
- case MNG_DELTATYPE_REPLACERGBA :
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (; iX > 0;iX--)
-#else
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- for (iX = 0; iX < iCount; iX++)
-#else
- for (iX = 0; iX < pData->iPPLTcount; iX++)
-#endif
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (paUsedentries [iX])
- {
- pBuf->aPLTEentries [iX].iRed = paIndexentries [iX].iRed;
- pBuf->aPLTEentries [iX].iGreen = paIndexentries [iX].iGreen;
- pBuf->aPLTEentries [iX].iBlue = paIndexentries [iX].iBlue;
- pBuf->aTRNSentries [iX] = paAlphaentries [iX];
- }
-#else
- if (pData->paPPLTusedentries [iX])
- {
- pBuf->aPLTEentries [iX].iRed = pData->paPPLTindexentries [iX].iRed;
- pBuf->aPLTEentries [iX].iGreen = pData->paPPLTindexentries [iX].iGreen;
- pBuf->aPLTEentries [iX].iBlue = pData->paPPLTindexentries [iX].iBlue;
- pBuf->aTRNSentries [iX] = pData->paPPLTalphaentries [iX];
- }
-#endif
- }
-
- break;
- }
- case MNG_DELTATYPE_DELTARGBA :
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (; iX > 0;iX--)
-#else
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- for (iX = 0; iX < iCount; iX++)
-#else
- for (iX = 0; iX < pData->iPPLTcount; iX++)
-#endif
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (paUsedentries [iX])
- {
- pBuf->aPLTEentries [iX].iRed =
- (mng_uint8)(pBuf->aPLTEentries [iX].iRed +
- paIndexentries [iX].iRed );
- pBuf->aPLTEentries [iX].iGreen =
- (mng_uint8)(pBuf->aPLTEentries [iX].iGreen +
- paIndexentries [iX].iGreen);
- pBuf->aPLTEentries [iX].iBlue =
- (mng_uint8)(pBuf->aPLTEentries [iX].iBlue +
- paIndexentries [iX].iBlue );
- pBuf->aTRNSentries [iX] =
- (mng_uint8)(pBuf->aTRNSentries [iX] +
- paAlphaentries [iX]);
- }
-#else
- if (pData->paPPLTusedentries [iX])
- {
- pBuf->aPLTEentries [iX].iRed =
- (mng_uint8)(pBuf->aPLTEentries [iX].iRed +
- pData->paPPLTindexentries [iX].iRed );
- pBuf->aPLTEentries [iX].iGreen =
- (mng_uint8)(pBuf->aPLTEentries [iX].iGreen +
- pData->paPPLTindexentries [iX].iGreen);
- pBuf->aPLTEentries [iX].iBlue =
- (mng_uint8)(pBuf->aPLTEentries [iX].iBlue +
- pData->paPPLTindexentries [iX].iBlue );
- pBuf->aTRNSentries [iX] =
- (mng_uint8)(pBuf->aTRNSentries [iX] +
- pData->paPPLTalphaentries [iX]);
- }
-#endif
- }
-
- break;
- }
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if ((iType != MNG_DELTATYPE_REPLACERGB) && (iType != MNG_DELTATYPE_DELTARGB))
-#else
- if ((pData->iPPLTtype != MNG_DELTATYPE_REPLACERGB) &&
- (pData->iPPLTtype != MNG_DELTATYPE_DELTARGB ) )
-#endif
- {
- if (pBuf->bHasTRNS)
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (iCount > pBuf->iTRNScount)
- pBuf->iTRNScount = iCount;
-#else
- if (pData->iPPLTcount > pBuf->iTRNScount)
- pBuf->iTRNScount = pData->iPPLTcount;
-#endif
- }
- else
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pBuf->iTRNScount = iCount;
- pBuf->bHasTRNS = MNG_TRUE;
-#else
- pBuf->iTRNScount = pData->iPPLTcount;
- pBuf->bHasTRNS = MNG_TRUE;
-#endif
- }
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if ((iType != MNG_DELTATYPE_REPLACEALPHA) && (iType != MNG_DELTATYPE_DELTAALPHA))
-#else
- if ((pData->iPPLTtype != MNG_DELTATYPE_REPLACEALPHA) &&
- (pData->iPPLTtype != MNG_DELTATYPE_DELTAALPHA ) )
-#endif
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (iCount > pBuf->iPLTEcount)
- pBuf->iPLTEcount = iCount;
-#else
- if (pData->iPPLTcount > pBuf->iPLTEcount)
- pBuf->iPLTEcount = pData->iPPLTcount;
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_PPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_magn (mng_datap pData,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iMethodX,
- mng_uint16 iMX,
- mng_uint16 iMY,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint16 iMT,
- mng_uint16 iMB,
- mng_uint8 iMethodY)
-#else
-mng_retcode mng_process_display_magn (mng_datap pData)
-#endif
-{
- mng_uint16 iX;
- mng_imagep pImage;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MAGN, MNG_LC_START);
-#endif
- /* iterate the object-ids */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- for (iX = iFirstid; iX <= iLastid; iX++)
-#else
- for (iX = pData->iMAGNfirstid; iX <= pData->iMAGNlastid; iX++)
-#endif
- {
- if (iX == 0) /* process object 0 ? */
- {
- pImage = (mng_imagep)pData->pObjzero;
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pImage->iMAGN_MethodX = iMethodX;
- pImage->iMAGN_MethodY = iMethodY;
- pImage->iMAGN_MX = iMX;
- pImage->iMAGN_MY = iMY;
- pImage->iMAGN_ML = iML;
- pImage->iMAGN_MR = iMR;
- pImage->iMAGN_MT = iMT;
- pImage->iMAGN_MB = iMB;
-#else
- pImage->iMAGN_MethodX = pData->iMAGNmethodX;
- pImage->iMAGN_MethodY = pData->iMAGNmethodY;
- pImage->iMAGN_MX = pData->iMAGNmX;
- pImage->iMAGN_MY = pData->iMAGNmY;
- pImage->iMAGN_ML = pData->iMAGNmL;
- pImage->iMAGN_MR = pData->iMAGNmR;
- pImage->iMAGN_MT = pData->iMAGNmT;
- pImage->iMAGN_MB = pData->iMAGNmB;
-#endif
- }
- else
- {
- pImage = mng_find_imageobject (pData, iX);
- /* object exists & is not frozen ? */
- if ((pImage) && (!pImage->bFrozen))
- { /* previous magnification to be done ? */
- if ((pImage->iMAGN_MethodX) || (pImage->iMAGN_MethodY))
- {
- mng_retcode iRetcode = mng_magnify_imageobject (pData, pImage);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pImage->iMAGN_MethodX = iMethodX;
- pImage->iMAGN_MethodY = iMethodY;
- pImage->iMAGN_MX = iMX;
- pImage->iMAGN_MY = iMY;
- pImage->iMAGN_ML = iML;
- pImage->iMAGN_MR = iMR;
- pImage->iMAGN_MT = iMT;
- pImage->iMAGN_MB = iMB;
-#else
- pImage->iMAGN_MethodX = pData->iMAGNmethodX;
- pImage->iMAGN_MethodY = pData->iMAGNmethodY;
- pImage->iMAGN_MX = pData->iMAGNmX;
- pImage->iMAGN_MY = pData->iMAGNmY;
- pImage->iMAGN_ML = pData->iMAGNmL;
- pImage->iMAGN_MR = pData->iMAGNmR;
- pImage->iMAGN_MT = pData->iMAGNmT;
- pImage->iMAGN_MB = pData->iMAGNmB;
-#endif
- }
- }
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pData->iMAGNfromid = iFirstid;
- pData->iMAGNtoid = iLastid;
- iX = iFirstid;
-#else
- pData->iMAGNfromid = pData->iMAGNfirstid;
- pData->iMAGNtoid = pData->iMAGNlastid;
- iX = pData->iMAGNfirstid;
-#endif
- /* iterate again for showing */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- while ((iX <= iLastid) && (!pData->bTimerset))
-#else
- while ((iX <= pData->iMAGNlastid) && (!pData->bTimerset))
-#endif
- {
- pData->iMAGNcurrentid = iX;
-
- if (iX) /* only real objects ! */
- {
- pImage = mng_find_imageobject (pData, iX);
- /* object exists & is not frozen &
- is visible & is viewable ? */
- if ((pImage) && (!pImage->bFrozen) &&
- (pImage->bVisible) && (pImage->bViewable))
- {
- mng_retcode iRetcode = mng_display_image (pData, pImage, MNG_FALSE);
- if (iRetcode)
- return iRetcode;
- }
- }
-
- iX++;
- }
-
- if (pData->bTimerset) /* broken ? */
- pData->iBreakpoint = 9;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MAGN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_display_magn2 (mng_datap pData)
-{
- mng_uint16 iX;
- mng_imagep pImage;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MAGN, MNG_LC_START);
-#endif
-
- iX = pData->iMAGNcurrentid;
- /* iterate again for showing */
- while ((iX <= pData->iMAGNtoid) && (!pData->bTimerset))
- {
- pData->iMAGNcurrentid = iX;
-
- if (iX) /* only real objects ! */
- {
- pImage = mng_find_imageobject (pData, iX);
- /* object exists & is not frozen &
- is visible & is viewable ? */
- if ((pImage) && (!pImage->bFrozen) &&
- (pImage->bVisible) && (pImage->bViewable))
- {
- mng_retcode iRetcode = mng_display_image (pData, pImage, MNG_FALSE);
- if (iRetcode)
- return iRetcode;
- }
- }
-
- iX++;
- }
-
- if (pData->bTimerset) /* broken ? */
- pData->iBreakpoint = 9;
- else
- pData->iBreakpoint = 0; /* not again ! */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MAGN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-mng_retcode mng_process_display_past (mng_datap pData,
- mng_uint16 iTargetid,
- mng_uint8 iTargettype,
- mng_int32 iTargetx,
- mng_int32 iTargety,
- mng_uint32 iCount,
- mng_ptr pSources)
-#else
-mng_retcode mng_process_display_past (mng_datap pData)
-#endif
-{
- mng_retcode iRetcode = MNG_NOERROR;
- mng_imagep pTargetimg;
- mng_imagep pSourceimg;
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- mng_past_sourcep pSource = (mng_past_sourcep)pSources;
-#else
- mng_past_sourcep pSource = (mng_past_sourcep)pData->pPASTsources;
-#endif
- mng_uint32 iX = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_PAST, MNG_LC_START);
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (iTargetid) /* a real destination object ? */
-#else
- if (pData->iPASTtargetid) /* a real destination object ? */
-#endif
- { /* let's find it then */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pTargetimg = (mng_imagep)mng_find_imageobject (pData, iTargetid);
-#else
- pTargetimg = (mng_imagep)mng_find_imageobject (pData, pData->iPASTtargetid);
-#endif
-
- if (!pTargetimg) /* if it doesn't exists; do a barf */
- MNG_ERROR (pData, MNG_OBJECTUNKNOWN);
- /* it's gotta be abstract !!! */
- if (pTargetimg->pImgbuf->bConcrete)
- MNG_ERROR (pData, MNG_OBJNOTABSTRACT);
- /* we want 32-/64-bit RGBA to play with ! */
- if ((pTargetimg->pImgbuf->iBitdepth <= MNG_BITDEPTH_8) ||
- (pTargetimg->pImgbuf->iColortype == MNG_COLORTYPE_GRAY) ||
- (pTargetimg->pImgbuf->iColortype == MNG_COLORTYPE_RGB) ||
- (pTargetimg->pImgbuf->iColortype == MNG_COLORTYPE_INDEXED) ||
- (pTargetimg->pImgbuf->iColortype == MNG_COLORTYPE_GRAYA) )
- iRetcode = mng_promote_imageobject (pData, pTargetimg, MNG_BITDEPTH_8,
- MNG_COLORTYPE_RGBA,
- MNG_FILLMETHOD_LEFTBITREPLICATE);
- else
- if ((pTargetimg->pImgbuf->iBitdepth > MNG_BITDEPTH_8) &&
- ((pTargetimg->pImgbuf->iColortype == MNG_COLORTYPE_GRAY) ||
- (pTargetimg->pImgbuf->iColortype == MNG_COLORTYPE_RGB) ||
- (pTargetimg->pImgbuf->iColortype == MNG_COLORTYPE_GRAYA) ) )
- iRetcode = mng_promote_imageobject (pData, pTargetimg, MNG_BITDEPTH_16,
- MNG_COLORTYPE_RGBA,
- MNG_FILLMETHOD_LEFTBITREPLICATE);
-#ifdef MNG_INCLUDE_JNG
- else
- if ((pTargetimg->pImgbuf->iColortype == MNG_COLORTYPE_JPEGGRAY) ||
- (pTargetimg->pImgbuf->iColortype == MNG_COLORTYPE_JPEGCOLOR) ||
- (pTargetimg->pImgbuf->iColortype == MNG_COLORTYPE_JPEGGRAYA) )
- iRetcode = mng_promote_imageobject (pData, pTargetimg,
- pTargetimg->pImgbuf->iBitdepth,
- MNG_COLORTYPE_JPEGCOLORA,
- MNG_FILLMETHOD_LEFTBITREPLICATE);
-#endif
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* make it really abstract ? */
- if (!pTargetimg->pImgbuf->bCorrected)
- {
- iRetcode = mng_colorcorrect_object (pData, pTargetimg);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
- else
- { /* pasting into object 0 !!! */
- pTargetimg = (mng_imagep)pData->pObjzero;
- /* is it usable ??? */
- if ((pTargetimg->bClipped) &&
- (pTargetimg->iClipr > pTargetimg->iPosx) &&
- (pTargetimg->iClipb > pTargetimg->iPosy))
- {
- /* make it 32-bit RGBA please !!! */
- iRetcode = mng_reset_object_details (pData, pTargetimg,
- pTargetimg->iClipr - pTargetimg->iPosx,
- pTargetimg->iClipb - pTargetimg->iPosy,
- MNG_BITDEPTH_8, MNG_COLORTYPE_RGBA,
- 0, 0, 0, MNG_FALSE);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- else
- pTargetimg = MNG_NULL; /* clipped beyond visibility ! */
- }
-
- if (pTargetimg) /* usable destination ? */
- {
- mng_int32 iSourceY;
- mng_int32 iSourceYinc;
- mng_int32 iSourcerowsize;
- mng_int32 iSourcesamples;
- mng_bool bSourceRGBA16;
- mng_int32 iTargetY;
- mng_int32 iTargetrowsize;
- mng_int32 iTargetsamples;
- mng_bool bTargetRGBA16 = MNG_FALSE;
- mng_int32 iTemprowsize;
- mng_imagedatap pBuf;
-#ifndef MNG_SKIPCHUNK_MAGN
- /* needs magnification ? */
- if ((pTargetimg->iMAGN_MethodX) || (pTargetimg->iMAGN_MethodY))
- iRetcode = mng_magnify_imageobject (pData, pTargetimg);
-#endif
-
- if (!iRetcode) /* still ok ? */
- {
- bTargetRGBA16 = (mng_bool)(pTargetimg->pImgbuf->iBitdepth > 8);
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- switch (iTargettype) /* determine target x/y */
-#else
- switch (pData->iPASTtargettype) /* determine target x/y */
-#endif
- {
- case 0 : {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pData->iPastx = iTargetx;
- pData->iPasty = iTargety;
-#else
- pData->iPastx = pData->iPASTtargetx;
- pData->iPasty = pData->iPASTtargety;
-#endif
- break;
- }
-
- case 1 : {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pData->iPastx = pTargetimg->iPastx + iTargetx;
- pData->iPasty = pTargetimg->iPasty + iTargety;
-#else
- pData->iPastx = pTargetimg->iPastx + pData->iPASTtargetx;
- pData->iPasty = pTargetimg->iPasty + pData->iPASTtargety;
-#endif
- break;
- }
-
- case 2 : {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pData->iPastx += iTargetx;
- pData->iPasty += iTargety;
-#else
- pData->iPastx += pData->iPASTtargetx;
- pData->iPasty += pData->iPASTtargety;
-#endif
- break;
- }
- }
- /* save for next time ... */
- pTargetimg->iPastx = pData->iPastx;
- pTargetimg->iPasty = pData->iPasty;
- /* address destination for row-routines */
- pData->pStoreobj = (mng_objectp)pTargetimg;
- pData->pStorebuf = (mng_objectp)pTargetimg->pImgbuf;
- }
- /* process the sources one by one */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- while ((!iRetcode) && (iX < iCount))
-#else
- while ((!iRetcode) && (iX < pData->iPASTcount))
-#endif
- { /* find the little bastards first */
- pSourceimg = (mng_imagep)mng_find_imageobject (pData, pSource->iSourceid);
- /* exists and viewable? */
- if ((pSourceimg) && (pSourceimg->bViewable))
- { /* needs magnification ? */
-#ifndef MNG_SKIPCHUNK_MAGN
- if ((pSourceimg->iMAGN_MethodX) || (pSourceimg->iMAGN_MethodY))
- iRetcode = mng_magnify_imageobject (pData, pSourceimg);
-#endif
-
- if (!iRetcode) /* still ok ? */
- {
- pBuf = (mng_imagedatap)pSourceimg->pImgbuf;
- /* address source for row-routines */
- pData->pRetrieveobj = (mng_objectp)pSourceimg;
-
- pData->iPass = -1; /* init row-processing variables */
- pData->iRowinc = 1;
- pData->iColinc = 1;
- pData->iPixelofs = 0;
- iSourcesamples = (mng_int32)pBuf->iWidth;
- iSourcerowsize = pBuf->iRowsize;
- bSourceRGBA16 = (mng_bool)(pBuf->iBitdepth > 8);
- /* make sure the delta-routines do the right thing */
- pData->iDeltatype = MNG_DELTATYPE_BLOCKPIXELREPLACE;
-
- switch (pBuf->iColortype)
- {
- case 0 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bSourceRGBA16)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g8;
-
- pData->bIsOpaque = (mng_bool)(!pBuf->bHasTRNS);
- break;
- }
-
- case 2 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bSourceRGBA16)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb8;
-
- pData->bIsOpaque = (mng_bool)(!pBuf->bHasTRNS);
- break;
- }
-
-
- case 3 : { pData->fRetrieverow = (mng_fptr)mng_retrieve_idx8;
- pData->bIsOpaque = (mng_bool)(!pBuf->bHasTRNS);
- break;
- }
-
-
- case 4 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bSourceRGBA16)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
-
-
- case 6 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bSourceRGBA16)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
-
- case 8 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bSourceRGBA16)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_g8;
-
- pData->bIsOpaque = MNG_TRUE;
- break;
- }
-
- case 10 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bSourceRGBA16)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgb8;
-
- pData->bIsOpaque = MNG_TRUE;
- break;
- }
-
-
- case 12 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bSourceRGBA16)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_ga8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
-
-
- case 14 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bSourceRGBA16)
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba16;
- else
-#endif
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba8;
-
- pData->bIsOpaque = MNG_FALSE;
- break;
- }
- }
- /* determine scaling */
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_NO_DELTA_PNG
- if ((!bSourceRGBA16) && (bTargetRGBA16))
- pData->fScalerow = (mng_fptr)mng_scale_rgba8_rgba16;
- else
- if ((bSourceRGBA16) && (!bTargetRGBA16))
- pData->fScalerow = (mng_fptr)mng_scale_rgba16_rgba8;
- else
-#endif
-#endif
- pData->fScalerow = MNG_NULL;
-
- /* default no color-correction */
- pData->fCorrectrow = MNG_NULL;
-
-#if defined(MNG_FULL_CMS) /* determine color-management routine */
- iRetcode = mng_init_full_cms (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#elif defined(MNG_GAMMA_ONLY)
- iRetcode = mng_init_gamma_only (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#elif defined(MNG_APP_CMS)
- iRetcode = mng_init_app_cms (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#endif
- }
-
- if (!iRetcode) /* still ok ? */
- {
- pData->fFliprow = MNG_NULL; /* no flipping or tiling by default */
- pData->fTilerow = MNG_NULL;
- /* but perhaps we do have to ... */
- switch (pSource->iOrientation)
- {
- case 2 : ;
- case 4 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bTargetRGBA16)
- pData->fFliprow = (mng_fptr)mng_flip_rgba16;
- else
-#endif
- pData->fFliprow = (mng_fptr)mng_flip_rgba8;
- break;
- }
-
- case 8 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bTargetRGBA16)
- pData->fTilerow = (mng_fptr)mng_tile_rgba16;
- else
-#endif
- pData->fTilerow = (mng_fptr)mng_tile_rgba8;
- break;
- }
- }
- /* determine composition routine */
- /* note that we're abusing the delta-routine setup !!! */
- switch (pSource->iComposition)
- {
- case 0 : { /* composite over */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bTargetRGBA16)
- pData->fDeltarow = (mng_fptr)mng_composeover_rgba16;
- else
-#endif
- pData->fDeltarow = (mng_fptr)mng_composeover_rgba8;
- break;
- }
-
- case 1 : { /* replace */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bTargetRGBA16)
- pData->fDeltarow = (mng_fptr)mng_delta_rgba16_rgba16;
- else
-#endif
- pData->fDeltarow = (mng_fptr)mng_delta_rgba8_rgba8;
- break;
- }
-
- case 2 : { /* composite under */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bTargetRGBA16)
- pData->fDeltarow = (mng_fptr)mng_composeunder_rgba16;
- else
-#endif
- pData->fDeltarow = (mng_fptr)mng_composeunder_rgba8;
- break;
- }
- }
- /* determine offsets & clipping */
- if (pSource->iOffsettype == 1)
- {
- pData->iDestl = pData->iPastx + pSource->iOffsetx;
- pData->iDestt = pData->iPasty + pSource->iOffsety;
- }
- else
- {
- pData->iDestl = pSource->iOffsetx;
- pData->iDestt = pSource->iOffsety;
- }
-
- pData->iDestr = (mng_int32)pTargetimg->pImgbuf->iWidth;
- pData->iDestb = (mng_int32)pTargetimg->pImgbuf->iHeight;
- /* take the source dimension into account ? */
- if (pSource->iOrientation != 8)
- {
- pData->iDestr = MIN_COORD (pData->iDestr, pData->iDestl + (mng_int32)pBuf->iWidth);
- pData->iDestb = MIN_COORD (pData->iDestb, pData->iDestt + (mng_int32)pBuf->iHeight);
- }
- /* source clipping */
- if (pSource->iBoundarytype == 1)
- {
- if (pData->iDestl < pData->iPastx + pSource->iBoundaryl)
- pData->iSourcel = pData->iPastx + pSource->iBoundaryl - pData->iDestl;
- else
- pData->iSourcel = 0;
-
- if (pData->iDestt < pData->iPasty + pSource->iBoundaryt)
- pData->iSourcet = pData->iPasty + pSource->iBoundaryt - pData->iDestt;
- else
- pData->iSourcet = 0;
-
- pData->iDestl = MAX_COORD (pData->iDestl, pData->iPastx + pSource->iBoundaryl);
- pData->iDestt = MAX_COORD (pData->iDestt, pData->iPasty + pSource->iBoundaryt);
- pData->iDestr = MIN_COORD (pData->iDestr, pData->iPastx + pSource->iBoundaryr);
- pData->iDestb = MIN_COORD (pData->iDestb, pData->iPasty + pSource->iBoundaryb);
- }
- else
- {
- if (pData->iDestl < pSource->iBoundaryl)
- pData->iSourcel = pSource->iBoundaryl - pData->iDestl;
- else
- pData->iSourcel = 0;
-
- if (pData->iDestt < pSource->iBoundaryt)
- pData->iSourcet = pSource->iBoundaryt - pData->iDestt;
- else
- pData->iSourcet = 0;
-
- pData->iDestl = MAX_COORD (pData->iDestl, pSource->iBoundaryl);
- pData->iDestt = MAX_COORD (pData->iDestt, pSource->iBoundaryt);
- pData->iDestr = MIN_COORD (pData->iDestr, pSource->iBoundaryr);
- pData->iDestb = MIN_COORD (pData->iDestb, pSource->iBoundaryb);
- }
-
- if (pData->iSourcel) /* indent source ? */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bTargetRGBA16) /* abuse tiling routine to shift source-pixels */
- pData->fTilerow = (mng_fptr)mng_tile_rgba16;
- else
-#endif
- pData->fTilerow = (mng_fptr)mng_tile_rgba8;
- }
- /* anything to display ? */
- if ((pData->iDestl <= pData->iDestr) && (pData->iDestt <= pData->iDestb))
- { /* init variables for the loop */
- if ((pSource->iOrientation == 2) || (pSource->iOrientation == 6))
- {
- iSourceY = (mng_int32)pBuf->iHeight - 1 - pData->iSourcet;
- iSourceYinc = -1;
- }
- else
- {
- iSourceY = pData->iSourcet;
- iSourceYinc = 1;
- }
-
- iTargetY = pData->iDestt;
- pData->iCol = pData->iDestl;
-
- iTargetsamples = pData->iDestr - pData->iDestl;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (bTargetRGBA16)
- iTargetrowsize = (iTargetsamples << 3);
- else
-#endif
- iTargetrowsize = (iTargetsamples << 2);
-
- /* get temporary work-buffers */
- if (iSourcerowsize > iTargetrowsize)
- iTemprowsize = iSourcerowsize << 1;
- else
- iTemprowsize = iTargetrowsize << 1;
- MNG_ALLOC (pData, pData->pRGBArow, iTemprowsize);
- MNG_ALLOC (pData, pData->pWorkrow, iTemprowsize);
-
- while ((!iRetcode) && (iTargetY < pData->iDestb))
- { /* get a row */
- pData->iRow = iSourceY;
- pData->iRowsamples = iSourcesamples;
- pData->iRowsize = iSourcerowsize;
- pData->bIsRGBA16 = bSourceRGBA16;
- iRetcode = ((mng_retrieverow)pData->fRetrieverow) (pData);
- /* scale it (if necessary) */
- if ((!iRetcode) && (pData->fScalerow))
- iRetcode = ((mng_scalerow)pData->fScalerow) (pData);
-
- pData->bIsRGBA16 = bTargetRGBA16;
- /* color correction (if necessary) */
- if ((!iRetcode) && (pData->fCorrectrow))
- iRetcode = ((mng_correctrow)pData->fCorrectrow) (pData);
- /* flipping (if necessary) */
- if ((!iRetcode) && (pData->fFliprow))
- iRetcode = ((mng_fliprow)pData->fFliprow) (pData);
- /* tiling (if necessary) */
- if ((!iRetcode) && (pData->fTilerow))
- iRetcode = ((mng_tilerow)pData->fTilerow) (pData);
-
- if (!iRetcode) /* and paste..... */
- {
- pData->iRow = iTargetY;
- pData->iRowsamples = iTargetsamples;
- pData->iRowsize = iTargetrowsize;
- iRetcode = ((mng_deltarow)pData->fDeltarow) (pData);
- }
-
- iSourceY += iSourceYinc; /* and next line */
-
- if (iSourceY < 0)
- iSourceY = (mng_int32)pBuf->iHeight - 1;
- else
- if (iSourceY >= (mng_int32)pBuf->iHeight)
- iSourceY = 0;
-
- iTargetY++;
- }
- /* drop the temporary row-buffer */
- MNG_FREEX (pData, pData->pWorkrow, iTemprowsize);
- MNG_FREEX (pData, pData->pRGBArow, iTemprowsize);
- }
-
-#if defined(MNG_FULL_CMS) /* cleanup cms stuff */
- if (!iRetcode)
- iRetcode = mng_clear_cms (pData);
-#endif
- }
-
- pSource++; /* neeeeext */
- iX++;
- }
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- if (!iTargetid) /* did we paste into object 0 ? */
-#else
- if (!pData->iPASTtargetid) /* did we paste into object 0 ? */
-#endif
- { /* display it then ! */
- iRetcode = mng_display_image (pData, pTargetimg, MNG_FALSE);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- else
- { /* target is visible & viewable ? */
- if ((pTargetimg->bVisible) && (pTargetimg->bViewable))
- {
- iRetcode = mng_display_image (pData, pTargetimg, MNG_FALSE);
- if (iRetcode)
- return iRetcode;
- }
- }
- }
-
- if (pData->bTimerset) /* broken ? */
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- pData->iPASTid = iTargetid;
-#else
- pData->iPASTid = pData->iPASTtargetid;
-#endif
- pData->iBreakpoint = 11;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_PAST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SKIPCHUNK_PAST */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_process_display_past2 (mng_datap pData)
-{
- mng_retcode iRetcode;
- mng_imagep pTargetimg;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_PAST, MNG_LC_START);
-#endif
-
- if (pData->iPASTid) /* a real destination object ? */
- pTargetimg = (mng_imagep)mng_find_imageobject (pData, pData->iPASTid);
- else /* otherwise object 0 */
- pTargetimg = (mng_imagep)pData->pObjzero;
-
- iRetcode = mng_display_image (pData, pTargetimg, MNG_FALSE);
- if (iRetcode)
- return iRetcode;
-
- pData->iBreakpoint = 0; /* only once */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_PAST, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SKIPCHUNK_PAST */
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_DISPLAY_PROCS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
-
diff --git a/src/3rdparty/libmng/libmng_display.h b/src/3rdparty/libmng/libmng_display.h
deleted file mode 100644
index f394dd2f6d..0000000000
--- a/src/3rdparty/libmng/libmng_display.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_display.h copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Display management (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the display managament routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.5.2 - 05/20/2000 - G.Juyn * */
-/* * - added JNG support stuff * */
-/* * * */
-/* * 0.5.3 - 06/16/2000 - G.Juyn * */
-/* * - changed progressive-display processing * */
-/* * 0.5.3 - 06/22/2000 - G.Juyn * */
-/* * - added support for delta-image processing * */
-/* * - added support for PPLT chunk processing * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * 0.9.3 - 08/07/2000 - G.Juyn * */
-/* * - B111300 - fixup for improved portability * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added JDAA chunk * */
-/* * * */
-/* * 0.9.4 - 11/24/2000 - G.Juyn * */
-/* * - moved restore of object 0 to libmng_display * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/13/2002 - G.Juyn * */
-/* * - fixed read/write of MAGN chunk * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - added support for PAST * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - added proposed change in handling of TERM- & if-delay * */
-/* * 1.0.5 - 10/20/2002 - G.Juyn * */
-/* * - fixed display of visible target of PAST operation * */
-/* * * */
-/* * 1.0.7 - 03/24/2004 - G.R-P. * */
-/* * - added some SKIPCHUNK conditionals * */
-/* * * */
-/* * 1.0.9 - 12/11/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_DISPLAYCALLS * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_display_h_
-#define _libmng_display_h_
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_DISPLAY_PROCS
-
-/* ************************************************************************** */
-
-mng_retcode mng_display_progressive_refresh (mng_datap pData,
- mng_uint32 iInterval);
-
-/* ************************************************************************** */
-
-mng_retcode mng_reset_objzero (mng_datap pData);
-
-mng_retcode mng_display_image (mng_datap pData,
- mng_imagep pImage,
- mng_bool bLayeradvanced);
-
-mng_retcode mng_execute_delta_image (mng_datap pData,
- mng_imagep pTarget,
- mng_imagep pDelta);
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_display (mng_datap pData);
-
-/* ************************************************************************** */
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
-png_imgtype mng_png_imgtype (mng_uint8 colortype,
- mng_uint8 bitdepth);
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-
-mng_retcode mng_process_display_ihdr (mng_datap pData);
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-mng_retcode mng_process_display_mpng (mng_datap pData);
-#endif
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-mng_retcode mng_process_display_ang (mng_datap pData);
-#endif
-
-mng_retcode mng_process_display_idat (mng_datap pData,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata);
-
-mng_retcode mng_process_display_iend (mng_datap pData);
-mng_retcode mng_process_display_mend (mng_datap pData);
-mng_retcode mng_process_display_mend2 (mng_datap pData);
-mng_retcode mng_process_display_defi (mng_datap pData);
-
-#ifndef MNG_SKIPCHUNK_BASI
-mng_retcode mng_process_display_basi (mng_datap pData,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_bool bHasalpha,
- mng_uint16 iAlpha,
- mng_uint8 iViewable);
-#endif
-
-#ifndef MNG_SKIPCHUNK_CLON
-mng_retcode mng_process_display_clon (mng_datap pData,
- mng_uint16 iSourceid,
- mng_uint16 iCloneid,
- mng_uint8 iClonetype,
- mng_bool bHasdonotshow,
- mng_uint8 iDonotshow,
- mng_uint8 iConcrete,
- mng_bool bHasloca,
- mng_uint8 iLocationtype,
- mng_int32 iLocationx,
- mng_int32 iLocationy);
-mng_retcode mng_process_display_clon2 (mng_datap pData);
-#endif
-
-#ifndef MNG_SKIPCHUNK_DISC
-mng_retcode mng_process_display_disc (mng_datap pData,
- mng_uint32 iCount,
- mng_uint16p pIds);
-#endif
-
-#ifndef MNG_SKIPCHUNK_FRAM
-mng_retcode mng_process_display_fram (mng_datap pData,
- mng_uint8 iFramemode,
- mng_uint8 iChangedelay,
- mng_uint32 iDelay,
- mng_uint8 iChangetimeout,
- mng_uint32 iTimeout,
- mng_uint8 iChangeclipping,
- mng_uint8 iCliptype,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb);
-mng_retcode mng_process_display_fram2 (mng_datap pData);
-#endif
-
-#ifndef MNG_SKIPCHUNK_MOVE
-mng_retcode mng_process_display_move (mng_datap pData,
- mng_uint16 iFromid,
- mng_uint16 iToid,
- mng_uint8 iMovetype,
- mng_int32 iMovex,
- mng_int32 iMovey);
-#endif
-
-#ifndef MNG_SKIPCHUNK_CLIP
-mng_retcode mng_process_display_clip (mng_datap pData,
- mng_uint16 iFromid,
- mng_uint16 iToid,
- mng_uint8 iCliptype,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb);
-#endif
-
-#ifndef MNG_SKIPCHUNK_SHOW
-mng_retcode mng_process_display_show (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode mng_process_display_save (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
-mng_retcode mng_process_display_seek (mng_datap pData);
-#endif
-#ifdef MNG_INCLUDE_JNG
-mng_retcode mng_process_display_jhdr (mng_datap pData);
-
-mng_retcode mng_process_display_jdaa (mng_datap pData,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata);
-
-mng_retcode mng_process_display_jdat (mng_datap pData,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata);
-
-#endif
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_process_display_dhdr (mng_datap pData,
- mng_uint16 iObjectid,
- mng_uint8 iImagetype,
- mng_uint8 iDeltatype,
- mng_uint32 iBlockwidth,
- mng_uint32 iBlockheight,
- mng_uint32 iBlockx,
- mng_uint32 iBlocky);
-
-mng_retcode mng_process_display_prom (mng_datap pData,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iFilltype);
-
-mng_retcode mng_process_display_ipng (mng_datap pData);
-#ifdef MNG_INCLUDE_JNG
-mng_retcode mng_process_display_ijng (mng_datap pData);
-#endif
-
-mng_retcode mng_process_display_pplt (mng_datap pData,
- mng_uint8 iType,
- mng_uint32 iCount,
- mng_palette8ep paIndexentries,
- mng_uint8p paAlphaentries,
- mng_uint8p paUsedentries);
-#endif
-
-#ifndef MNG_SKIPCHUNK_MAGN
-mng_retcode mng_process_display_magn (mng_datap pData,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iMethodX,
- mng_uint16 iMX,
- mng_uint16 iMY,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint16 iMT,
- mng_uint16 iMB,
- mng_uint8 iMethodY);
-mng_retcode mng_process_display_magn2 (mng_datap pData);
-#endif
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_process_display_past (mng_datap pData,
- mng_uint16 iTargetid,
- mng_uint8 iTargettype,
- mng_int32 iTargetx,
- mng_int32 iTargety,
- mng_uint32 iCount,
- mng_ptr pSources);
-mng_retcode mng_process_display_past2 (mng_datap pData);
-#endif
-
-#else /* MNG_OPTIMIZE_DISPLAYCALLS */
-
-mng_retcode mng_process_display_ihdr (mng_datap pData);
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-mng_retcode mng_process_display_mpng (mng_datap pData);
-#endif
-mng_retcode mng_process_display_idat (mng_datap pData);
-mng_retcode mng_process_display_iend (mng_datap pData);
-mng_retcode mng_process_display_mend (mng_datap pData);
-mng_retcode mng_process_display_mend2 (mng_datap pData);
-mng_retcode mng_process_display_defi (mng_datap pData);
-#ifndef MNG_SKIPCHUNK_BASI
-mng_retcode mng_process_display_basi (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_CLON
-mng_retcode mng_process_display_clon (mng_datap pData);
-mng_retcode mng_process_display_clon2 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_DISC
-mng_retcode mng_process_display_disc (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_FRAM
-mng_retcode mng_process_display_fram (mng_datap pData);
-mng_retcode mng_process_display_fram2 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_MOVE
-mng_retcode mng_process_display_move (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_CLIP
-mng_retcode mng_process_display_clip (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_SHOW
-mng_retcode mng_process_display_show (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode mng_process_display_save (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
-mng_retcode mng_process_display_seek (mng_datap pData);
-#endif
-#ifdef MNG_INCLUDE_JNG
-mng_retcode mng_process_display_jhdr (mng_datap pData);
-mng_retcode mng_process_display_jdaa (mng_datap pData);
-mng_retcode mng_process_display_jdat (mng_datap pData);
-#endif
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_process_display_dhdr (mng_datap pData);
-mng_retcode mng_process_display_prom (mng_datap pData);
-mng_retcode mng_process_display_ipng (mng_datap pData);
-#ifdef MNG_INCLUDE_JNG
-mng_retcode mng_process_display_ijng (mng_datap pData);
-#endif
-mng_retcode mng_process_display_pplt (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_MAGN
-mng_retcode mng_process_display_magn (mng_datap pData);
-mng_retcode mng_process_display_magn2 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_process_display_past (mng_datap pData);
-mng_retcode mng_process_display_past2 (mng_datap pData);
-#endif
-
-#endif /* MNG_OPTIMIZE_DISPLAYCALLS */
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_DISPLAY_PROCS */
-
-/* ************************************************************************** */
-
-#endif /* _libmng_display_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_dither.c b/src/3rdparty/libmng/libmng_dither.c
deleted file mode 100644
index e23850cef4..0000000000
--- a/src/3rdparty/libmng/libmng_dither.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_dither.c copyright (c) 2000-2004 G.Juyn * */
-/* * version : 1.0.9 * */
-/* * * */
-/* * purpose : Dithering routines (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the dithering routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_dither.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_dither_a_row (mng_datap pData,
- mng_uint8p pRow)
-{
-
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
-
-
diff --git a/src/3rdparty/libmng/libmng_dither.h b/src/3rdparty/libmng/libmng_dither.h
deleted file mode 100644
index d9217c0cac..0000000000
--- a/src/3rdparty/libmng/libmng_dither.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_dither.h copyright (c) 2000-2002 G.Juyn * */
-/* * version : 1.0.5 * */
-/* * * */
-/* * purpose : Dithering routines (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the dithering routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_dither_h_
-#define _libmng_dither_h_
-
-/* ************************************************************************** */
-
-mng_retcode mng_dither_a_row (mng_datap pData,
- mng_uint8p pRow);
-
-/* ************************************************************************** */
-
-#endif /* _libmng_dither_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_error.c b/src/3rdparty/libmng/libmng_error.c
deleted file mode 100644
index 3a4da20638..0000000000
--- a/src/3rdparty/libmng/libmng_error.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_error.c copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Error routines (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the general error handling routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.5.2 - 05/23/2000 - G.Juyn * */
-/* * - added error telltaling * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - added errorstrings for delta-image processing * */
-/* * 0.5.2 - 05/31/2000 - G.Juyn * */
-/* * - fixed up punctuation (contributed by Tim Rowley) * */
-/* * 0.5.2 - 06/06/2000 - G.Juyn * */
-/* * - added errorstring for delayed buffer-processing * */
-/* * * */
-/* * 0.9.1 - 07/06/2000 - G.Juyn * */
-/* * - added MNG_NEEDTIMERWAIT errorstring * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - added NEEDSECTIONWAIT errorstring * */
-/* * - added macro + routine to set returncode without * */
-/* * calling error callback * */
-/* * 0.9.1 - 07/19/2000 - G.Juyn * */
-/* * - added errorstring for updatemngheader if not a MNG * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/09/2000 - G.Juyn * */
-/* * - added check for simplicity-bits in MHDR * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - fixed processing of unknown critical chunks * */
-/* * - added support for nEED * */
-/* * 0.9.3 - 10/20/2000 - G.Juyn * */
-/* * - added errorcode for delayed delta-processing * */
-/* * * */
-/* * 0.9.4 - 01/18/2001 - G.Juyn * */
-/* * - added errorcode for MAGN methods * */
-/* * * */
-/* * 1.0.2 - 06/23/2001 - G.Juyn * */
-/* * - added optimization option for MNG-video playback * */
-/* * * */
-/* * 1.0.5 - 07/04/2002 - G.Juyn * */
-/* * - added errorcode for extreme chunk-sizes * */
-/* * 1.0.5 - 08/15/2002 - G.Juyn * */
-/* * - completed delta-image support * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 09/15/2002 - G.Juyn * */
-/* * - fixed LOOP iteration=0 special case * */
-/* * 1.0.5 - 09/19/2002 - G.Juyn * */
-/* * - warnings are ignored by default now! * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - added support for PAST * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - added check for TERM placement during create/write * */
-/* * * */
-/* * 1.0.6 - 07/07/2003 - G. R-P * */
-/* * - added MNG_SKIPCHUNK_CHNK, MNG_NO_DELTA_PNG reductions. * */
-/* * - skipped more code when MNG_INCLUDE_JNG is not enabled. * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditional around evNT chunk support * */
-/* * * */
-/* * 1.0.7 - 03/24/2004 - G.R-P * */
-/* * - fixed typo on SKIPCHUNK_evNT (->PAST) * */
-/* * * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ERROR_STRINGS
-MNG_LOCAL mng_error_entry const error_table [] =
- {
- {MNG_NOERROR, "No error"},
- {MNG_OUTOFMEMORY, "Out of memory"},
- {MNG_INVALIDHANDLE, "The handle is invalid"},
- {MNG_NOCALLBACK, "A required callback is not defined"},
- {MNG_UNEXPECTEDEOF, "Encountered unexpected end-of-file"},
- {MNG_ZLIBERROR, "zlib encountered an error"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_JPEGERROR, "ijgsrc6b encountered an error"},
-#endif
- {MNG_LCMSERROR, "lcms encountered an error"},
- {MNG_NOOUTPUTPROFILE, "No output-profile defined for CMS"},
- {MNG_NOSRGBPROFILE, "No sRGB-profile defined for CMS"},
- {MNG_BUFOVERFLOW, "Internal buffer-overflow"},
- {MNG_FUNCTIONINVALID, "Function is invalid at this point"},
- {MNG_OUTPUTERROR, "Writing was unsuccessful; disk full?"},
- {MNG_JPEGBUFTOOSMALL, "Internal buffer for JPEG processing too small"},
- {MNG_NEEDMOREDATA, "Reading suspended; waiting for I/O to catch up"},
- {MNG_NEEDTIMERWAIT, "Timer suspension; normal animation delay"},
- {MNG_NEEDSECTIONWAIT, "SEEK suspension; application decides"},
- {MNG_LOOPWITHCACHEOFF, "LOOP encountered when playback cache is turned off"},
-
- {MNG_APPIOERROR, "Application signalled I/O error"},
- {MNG_APPTIMERERROR, "Application signalled timing error"},
- {MNG_APPCMSERROR, "Application signalled CMS error"},
- {MNG_APPMISCERROR, "Application signalled an error"},
- {MNG_APPTRACEABORT, "Application signalled error during trace-callback"},
-
- {MNG_INTERNALERROR, "Internal error in libmng"},
-
- {MNG_INVALIDSIG, "The signature is invalid"},
- {MNG_INVALIDCRC, "The CRC for this chunk is invalid"},
- {MNG_INVALIDLENGTH, "Chunk-length is invalid"},
- {MNG_SEQUENCEERROR, "Chunk out of sequence"},
- {MNG_CHUNKNOTALLOWED, "Chunk not allowed at this point"},
- {MNG_MULTIPLEERROR, "Chunk cannot occur multiple times"},
- {MNG_PLTEMISSING, "Missing PLTE chunk"},
- {MNG_IDATMISSING, "Missing IDAT chunk(s)"},
- {MNG_CANNOTBEEMPTY, "Chunk cannot be empty"},
- {MNG_GLOBALLENGTHERR, "Global data length invalid"},
- {MNG_INVALIDBITDEPTH, "The bit_depth is invalid"},
- {MNG_INVALIDCOLORTYPE, "The color_type is invalid"},
- {MNG_INVALIDCOMPRESS, "The compression_method is invalid"},
- {MNG_INVALIDFILTER, "The filter_method or filter_type is invalid"},
- {MNG_INVALIDINTERLACE, "The interlace_method is invalid"},
- {MNG_NOTENOUGHIDAT, "There is not enough data in the IDAT chunk(s)"},
- {MNG_PLTEINDEXERROR, "Palette-index out of bounds"},
- {MNG_NULLNOTFOUND, "NULL separator not found"},
- {MNG_KEYWORDNULL, "Keyword cannot be zero-length"},
- {MNG_OBJECTUNKNOWN, "Object does not exist"},
- {MNG_OBJECTEXISTS, "Object already exists"},
- {MNG_TOOMUCHIDAT, "Too much data in IDAT chunk(s)"},
- {MNG_INVSAMPLEDEPTH, "The sample_depth is invalid"},
- {MNG_INVOFFSETSIZE, "The offset_type is invalid"},
- {MNG_INVENTRYTYPE, "The entry_type is invalid"},
- {MNG_ENDWITHNULL, "Chunk must not end with NULL byte"},
- {MNG_INVIMAGETYPE, "The image_type is invalid"},
-#ifndef MNG_NO_DELTA_PNG
- {MNG_INVDELTATYPE, "The delta_type is invalid"},
-#endif
- {MNG_INVALIDINDEX, "Index-value out of bounds"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_TOOMUCHJDAT, "Too much data in JDAT chunk(s)"},
- {MNG_JPEGPARMSERR, "JHDR parameters & JFIF-data do not match"},
-#endif
- {MNG_INVFILLMETHOD, "The fill_method is invalid"},
-#ifndef MNG_NO_DELTA_PNG
- {MNG_OBJNOTCONCRETE, "Target object for DHDR must be concrete"},
-#endif
- {MNG_TARGETNOALPHA, "Target object must have alpha-channel"},
- {MNG_MNGTOOCOMPLEX, "MHDR simplicity indicates unsupported feature(s)"},
- {MNG_UNKNOWNCRITICAL, "Unknown critical chunk encountered"},
-#ifndef MNG_SKIPCHUNK_nEED
- {MNG_UNSUPPORTEDNEED, "Requested nEED resources are not supported"},
-#endif
- {MNG_INVALIDDELTA, "The delta operation is invalid (mismatched color_types?)"},
- {MNG_INVALIDMETHOD, "Method is invalid"},
- {MNG_IMPROBABLELENGTH, "Chunklength is incredibly large"},
- {MNG_INVALIDBLOCK, "Delta block width and or height invalid"},
- {MNG_INVALIDEVENT, "Event type is invalid"},
- {MNG_INVALIDMASK, "Mask type is invalid"},
- {MNG_NOMATCHINGLOOP, "ENDL without matching LOOP"},
-#ifndef MNG_SKIPCHUNK_evNT
- {MNG_SEEKNOTFOUND, "evNT points to unknown SEEK"},
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_OBJNOTABSTRACT, "Destination object for PAST must be abstract"},
-#endif
- {MNG_TERMSEQERROR, "TERM misplaced during creation of MNG stream"},
- {MNG_INVALIDFIELDVAL, "invalid fieldvalue (generic)"},
- {MNG_INVALIDWIDTH, "invalid frame/image width"},
- {MNG_INVALIDHEIGHT, "invalid frame/image height"},
-
- {MNG_INVALIDCNVSTYLE, "Canvas_style is invalid"},
- {MNG_WRONGCHUNK, "Attempt to access the wrong chunk"},
- {MNG_INVALIDENTRYIX, "Attempt to access an non-existing entry"},
- {MNG_NOHEADER, "No valid header-chunk"},
- {MNG_NOCORRCHUNK, "Parent chunk not found"},
- {MNG_NOMHDR, "No MNG header (MHDR) found"},
-
- {MNG_IMAGETOOLARGE, "Image is larger than defined maximum"},
- {MNG_NOTANANIMATION, "Image is not an animation"},
- {MNG_FRAMENRTOOHIGH, "Framenr out of bounds"},
- {MNG_LAYERNRTOOHIGH, "Layernr out of bounds"},
- {MNG_PLAYTIMETOOHIGH, "Playtime out of bounds"},
- {MNG_FNNOTIMPLEMENTED, "Function not yet implemented"},
- {MNG_IMAGEFROZEN, "Image is frozen"},
-
- {MNG_LCMS_NOHANDLE, "Handle could not be initialized"},
- {MNG_LCMS_NOMEM, "No memory for gamma-table(s)"},
- {MNG_LCMS_NOTRANS, "Transformation could not be initialized"}
- };
-#endif /* MNG_INCLUDE_ERROR_STRINGS */
-
-/* ************************************************************************** */
-
-mng_bool mng_store_error (mng_datap pData,
- mng_retcode iError,
- mng_retcode iExtra1,
- mng_retcode iExtra2)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (pData, MNG_FN_STORE_ERROR, MNG_LC_START);
-#endif
-
- if (pData != 0)
- {
- pData->iErrorcode = iError; /* save also for getlasterror */
- pData->iErrorx1 = iExtra1;
- pData->iErrorx2 = iExtra2;
-
-#ifdef MNG_INCLUDE_ERROR_STRINGS
- { /* binary search variables */
- mng_int32 iTop, iLower, iUpper, iMiddle;
- mng_error_entryp pEntry; /* pointer to found entry */
- /* determine max index of table */
- iTop = (sizeof (error_table) / sizeof (error_table [0])) - 1;
-
- iLower = 0; /* initialize binary search */
- iMiddle = iTop >> 1; /* start in the middle */
- iUpper = iTop;
- pEntry = 0; /* no goods yet! */
-
- do /* the binary search itself */
- {
- if (error_table [iMiddle].iError < iError)
- iLower = iMiddle + 1;
- else if (error_table [iMiddle].iError > iError)
- iUpper = iMiddle - 1;
- else
- {
- pEntry = &error_table [iMiddle];
- break;
- }
-
- iMiddle = (iLower + iUpper) >> 1;
- }
- while (iLower <= iUpper);
-
- if (pEntry) /* found it ? */
- pData->zErrortext = pEntry->zErrortext;
- else
- pData->zErrortext = "Unknown error";
- }
-#else /* MNG_INCLUDE_ERROR_STRINGS */
- pData->zErrortext = 0;
-#endif /* MNG_INCLUDE_ERROR_STRINGS */
-
- if (iError == 0) /* no error is not severe ! */
- {
- pData->iSeverity = 0;
- }
- else
- {
- switch (iError&0x3C00) /* determine the severity */
- {
- case 0x0800 : { pData->iSeverity = 5; break; }
- case 0x1000 : { pData->iSeverity = 2; break; }
- case 0x2000 : { pData->iSeverity = 1; break; }
- default : { pData->iSeverity = 9; }
- }
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (pData, MNG_FN_STORE_ERROR, MNG_LC_END);
-#endif
-
- return MNG_TRUE;
-}
-
-/* ************************************************************************** */
-
-mng_bool mng_process_error (mng_datap pData,
- mng_retcode iError,
- mng_retcode iExtra1,
- mng_retcode iExtra2)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (pData, MNG_FN_PROCESS_ERROR, MNG_LC_START);
-#endif
-
- mng_store_error (pData, iError, iExtra1, iExtra2);
-
- if ((pData != MNG_NULL) && (pData->iMagic == MNG_MAGIC))
- {
- if (pData->fErrorproc) /* callback defined ? */
- return pData->fErrorproc (((mng_handle)pData), iError, pData->iSeverity,
- pData->iChunkname, pData->iChunkseq,
- pData->iErrorx1, pData->iErrorx2, pData->zErrortext);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (pData, MNG_FN_PROCESS_ERROR, MNG_LC_END);
-#endif
-
- return MNG_TRUE; /* warnings are ignored by default ! */
-}
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_error.h b/src/3rdparty/libmng/libmng_error.h
deleted file mode 100644
index b49ff73308..0000000000
--- a/src/3rdparty/libmng/libmng_error.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_error.h copyright (c) 2000-2002 G.Juyn * */
-/* * version : 1.0.5 * */
-/* * * */
-/* * purpose : Error functions (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the generic error-codes and functions * */
-/* * * */
-/* * changes : 0.5.1 - 05/06/2000 - G.Juyn * */
-/* * - added some errorcodes * */
-/* * 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - added some errorcodes * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - added application errorcodes (used with callbacks) * */
-/* * - moved chunk-access errorcodes to severity 5 * */
-/* * * */
-/* * 0.5.2 - 05/20/2000 - G.Juyn * */
-/* * - added JNG errorcodes * */
-/* * 0.5.2 - 05/23/2000 - G.Juyn * */
-/* * - added error tell-tale definition * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - added errorcodes for delta-image processing * */
-/* * 0.5.2 - 06/06/2000 - G.Juyn * */
-/* * - added errorcode for delayed buffer-processing * */
-/* * - moved errorcodes to "libmng.h" * */
-/* * * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - added macro + routine to set returncode without * */
-/* * calling error callback * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 08/20/2002 - G.Juyn * */
-/* * - added option for soft-handling of errors * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_error_h_
-#define _libmng_error_h_
-
-/* ************************************************************************** */
-/* * * */
-/* * Default error routines * */
-/* * * */
-/* ************************************************************************** */
-
-mng_bool mng_store_error (mng_datap pData,
- mng_retcode iError,
- mng_retcode iExtra1,
- mng_retcode iExtra2);
-
-mng_bool mng_process_error (mng_datap pData,
- mng_retcode iError,
- mng_retcode iExtra1,
- mng_retcode iExtra2);
-
-/* ************************************************************************** */
-/* * * */
-/* * Error handling macros * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_SOFTERRORS
-#define MNG_ERROR(D,C) { if (!mng_process_error (D, C, 0, 0)) return C; }
-#define MNG_ERRORZ(D,Z) { if (!mng_process_error (D, MNG_ZLIBERROR, Z, 0)) return MNG_ZLIBERROR; }
-#define MNG_ERRORJ(D,J) { if (!mng_process_error (D, MNG_JPEGERROR, J, 0)) return MNG_JPEGERROR; }
-#define MNG_ERRORL(D,L) { if (!mng_process_error (D, MNG_LCMSERROR, L, 0)) return MNG_LCMSERROR; }
-#else
-#define MNG_ERROR(D,C) { mng_process_error (D, C, 0, 0); return C; }
-#define MNG_ERRORZ(D,Z) { mng_process_error (D, MNG_ZLIBERROR, Z, 0); return MNG_ZLIBERROR; }
-#define MNG_ERRORJ(D,J) { mng_process_error (D, MNG_JPEGERROR, J, 0); return MNG_JPEGERROR; }
-#define MNG_ERRORL(D,L) { mng_process_error (D, MNG_LCMSERROR, L, 0); return MNG_LCMSERROR; }
-#endif
-
-#define MNG_RETURN(D,C) { mng_store_error (D, C, 0, 0); return C; }
-
-#define MNG_WARNING(D,C) { if (!mng_process_error (D, C, 0, 0)) return C; }
-
-#define MNG_VALIDHANDLE(H) { if ((H == 0) || (((mng_datap)H)->iMagic != MNG_MAGIC)) \
- return MNG_INVALIDHANDLE; }
-#define MNG_VALIDHANDLEX(H) { if ((H == 0) || (((mng_datap)H)->iMagic != MNG_MAGIC)) \
- return 0; }
-#define MNG_VALIDCB(D,C) { if (!((mng_datap)D)->C) \
- MNG_ERROR (((mng_datap)D), MNG_NOCALLBACK) }
-
-/* ************************************************************************** */
-/* * * */
-/* * Error string-table entry * */
-/* * * */
-/* ************************************************************************** */
-
-typedef struct {
- mng_retcode iError;
- mng_pchar zErrortext;
- } mng_error_entry;
-typedef mng_error_entry const * mng_error_entryp;
-
-/* ************************************************************************** */
-
-#endif /* _libmng_error_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_filter.c b/src/3rdparty/libmng/libmng_filter.c
deleted file mode 100644
index ed69a75340..0000000000
--- a/src/3rdparty/libmng/libmng_filter.c
+++ /dev/null
@@ -1,978 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_filter.c copyright (c) 2000-2004 G.Juyn * */
-/* * version : 1.0.9 * */
-/* * * */
-/* * purpose : Filtering routines (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the filtering routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * * */
-/* * 1.0.5 - 08/07/2002 - G.Juyn * */
-/* * - added test-option for PNG filter method 193 (=no filter) * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - reversed some loops to use decrementing counter * */
-/* * * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_filter.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_FILTERS
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode filter_sub (mng_datap pData)
-{
- mng_uint32 iBpp;
- mng_uint8p pRawx;
- mng_uint8p pRawx_prev;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FILTER_SUB, MNG_LC_START);
-#endif
-
- iBpp = pData->iFilterbpp;
- pRawx = pData->pWorkrow + pData->iPixelofs + iBpp;
- pRawx_prev = pData->pWorkrow + pData->iPixelofs;
-
- for (iX = iBpp; iX < pData->iRowsize; iX++)
- {
- *pRawx = (mng_uint8)(*pRawx + *pRawx_prev);
- pRawx++;
- pRawx_prev++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FILTER_SUB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode filter_up (mng_datap pData)
-{
- mng_uint8p pRawx;
- mng_uint8p pPriorx;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FILTER_UP, MNG_LC_START);
-#endif
-
- pRawx = pData->pWorkrow + pData->iPixelofs;
- pPriorx = pData->pPrevrow + pData->iPixelofs;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsize - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsize; iX++)
-#endif
- {
- *pRawx = (mng_uint8)(*pRawx + *pPriorx);
- pRawx++;
- pPriorx++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FILTER_UP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode filter_average (mng_datap pData)
-{
- mng_int32 iBpp;
- mng_uint8p pRawx;
- mng_uint8p pRawx_prev;
- mng_uint8p pPriorx;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FILTER_AVERAGE, MNG_LC_START);
-#endif
-
- iBpp = pData->iFilterbpp;
- pRawx = pData->pWorkrow + pData->iPixelofs;
- pPriorx = pData->pPrevrow + pData->iPixelofs;
- pRawx_prev = pData->pWorkrow + pData->iPixelofs;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = iBpp - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < iBpp; iX++)
-#endif
- {
- *pRawx = (mng_uint8)(*pRawx + ((*pPriorx) >> 1));
- pRawx++;
- pPriorx++;
- }
-
- for (iX = iBpp; iX < pData->iRowsize; iX++)
- {
- *pRawx = (mng_uint8)(*pRawx + ((*pRawx_prev + *pPriorx) >> 1));
- pRawx++;
- pPriorx++;
- pRawx_prev++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FILTER_AVERAGE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode filter_paeth (mng_datap pData)
-{
- mng_int32 iBpp;
- mng_uint8p pRawx;
- mng_uint8p pRawx_prev;
- mng_uint8p pPriorx;
- mng_uint8p pPriorx_prev;
- mng_int32 iX;
- mng_uint32 iA, iB, iC;
- mng_uint32 iP;
- mng_uint32 iPa, iPb, iPc;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FILTER_PAETH, MNG_LC_START);
-#endif
-
- iBpp = pData->iFilterbpp;
- pRawx = pData->pWorkrow + pData->iPixelofs;
- pPriorx = pData->pPrevrow + pData->iPixelofs;
- pRawx_prev = pData->pWorkrow + pData->iPixelofs;
- pPriorx_prev = pData->pPrevrow + pData->iPixelofs;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = iBpp - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < iBpp; iX++)
-#endif
- {
- *pRawx = (mng_uint8)(*pRawx + *pPriorx);
-
- pRawx++;
- pPriorx++;
- }
-
- for (iX = iBpp; iX < pData->iRowsize; iX++)
- {
- iA = (mng_uint32)*pRawx_prev;
- iB = (mng_uint32)*pPriorx;
- iC = (mng_uint32)*pPriorx_prev;
- iP = iA + iB - iC;
- iPa = abs (iP - iA);
- iPb = abs (iP - iB);
- iPc = abs (iP - iC);
-
- if ((iPa <= iPb) && (iPa <= iPc))
- *pRawx = (mng_uint8)(*pRawx + iA);
- else
- if (iPb <= iPc)
- *pRawx = (mng_uint8)(*pRawx + iB);
- else
- *pRawx = (mng_uint8)(*pRawx + iC);
-
- pRawx++;
- pPriorx++;
- pRawx_prev++;
- pPriorx_prev++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FILTER_PAETH, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_filter_a_row (mng_datap pData)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FILTER_A_ROW, MNG_LC_START);
-#endif
-
- switch (*(pData->pWorkrow + pData->iFilterofs))
- {
- case 1 : {
- iRetcode = filter_sub (pData);
- break;
- }
- case 2 : {
- iRetcode = filter_up (pData);
- break;
- }
- case 3 : {
- iRetcode = filter_average (pData);
- break;
- }
- case 4 : {
- iRetcode = filter_paeth (pData);
- break;
- }
-
- default : iRetcode = MNG_INVALIDFILTER;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FILTER_A_ROW, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifdef FILTER192
-mng_retcode mng_init_rowdiffering (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ROWDIFFERING, MNG_LC_START);
-#endif
-
- if (pData->iFilter == 0xC0) /* has leveling parameters ? */
- {
- switch (pData->iColortype) /* salvage leveling parameters */
- {
- case 0 : { /* gray */
- if (pData->iBitdepth <= 8)
- pData->iLevel0 = (mng_uint16)*pData->pWorkrow;
- else
- pData->iLevel0 = mng_get_uint16 (pData->pWorkrow);
-
- break;
- }
- case 2 : { /* rgb */
- if (pData->iBitdepth <= 8)
- {
- pData->iLevel0 = (mng_uint16)*pData->pWorkrow;
- pData->iLevel1 = (mng_uint16)*(pData->pWorkrow+1);
- pData->iLevel2 = (mng_uint16)*(pData->pWorkrow+2);
- }
- else
- {
- pData->iLevel0 = mng_get_uint16 (pData->pWorkrow);
- pData->iLevel1 = mng_get_uint16 (pData->pWorkrow+2);
- pData->iLevel2 = mng_get_uint16 (pData->pWorkrow+4);
- }
-
- break;
- }
- case 3 : { /* indexed */
- pData->iLevel0 = (mng_uint16)*pData->pWorkrow;
- break;
- }
- case 4 : { /* gray+alpha */
- if (pData->iBitdepth <= 8)
- {
- pData->iLevel0 = (mng_uint16)*pData->pWorkrow;
- pData->iLevel1 = (mng_uint16)*(pData->pWorkrow+1);
- }
- else
- {
- pData->iLevel0 = mng_get_uint16 (pData->pWorkrow);
- pData->iLevel1 = mng_get_uint16 (pData->pWorkrow+2);
- }
-
- break;
- }
- case 6 : { /* rgb+alpha */
- if (pData->iBitdepth <= 8)
- {
- pData->iLevel0 = (mng_uint16)*pData->pWorkrow;
- pData->iLevel1 = (mng_uint16)*(pData->pWorkrow+1);
- pData->iLevel2 = (mng_uint16)*(pData->pWorkrow+2);
- pData->iLevel3 = (mng_uint16)*(pData->pWorkrow+3);
- }
- else
- {
- pData->iLevel0 = mng_get_uint16 (pData->pWorkrow);
- pData->iLevel1 = mng_get_uint16 (pData->pWorkrow+2);
- pData->iLevel2 = mng_get_uint16 (pData->pWorkrow+4);
- pData->iLevel3 = mng_get_uint16 (pData->pWorkrow+6);
- }
-
- break;
- }
- }
- }
- /* shift the entire row back in place */
- pRawi = pData->pWorkrow + pData->iFilterofs;
- pRawo = pData->pWorkrow;
-
- for (iX = 0; iX < pData->iRowsize + pData->iPixelofs - pData->iFilterofs; iX++)
- *pRawo++ = *pRawi++;
-
- pData->iFilterofs = 0; /* indicate so ! */
-
-#ifdef FILTER193
- if (pData->iFilter == 0xC1) /* no adaptive filtering ? */
- pData->iPixelofs = pData->iFilterofs;
- else
-#endif
- pData->iPixelofs = pData->iFilterofs + 1;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ROWDIFFERING, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_g1 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_G1, MNG_LC_START);
-#endif
-
- if (pData->iLevel0 & 0x01) /* is it uneven level ? */
- {
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
- /* just invert every bit */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsize - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsize; iX++)
-#endif
- *pRawo++ = (mng_uint8)(~(*pRawi++));
-
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_G1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_g2 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
- mng_int32 iC, iS;
- mng_uint8 iB, iN, iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_G2, MNG_LC_START);
-#endif
-
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
- iC = 0;
- iB = 0;
- iN = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iC)
- {
- iC = 4;
- iB = *pRawi++;
- iN = 0;
- iS = 8;
- }
-
- iS -= 2;
- iQ = (mng_uint8)(((iB >> iS) + pData->iLevel0) & 0x03);
- iN = (mng_uint8)((iN << 2) + iQ);
- iC--;
-
- if (!iC)
- *pRawo++ = iN;
-
- }
-
- if (iC)
- *pRawo = (mng_uint8)(iN << iS);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_G2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_g4 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
- mng_int32 iC, iS;
- mng_uint8 iB, iN, iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_G4, MNG_LC_START);
-#endif
-
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
- iC = 0;
- iB = 0;
- iN = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iC)
- {
- iC = 2;
- iB = *pRawi++;
- iN = 0;
- iS = 8;
- }
-
- iS -= 4;
- iQ = (mng_uint8)(((iB >> iS) + pData->iLevel0) & 0x0F);
- iN = (mng_uint8)((iN << 4) + iQ);
- iC--;
-
- if (!iC)
- *pRawo++ = iN;
-
- }
-
- if (iC)
- *pRawo = (mng_uint8)(iN << iS);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_G4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_g8 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_G8, MNG_LC_START);
-#endif
-
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pRawo++ = (mng_uint8)(((mng_uint16)*pRawi + pData->iLevel0) & 0xFF);
-
- pRawi++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_g16 (mng_datap pData)
-{
- mng_uint16p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_G16, MNG_LC_START);
-#endif
-
- pRawi = (mng_uint16p)(pData->pWorkrow + pData->iPixelofs);
- pRawo = (mng_uint16p)(pData->pPrevrow + pData->iPixelofs);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pRawo++ = (mng_uint16)(((mng_uint32)*pRawi + (mng_uint32)pData->iLevel0) & 0xFFFF);
-
- pRawi++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_rgb8 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_RGB8, MNG_LC_START);
-#endif
-
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pRawo+1) = (mng_uint8)(((mng_uint16)*(pRawi+1) + pData->iLevel1) & 0xFF);
- *pRawo = (mng_uint8)(((mng_uint16)*pRawi + pData->iLevel0 +
- (mng_uint16)*(pRawo+1)) & 0xFF);
- *(pRawo+2) = (mng_uint8)(((mng_uint16)*(pRawi+2) + pData->iLevel2 +
- (mng_uint16)*(pRawo+1)) & 0xFF);
-
- pRawi += 3;
- pRawo += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_rgb16 (mng_datap pData)
-{
- mng_uint16p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_RGB16, MNG_LC_START);
-#endif
-
- pRawi = (mng_uint16p)(pData->pWorkrow + pData->iPixelofs);
- pRawo = (mng_uint16p)(pData->pPrevrow + pData->iPixelofs);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pRawo+1) = (mng_uint16)(((mng_uint32)*(pRawi+1) + (mng_uint32)pData->iLevel1) & 0xFFFF);
- *pRawo = (mng_uint16)(((mng_uint32)*pRawi + (mng_uint32)pData->iLevel0 +
- (mng_uint32)*(pRawo+1)) & 0xFFFF);
- *(pRawo+2) = (mng_uint16)(((mng_uint32)*(pRawi+2) + (mng_uint32)pData->iLevel2 +
- (mng_uint32)*(pRawo+1)) & 0xFFFF);
-
- pRawi += 3;
- pRawo += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_idx1 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_IDX1, MNG_LC_START);
-#endif
-
- if (pData->iLevel0 & 0x01) /* is it uneven level ? */
- {
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
- /* just invert every bit */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsize - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsize; iX++)
-#endif
- *pRawo++ = (mng_uint8)(~(*pRawi++));
-
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_IDX1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_idx2 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
- mng_int32 iC, iS;
- mng_uint8 iB, iN, iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_IDX2, MNG_LC_START);
-#endif
-
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
- iC = 0;
- iB = 0;
- iN = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iC)
- {
- iC = 4;
- iB = *pRawi++;
- iN = 0;
- iS = 8;
- }
-
- iS -= 2;
- iQ = (mng_uint8)(((iB >> iS) + pData->iLevel0) & 0x03);
- iN = (mng_uint8)((iN << 2) + iQ);
- iC--;
-
- if (!iC)
- *pRawo++ = iN;
-
- }
-
- if (iC)
- *pRawo = (mng_uint8)(iN << iS);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_IDX2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_idx4 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
- mng_int32 iC, iS;
- mng_uint8 iB, iN, iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_IDX4, MNG_LC_START);
-#endif
-
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
- iC = 0;
- iB = 0;
- iN = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iC)
- {
- iC = 2;
- iB = *pRawi++;
- iN = 0;
- iS = 8;
- }
-
- iS -= 4;
- iQ = (mng_uint8)(((iB >> iS) + pData->iLevel0) & 0x0F);
- iN = (mng_uint8)((iN << 4) + iQ);
- iC--;
-
- if (!iC)
- *pRawo++ = iN;
-
- }
-
- if (iC)
- *pRawo = (mng_uint8)(iN << iS);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_IDX4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_idx8 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_IDX8, MNG_LC_START);
-#endif
-
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pRawo++ = (mng_uint8)(((mng_uint16)*pRawi + pData->iLevel0) & 0xFF);
-
- pRawi++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_IDX8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_ga8 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_GA8, MNG_LC_START);
-#endif
-
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pRawo = (mng_uint8)(((mng_uint16)*pRawi + pData->iLevel0) & 0xFF);
- *(pRawo+1) = (mng_uint8)(((mng_uint16)*(pRawi+1) + pData->iLevel1) & 0xFF);
-
- pRawi += 2;
- pRawo += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_GA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_ga16 (mng_datap pData)
-{
- mng_uint16p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_GA16, MNG_LC_START);
-#endif
-
- pRawi = (mng_uint16p)(pData->pWorkrow + pData->iPixelofs);
- pRawo = (mng_uint16p)(pData->pPrevrow + pData->iPixelofs);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pRawo = (mng_uint16)(((mng_uint32)*pRawi + (mng_uint32)pData->iLevel0) & 0xFFFF);
- *(pRawo+1) = (mng_uint16)(((mng_uint32)*(pRawi+1) + (mng_uint32)pData->iLevel1) & 0xFFFF);
-
- pRawi += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_GA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_rgba8 (mng_datap pData)
-{
- mng_uint8p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_RGBA8, MNG_LC_START);
-#endif
-
- pRawi = pData->pWorkrow + pData->iPixelofs;
- pRawo = pData->pPrevrow + pData->iPixelofs;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pRawo+1) = (mng_uint8)(((mng_uint16)*(pRawi+1) + pData->iLevel1) & 0xFF);
- *pRawo = (mng_uint8)(((mng_uint16)*pRawi + pData->iLevel0 +
- (mng_uint16)*(pRawo+1)) & 0xFF);
- *(pRawo+2) = (mng_uint8)(((mng_uint16)*(pRawi+2) + pData->iLevel2 +
- (mng_uint16)*(pRawo+1)) & 0xFF);
- *(pRawo+3) = (mng_uint8)(((mng_uint16)*(pRawi+3) + pData->iLevel3) & 0xFF);
-
- pRawi += 4;
- pRawo += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_differ_rgba16 (mng_datap pData)
-{
- mng_uint16p pRawi, pRawo;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_RGBA16, MNG_LC_START);
-#endif
-
- pRawi = (mng_uint16p)(pData->pWorkrow + pData->iPixelofs);
- pRawo = (mng_uint16p)(pData->pPrevrow + pData->iPixelofs);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples - 1; iX >= 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pRawo+1) = (mng_uint16)(((mng_uint32)*(pRawi+1) + (mng_uint32)pData->iLevel1) & 0xFFFF);
- *pRawo = (mng_uint16)(((mng_uint32)*pRawi + (mng_uint32)pData->iLevel0 +
- (mng_uint32)*(pRawo+1)) & 0xFFFF);
- *(pRawo+2) = (mng_uint16)(((mng_uint32)*(pRawi+2) + (mng_uint32)pData->iLevel2 +
- (mng_uint32)*(pRawo+1)) & 0xFFFF);
- *(pRawo+3) = (mng_uint16)(((mng_uint32)*(pRawi+3) + (mng_uint32)pData->iLevel3) & 0xFFFF);
-
- pRawi += 4;
- pRawo += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DIFFER_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* FILTER192 */
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_FILTERS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_filter.h b/src/3rdparty/libmng/libmng_filter.h
deleted file mode 100644
index 9ac9c7f99d..0000000000
--- a/src/3rdparty/libmng/libmng_filter.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_filter.h copyright (c) 2000-2002 G.Juyn * */
-/* * version : 1.0.5 * */
-/* * * */
-/* * purpose : Filtering routines (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the filtering routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_filter_h_
-#define _libmng_filter_h_
-
-/* ************************************************************************** */
-
-mng_retcode mng_filter_a_row (mng_datap pData);
-
-/* ************************************************************************** */
-
-#ifdef FILTER192
-mng_retcode mng_init_rowdiffering (mng_datap pData);
-
-mng_retcode mng_differ_g1 (mng_datap pData);
-mng_retcode mng_differ_g2 (mng_datap pData);
-mng_retcode mng_differ_g4 (mng_datap pData);
-mng_retcode mng_differ_g8 (mng_datap pData);
-mng_retcode mng_differ_g16 (mng_datap pData);
-mng_retcode mng_differ_rgb8 (mng_datap pData);
-mng_retcode mng_differ_rgb16 (mng_datap pData);
-mng_retcode mng_differ_idx1 (mng_datap pData);
-mng_retcode mng_differ_idx2 (mng_datap pData);
-mng_retcode mng_differ_idx4 (mng_datap pData);
-mng_retcode mng_differ_idx8 (mng_datap pData);
-mng_retcode mng_differ_ga8 (mng_datap pData);
-mng_retcode mng_differ_ga16 (mng_datap pData);
-mng_retcode mng_differ_rgba8 (mng_datap pData);
-mng_retcode mng_differ_rgba16 (mng_datap pData);
-#endif
-
-/* ************************************************************************** */
-
-#endif /* _libmng_filter_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_hlapi.c b/src/3rdparty/libmng/libmng_hlapi.c
deleted file mode 100644
index e71034757c..0000000000
--- a/src/3rdparty/libmng/libmng_hlapi.c
+++ /dev/null
@@ -1,3001 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_hlapi.c copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : high-level application API (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the high-level function interface * */
-/* * for applications. * */
-/* * * */
-/* * changes : 0.5.1 - 05/06/2000 - G.Juyn * */
-/* * - added init of iPLTEcount * */
-/* * 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed calling-convention definition * */
-/* * - changed status-handling of display-routines * */
-/* * - added versioning-control routines * */
-/* * - filled the write routine * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - added callback error-reporting support * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * 0.5.1 - 05/13/2000 - G.Juyn * */
-/* * - added eMNGma hack (will be removed in 1.0.0 !!!) * */
-/* * - added TERM animation object pointer (easier reference) * */
-/* * 0.5.1 - 05/14/2000 - G.Juyn * */
-/* * - added cleanup of saved-data (SAVE/SEEK processing) * */
-/* * 0.5.1 - 05/16/2000 - G.Juyn * */
-/* * - moved the actual write_graphic functionality from here * */
-/* * to its appropriate function in the mng_write module * */
-/* * * */
-/* * 0.5.2 - 05/19/2000 - G.Juyn * */
-/* * - cleaned up some code regarding mixed support * */
-/* * - added JNG support * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - moved init of default zlib parms here from "mng_zlib.c" * */
-/* * - added init of default IJG parms * */
-/* * 0.5.2 - 05/29/2000 - G.Juyn * */
-/* * - fixed inconsistancy with freeing global iCCP profile * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - added delta-image field initialization * */
-/* * 0.5.2 - 06/06/2000 - G.Juyn * */
-/* * - added initialization of the buffer-suspend parameter * */
-/* * * */
-/* * 0.5.3 - 06/16/2000 - G.Juyn * */
-/* * - added initialization of update-region for refresh * */
-/* * - added initialization of Needrefresh parameter * */
-/* * 0.5.3 - 06/17/2000 - G.Juyn * */
-/* * - added initialization of Deltaimmediate * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - added initialization of Speed * */
-/* * - added initialization of Imagelevel * */
-/* * 0.5.3 - 06/26/2000 - G.Juyn * */
-/* * - changed userdata variable to mng_ptr * */
-/* * 0.5.3 - 06/29/2000 - G.Juyn * */
-/* * - fixed initialization routine for new mng_handle type * */
-/* * * */
-/* * 0.9.1 - 07/06/2000 - G.Juyn * */
-/* * - changed mng_display_resume to allow to be called after * */
-/* * a suspension return with MNG_NEEDMOREDATA * */
-/* * - added returncode MNG_NEEDTIMERWAIT for timer breaks * */
-/* * 0.9.1 - 07/07/2000 - G.Juyn * */
-/* * - implemented support for freeze/reset/resume & go_xxxx * */
-/* * 0.9.1 - 07/08/2000 - G.Juyn * */
-/* * - added support for improved timing * */
-/* * - added support for improved I/O-suspension * */
-/* * 0.9.1 - 07/14/2000 - G.Juyn * */
-/* * - changed EOF processing behavior * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - added callbacks for SAVE/SEEK processing * */
-/* * - added variable for NEEDSECTIONWAIT breaks * */
-/* * - added variable for freeze & reset processing * */
-/* * 0.9.1 - 07/17/2000 - G.Juyn * */
-/* * - added error cleanup processing * */
-/* * - fixed support for mng_display_reset() * */
-/* * - fixed suspension-buffering for 32K+ chunks * */
-/* * * */
-/* * 0.9.2 - 07/29/2000 - G.Juyn * */
-/* * - fixed small bugs in display processing * */
-/* * 0.9.2 - 07/31/2000 - G.Juyn * */
-/* * - fixed wrapping of suspension parameters * */
-/* * 0.9.2 - 08/04/2000 - G.Juyn * */
-/* * - B111096 - fixed large-buffer read-suspension * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * 0.9.3 - 09/10/2000 - G.Juyn * */
-/* * - fixed DEFI behavior * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - added support for nEED * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added optional support for bKGD for PNG images * */
-/* * - raised initial maximum canvas size * */
-/* * - added support for JDAA * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - added callback to process non-critical unknown chunks * */
-/* * - fixed support for delta-images during read() / display() * */
-/* * 0.9.3 - 10/18/2000 - G.Juyn * */
-/* * - added closestream() processing for mng_cleanup() * */
-/* * 0.9.3 - 10/27/2000 - G.Juyn * */
-/* * - fixed separate read() & display() processing * */
-/* * * */
-/* * 0.9.4 - 11/20/2000 - G.Juyn * */
-/* * - fixed unwanted repetition in mng_readdisplay() * */
-/* * 0.9.4 - 11/24/2000 - G.Juyn * */
-/* * - moved restore of object 0 to libmng_display * */
-/* * * */
-/* * 1.0.1 - 02/08/2001 - G.Juyn * */
-/* * - added MEND processing callback * */
-/* * 1.0.1 - 02/13/2001 - G.Juyn * */
-/* * - fixed first FRAM_MODE=4 timing problem * */
-/* * 1.0.1 - 04/21/2001 - G.Juyn * */
-/* * - fixed bug with display_reset/display_resume (Thanks G!) * */
-/* * 1.0.1 - 04/22/2001 - G.Juyn * */
-/* * - fixed memory-leak (Thanks Gregg!) * */
-/* * 1.0.1 - 04/23/2001 - G.Juyn * */
-/* * - fixed reset_rundata to drop all objects * */
-/* * 1.0.1 - 04/25/2001 - G.Juyn * */
-/* * - moved mng_clear_cms to libmng_cms * */
-/* * * */
-/* * 1.0.2 - 06/23/2001 - G.Juyn * */
-/* * - added optimization option for MNG-video playback * */
-/* * - added processterm callback * */
-/* * 1.0.2 - 06/25/2001 - G.Juyn * */
-/* * - added option to turn off progressive refresh * */
-/* * * */
-/* * 1.0.5 - 07/08/2002 - G.Juyn * */
-/* * - B578572 - removed eMNGma hack (thanks Dimitri!) * */
-/* * 1.0.5 - 07/16/2002 - G.Juyn * */
-/* * - B581625 - large chunks fail with suspension reads * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/15/2002 - G.Juyn * */
-/* * - fixed LOOP iteration=0 special case * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - added another fix for misplaced TERM chunk * */
-/* * - completed support for condition=2 in TERM chunk * */
-/* * - added beta version function & constant * */
-/* * 1.0.5 - 10/11/2002 - G.Juyn * */
-/* * - added mng_status_dynamic to supports function * */
-/* * 1.0.5 - 11/04/2002 - G.Juyn * */
-/* * - changed FRAMECOUNT/LAYERCOUNT/PLAYTIME error to warning * */
-/* * 1.0.5 - 11/07/2002 - G.Juyn * */
-/* * - added support to get totals after mng_read() * */
-/* * 1.0.5 - 11/29/2002 - G.Juyn * */
-/* * - fixed goxxxxx() support for zero values * */
-/* * * */
-/* * 1.0.6 - 05/25/2003 - G.R-P * */
-/* * - added MNG_SKIPCHUNK_cHNK footprint optimizations * */
-/* * 1.0.6 - 07/11/2003 - G.R-P * */
-/* * - added conditionals zlib and jpeg property accessors * */
-/* * 1.0.6 - 07/14/2003 - G.R-P * */
-/* * - added conditionals around "mng_display_go*" and other * */
-/* * unused functions * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * * */
-/* * 1.0.7 - 03/07/2004 - G. Randers-Pehrson * */
-/* * - put gamma, cms-related declarations inside #ifdef * */
-/* * 1.0.7 - 03/10/2004 - G.R-P * */
-/* * - added conditionals around openstream/closestream * */
-/* * 1.0.7 - 03/24/2004 - G.R-P * */
-/* * - fixed zTXT -> zTXt typo * */
-/* * * */
-/* * 1.0.8 - 04/02/2004 - G.Juyn * */
-/* * - added CRC existence & checking flags * */
-/* * 1.0.8 - 04/10/2004 - G.Juyn * */
-/* * - added data-push mechanisms for specialized decoders * */
-/* * 1.0.8 - 07/06/2004 - G.R-P * */
-/* * - defend against using undefined openstream function * */
-/* * 1.0.8 - 08/02/2004 - G.Juyn * */
-/* * - added conditional to allow easier writing of large MNG's * */
-/* * * */
-/* * 1.0.9 - 08/17/2004 - G.R-P * */
-/* * - added more SKIPCHUNK conditionals * */
-/* * 1.0.9 - 09/25/2004 - G.Juyn * */
-/* * - replaced MNG_TWEAK_LARGE_FILES with permanent solution * */
-/* * 1.0.9 - 10/03/2004 - G.Juyn * */
-/* * - added function to retrieve current FRAM delay * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* * 1.0.10 - 07/06/2005 - G.R-P * */
-/* * - added more SKIPCHUNK conditionals * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * 1.0.10 - 07/06/2007 - G.R-P bugfix by Lucas Quintana * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_objects.h"
-#include "libmng_object_prc.h"
-#include "libmng_chunks.h"
-#include "libmng_memory.h"
-#include "libmng_read.h"
-#include "libmng_write.h"
-#include "libmng_display.h"
-#include "libmng_zlib.h"
-#include "libmng_jpeg.h"
-#include "libmng_cms.h"
-#include "libmng_pixels.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * local routines * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-MNG_LOCAL mng_retcode mng_drop_objects (mng_datap pData,
- mng_bool bDropaniobj)
-{
- mng_objectp pObject;
- mng_objectp pNext;
- mng_cleanupobject fCleanup;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DROP_OBJECTS, MNG_LC_START);
-#endif
-
- pObject = pData->pFirstimgobj; /* get first stored image-object (if any) */
-
- while (pObject) /* more objects to discard ? */
- {
- pNext = ((mng_object_headerp)pObject)->pNext;
- /* call appropriate cleanup */
- fCleanup = ((mng_object_headerp)pObject)->fCleanup;
- fCleanup (pData, pObject);
-
- pObject = pNext; /* neeeext */
- }
-
- pData->pFirstimgobj = MNG_NULL; /* clean this up!!! */
- pData->pLastimgobj = MNG_NULL;
-
- if (bDropaniobj) /* drop animation objects ? */
- {
- pObject = pData->pFirstaniobj; /* get first stored animation-object (if any) */
-
- while (pObject) /* more objects to discard ? */
- {
- pNext = ((mng_object_headerp)pObject)->pNext;
- /* call appropriate cleanup */
- fCleanup = ((mng_object_headerp)pObject)->fCleanup;
- fCleanup (pData, pObject);
-
- pObject = pNext; /* neeeext */
- }
-
- pData->pFirstaniobj = MNG_NULL; /* clean this up!!! */
- pData->pLastaniobj = MNG_NULL;
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
- pObject = pData->pFirstevent; /* get first event-object (if any) */
-
- while (pObject) /* more objects to discard ? */
- {
- pNext = ((mng_object_headerp)pObject)->pNext;
- /* call appropriate cleanup */
- fCleanup = ((mng_object_headerp)pObject)->fCleanup;
- fCleanup (pData, pObject);
-
- pObject = pNext; /* neeeext */
- }
-
- pData->pFirstevent = MNG_NULL; /* clean this up!!! */
- pData->pLastevent = MNG_NULL;
-#endif
- }
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- if (pData->pMPNG) /* drop MPNG data (if any) */
- {
- fCleanup = ((mng_object_headerp)pData->pMPNG)->fCleanup;
- fCleanup (pData, pData->pMPNG);
- pData->pMPNG = MNG_NULL;
- }
-#endif
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
- if (pData->pANG) /* drop ANG data (if any) */
- {
- fCleanup = ((mng_object_headerp)pData->pANG)->fCleanup;
- fCleanup (pData, pData->pANG);
- pData->pANG = MNG_NULL;
- }
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DROP_OBJECTS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_SKIPCHUNK_SAVE
-MNG_LOCAL mng_retcode mng_drop_savedata (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DROP_SAVEDATA, MNG_LC_START);
-#endif
-
- if (pData->pSavedata) /* sanity check */
- { /* address it more directly */
- mng_savedatap pSave = pData->pSavedata;
-
- if (pSave->iGlobalProfilesize) /* cleanup the profile ? */
- MNG_FREEX (pData, pSave->pGlobalProfile, pSave->iGlobalProfilesize);
- /* cleanup the save structure */
- MNG_FREE (pData, pData->pSavedata, sizeof (mng_savedata));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DROP_SAVEDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-MNG_LOCAL mng_retcode mng_reset_rundata (mng_datap pData)
-{
- mng_drop_invalid_objects (pData); /* drop invalidly stored objects */
-#ifndef MNG_SKIPCHUNK_SAVE
- mng_drop_savedata (pData); /* drop stored savedata */
-#endif
- mng_reset_objzero (pData); /* reset object 0 */
- /* drop stored objects (if any) */
- mng_drop_objects (pData, MNG_FALSE);
-
- pData->bFramedone = MNG_FALSE;
- pData->iFrameseq = 0; /* reset counters & stuff */
- pData->iLayerseq = 0;
- pData->iFrametime = 0;
-
- pData->bSkipping = MNG_FALSE;
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
- pData->bRunningevent = MNG_FALSE;
- pData->bStopafterseek = MNG_FALSE;
- pData->iEventx = 0;
- pData->iEventy = 0;
- pData->pLastmousemove = MNG_NULL;
-#endif
-
- pData->iRequestframe = 0;
- pData->iRequestlayer = 0;
- pData->iRequesttime = 0;
- pData->bSearching = MNG_FALSE;
-
- pData->iRuntime = 0;
- pData->iSynctime = 0;
- pData->iStarttime = 0;
- pData->iEndtime = 0;
- pData->bRunning = MNG_FALSE;
- pData->bTimerset = MNG_FALSE;
- pData->iBreakpoint = 0;
- pData->bSectionwait = MNG_FALSE;
- pData->bFreezing = MNG_FALSE;
- pData->bResetting = MNG_FALSE;
- pData->bNeedrefresh = MNG_FALSE;
- pData->bOnlyfirstframe = MNG_FALSE;
- pData->iFramesafterTERM = 0;
-
- pData->iIterations = 0;
- /* start of animation objects! */
- pData->pCurraniobj = MNG_NULL;
-
- pData->iUpdateleft = 0; /* reset region */
- pData->iUpdateright = 0;
- pData->iUpdatetop = 0;
- pData->iUpdatebottom = 0;
- pData->iPLTEcount = 0; /* reset PLTE data */
-
-#ifndef MNG_SKIPCHUNK_DEFI
- pData->iDEFIobjectid = 0; /* reset DEFI data */
- pData->bDEFIhasdonotshow = MNG_FALSE;
- pData->iDEFIdonotshow = 0;
- pData->bDEFIhasconcrete = MNG_FALSE;
- pData->iDEFIconcrete = 0;
- pData->bDEFIhasloca = MNG_FALSE;
- pData->iDEFIlocax = 0;
- pData->iDEFIlocay = 0;
- pData->bDEFIhasclip = MNG_FALSE;
- pData->iDEFIclipl = 0;
- pData->iDEFIclipr = 0;
- pData->iDEFIclipt = 0;
- pData->iDEFIclipb = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_BACK
- pData->iBACKred = 0; /* reset BACK data */
- pData->iBACKgreen = 0;
- pData->iBACKblue = 0;
- pData->iBACKmandatory = 0;
- pData->iBACKimageid = 0;
- pData->iBACKtile = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_FRAM
- pData->iFRAMmode = 1; /* default global FRAM variables */
- pData->iFRAMdelay = 1;
- pData->iFRAMtimeout = 0x7fffffffl;
- pData->bFRAMclipping = MNG_FALSE;
- pData->iFRAMclipl = 0;
- pData->iFRAMclipr = 0;
- pData->iFRAMclipt = 0;
- pData->iFRAMclipb = 0;
-
- pData->iFramemode = 1; /* again for the current frame */
- pData->iFramedelay = 1;
- pData->iFrametimeout = 0x7fffffffl;
- pData->bFrameclipping = MNG_FALSE;
- pData->iFrameclipl = 0;
- pData->iFrameclipr = 0;
- pData->iFrameclipt = 0;
- pData->iFrameclipb = 0;
-
- pData->iNextdelay = 1;
-
- pData->bForcedelay = MNG_FALSE;
- pData->iAccumdelay = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_SHOW
- pData->iSHOWmode = 0; /* reset SHOW data */
- pData->iSHOWfromid = 0;
- pData->iSHOWtoid = 0;
- pData->iSHOWnextid = 0;
- pData->iSHOWskip = 0;
-#endif
-
- pData->iGlobalPLTEcount = 0; /* reset global PLTE data */
-
- pData->iGlobalTRNSrawlen = 0; /* reset global tRNS data */
-
- pData->iGlobalGamma = 0; /* reset global gAMA data */
-
-#ifndef MNG_SKIPCHUNK_cHRM
- pData->iGlobalWhitepointx = 0; /* reset global cHRM data */
- pData->iGlobalWhitepointy = 0;
- pData->iGlobalPrimaryredx = 0;
- pData->iGlobalPrimaryredy = 0;
- pData->iGlobalPrimarygreenx = 0;
- pData->iGlobalPrimarygreeny = 0;
- pData->iGlobalPrimarybluex = 0;
- pData->iGlobalPrimarybluey = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_sRGB
- pData->iGlobalRendintent = 0; /* reset global sRGB data */
-#endif
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pData->iGlobalProfilesize) /* drop global profile (if any) */
- MNG_FREE (pData, pData->pGlobalProfile, pData->iGlobalProfilesize);
-
- pData->iGlobalProfilesize = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_bKGD
- pData->iGlobalBKGDred = 0; /* reset global bKGD data */
- pData->iGlobalBKGDgreen = 0;
- pData->iGlobalBKGDblue = 0;
-#endif
-#ifndef MNG_NO_DELTA_PNG
- /* reset delta-image */
- pData->pDeltaImage = MNG_NULL;
- pData->iDeltaImagetype = 0;
- pData->iDeltatype = 0;
- pData->iDeltaBlockwidth = 0;
- pData->iDeltaBlockheight = 0;
- pData->iDeltaBlockx = 0;
- pData->iDeltaBlocky = 0;
- pData->bDeltaimmediate = MNG_FALSE;
-
- pData->fDeltagetrow = MNG_NULL;
- pData->fDeltaaddrow = MNG_NULL;
- pData->fDeltareplacerow = MNG_NULL;
- pData->fDeltaputrow = MNG_NULL;
-
- pData->fPromoterow = MNG_NULL;
- pData->fPromBitdepth = MNG_NULL;
- pData->pPromBuf = MNG_NULL;
- pData->iPromColortype = 0;
- pData->iPromBitdepth = 0;
- pData->iPromFilltype = 0;
- pData->iPromWidth = 0;
- pData->pPromSrc = MNG_NULL;
- pData->pPromDst = MNG_NULL;
-#endif
-
-#ifndef MNG_SKIPCHUNK_MAGN
- pData->iMAGNfromid = 0;
- pData->iMAGNtoid = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_PAST
- pData->iPastx = 0;
- pData->iPasty = 0;
-#endif
-
- pData->pLastseek = MNG_NULL;
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-MNG_LOCAL void cleanup_errors (mng_datap pData)
-{
- pData->iErrorcode = MNG_NOERROR;
- pData->iSeverity = 0;
- pData->iErrorx1 = 0;
- pData->iErrorx2 = 0;
- pData->zErrortext = MNG_NULL;
-
- return;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-MNG_LOCAL mng_retcode make_pushbuffer (mng_datap pData,
- mng_ptr pPushdata,
- mng_size_t iLength,
- mng_bool bTakeownership,
- mng_pushdatap * pPush)
-{
- mng_pushdatap pTemp;
-
- MNG_ALLOC (pData, pTemp, sizeof(mng_pushdata));
-
- pTemp->pNext = MNG_NULL;
-
- if (bTakeownership) /* are we going to own the buffer? */
- { /* then just copy the pointer */
- pTemp->pData = (mng_uint8p)pPushdata;
- }
- else
- { /* otherwise create new buffer */
- MNG_ALLOCX (pData, pTemp->pData, iLength);
- if (!pTemp->pData) /* succeeded? */
- {
- MNG_FREEX (pData, pTemp, sizeof(mng_pushdata));
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
- /* and copy the bytes across */
- MNG_COPY (pTemp->pData, pPushdata, iLength);
- }
-
- pTemp->iLength = iLength;
- pTemp->bOwned = bTakeownership;
- pTemp->pDatanext = pTemp->pData;
- pTemp->iRemaining = iLength;
-
- *pPush = pTemp; /* return it */
-
- return MNG_NOERROR; /* and all's well */
-}
-#endif
-
-#ifdef MNG_VERSION_QUERY_SUPPORT
-/* ************************************************************************** */
-/* * * */
-/* * Versioning control * */
-/* * * */
-/* ************************************************************************** */
-
-mng_pchar MNG_DECL mng_version_text (void)
-{
- return MNG_VERSION_TEXT;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_version_so (void)
-{
- return MNG_VERSION_SO;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_version_dll (void)
-{
- return MNG_VERSION_DLL;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_version_major (void)
-{
- return MNG_VERSION_MAJOR;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_version_minor (void)
-{
- return MNG_VERSION_MINOR;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_version_release (void)
-{
- return MNG_VERSION_RELEASE;
-}
-
-/* ************************************************************************** */
-
-mng_bool MNG_DECL mng_version_beta (void)
-{
- return MNG_VERSION_BETA;
-}
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * 'supports' function * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_FUNCQUERY
-typedef struct {
- mng_pchar zFunction;
- mng_uint8 iMajor; /* Major == 0 means not implemented ! */
- mng_uint8 iMinor;
- mng_uint8 iRelease;
- } mng_func_entry;
-typedef mng_func_entry const * mng_func_entryp;
-
-MNG_LOCAL mng_func_entry const func_table [] =
- { /* keep it alphabetically sorted !!!!! */
- {"mng_cleanup", 1, 0, 0},
- {"mng_copy_chunk", 1, 0, 5},
- {"mng_create", 1, 0, 0},
- {"mng_display", 1, 0, 0},
- {"mng_display_freeze", 1, 0, 0},
-#ifndef MNG_NO_DISPLAY_GO_SUPPORTED
- {"mng_display_goframe", 1, 0, 0},
- {"mng_display_golayer", 1, 0, 0},
- {"mng_display_gotime", 1, 0, 0},
-#endif
- {"mng_display_reset", 1, 0, 0},
- {"mng_display_resume", 1, 0, 0},
- {"mng_get_alphabitdepth", 1, 0, 0},
- {"mng_get_alphacompression", 1, 0, 0},
- {"mng_get_alphadepth", 1, 0, 0},
- {"mng_get_alphafilter", 1, 0, 0},
- {"mng_get_alphainterlace", 1, 0, 0},
- {"mng_get_bgcolor", 1, 0, 0},
- {"mng_get_bitdepth", 1, 0, 0},
- {"mng_get_bkgdstyle", 1, 0, 0},
- {"mng_get_cacheplayback", 1, 0, 2},
- {"mng_get_canvasstyle", 1, 0, 0},
- {"mng_get_colortype", 1, 0, 0},
- {"mng_get_compression", 1, 0, 0},
-#ifndef MNG_NO_CURRENT_INFO
- {"mng_get_currentframe", 1, 0, 0},
- {"mng_get_currentlayer", 1, 0, 0},
- {"mng_get_currentplaytime", 1, 0, 0},
-#endif
- {"mng_get_currframdelay", 1, 0, 9},
-#ifndef MNG_NO_DFLT_INFO
- {"mng_get_dfltimggamma", 1, 0, 0},
- {"mng_get_dfltimggammaint", 1, 0, 0},
-#endif
- {"mng_get_displaygamma", 1, 0, 0},
- {"mng_get_displaygammaint", 1, 0, 0},
- {"mng_get_doprogressive", 1, 0, 2},
- {"mng_get_filter", 1, 0, 0},
- {"mng_get_framecount", 1, 0, 0},
- {"mng_get_imageheight", 1, 0, 0},
- {"mng_get_imagelevel", 1, 0, 0},
- {"mng_get_imagetype", 1, 0, 0},
- {"mng_get_imagewidth", 1, 0, 0},
- {"mng_get_interlace", 1, 0, 0},
-#ifdef MNG_ACCESS_JPEG
- {"mng_get_jpeg_dctmethod", 1, 0, 0},
- {"mng_get_jpeg_maxjdat", 1, 0, 0},
- {"mng_get_jpeg_optimized", 1, 0, 0},
- {"mng_get_jpeg_progressive", 1, 0, 0},
- {"mng_get_jpeg_quality", 1, 0, 0},
- {"mng_get_jpeg_smoothing", 1, 0, 0},
-#endif
- {"mng_get_lastbackchunk", 1, 0, 3},
- {"mng_get_lastseekname", 1, 0, 5},
- {"mng_get_layercount", 1, 0, 0},
-#ifndef MNG_SKIP_MAXCANVAS
- {"mng_get_maxcanvasheight", 1, 0, 0},
- {"mng_get_maxcanvaswidth", 1, 0, 0},
-#endif
- {"mng_get_playtime", 1, 0, 0},
- {"mng_get_refreshpass", 1, 0, 0},
- {"mng_get_runtime", 1, 0, 0},
- {"mng_get_sectionbreaks", 1, 0, 0},
- {"mng_get_sigtype", 1, 0, 0},
- {"mng_get_simplicity", 1, 0, 0},
- {"mng_get_speed", 1, 0, 0},
- {"mng_get_srgb", 1, 0, 0},
- {"mng_get_starttime", 1, 0, 0},
- {"mng_get_storechunks", 1, 0, 0},
- {"mng_get_suspensionmode", 1, 0, 0},
- {"mng_get_ticks", 1, 0, 0},
-#ifndef MNG_NO_CURRENT_INFO
- {"mng_get_totalframes", 1, 0, 5},
- {"mng_get_totallayers", 1, 0, 5},
- {"mng_get_totalplaytime", 1, 0, 5},
-#endif
- {"mng_get_usebkgd", 1, 0, 0},
- {"mng_get_userdata", 1, 0, 0},
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
- {"mng_get_viewgamma", 1, 0, 0},
- {"mng_get_viewgammaint", 1, 0, 0},
-#endif
-#ifdef MNG_ACCESS_ZLIB
- {"mng_get_zlib_level", 1, 0, 0},
- {"mng_get_zlib_maxidat", 1, 0, 0},
- {"mng_get_zlib_memlevel", 1, 0, 0},
- {"mng_get_zlib_method", 1, 0, 0},
- {"mng_get_zlib_strategy", 1, 0, 0},
- {"mng_get_zlib_windowbits", 1, 0, 0},
-#endif
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- {"mng_getcb_closestream", 1, 0, 0},
-#endif
- {"mng_getcb_errorproc", 1, 0, 0},
- {"mng_getcb_getalphaline", 1, 0, 0},
- {"mng_getcb_getbkgdline", 1, 0, 0},
- {"mng_getcb_getcanvasline", 1, 0, 0},
- {"mng_getcb_gettickcount", 1, 0, 0},
- {"mng_getcb_memalloc", 1, 0, 0},
- {"mng_getcb_memfree", 1, 0, 0},
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- {"mng_getcb_openstream", 1, 0, 0},
-#endif
- {"mng_getcb_processarow", 1, 0, 0},
- {"mng_getcb_processchroma", 1, 0, 0},
- {"mng_getcb_processgamma", 1, 0, 0},
- {"mng_getcb_processheader", 1, 0, 0},
- {"mng_getcb_processiccp", 1, 0, 0},
- {"mng_getcb_processmend", 1, 0, 1},
- {"mng_getcb_processneed", 1, 0, 0},
- {"mng_getcb_processsave", 1, 0, 0},
- {"mng_getcb_processseek", 1, 0, 0},
- {"mng_getcb_processsrgb", 1, 0, 0},
- {"mng_getcb_processterm", 1, 0, 2},
- {"mng_getcb_processtext", 1, 0, 0},
- {"mng_getcb_processunknown", 1, 0, 0},
- {"mng_getcb_readdata", 1, 0, 0},
- {"mng_getcb_refresh", 1, 0, 0},
- {"mng_getcb_releasedata", 1, 0, 8},
- {"mng_getcb_settimer", 1, 0, 0},
- {"mng_getcb_traceproc", 1, 0, 0},
- {"mng_getcb_writedata", 1, 0, 0},
- {"mng_getchunk_back", 1, 0, 0},
- {"mng_getchunk_basi", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_bKGD
- {"mng_getchunk_bkgd", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_cHRM
- {"mng_getchunk_chrm", 1, 0, 0},
-#endif
- {"mng_getchunk_clip", 1, 0, 0},
- {"mng_getchunk_clon", 1, 0, 0},
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_dBYK
- {"mng_getchunk_dbyk", 1, 0, 0},
-#endif
-#endif
- {"mng_getchunk_defi", 1, 0, 0},
-#ifndef MNG_NO_DELTA_PNG
- {"mng_getchunk_dhdr", 1, 0, 0},
-#endif
- {"mng_getchunk_disc", 1, 0, 0},
-#ifndef MNG_NO_DELTA_PNG
- {"mng_getchunk_drop", 1, 0, 0},
-#endif
- {"mng_getchunk_endl", 1, 0, 0},
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {"mng_getchunk_mpng", 1, 0, 10},
- {"mng_getchunk_mpng_frame", 1, 0, 10},
-#endif
-#ifndef MNG_SKIPCHUNK_evNT
- {"mng_getchunk_evnt", 1, 0, 5},
- {"mng_getchunk_evnt_entry", 1, 0, 5},
-#endif
-#ifndef MNG_SKIPCHUNK_eXPI
- {"mng_getchunk_expi", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_fPRI
- {"mng_getchunk_fpri", 1, 0, 0},
-#endif
- {"mng_getchunk_fram", 1, 0, 0},
- {"mng_getchunk_gama", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_hIST
- {"mng_getchunk_hist", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_iCCP
- {"mng_getchunk_iccp", 1, 0, 0},
-#endif
- {"mng_getchunk_idat", 1, 0, 0},
- {"mng_getchunk_iend", 1, 0, 0},
- {"mng_getchunk_ihdr", 1, 0, 0},
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
- {"mng_getchunk_ijng", 1, 0, 0},
-#endif
- {"mng_getchunk_ipng", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_iTXt
- {"mng_getchunk_itxt", 1, 0, 0},
-#endif
-#ifdef MNG_INCLUDE_JNG
- {"mng_getchunk_jdaa", 1, 0, 0},
- {"mng_getchunk_jdat", 1, 0, 0},
- {"mng_getchunk_jhdr", 1, 0, 0},
- {"mng_getchunk_jsep", 1, 0, 0},
-#endif
- {"mng_getchunk_loop", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_MAGN
- {"mng_getchunk_magn", 1, 0, 0},
-#endif
- {"mng_getchunk_mend", 1, 0, 0},
- {"mng_getchunk_mhdr", 1, 0, 0},
- {"mng_getchunk_move", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_nEED
- {"mng_getchunk_need", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_ORDR
-#ifndef MNG_NO_DELTA_PNG
- {"mng_getchunk_ordr", 1, 0, 0},
- {"mng_getchunk_ordr_entry", 1, 0, 0},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
- {"mng_getchunk_past", 1, 0, 0},
- {"mng_getchunk_past_src", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYg
- {"mng_getchunk_phyg", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYs
- {"mng_getchunk_phys", 1, 0, 0},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {"mng_getchunk_plte", 1, 0, 0},
- {"mng_getchunk_pplt", 1, 0, 0},
- {"mng_getchunk_pplt_entry", 1, 0, 0},
- {"mng_getchunk_prom", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_SAVE
- {"mng_getchunk_save", 1, 0, 0},
- {"mng_getchunk_save_entry", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_sBIT
- {"mng_getchunk_sbit", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
- {"mng_getchunk_seek", 1, 0, 0},
-#endif
- {"mng_getchunk_show", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_sPLT
- {"mng_getchunk_splt", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_sRGB
- {"mng_getchunk_srgb", 1, 0, 0},
-#endif
- {"mng_getchunk_term", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_tEXt
- {"mng_getchunk_text", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_tIME
- {"mng_getchunk_time", 1, 0, 0},
-#endif
- {"mng_getchunk_trns", 1, 0, 0},
- {"mng_getchunk_unkown", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_zTXt
- {"mng_getchunk_ztxt", 1, 0, 0},
-#endif
- {"mng_getimgdata_chunk", 0, 0, 0},
- {"mng_getimgdata_chunkseq", 0, 0, 0},
- {"mng_getimgdata_seq", 0, 0, 0},
- {"mng_getlasterror", 1, 0, 0},
- {"mng_initialize", 1, 0, 0},
- {"mng_iterate_chunks", 1, 0, 0},
- {"mng_putchunk_back", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_BASI
- {"mng_putchunk_basi", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
- {"mng_putchunk_bkgd", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_cHRM
- {"mng_putchunk_chrm", 1, 0, 0},
-#endif
- {"mng_putchunk_clip", 1, 0, 0},
- {"mng_putchunk_clon", 1, 0, 0},
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
- {"mng_putchunk_dbyk", 1, 0, 0},
-#endif
-#endif
- {"mng_putchunk_defi", 1, 0, 0},
-#ifndef MNG_NO_DELTA_PNG
- {"mng_putchunk_dhdr", 1, 0, 0},
-#endif
- {"mng_putchunk_disc", 1, 0, 0},
-#ifndef MNG_NO_DELTA_PNG
- {"mng_putchunk_drop", 1, 0, 0},
-#endif
- {"mng_putchunk_endl", 1, 0, 0},
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {"mng_putchunk_mpng", 1, 0, 10},
- {"mng_putchunk_mpng_frame", 1, 0, 10},
-#endif
-#ifndef MNG_SKIPCHUNK_evNT
- {"mng_putchunk_evnt", 1, 0, 5},
- {"mng_putchunk_evnt_entry", 1, 0, 5},
-#endif
-#ifndef MNG_SKIPCHUNK_eXPI
- {"mng_putchunk_expi", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_fPRI
- {"mng_putchunk_fpri", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_FRAM
- {"mng_putchunk_fram", 1, 0, 0},
-#endif
- {"mng_putchunk_gama", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_hIST
- {"mng_putchunk_hist", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_iCCP
- {"mng_putchunk_iccp", 1, 0, 0},
-#endif
- {"mng_putchunk_idat", 1, 0, 0},
- {"mng_putchunk_iend", 1, 0, 0},
- {"mng_putchunk_ihdr", 1, 0, 0},
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
- {"mng_putchunk_ijng", 1, 0, 0},
-#endif
- {"mng_putchunk_ipng", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_iTXt
- {"mng_putchunk_itxt", 1, 0, 0},
-#endif
-#ifdef MNG_INCLUDE_JNG
- {"mng_putchunk_jdaa", 1, 0, 0},
- {"mng_putchunk_jdat", 1, 0, 0},
- {"mng_putchunk_jhdr", 1, 0, 0},
- {"mng_putchunk_jsep", 1, 0, 0},
-#endif
- {"mng_putchunk_loop", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_MAGN
- {"mng_putchunk_magn", 1, 0, 0},
-#endif
- {"mng_putchunk_mend", 1, 0, 0},
- {"mng_putchunk_mhdr", 1, 0, 0},
- {"mng_putchunk_move", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_nEED
- {"mng_putchunk_need", 1, 0, 0},
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
- {"mng_putchunk_ordr", 1, 0, 0},
- {"mng_putchunk_ordr_entry", 1, 0, 0},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
- {"mng_putchunk_past", 1, 0, 0},
- {"mng_putchunk_past_src", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYg
- {"mng_putchunk_phyg", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYs
- {"mng_putchunk_phys", 1, 0, 0},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {"mng_putchunk_plte", 1, 0, 0},
- {"mng_putchunk_pplt", 1, 0, 0},
- {"mng_putchunk_pplt_entry", 1, 0, 0},
- {"mng_putchunk_prom", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_SAVE
- {"mng_putchunk_save", 1, 0, 0},
- {"mng_putchunk_save_entry", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_sBIT
- {"mng_putchunk_sbit", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
- {"mng_putchunk_seek", 1, 0, 0},
-#endif
- {"mng_putchunk_show", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_sPLT
- {"mng_putchunk_splt", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_sRGB
- {"mng_putchunk_srgb", 1, 0, 0},
-#endif
- {"mng_putchunk_term", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_tEXt
- {"mng_putchunk_text", 1, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_tIME
- {"mng_putchunk_time", 1, 0, 0},
-#endif
- {"mng_putchunk_trns", 1, 0, 0},
- {"mng_putchunk_unkown", 1, 0, 0},
-#ifndef MNG_SKIPCHUNK_zTXt
- {"mng_putchunk_ztxt", 1, 0, 0},
-#endif
- {"mng_putimgdata_ihdr", 0, 0, 0},
- {"mng_putimgdata_jhdr", 0, 0, 0},
- {"mng_reset", 1, 0, 0},
- {"mng_read", 1, 0, 0},
- {"mng_read_pushchunk", 1, 0, 8},
- {"mng_read_pushdata", 1, 0, 8},
- {"mng_read_pushsig", 1, 0, 8},
- {"mng_read_resume", 1, 0, 0},
- {"mng_readdisplay", 1, 0, 0},
- {"mng_set_bgcolor", 1, 0, 0},
- {"mng_set_bkgdstyle", 1, 0, 0},
- {"mng_set_cacheplayback", 1, 0, 2},
- {"mng_set_canvasstyle", 1, 0, 0},
- {"mng_set_dfltimggamma", 1, 0, 0},
-#ifndef MNG_NO_DFLT_INFO
- {"mng_set_dfltimggammaint", 1, 0, 0},
-#endif
- {"mng_set_displaygamma", 1, 0, 0},
- {"mng_set_displaygammaint", 1, 0, 0},
- {"mng_set_doprogressive", 1, 0, 2},
-#ifdef MNG_ACCESS_JPEG
- {"mng_set_jpeg_dctmethod", 1, 0, 0},
- {"mng_set_jpeg_maxjdat", 1, 0, 0},
- {"mng_set_jpeg_optimized", 1, 0, 0},
- {"mng_set_jpeg_progressive", 1, 0, 0},
- {"mng_set_jpeg_quality", 1, 0, 0},
- {"mng_set_jpeg_smoothing", 1, 0, 0},
-#endif
-#ifndef MNG_SKIP_MAXCANVAS
- {"mng_set_maxcanvasheight", 1, 0, 0},
- {"mng_set_maxcanvassize", 1, 0, 0},
- {"mng_set_maxcanvaswidth", 1, 0, 0},
-#endif
- {"mng_set_outputprofile", 1, 0, 0},
- {"mng_set_outputprofile2", 1, 0, 0},
- {"mng_set_outputsrgb", 1, 0, 1},
- {"mng_set_sectionbreaks", 1, 0, 0},
- {"mng_set_speed", 1, 0, 0},
- {"mng_set_srgb", 1, 0, 0},
- {"mng_set_srgbimplicit", 1, 0, 1},
- {"mng_set_srgbprofile", 1, 0, 0},
- {"mng_set_srgbprofile2", 1, 0, 0},
- {"mng_set_storechunks", 1, 0, 0},
- {"mng_set_suspensionmode", 1, 0, 0},
- {"mng_set_usebkgd", 1, 0, 0},
- {"mng_set_userdata", 1, 0, 0},
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
- {"mng_set_viewgamma", 1, 0, 0},
- {"mng_set_viewgammaint", 1, 0, 0},
-#endif
-#ifdef MNG_ACCESS_ZLIB
- {"mng_set_zlib_level", 1, 0, 0},
- {"mng_set_zlib_maxidat", 1, 0, 0},
- {"mng_set_zlib_memlevel", 1, 0, 0},
- {"mng_set_zlib_method", 1, 0, 0},
- {"mng_set_zlib_strategy", 1, 0, 0},
- {"mng_set_zlib_windowbits", 1, 0, 0},
-#endif
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- {"mng_setcb_closestream", 1, 0, 0},
-#endif
- {"mng_setcb_errorproc", 1, 0, 0},
- {"mng_setcb_getalphaline", 1, 0, 0},
- {"mng_setcb_getbkgdline", 1, 0, 0},
- {"mng_setcb_getcanvasline", 1, 0, 0},
- {"mng_setcb_gettickcount", 1, 0, 0},
- {"mng_setcb_memalloc", 1, 0, 0},
- {"mng_setcb_memfree", 1, 0, 0},
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- {"mng_setcb_openstream", 1, 0, 0},
-#endif
- {"mng_setcb_processarow", 1, 0, 0},
- {"mng_setcb_processchroma", 1, 0, 0},
- {"mng_setcb_processgamma", 1, 0, 0},
- {"mng_setcb_processheader", 1, 0, 0},
- {"mng_setcb_processiccp", 1, 0, 0},
- {"mng_setcb_processmend", 1, 0, 1},
- {"mng_setcb_processneed", 1, 0, 0},
- {"mng_setcb_processsave", 1, 0, 0},
- {"mng_setcb_processseek", 1, 0, 0},
- {"mng_setcb_processsrgb", 1, 0, 0},
- {"mng_setcb_processterm", 1, 0, 2},
- {"mng_setcb_processtext", 1, 0, 0},
- {"mng_setcb_processunknown", 1, 0, 0},
- {"mng_setcb_readdata", 1, 0, 0},
- {"mng_setcb_refresh", 1, 0, 0},
- {"mng_setcb_releasedata", 1, 0, 8},
- {"mng_setcb_settimer", 1, 0, 0},
- {"mng_setcb_traceproc", 1, 0, 0},
- {"mng_setcb_writedata", 1, 0, 0},
- {"mng_status_creating", 1, 0, 0},
- {"mng_status_displaying", 1, 0, 0},
- {"mng_status_dynamic", 1, 0, 5},
- {"mng_status_error", 1, 0, 0},
- {"mng_status_reading", 1, 0, 0},
- {"mng_status_running", 1, 0, 0},
- {"mng_status_runningevent", 1, 0, 5},
- {"mng_status_suspendbreak", 1, 0, 0},
- {"mng_status_timerbreak", 1, 0, 0},
- {"mng_status_writing", 1, 0, 0},
- {"mng_supports_func", 1, 0, 5},
- {"mng_trapevent", 1, 0, 5},
- {"mng_updatemngheader", 1, 0, 0},
- {"mng_updatemngsimplicity", 1, 0, 0},
- {"mng_version_beta", 1, 0, 5},
- {"mng_version_dll", 1, 0, 0},
- {"mng_version_major", 1, 0, 0},
- {"mng_version_minor", 1, 0, 0},
- {"mng_version_release", 1, 0, 0},
- {"mng_version_so", 1, 0, 0},
- {"mng_version_text", 1, 0, 0},
- {"mng_write", 1, 0, 0},
- };
-
-mng_bool MNG_DECL mng_supports_func (mng_pchar zFunction,
- mng_uint8* iMajor,
- mng_uint8* iMinor,
- mng_uint8* iRelease)
-{
- mng_int32 iTop, iLower, iUpper, iMiddle;
- mng_func_entryp pEntry; /* pointer to found entry */
- /* determine max index of table */
- iTop = (sizeof (func_table) / sizeof (func_table [0])) - 1;
-
- iLower = 0; /* initialize binary search */
- iMiddle = iTop >> 1; /* start in the middle */
- iUpper = iTop;
- pEntry = 0; /* no goods yet! */
-
- do /* the binary search itself */
- {
- mng_int32 iRslt = strcmp(func_table [iMiddle].zFunction, zFunction);
- if (iRslt < 0)
- iLower = iMiddle + 1;
- else if (iRslt > 0)
- iUpper = iMiddle - 1;
- else
- {
- pEntry = &func_table [iMiddle];
- break;
- };
-
- iMiddle = (iLower + iUpper) >> 1;
- }
- while (iLower <= iUpper);
-
- if (pEntry) /* found it ? */
- {
- *iMajor = pEntry->iMajor;
- *iMinor = pEntry->iMinor;
- *iRelease = pEntry->iRelease;
- return MNG_TRUE;
- }
- else
- {
- *iMajor = 0;
- *iMinor = 0;
- *iRelease = 0;
- return MNG_FALSE;
- }
-}
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * HLAPI routines * */
-/* * * */
-/* ************************************************************************** */
-
-mng_handle MNG_DECL mng_initialize (mng_ptr pUserdata,
- mng_memalloc fMemalloc,
- mng_memfree fMemfree,
- mng_traceproc fTraceproc)
-{
- mng_datap pData;
-#ifdef MNG_SUPPORT_DISPLAY
- mng_retcode iRetcode;
- mng_imagep pImage;
-#endif
-
-#ifdef MNG_INTERNAL_MEMMNGMT /* allocate the main datastruc */
- pData = (mng_datap)calloc (1, sizeof (mng_data));
-#else
- pData = (mng_datap)fMemalloc (sizeof (mng_data));
-#endif
-
- if (!pData)
- return MNG_NULL; /* error: out of memory?? */
- /* validate the structure */
- pData->iMagic = MNG_MAGIC;
- /* save userdata field */
- pData->pUserdata = pUserdata;
- /* remember trace callback */
- pData->fTraceproc = fTraceproc;
-
-#ifdef MNG_SUPPORT_TRACE
- if (mng_trace (pData, MNG_FN_INITIALIZE, MNG_LC_INITIALIZE))
- {
- MNG_FREEX (pData, pData, sizeof (mng_data));
- return MNG_NULL;
- }
-#endif
- /* default canvas styles are 8-bit RGB */
- pData->iCanvasstyle = MNG_CANVAS_RGB8;
- pData->iBkgdstyle = MNG_CANVAS_RGB8;
-
- pData->iBGred = 0; /* black */
- pData->iBGgreen = 0;
- pData->iBGblue = 0;
-
- pData->bUseBKGD = MNG_TRUE;
-
-#ifdef MNG_FULL_CMS
- pData->bIssRGB = MNG_TRUE;
- pData->hProf1 = 0; /* no profiles yet */
- pData->hProf2 = 0;
- pData->hProf3 = 0;
- pData->hTrans = 0;
-#endif
-
- pData->dViewgamma = 1.0;
- pData->dDisplaygamma = 2.2;
- pData->dDfltimggamma = 0.45455;
- /* initially remember chunks */
- pData->bStorechunks = MNG_TRUE;
- /* no breaks at section-borders */
- pData->bSectionbreaks = MNG_FALSE;
- /* initially cache playback info */
- pData->bCacheplayback = MNG_TRUE;
- /* progressive refresh for large images */
- pData->bDoProgressive = MNG_TRUE;
- /* crc exists; should check; error for
- critical chunks; warning for ancillery;
- generate crc for output */
- pData->iCrcmode = MNG_CRC_DEFAULT;
- /* normal animation-speed ! */
- pData->iSpeed = mng_st_normal;
- /* initial image limits */
- pData->iMaxwidth = 10000;
- pData->iMaxheight = 10000;
-
-#ifdef MNG_INTERNAL_MEMMNGMT /* internal management */
- pData->fMemalloc = MNG_NULL;
- pData->fMemfree = MNG_NULL;
-#else /* keep callbacks */
- pData->fMemalloc = fMemalloc;
- pData->fMemfree = fMemfree;
-#endif
- /* no value (yet) */
- pData->fReleasedata = MNG_NULL;
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- pData->fOpenstream = MNG_NULL;
- pData->fClosestream = MNG_NULL;
-#endif
- pData->fReaddata = MNG_NULL;
- pData->fWritedata = MNG_NULL;
- pData->fErrorproc = MNG_NULL;
- pData->fProcessheader = MNG_NULL;
- pData->fProcesstext = MNG_NULL;
- pData->fProcesssave = MNG_NULL;
- pData->fProcessseek = MNG_NULL;
- pData->fProcessneed = MNG_NULL;
- pData->fProcessmend = MNG_NULL;
- pData->fProcessunknown = MNG_NULL;
- pData->fProcessterm = MNG_NULL;
- pData->fGetcanvasline = MNG_NULL;
- pData->fGetbkgdline = MNG_NULL;
- pData->fGetalphaline = MNG_NULL;
- pData->fRefresh = MNG_NULL;
- pData->fGettickcount = MNG_NULL;
- pData->fSettimer = MNG_NULL;
- pData->fProcessgamma = MNG_NULL;
- pData->fProcesschroma = MNG_NULL;
- pData->fProcesssrgb = MNG_NULL;
- pData->fProcessiccp = MNG_NULL;
- pData->fProcessarow = MNG_NULL;
-
-#if defined(MNG_SUPPORT_DISPLAY) && (defined(MNG_GAMMA_ONLY) || defined(MNG_FULL_CMS))
- pData->dLastgamma = 0; /* lookup table needs first-time calc */
-#endif
-
-#ifdef MNG_SUPPORT_DISPLAY /* create object 0 */
- iRetcode = mng_create_imageobject (pData, 0, MNG_TRUE, MNG_TRUE, MNG_TRUE,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, MNG_FALSE,
- 0, 0, 0, 0, &pImage);
-
- if (iRetcode) /* on error drop out */
- {
- MNG_FREEX (pData, pData, sizeof (mng_data));
- return MNG_NULL;
- }
-
- pData->pObjzero = pImage;
-#endif
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_INCLUDE_LCMS)
- mnglcms_initlibrary (); /* init lcms particulars */
-#endif
-
-#ifdef MNG_SUPPORT_READ
- pData->bSuspensionmode = MNG_FALSE;
- pData->iSuspendbufsize = 0;
- pData->pSuspendbuf = MNG_NULL;
- pData->pSuspendbufnext = MNG_NULL;
- pData->iSuspendbufleft = 0;
- pData->iChunklen = 0;
- pData->pReadbufnext = MNG_NULL;
- pData->pLargebufnext = MNG_NULL;
-
- pData->pFirstpushchunk = MNG_NULL;
- pData->pLastpushchunk = MNG_NULL;
- pData->pFirstpushdata = MNG_NULL;
- pData->pLastpushdata = MNG_NULL;
-#endif
-
-#ifdef MNG_INCLUDE_ZLIB
- mngzlib_initialize (pData); /* initialize zlib structures and such */
- /* default zlib compression parameters */
- pData->iZlevel = MNG_ZLIB_LEVEL;
- pData->iZmethod = MNG_ZLIB_METHOD;
- pData->iZwindowbits = MNG_ZLIB_WINDOWBITS;
- pData->iZmemlevel = MNG_ZLIB_MEMLEVEL;
- pData->iZstrategy = MNG_ZLIB_STRATEGY;
- /* default maximum IDAT data size */
- pData->iMaxIDAT = MNG_MAX_IDAT_SIZE;
-#endif
-
-#ifdef MNG_INCLUDE_JNG /* default IJG compression parameters */
- pData->eJPEGdctmethod = MNG_JPEG_DCT;
- pData->iJPEGquality = MNG_JPEG_QUALITY;
- pData->iJPEGsmoothing = MNG_JPEG_SMOOTHING;
- pData->bJPEGcompressprogr = MNG_JPEG_PROGRESSIVE;
- pData->bJPEGcompressopt = MNG_JPEG_OPTIMIZED;
- /* default maximum JDAT data size */
- pData->iMaxJDAT = MNG_MAX_JDAT_SIZE;
-#endif
-
- mng_reset ((mng_handle)pData);
-
-#ifdef MNG_SUPPORT_TRACE
- if (mng_trace (pData, MNG_FN_INITIALIZE, MNG_LC_END))
- {
- MNG_FREEX (pData, pData, sizeof (mng_data));
- return MNG_NULL;
- }
-#endif
-
- return (mng_handle)pData; /* if we get here, we're in business */
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_reset (mng_handle hHandle)
-{
- mng_datap pData;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_RESET, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)(hHandle)); /* address main structure */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_SKIPCHUNK_SAVE
- mng_drop_savedata (pData); /* cleanup saved-data from SAVE/SEEK */
-#endif
-#endif
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_FULL_CMS)
- mng_clear_cms (pData); /* cleanup left-over cms stuff if any */
-#endif
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_INCLUDE_JNG)
- mngjpeg_cleanup (pData); /* cleanup jpeg stuff */
-#endif
-
-#ifdef MNG_INCLUDE_ZLIB
- if (pData->bInflating) /* if we've been inflating */
- {
-#ifdef MNG_INCLUDE_DISPLAY_PROCS
- mng_cleanup_rowproc (pData); /* cleanup row-processing, */
-#endif
- mngzlib_inflatefree (pData); /* cleanup inflate! */
- }
-#endif /* MNG_INCLUDE_ZLIB */
-
-#ifdef MNG_SUPPORT_READ
- if ((pData->bReading) && (!pData->bEOF))
- mng_process_eof (pData); /* cleanup app streaming */
- /* cleanup default read buffers */
- MNG_FREE (pData, pData->pReadbuf, pData->iReadbufsize);
- MNG_FREE (pData, pData->pLargebuf, pData->iLargebufsize);
- MNG_FREE (pData, pData->pSuspendbuf, pData->iSuspendbufsize);
-
- while (pData->pFirstpushdata) /* release any pushed data & chunks */
- mng_release_pushdata (pData);
- while (pData->pFirstpushchunk)
- mng_release_pushchunk (pData);
-#endif
-
-#ifdef MNG_SUPPORT_WRITE /* cleanup default write buffer */
- MNG_FREE (pData, pData->pWritebuf, pData->iWritebufsize);
-#endif
-
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
- mng_drop_chunks (pData); /* drop stored chunks (if any) */
-#endif
-
-#ifdef MNG_SUPPORT_DISPLAY
- mng_drop_objects (pData, MNG_TRUE); /* drop stored objects (if any) */
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pData->iGlobalProfilesize) /* drop global profile (if any) */
- MNG_FREEX (pData, pData->pGlobalProfile, pData->iGlobalProfilesize);
-#endif
-#endif
-
- pData->eSigtype = mng_it_unknown;
- pData->eImagetype = mng_it_unknown;
- pData->iWidth = 0; /* these are unknown yet */
- pData->iHeight = 0;
- pData->iTicks = 0;
- pData->iLayercount = 0;
- pData->iFramecount = 0;
- pData->iPlaytime = 0;
- pData->iSimplicity = 0;
- pData->iAlphadepth = 16; /* assume the worst! */
-
- pData->iImagelevel = 0; /* no image encountered */
-
- pData->iMagnify = 0; /* 1-to-1 display */
- pData->iOffsetx = 0; /* no offsets */
- pData->iOffsety = 0;
- pData->iCanvaswidth = 0; /* let the app decide during processheader */
- pData->iCanvasheight = 0;
- /* so far, so good */
- pData->iErrorcode = MNG_NOERROR;
- pData->iSeverity = 0;
- pData->iErrorx1 = 0;
- pData->iErrorx2 = 0;
- pData->zErrortext = MNG_NULL;
-
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
- /* let's assume the best scenario */
-#ifndef MNG_NO_OLD_VERSIONS
- pData->bPreDraft48 = MNG_FALSE;
-#endif
- /* the unknown chunk */
- pData->iChunkname = MNG_UINT_HUH;
- pData->iChunkseq = 0;
- pData->pFirstchunk = MNG_NULL;
- pData->pLastchunk = MNG_NULL;
- /* nothing processed yet */
- pData->bHasheader = MNG_FALSE;
- pData->bHasMHDR = MNG_FALSE;
- pData->bHasIHDR = MNG_FALSE;
- pData->bHasBASI = MNG_FALSE;
- pData->bHasDHDR = MNG_FALSE;
-#ifdef MNG_INCLUDE_JNG
- pData->bHasJHDR = MNG_FALSE;
- pData->bHasJSEP = MNG_FALSE;
- pData->bHasJDAA = MNG_FALSE;
- pData->bHasJDAT = MNG_FALSE;
-#endif
- pData->bHasPLTE = MNG_FALSE;
- pData->bHasTRNS = MNG_FALSE;
- pData->bHasGAMA = MNG_FALSE;
- pData->bHasCHRM = MNG_FALSE;
- pData->bHasSRGB = MNG_FALSE;
- pData->bHasICCP = MNG_FALSE;
- pData->bHasBKGD = MNG_FALSE;
- pData->bHasIDAT = MNG_FALSE;
-
- pData->bHasSAVE = MNG_FALSE;
- pData->bHasBACK = MNG_FALSE;
- pData->bHasFRAM = MNG_FALSE;
- pData->bHasTERM = MNG_FALSE;
- pData->bHasLOOP = MNG_FALSE;
- /* there's no global stuff yet either */
- pData->bHasglobalPLTE = MNG_FALSE;
- pData->bHasglobalTRNS = MNG_FALSE;
- pData->bHasglobalGAMA = MNG_FALSE;
- pData->bHasglobalCHRM = MNG_FALSE;
- pData->bHasglobalSRGB = MNG_FALSE;
- pData->bHasglobalICCP = MNG_FALSE;
-
- pData->iDatawidth = 0; /* no IHDR/BASI/DHDR done yet */
- pData->iDataheight = 0;
- pData->iBitdepth = 0;
- pData->iColortype = 0;
- pData->iCompression = 0;
- pData->iFilter = 0;
- pData->iInterlace = 0;
-
-#ifdef MNG_INCLUDE_JNG
- pData->iJHDRcolortype = 0; /* no JHDR data */
- pData->iJHDRimgbitdepth = 0;
- pData->iJHDRimgcompression = 0;
- pData->iJHDRimginterlace = 0;
- pData->iJHDRalphabitdepth = 0;
- pData->iJHDRalphacompression = 0;
- pData->iJHDRalphafilter = 0;
- pData->iJHDRalphainterlace = 0;
-#endif
-
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-#ifdef MNG_SUPPORT_READ /* no reading done */
- pData->bReading = MNG_FALSE;
- pData->bHavesig = MNG_FALSE;
- pData->bEOF = MNG_FALSE;
- pData->iReadbufsize = 0;
- pData->pReadbuf = MNG_NULL;
-
- pData->iLargebufsize = 0;
- pData->pLargebuf = MNG_NULL;
-
- pData->iSuspendtime = 0;
- pData->bSuspended = MNG_FALSE;
- pData->iSuspendpoint = 0;
-
- pData->pSuspendbufnext = pData->pSuspendbuf;
- pData->iSuspendbufleft = 0;
-#endif /* MNG_SUPPORT_READ */
-
-#ifdef MNG_SUPPORT_WRITE /* no creating/writing done */
- pData->bCreating = MNG_FALSE;
- pData->bWriting = MNG_FALSE;
- pData->iFirstchunkadded = 0;
- pData->iWritebufsize = 0;
- pData->pWritebuf = MNG_NULL;
-#endif /* MNG_SUPPORT_WRITE */
-
-#ifdef MNG_SUPPORT_DISPLAY /* done nuttin' yet */
- pData->bDisplaying = MNG_FALSE;
- pData->iFrameseq = 0;
- pData->iLayerseq = 0;
- pData->iFrametime = 0;
-
- pData->iTotallayers = 0;
- pData->iTotalframes = 0;
- pData->iTotalplaytime = 0;
-
- pData->bSkipping = MNG_FALSE;
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
- pData->bDynamic = MNG_FALSE;
- pData->bRunningevent = MNG_FALSE;
- pData->bStopafterseek = MNG_FALSE;
- pData->iEventx = 0;
- pData->iEventy = 0;
- pData->pLastmousemove = MNG_NULL;
-#endif
-
- pData->iRequestframe = 0;
- pData->iRequestlayer = 0;
- pData->iRequesttime = 0;
- pData->bSearching = MNG_FALSE;
-
- pData->bRestorebkgd = MNG_FALSE;
-
- pData->iRuntime = 0;
- pData->iSynctime = 0;
- pData->iStarttime = 0;
- pData->iEndtime = 0;
- pData->bRunning = MNG_FALSE;
- pData->bTimerset = MNG_FALSE;
- pData->iBreakpoint = 0;
- pData->bSectionwait = MNG_FALSE;
- pData->bFreezing = MNG_FALSE;
- pData->bResetting = MNG_FALSE;
- pData->bNeedrefresh = MNG_FALSE;
- pData->bMisplacedTERM = MNG_FALSE;
- pData->bOnlyfirstframe = MNG_FALSE;
- pData->iFramesafterTERM = 0;
- /* these don't exist yet */
- pData->pCurrentobj = MNG_NULL;
- pData->pCurraniobj = MNG_NULL;
- pData->pTermaniobj = MNG_NULL;
- pData->pLastclone = MNG_NULL;
- pData->pStoreobj = MNG_NULL;
- pData->pStorebuf = MNG_NULL;
- pData->pRetrieveobj = MNG_NULL;
- /* no saved data ! */
- pData->pSavedata = MNG_NULL;
-
- pData->iUpdateleft = 0; /* no region updated yet */
- pData->iUpdateright = 0;
- pData->iUpdatetop = 0;
- pData->iUpdatebottom = 0;
-
- pData->iPass = -1; /* interlacing stuff and temp buffers */
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = 0;
- pData->iSamplemul = 0;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = 0;
- pData->iRowmax = 0;
- pData->iFilterofs = 0;
- pData->iPixelofs = 1;
- pData->iLevel0 = 0;
- pData->iLevel1 = 0;
- pData->iLevel2 = 0;
- pData->iLevel3 = 0;
- pData->pWorkrow = MNG_NULL;
- pData->pPrevrow = MNG_NULL;
- pData->pRGBArow = MNG_NULL;
- pData->bIsRGBA16 = MNG_TRUE;
- pData->bIsOpaque = MNG_TRUE;
- pData->iFilterbpp = 1;
-
- pData->iSourcel = 0; /* always initialized just before */
- pData->iSourcer = 0; /* compositing the next layer */
- pData->iSourcet = 0;
- pData->iSourceb = 0;
- pData->iDestl = 0;
- pData->iDestr = 0;
- pData->iDestt = 0;
- pData->iDestb = 0;
- /* lists are empty */
- pData->pFirstimgobj = MNG_NULL;
- pData->pLastimgobj = MNG_NULL;
- pData->pFirstaniobj = MNG_NULL;
- pData->pLastaniobj = MNG_NULL;
-#ifdef MNG_SUPPORT_DYNAMICMNG
- pData->pFirstevent = MNG_NULL;
- pData->pLastevent = MNG_NULL;
-#endif
- /* no processing callbacks */
- pData->fDisplayrow = MNG_NULL;
- pData->fRestbkgdrow = MNG_NULL;
- pData->fCorrectrow = MNG_NULL;
- pData->fRetrieverow = MNG_NULL;
- pData->fStorerow = MNG_NULL;
- pData->fProcessrow = MNG_NULL;
- pData->fDifferrow = MNG_NULL;
- pData->fScalerow = MNG_NULL;
- pData->fDeltarow = MNG_NULL;
-#ifndef MNG_SKIPCHUNK_PAST
- pData->fFliprow = MNG_NULL;
- pData->fTilerow = MNG_NULL;
-#endif
- pData->fInitrowproc = MNG_NULL;
-
- pData->iPLTEcount = 0; /* no PLTE data */
-
-#ifndef MNG_SKIPCHUNK_DEFI
- pData->iDEFIobjectid = 0; /* no DEFI data */
- pData->bDEFIhasdonotshow = MNG_FALSE;
- pData->iDEFIdonotshow = 0;
- pData->bDEFIhasconcrete = MNG_FALSE;
- pData->iDEFIconcrete = 0;
- pData->bDEFIhasloca = MNG_FALSE;
- pData->iDEFIlocax = 0;
- pData->iDEFIlocay = 0;
- pData->bDEFIhasclip = MNG_FALSE;
- pData->iDEFIclipl = 0;
- pData->iDEFIclipr = 0;
- pData->iDEFIclipt = 0;
- pData->iDEFIclipb = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_BACK
- pData->iBACKred = 0; /* no BACK data */
- pData->iBACKgreen = 0;
- pData->iBACKblue = 0;
- pData->iBACKmandatory = 0;
- pData->iBACKimageid = 0;
- pData->iBACKtile = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_FRAM
- pData->iFRAMmode = 1; /* default global FRAM variables */
- pData->iFRAMdelay = 1;
- pData->iFRAMtimeout = 0x7fffffffl;
- pData->bFRAMclipping = MNG_FALSE;
- pData->iFRAMclipl = 0;
- pData->iFRAMclipr = 0;
- pData->iFRAMclipt = 0;
- pData->iFRAMclipb = 0;
-
- pData->iFramemode = 1; /* again for the current frame */
- pData->iFramedelay = 1;
- pData->iFrametimeout = 0x7fffffffl;
- pData->bFrameclipping = MNG_FALSE;
- pData->iFrameclipl = 0;
- pData->iFrameclipr = 0;
- pData->iFrameclipt = 0;
- pData->iFrameclipb = 0;
-
- pData->iNextdelay = 1;
-
- pData->bForcedelay = MNG_FALSE;
- pData->iAccumdelay = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_SHOW
- pData->iSHOWmode = 0; /* no SHOW data */
- pData->iSHOWfromid = 0;
- pData->iSHOWtoid = 0;
- pData->iSHOWnextid = 0;
- pData->iSHOWskip = 0;
-#endif
-
- pData->iGlobalPLTEcount = 0; /* no global PLTE data */
-
- pData->iGlobalTRNSrawlen = 0; /* no global tRNS data */
-
- pData->iGlobalGamma = 0; /* no global gAMA data */
-
-#ifndef MNG_SKIPCHUNK_cHRM
- pData->iGlobalWhitepointx = 0; /* no global cHRM data */
- pData->iGlobalWhitepointy = 0;
- pData->iGlobalPrimaryredx = 0;
- pData->iGlobalPrimaryredy = 0;
- pData->iGlobalPrimarygreenx = 0;
- pData->iGlobalPrimarygreeny = 0;
- pData->iGlobalPrimarybluex = 0;
- pData->iGlobalPrimarybluey = 0;
-#endif
-
- pData->iGlobalRendintent = 0; /* no global sRGB data */
-
-#ifndef MNG_SKIPCHUNK_iCCP
- pData->iGlobalProfilesize = 0; /* no global iCCP data */
- pData->pGlobalProfile = MNG_NULL;
-#endif
-
-#ifndef MNG_SKIPCHUNK_bKGD
- pData->iGlobalBKGDred = 0; /* no global bKGD data */
- pData->iGlobalBKGDgreen = 0;
- pData->iGlobalBKGDblue = 0;
-#endif
- /* no delta-image */
-#ifndef MNG_NO_DELTA_PNG
- pData->pDeltaImage = MNG_NULL;
- pData->iDeltaImagetype = 0;
- pData->iDeltatype = 0;
- pData->iDeltaBlockwidth = 0;
- pData->iDeltaBlockheight = 0;
- pData->iDeltaBlockx = 0;
- pData->iDeltaBlocky = 0;
- pData->bDeltaimmediate = MNG_FALSE;
-
- pData->fDeltagetrow = MNG_NULL;
- pData->fDeltaaddrow = MNG_NULL;
- pData->fDeltareplacerow = MNG_NULL;
- pData->fDeltaputrow = MNG_NULL;
-
- pData->fPromoterow = MNG_NULL;
- pData->fPromBitdepth = MNG_NULL;
- pData->pPromBuf = MNG_NULL;
- pData->iPromColortype = 0;
- pData->iPromBitdepth = 0;
- pData->iPromFilltype = 0;
- pData->iPromWidth = 0;
- pData->pPromSrc = MNG_NULL;
- pData->pPromDst = MNG_NULL;
-#endif
-
-#ifndef MNG_SKIPCHUNK_MAGN
- pData->iMAGNfromid = 0;
- pData->iMAGNtoid = 0;
-#endif
-
-#ifndef MNG_SKIPCHUNK_PAST
- pData->iPastx = 0;
- pData->iPasty = 0;
-#endif
-
- pData->pLastseek = MNG_NULL;
-#endif
-
-#ifdef MNG_INCLUDE_ZLIB
- pData->bInflating = 0; /* no inflating or deflating */
- pData->bDeflating = 0; /* going on at the moment */
-#endif
-
-#ifdef MNG_SUPPORT_DISPLAY /* reset object 0 */
- mng_reset_objzero (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_RESET, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_cleanup (mng_handle* hHandle)
-{
- mng_datap pData; /* local vars */
-#ifndef MNG_INTERNAL_MEMMNGMT
- mng_memfree fFree;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)*hHandle), MNG_FN_CLEANUP, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (*hHandle) /* check validity handle */
- pData = ((mng_datap)(*hHandle)); /* and address main structure */
-
- mng_reset (*hHandle); /* do an implicit reset to cleanup most stuff */
-
-#ifdef MNG_SUPPORT_DISPLAY /* drop object 0 */
- mng_free_imageobject (pData, (mng_imagep)pData->pObjzero);
-#endif
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_FULL_CMS)
- if (pData->hProf2) /* output profile defined ? */
- mnglcms_freeprofile (pData->hProf2);
-
- if (pData->hProf3) /* sRGB profile defined ? */
- mnglcms_freeprofile (pData->hProf3);
-#endif
-
-#ifdef MNG_INCLUDE_ZLIB
- mngzlib_cleanup (pData); /* cleanup zlib stuff */
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)*hHandle), MNG_FN_CLEANUP, MNG_LC_CLEANUP)
-#endif
-
- pData->iMagic = 0; /* invalidate the actual memory */
-
-#ifdef MNG_INTERNAL_MEMMNGMT
- free ((void *)*hHandle); /* cleanup the data-structure */
-#else
- fFree = ((mng_datap)*hHandle)->fMemfree;
- fFree ((mng_ptr)*hHandle, sizeof (mng_data));
-#endif
-
- *hHandle = 0; /* wipe pointer to inhibit future use */
-
- return MNG_NOERROR; /* and we're done */
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_read (mng_handle hHandle)
-{
- mng_datap pData; /* local vars */
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READ, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle and callbacks */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
-#ifndef MNG_INTERNAL_MEMMNGMT
- MNG_VALIDCB (hHandle, fMemalloc)
- MNG_VALIDCB (hHandle, fMemfree)
-#endif
-
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- MNG_VALIDCB (hHandle, fOpenstream)
- MNG_VALIDCB (hHandle, fClosestream)
-#endif
- MNG_VALIDCB (hHandle, fReaddata)
-
-#ifdef MNG_SUPPORT_DISPLAY /* valid at this point ? */
- if ((pData->bReading) || (pData->bDisplaying))
-#else
- if (pData->bReading)
-#endif
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
-#ifdef MNG_SUPPORT_WRITE
- if ((pData->bWriting) || (pData->bCreating))
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-#endif
-
- if (!pData->bCacheplayback) /* must store playback info to work!! */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- pData->bReading = MNG_TRUE; /* read only! */
-
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- if (pData->fOpenstream && !pData->fOpenstream (hHandle))
- /* open it and start reading */
- iRetcode = MNG_APPIOERROR;
- else
-#endif
- iRetcode = mng_read_graphic (pData);
-
- if (pData->bEOF) /* already at EOF ? */
- {
- pData->bReading = MNG_FALSE; /* then we're no longer reading */
-
-#ifdef MNG_SUPPORT_DISPLAY
- mng_reset_rundata (pData); /* reset rundata */
-#endif
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (pData->bSuspended) /* read suspension ? */
- {
- iRetcode = MNG_NEEDMOREDATA;
- pData->iSuspendtime = pData->fGettickcount ((mng_handle)pData);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READ, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_read_pushdata (mng_handle hHandle,
- mng_ptr pData,
- mng_size_t iLength,
- mng_bool bTakeownership)
-{
- mng_datap pMyData; /* local vars */
- mng_pushdatap pPush;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READ_PUSHDATA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pMyData = ((mng_datap)hHandle); /* and make it addressable */
- /* create a containing buffer */
- iRetcode = make_pushbuffer (pMyData, pData, iLength, bTakeownership, &pPush);
- if (iRetcode)
- return iRetcode;
-
- if (pMyData->pLastpushdata) /* and update the buffer chain */
- pMyData->pLastpushdata->pNext = pPush;
- else
- pMyData->pFirstpushdata = pPush;
-
- pMyData->pLastpushdata = pPush;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READ_PUSHDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_read_pushsig (mng_handle hHandle,
- mng_imgtype eSigtype)
-{
- mng_datap pData; /* local vars */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READ_PUSHSIG, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
- if (pData->bHavesig) /* can we expect this call ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- pData->eSigtype = eSigtype;
- pData->bHavesig = MNG_TRUE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READ_PUSHSIG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_read_pushchunk (mng_handle hHandle,
- mng_ptr pChunk,
- mng_size_t iLength,
- mng_bool bTakeownership)
-{
- mng_datap pMyData; /* local vars */
- mng_pushdatap pPush;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READ_PUSHCHUNK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pMyData = ((mng_datap)hHandle); /* and make it addressable */
- /* create a containing buffer */
- iRetcode = make_pushbuffer (pMyData, pChunk, iLength, bTakeownership, &pPush);
- if (iRetcode)
- return iRetcode;
-
- if (pMyData->pLastpushchunk) /* and update the buffer chain */
- pMyData->pLastpushchunk->pNext = pPush;
- else
- pMyData->pFirstpushchunk = pPush;
-
- pMyData->pLastpushchunk = pPush;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READ_PUSHCHUNK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_read_resume (mng_handle hHandle)
-{
- mng_datap pData; /* local vars */
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READ_RESUME, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
- /* can we expect this call ? */
- if ((!pData->bReading) || (!pData->bSuspended))
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- pData->bSuspended = MNG_FALSE; /* reset the flag */
-
-#ifdef MNG_SUPPORT_DISPLAY /* re-synchronize ? */
- if ((pData->bDisplaying) && (pData->bRunning))
- pData->iSynctime = pData->iSynctime - pData->iSuspendtime +
- pData->fGettickcount (hHandle);
-#endif
-
- iRetcode = mng_read_graphic (pData); /* continue reading now */
-
- if (pData->bEOF) /* at EOF ? */
- {
- pData->bReading = MNG_FALSE; /* then we're no longer reading */
-
-#ifdef MNG_SUPPORT_DISPLAY
- mng_reset_rundata (pData); /* reset rundata */
-#endif
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (pData->bSuspended) /* read suspension ? */
- {
- iRetcode = MNG_NEEDMOREDATA;
- pData->iSuspendtime = pData->fGettickcount ((mng_handle)pData);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READ_RESUME, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_write (mng_handle hHandle)
-{
- mng_datap pData;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_WRITE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle and callbacks */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
-#ifndef MNG_INTERNAL_MEMMNGMT
- MNG_VALIDCB (hHandle, fMemalloc)
- MNG_VALIDCB (hHandle, fMemfree)
-#endif
-
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- MNG_VALIDCB (hHandle, fOpenstream)
- MNG_VALIDCB (hHandle, fClosestream)
-#endif
- MNG_VALIDCB (hHandle, fWritedata)
-
-#ifdef MNG_SUPPORT_READ
- if (pData->bReading) /* valid at this point ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-#endif
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- iRetcode = mng_write_graphic (pData);/* do the write */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_WRITE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_create (mng_handle hHandle)
-{
- mng_datap pData;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_CREATE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle and callbacks */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
-#ifndef MNG_INTERNAL_MEMMNGMT
- MNG_VALIDCB (hHandle, fMemalloc)
- MNG_VALIDCB (hHandle, fMemfree)
-#endif
-
-#ifdef MNG_SUPPORT_READ
- if (pData->bReading) /* valid at this point ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-#endif
-
- if ((pData->bWriting) || (pData->bCreating))
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- iRetcode = mng_reset (hHandle); /* clear any previous stuff */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pData->bCreating = MNG_TRUE; /* indicate we're creating a new file */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_CREATE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_SUPPORT_READ)
-mng_retcode MNG_DECL mng_readdisplay (mng_handle hHandle)
-{
- mng_datap pData; /* local vars */
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READDISPLAY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle and callbacks */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
-#ifndef MNG_INTERNAL_MEMMNGMT
- MNG_VALIDCB (hHandle, fMemalloc)
- MNG_VALIDCB (hHandle, fMemfree)
-#endif
-
- MNG_VALIDCB (hHandle, fReaddata)
- MNG_VALIDCB (hHandle, fGetcanvasline)
- MNG_VALIDCB (hHandle, fRefresh)
- MNG_VALIDCB (hHandle, fGettickcount)
- MNG_VALIDCB (hHandle, fSettimer)
- /* valid at this point ? */
- if ((pData->bReading) || (pData->bDisplaying))
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
-#ifdef MNG_SUPPORT_WRITE
- if ((pData->bWriting) || (pData->bCreating))
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-#endif
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- pData->bReading = MNG_TRUE; /* read & display! */
- pData->bDisplaying = MNG_TRUE;
- pData->bRunning = MNG_TRUE;
- pData->iFrameseq = 0;
- pData->iLayerseq = 0;
- pData->iFrametime = 0;
- pData->iRequestframe = 0;
- pData->iRequestlayer = 0;
- pData->iRequesttime = 0;
- pData->bSearching = MNG_FALSE;
- pData->iRuntime = 0;
- pData->iSynctime = pData->fGettickcount (hHandle);
- pData->iSuspendtime = 0;
- pData->iStarttime = pData->iSynctime;
- pData->iEndtime = 0;
-
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- if (pData->fOpenstream && !pData->fOpenstream (hHandle))
- /* open it and start reading */
- iRetcode = MNG_APPIOERROR;
- else
-#endif
- iRetcode = mng_read_graphic (pData);
-
- if (pData->bEOF) /* already at EOF ? */
- {
- pData->bReading = MNG_FALSE; /* then we're no longer reading */
- mng_drop_invalid_objects (pData); /* drop invalidly stored objects */
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (pData->bSuspended) /* read suspension ? */
- {
- iRetcode = MNG_NEEDMOREDATA;
- pData->iSuspendtime = pData->fGettickcount ((mng_handle)pData);
- }
- else
- if (pData->bTimerset) /* indicate timer break ? */
- iRetcode = MNG_NEEDTIMERWAIT;
- else
- if (pData->bSectionwait) /* indicate section break ? */
- iRetcode = MNG_NEEDSECTIONWAIT;
- else
- { /* no breaks = end of run */
- pData->bRunning = MNG_FALSE;
-
- if (pData->bFreezing) /* dynamic MNG reached SEEK ? */
- pData->bFreezing = MNG_FALSE; /* reset it ! */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_READDISPLAY, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif /* MNG_SUPPORT_DISPLAY && MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_display (mng_handle hHandle)
-{
- mng_datap pData; /* local vars */
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle and callbacks */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
-#ifndef MNG_INTERNAL_MEMMNGMT
- MNG_VALIDCB (hHandle, fMemalloc)
- MNG_VALIDCB (hHandle, fMemfree)
-#endif
-
- MNG_VALIDCB (hHandle, fGetcanvasline)
- MNG_VALIDCB (hHandle, fRefresh)
- MNG_VALIDCB (hHandle, fGettickcount)
- MNG_VALIDCB (hHandle, fSettimer)
-
- if (pData->bDisplaying) /* valid at this point ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
-#ifdef MNG_SUPPORT_READ
- if (pData->bReading)
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-#endif
-
-#ifdef MNG_SUPPORT_WRITE
- if ((pData->bWriting) || (pData->bCreating))
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-#endif
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- pData->bDisplaying = MNG_TRUE; /* display! */
- pData->bRunning = MNG_TRUE;
- pData->iFrameseq = 0;
- pData->iLayerseq = 0;
- pData->iFrametime = 0;
- pData->iRequestframe = 0;
- pData->iRequestlayer = 0;
- pData->iRequesttime = 0;
- pData->bSearching = MNG_FALSE;
- pData->iRuntime = 0;
- pData->iSynctime = pData->fGettickcount (hHandle);
-#ifdef MNG_SUPPORT_READ
- pData->iSuspendtime = 0;
-#endif
- pData->iStarttime = pData->iSynctime;
- pData->iEndtime = 0;
- pData->pCurraniobj = pData->pFirstaniobj;
- /* go do it */
- iRetcode = mng_process_display (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (pData->bTimerset) /* indicate timer break ? */
- iRetcode = MNG_NEEDTIMERWAIT;
- else
- { /* no breaks = end of run */
- pData->bRunning = MNG_FALSE;
-
- if (pData->bFreezing) /* dynamic MNG reached SEEK ? */
- pData->bFreezing = MNG_FALSE; /* reset it ! */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_display_resume (mng_handle hHandle)
-{
- mng_datap pData; /* local vars */
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_RESUME, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
- if (!pData->bDisplaying) /* can we expect this call ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- cleanup_errors (pData); /* cleanup previous errors */
- /* was it running ? */
- if ((pData->bRunning) || (pData->bReading))
- { /* are we expecting this call ? */
- if ((pData->bTimerset) || (pData->bSuspended) || (pData->bSectionwait))
- {
- pData->bTimerset = MNG_FALSE; /* reset the flags */
- pData->bSectionwait = MNG_FALSE;
-
-#ifdef MNG_SUPPORT_READ
- if (pData->bReading) /* set during read&display ? */
- {
- if (pData->bSuspended) /* calculate proper synchronization */
- pData->iSynctime = pData->iSynctime - pData->iSuspendtime +
- pData->fGettickcount (hHandle);
- else
- pData->iSynctime = pData->fGettickcount (hHandle);
-
- pData->bSuspended = MNG_FALSE; /* now reset this flag */
- /* and continue reading */
- iRetcode = mng_read_graphic (pData);
-
- if (pData->bEOF) /* already at EOF ? */
- {
- pData->bReading = MNG_FALSE; /* then we're no longer reading */
- /* drop invalidly stored objects */
- mng_drop_invalid_objects (pData);
- }
- }
- else
-#endif /* MNG_SUPPORT_READ */
- { /* synchronize timing */
- pData->iSynctime = pData->fGettickcount (hHandle);
- /* resume display processing */
- iRetcode = mng_process_display (pData);
- }
- }
- else
- {
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
- }
- }
- else
- { /* synchronize timing */
- pData->iSynctime = pData->fGettickcount (hHandle);
- pData->bRunning = MNG_TRUE; /* it's restarted again ! */
- /* resume display processing */
- iRetcode = mng_process_display (pData);
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (pData->bSuspended) /* read suspension ? */
- {
- iRetcode = MNG_NEEDMOREDATA;
- pData->iSuspendtime = pData->fGettickcount ((mng_handle)pData);
- }
- else
- if (pData->bTimerset) /* indicate timer break ? */
- iRetcode = MNG_NEEDTIMERWAIT;
- else
- if (pData->bSectionwait) /* indicate section break ? */
- iRetcode = MNG_NEEDSECTIONWAIT;
- else
- { /* no breaks = end of run */
- pData->bRunning = MNG_FALSE;
-
- if (pData->bFreezing) /* trying to freeze ? */
- pData->bFreezing = MNG_FALSE; /* then we're there */
-
- if (pData->bResetting) /* trying to reset as well ? */
- { /* full stop!!! */
- pData->bDisplaying = MNG_FALSE;
-
- iRetcode = mng_reset_rundata (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_RESUME, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_display_freeze (mng_handle hHandle)
-{
- mng_datap pData;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_FREEZE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
- /* can we expect this call ? */
- if ((!pData->bDisplaying) || (pData->bReading))
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- if (pData->bRunning) /* is it running ? */
- {
- mng_retcode iRetcode;
-
- pData->bFreezing = MNG_TRUE; /* indicate we need to freeze */
- /* continue "normal" processing */
- iRetcode = mng_display_resume (hHandle);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_FREEZE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_display_reset (mng_handle hHandle)
-{
- mng_datap pData;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_RESET, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
- /* can we expect this call ? */
- if ((!pData->bDisplaying) || (pData->bReading))
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- if (!pData->bCacheplayback) /* must store playback info to work!! */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- if (pData->bRunning) /* is it running ? */
- {
- pData->bFreezing = MNG_TRUE; /* indicate we need to freeze */
- pData->bResetting = MNG_TRUE; /* indicate we're about to reset too */
- /* continue normal processing ? */
- iRetcode = mng_display_resume (hHandle);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- else
- { /* full stop!!! */
- pData->bDisplaying = MNG_FALSE;
-
- iRetcode = mng_reset_rundata (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_RESET, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_DISPLAY_GO_SUPPORTED
-mng_retcode MNG_DECL mng_display_goframe (mng_handle hHandle,
- mng_uint32 iFramenr)
-{
- mng_datap pData;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_GOFRAME, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
- if (pData->eImagetype != mng_it_mng) /* is it an animation ? */
- MNG_ERROR (pData, MNG_NOTANANIMATION);
- /* can we expect this call ? */
- if ((!pData->bDisplaying) || (pData->bRunning))
- MNG_ERROR ((mng_datap)hHandle, MNG_FUNCTIONINVALID);
-
- if (!pData->bCacheplayback) /* must store playback info to work!! */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- if (iFramenr > pData->iTotalframes) /* is the parameter within bounds ? */
- MNG_ERROR (pData, MNG_FRAMENRTOOHIGH);
- /* within MHDR bounds ? */
- if ((pData->iFramecount) && (iFramenr > pData->iFramecount))
- MNG_WARNING (pData, MNG_FRAMENRTOOHIGH);
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- if (pData->iFrameseq > iFramenr) /* search from current or go back to start ? */
- {
- iRetcode = mng_reset_rundata (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
- if (iFramenr)
- {
- pData->iRequestframe = iFramenr; /* go find the requested frame then */
- iRetcode = mng_process_display (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pData->bTimerset = MNG_FALSE; /* reset just to be safe */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_GOFRAME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_DISPLAY_GO_SUPPORTED
-mng_retcode MNG_DECL mng_display_golayer (mng_handle hHandle,
- mng_uint32 iLayernr)
-{
- mng_datap pData;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_GOLAYER, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
- if (pData->eImagetype != mng_it_mng) /* is it an animation ? */
- MNG_ERROR (pData, MNG_NOTANANIMATION);
- /* can we expect this call ? */
- if ((!pData->bDisplaying) || (pData->bRunning))
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- if (!pData->bCacheplayback) /* must store playback info to work!! */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- if (iLayernr > pData->iTotallayers) /* is the parameter within bounds ? */
- MNG_ERROR (pData, MNG_LAYERNRTOOHIGH);
- /* within MHDR bounds ? */
- if ((pData->iLayercount) && (iLayernr > pData->iLayercount))
- MNG_WARNING (pData, MNG_LAYERNRTOOHIGH);
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- if (pData->iLayerseq > iLayernr) /* search from current or go back to start ? */
- {
- iRetcode = mng_reset_rundata (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
- if (iLayernr)
- {
- pData->iRequestlayer = iLayernr; /* go find the requested layer then */
- iRetcode = mng_process_display (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pData->bTimerset = MNG_FALSE; /* reset just to be safe */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_GOLAYER, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_DISPLAY_GO_SUPPORTED
-mng_retcode MNG_DECL mng_display_gotime (mng_handle hHandle,
- mng_uint32 iPlaytime)
-{
- mng_datap pData;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_GOTIME, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
- if (pData->eImagetype != mng_it_mng) /* is it an animation ? */
- MNG_ERROR (pData, MNG_NOTANANIMATION);
- /* can we expect this call ? */
- if ((!pData->bDisplaying) || (pData->bRunning))
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- if (!pData->bCacheplayback) /* must store playback info to work!! */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
- /* is the parameter within bounds ? */
- if (iPlaytime > pData->iTotalplaytime)
- MNG_ERROR (pData, MNG_PLAYTIMETOOHIGH);
- /* within MHDR bounds ? */
- if ((pData->iPlaytime) && (iPlaytime > pData->iPlaytime))
- MNG_WARNING (pData, MNG_PLAYTIMETOOHIGH);
-
- cleanup_errors (pData); /* cleanup previous errors */
-
- if (pData->iFrametime > iPlaytime) /* search from current or go back to start ? */
- {
- iRetcode = mng_reset_rundata (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
- if (iPlaytime)
- {
- pData->iRequesttime = iPlaytime; /* go find the requested playtime then */
- iRetcode = mng_process_display (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pData->bTimerset = MNG_FALSE; /* reset just to be safe */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_DISPLAY_GOTIME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_DISPLAY) && defined(MNG_SUPPORT_DYNAMICMNG)
-mng_retcode MNG_DECL mng_trapevent (mng_handle hHandle,
- mng_uint8 iEventtype,
- mng_int32 iX,
- mng_int32 iY)
-{
- mng_datap pData;
- mng_eventp pEvent;
- mng_bool bFound = MNG_FALSE;
- mng_retcode iRetcode;
- mng_imagep pImage;
- mng_uint8p pPixel;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_TRAPEVENT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
- if (pData->eImagetype != mng_it_mng) /* is it an animation ? */
- MNG_ERROR (pData, MNG_NOTANANIMATION);
-
- if (!pData->bDisplaying) /* can we expect this call ? */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- if (!pData->bCacheplayback) /* must store playback info to work!! */
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
- /* let's find a matching event object */
- pEvent = (mng_eventp)pData->pFirstevent;
-
- while ((pEvent) && (!bFound))
- { /* matching eventtype ? */
- if (pEvent->iEventtype == iEventtype)
- {
- switch (pEvent->iMasktype) /* check X/Y on basis of masktype */
- {
- case MNG_MASK_NONE : /* no mask is easy */
- {
- bFound = MNG_TRUE;
- break;
- }
-
- case MNG_MASK_BOX : /* inside the given box ? */
- { /* right- and bottom-border don't count ! */
- if ((iX >= pEvent->iLeft) && (iX < pEvent->iRight) &&
- (iY >= pEvent->iTop) && (iY < pEvent->iBottom))
- bFound = MNG_TRUE;
- break;
- }
-
- case MNG_MASK_OBJECT : /* non-zero pixel in the image object ? */
- {
- pImage = mng_find_imageobject (pData, pEvent->iObjectid);
- /* valid image ? */
- if ((pImage) && (pImage->pImgbuf->iBitdepth <= 8) &&
- ((pImage->pImgbuf->iColortype == 0) || (pImage->pImgbuf->iColortype == 3)) &&
- ((mng_int32)pImage->pImgbuf->iWidth > iX) &&
- ((mng_int32)pImage->pImgbuf->iHeight > iY))
- {
- pPixel = pImage->pImgbuf->pImgdata + ((pImage->pImgbuf->iWidth * iY) + iX);
-
- if (*pPixel) /* non-zero ? */
- bFound = MNG_TRUE;
- }
-
- break;
- }
-
- case MNG_MASK_OBJECTIX : /* pixel in the image object matches index ? */
- {
- pImage = mng_find_imageobject (pData, pEvent->iObjectid);
- /* valid image ? */
- if ((pImage) && (pImage->pImgbuf->iBitdepth <= 8) &&
- ((pImage->pImgbuf->iColortype == 0) || (pImage->pImgbuf->iColortype == 3)) &&
- ((mng_int32)pImage->pImgbuf->iWidth > iX) && (iX >= 0) &&
- ((mng_int32)pImage->pImgbuf->iHeight > iY) && (iY >= 0))
- {
- pPixel = pImage->pImgbuf->pImgdata + ((pImage->pImgbuf->iWidth * iY) + iX);
- /* matching index ? */
- if (*pPixel == pEvent->iIndex)
- bFound = MNG_TRUE;
- }
-
- break;
- }
-
- case MNG_MASK_BOXOBJECT : /* non-zero pixel in the image object ? */
- {
- mng_int32 iTempx = iX - pEvent->iLeft;
- mng_int32 iTempy = iY - pEvent->iTop;
-
- pImage = mng_find_imageobject (pData, pEvent->iObjectid);
- /* valid image ? */
- if ((pImage) && (pImage->pImgbuf->iBitdepth <= 8) &&
- ((pImage->pImgbuf->iColortype == 0) || (pImage->pImgbuf->iColortype == 3)) &&
- (iTempx < (mng_int32)pImage->pImgbuf->iWidth) &&
- (iTempx >= 0) && (iX < pEvent->iRight) &&
- (iTempy < (mng_int32)pImage->pImgbuf->iHeight) &&
- (iTempy >= 0) && (iY < pEvent->iBottom))
- {
- pPixel = pImage->pImgbuf->pImgdata + ((pImage->pImgbuf->iWidth * iTempy) + iTempx);
-
- if (*pPixel) /* non-zero ? */
- bFound = MNG_TRUE;
- }
-
- break;
- }
-
- case MNG_MASK_BOXOBJECTIX : /* pixel in the image object matches index ? */
- {
- mng_int32 iTempx = iX - pEvent->iLeft;
- mng_int32 iTempy = iY - pEvent->iTop;
-
- pImage = mng_find_imageobject (pData, pEvent->iObjectid);
- /* valid image ? */
- if ((pImage) && (pImage->pImgbuf->iBitdepth <= 8) &&
- ((pImage->pImgbuf->iColortype == 0) || (pImage->pImgbuf->iColortype == 3)) &&
- (iTempx < (mng_int32)pImage->pImgbuf->iWidth) &&
- (iTempx >= 0) && (iX < pEvent->iRight) &&
- (iTempy < (mng_int32)pImage->pImgbuf->iHeight) &&
- (iTempy >= 0) && (iY < pEvent->iBottom))
- {
- pPixel = pImage->pImgbuf->pImgdata + ((pImage->pImgbuf->iWidth * iTempy) + iTempx);
- /* matching index ? */
- if (*pPixel == pEvent->iIndex)
- bFound = MNG_TRUE;
- }
-
- break;
- }
-
- }
- }
-
- if (!bFound) /* try the next one */
- pEvent = (mng_eventp)pEvent->sHeader.pNext;
- }
- /* found one that's not the last mousemove ? */
- if ((pEvent) && ((mng_objectp)pEvent != pData->pLastmousemove))
- { /* can we start an event process now ? */
- if ((!pData->bReading) && (!pData->bRunning))
- {
- pData->iEventx = iX; /* save coordinates */
- pData->iEventy = iY;
- /* do it then ! */
- iRetcode = pEvent->sHeader.fProcess (pData, pEvent);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* remember last mousemove event */
- if (pEvent->iEventtype == MNG_EVENT_MOUSEMOVE)
- pData->pLastmousemove = (mng_objectp)pEvent;
- else
- pData->pLastmousemove = MNG_NULL;
- }
- else
- {
-
- /* TODO: store unprocessed events or not ??? */
-
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_TRAPEVENT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_getlasterror (mng_handle hHandle,
- mng_int8* iSeverity,
- mng_chunkid* iChunkname,
- mng_uint32* iChunkseq,
- mng_int32* iExtra1,
- mng_int32* iExtra2,
- mng_pchar* zErrortext)
-{
- mng_datap pData; /* local vars */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETLASTERROR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle) /* check validity handle */
- pData = ((mng_datap)hHandle); /* and make it addressable */
-
- *iSeverity = pData->iSeverity; /* return the appropriate fields */
-
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
- *iChunkname = pData->iChunkname;
- *iChunkseq = pData->iChunkseq;
-#else
- *iChunkname = MNG_UINT_HUH;
- *iChunkseq = 0;
-#endif
-
- *iExtra1 = pData->iErrorx1;
- *iExtra2 = pData->iErrorx2;
- *zErrortext = pData->zErrortext;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GETLASTERROR, MNG_LC_END);
-#endif
-
- return pData->iErrorcode; /* and the errorcode */
-}
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
-
diff --git a/src/3rdparty/libmng/libmng_jpeg.c b/src/3rdparty/libmng/libmng_jpeg.c
deleted file mode 100644
index 5042e1d550..0000000000
--- a/src/3rdparty/libmng/libmng_jpeg.c
+++ /dev/null
@@ -1,1088 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_jpeg.c copyright (c) 2000-2004 G.Juyn * */
-/* * version : 1.0.9 * */
-/* * * */
-/* * purpose : JPEG library interface (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the JPEG library interface * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.5.2 - 05/22/2000 - G.Juyn * */
-/* * - implemented all the JNG routines * */
-/* * * */
-/* * 0.5.3 - 06/17/2000 - G.Juyn * */
-/* * - added tracing of JPEG calls * */
-/* * 0.5.3 - 06/24/2000 - G.Juyn * */
-/* * - fixed inclusion of IJG read/write code * */
-/* * 0.5.3 - 06/29/2000 - G.Juyn * */
-/* * - fixed some 64-bit warnings * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added support for JDAA * */
-/* * * */
-/* * 1.0.1 - 04/19/2001 - G.Juyn * */
-/* * - added export of JPEG functions for DLL * */
-/* * 1.0.1 - 04/22/2001 - G.Juyn * */
-/* * - fixed memory-leaks (Thanks Gregg!) * */
-/* * * */
-/* * 1.0.4 - 06/22/2002 - G.Juyn * */
-/* * - B526138 - returned IJGSRC6B calling convention to * */
-/* * default for MSVC * */
-/* * * */
-/* * 1.0.5 - 24/02/2003 - G.Juyn * */
-/* * - B683152 - libjpeg suspension not always honored correctly* */
-/* * * */
-/* * 1.0.6 - 03/04/2003 - G.Juyn * */
-/* * - fixed some compiler-warnings * */
-/* * * */
-/* * 1.0.8 - 08/01/2004 - G.Juyn * */
-/* * - added support for 3+byte pixelsize for JPEG's * */
-/* * * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_memory.h"
-#include "libmng_pixels.h"
-#include "libmng_jpeg.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#if defined(MNG_INCLUDE_JNG) && defined(MNG_INCLUDE_DISPLAY_PROCS)
-
-/* ************************************************************************** */
-/* * * */
-/* * Local IJG callback routines (source-manager, error-manager and such) * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_IJG6B
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-#ifdef MNG_DEFINE_JPEG_STDCALL
-void MNG_DECL mng_init_source (j_decompress_ptr cinfo)
-#else
-void mng_init_source (j_decompress_ptr cinfo)
-#endif
-{
- return; /* nothing needed */
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-#ifdef MNG_DEFINE_JPEG_STDCALL
-boolean MNG_DECL mng_fill_input_buffer (j_decompress_ptr cinfo)
-#else
-boolean mng_fill_input_buffer (j_decompress_ptr cinfo)
-#endif
-{
- return FALSE; /* force IJG routine to return to caller */
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-#ifdef MNG_DEFINE_JPEG_STDCALL
-void MNG_DECL mng_skip_input_data (j_decompress_ptr cinfo, long num_bytes)
-#else
-void mng_skip_input_data (j_decompress_ptr cinfo, long num_bytes)
-#endif
-{
- if (num_bytes > 0) /* ignore fony calls */
- { /* address my generic structure */
- mng_datap pData = (mng_datap)cinfo->client_data;
- /* address source manager */
- mngjpeg_sourcep pSrc = pData->pJPEGdinfo->src;
- /* problem scenario ? */
- if (pSrc->bytes_in_buffer < (size_t)num_bytes)
- { /* tell the boss we need to skip some data! */
- pData->iJPEGtoskip = (mng_uint32)((size_t)num_bytes - pSrc->bytes_in_buffer);
-
- pSrc->bytes_in_buffer = 0; /* let the JPEG lib suspend */
- pSrc->next_input_byte = MNG_NULL;
- }
- else
- { /* simply advance in the buffer */
- pSrc->bytes_in_buffer -= num_bytes;
- pSrc->next_input_byte += num_bytes;
- }
- }
-
- return;
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-#ifdef MNG_DEFINE_JPEG_STDCALL
-void MNG_DECL mng_skip_input_data2 (j_decompress_ptr cinfo, long num_bytes)
-#else
-void mng_skip_input_data2 (j_decompress_ptr cinfo, long num_bytes)
-#endif
-{
- if (num_bytes > 0) /* ignore fony calls */
- { /* address my generic structure */
- mng_datap pData = (mng_datap)cinfo->client_data;
- /* address source manager */
- mngjpeg_sourcep pSrc = pData->pJPEGdinfo2->src;
- /* problem scenario ? */
- if (pSrc->bytes_in_buffer < (size_t)num_bytes)
- { /* tell the boss we need to skip some data! */
- pData->iJPEGtoskip2 = (mng_uint32)((size_t)num_bytes - pSrc->bytes_in_buffer);
-
- pSrc->bytes_in_buffer = 0; /* let the JPEG lib suspend */
- pSrc->next_input_byte = MNG_NULL;
- }
- else
- { /* simply advance in the buffer */
- pSrc->bytes_in_buffer -= num_bytes;
- pSrc->next_input_byte += num_bytes;
- }
- }
-
- return;
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-#ifdef MNG_DEFINE_JPEG_STDCALL
-void MNG_DECL mng_term_source (j_decompress_ptr cinfo)
-#else
-void mng_term_source (j_decompress_ptr cinfo)
-#endif
-{
- return; /* nothing needed */
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_USE_SETJMP
-#ifdef MNG_DEFINE_JPEG_STDCALL
-void MNG_DECL mng_error_exit (j_common_ptr cinfo)
-#else
-void mng_error_exit (j_common_ptr cinfo)
-#endif
-{ /* address my generic structure */
- mng_datap pData = (mng_datap)cinfo->client_data;
-
-#ifdef MNG_ERROR_TELLTALE /* fill the message text ??? */
- (*cinfo->err->output_message) (cinfo);
-#endif
- /* return to the point of no return... */
- longjmp (pData->sErrorbuf, cinfo->err->msg_code);
-}
-#endif /* MNG_USE_SETJMP */
-
-/* ************************************************************************** */
-
-#ifdef MNG_USE_SETJMP
-#ifdef MNG_DEFINE_JPEG_STDCALL
-void MNG_DECL mng_output_message (j_common_ptr cinfo)
-#else
-void mng_output_message (j_common_ptr cinfo)
-#endif
-{
- return; /* just do nothing ! */
-}
-#endif /* MNG_USE_SETJMP */
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_IJG6B */
-
-/* ************************************************************************** */
-/* * * */
-/* * Global JPEG routines * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mngjpeg_initialize (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_INITIALIZE, MNG_LC_START);
-#endif
- /* allocate space for JPEG structures if necessary */
-#ifdef MNG_INCLUDE_JNG_READ
- if (pData->pJPEGderr == MNG_NULL)
- MNG_ALLOC (pData, pData->pJPEGderr, sizeof (mngjpeg_error ));
- if (pData->pJPEGdsrc == MNG_NULL)
- MNG_ALLOC (pData, pData->pJPEGdsrc, sizeof (mngjpeg_source));
- if (pData->pJPEGdinfo == MNG_NULL)
- MNG_ALLOC (pData, pData->pJPEGdinfo, sizeof (mngjpeg_decomp));
- /* enable reverse addressing */
- pData->pJPEGdinfo->client_data = pData;
-
- if (pData->pJPEGderr2 == MNG_NULL)
- MNG_ALLOC (pData, pData->pJPEGderr2, sizeof (mngjpeg_error ));
- if (pData->pJPEGdsrc2 == MNG_NULL)
- MNG_ALLOC (pData, pData->pJPEGdsrc2, sizeof (mngjpeg_source));
- if (pData->pJPEGdinfo2 == MNG_NULL)
- MNG_ALLOC (pData, pData->pJPEGdinfo2, sizeof (mngjpeg_decomp));
- /* enable reverse addressing */
- pData->pJPEGdinfo2->client_data = pData;
-#endif
-
-#ifdef MNG_INCLUDE_JNG_WRITE
- if (pData->pJPEGcerr == MNG_NULL)
- MNG_ALLOC (pData, pData->pJPEGcerr, sizeof (mngjpeg_error ));
- if (pData->pJPEGcinfo == MNG_NULL)
- MNG_ALLOC (pData, pData->pJPEGcinfo, sizeof (mngjpeg_comp ));
- /* enable reverse addressing */
- pData->pJPEGcinfo->client_data = pData;
-#endif
-
- if (pData->pJPEGbuf == MNG_NULL) /* initialize temporary buffers */
- {
- pData->iJPEGbufmax = MNG_JPEG_MAXBUF;
- MNG_ALLOC (pData, pData->pJPEGbuf, pData->iJPEGbufmax);
- }
-
- if (pData->pJPEGbuf2 == MNG_NULL)
- {
- pData->iJPEGbufmax2 = MNG_JPEG_MAXBUF;
- MNG_ALLOC (pData, pData->pJPEGbuf2, pData->iJPEGbufmax2);
- }
-
- pData->pJPEGcurrent = pData->pJPEGbuf;
- pData->iJPEGbufremain = 0;
- pData->pJPEGrow = MNG_NULL;
- pData->iJPEGrowlen = 0;
- pData->iJPEGtoskip = 0;
-
- pData->pJPEGcurrent2 = pData->pJPEGbuf2;
- pData->iJPEGbufremain2 = 0;
- pData->pJPEGrow2 = MNG_NULL;
- pData->iJPEGrowlen2 = 0;
- pData->iJPEGtoskip2 = 0;
- /* not doing anything yet ! */
- pData->bJPEGcompress = MNG_FALSE;
-
- pData->bJPEGdecompress = MNG_FALSE;
- pData->bJPEGhasheader = MNG_FALSE;
- pData->bJPEGdecostarted = MNG_FALSE;
- pData->bJPEGscanstarted = MNG_FALSE;
- pData->bJPEGscanending = MNG_FALSE;
-
- pData->bJPEGdecompress2 = MNG_FALSE;
- pData->bJPEGhasheader2 = MNG_FALSE;
- pData->bJPEGdecostarted2 = MNG_FALSE;
- pData->bJPEGscanstarted2 = MNG_FALSE;
-
- pData->iJPEGrow = 0; /* zero input/output lines */
- pData->iJPEGalpharow = 0;
- pData->iJPEGrgbrow = 0;
- pData->iJPEGdisprow = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_INITIALIZE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mngjpeg_cleanup (mng_datap pData)
-{
-#if defined(MNG_INCLUDE_IJG6B) && defined(MNG_USE_SETJMP)
- mng_retcode iRetcode;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_CLEANUP, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_IJG6B
-#ifdef MNG_USE_SETJMP
- iRetcode = setjmp (pData->sErrorbuf);/* setup local JPEG error-recovery */
- if (iRetcode != 0) /* got here from longjmp ? */
- MNG_ERRORJ (pData, iRetcode); /* then IJG-lib issued an error */
-#endif
-
-#ifdef MNG_INCLUDE_JNG_READ /* still decompressing something ? */
- if (pData->bJPEGdecompress)
- jpeg_destroy_decompress (pData->pJPEGdinfo);
- if (pData->bJPEGdecompress2)
- jpeg_destroy_decompress (pData->pJPEGdinfo2);
-#endif
-
-#ifdef MNG_INCLUDE_JNG_WRITE
- if (pData->bJPEGcompress) /* still compressing something ? */
- jpeg_destroy_compress (pData->pJPEGcinfo);
-#endif
-
-#endif /* MNG_INCLUDE_IJG6B */
- /* cleanup temporary buffers */
- MNG_FREE (pData, pData->pJPEGbuf2, pData->iJPEGbufmax2);
- MNG_FREE (pData, pData->pJPEGbuf, pData->iJPEGbufmax);
- /* cleanup space for JPEG structures */
-#ifdef MNG_INCLUDE_JNG_WRITE
- MNG_FREE (pData, pData->pJPEGcinfo, sizeof (mngjpeg_comp ));
- MNG_FREE (pData, pData->pJPEGcerr, sizeof (mngjpeg_error ));
-#endif
-
-#ifdef MNG_INCLUDE_JNG_READ
- MNG_FREE (pData, pData->pJPEGdinfo, sizeof (mngjpeg_decomp));
- MNG_FREE (pData, pData->pJPEGdsrc, sizeof (mngjpeg_source));
- MNG_FREE (pData, pData->pJPEGderr, sizeof (mngjpeg_error ));
- MNG_FREE (pData, pData->pJPEGdinfo2, sizeof (mngjpeg_decomp));
- MNG_FREE (pData, pData->pJPEGdsrc2, sizeof (mngjpeg_source));
- MNG_FREE (pData, pData->pJPEGderr2, sizeof (mngjpeg_error ));
-#endif
-
- MNG_FREE (pData, pData->pJPEGrow2, pData->iJPEGrowlen2);
- MNG_FREE (pData, pData->pJPEGrow, pData->iJPEGrowlen);
- /* whatever we were doing ... */
- /* we don't anymore ... */
- pData->bJPEGcompress = MNG_FALSE;
-
- pData->bJPEGdecompress = MNG_FALSE;
- pData->bJPEGhasheader = MNG_FALSE;
- pData->bJPEGdecostarted = MNG_FALSE;
- pData->bJPEGscanstarted = MNG_FALSE;
- pData->bJPEGscanending = MNG_FALSE;
-
- pData->bJPEGdecompress2 = MNG_FALSE;
- pData->bJPEGhasheader2 = MNG_FALSE;
- pData->bJPEGdecostarted2 = MNG_FALSE;
- pData->bJPEGscanstarted2 = MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_CLEANUP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * JPEG decompression routines (JDAT) * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-mng_retcode mngjpeg_decompressinit (mng_datap pData)
-{
-#if defined(MNG_INCLUDE_IJG6B) && defined(MNG_USE_SETJMP)
- mng_retcode iRetcode;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSINIT, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_IJG6B
- /* allocate and initialize a JPEG decompression object */
- pData->pJPEGdinfo->err = jpeg_std_error (pData->pJPEGderr);
-
-#ifdef MNG_USE_SETJMP /* setup local JPEG error-routines */
- pData->pJPEGderr->error_exit = mng_error_exit;
- pData->pJPEGderr->output_message = mng_output_message;
-
- iRetcode = setjmp (pData->sErrorbuf);/* setup local JPEG error-recovery */
- if (iRetcode != 0) /* got here from longjmp ? */
- MNG_ERRORJ (pData, iRetcode); /* then IJG-lib issued an error */
-#endif /* MNG_USE_SETJMP */
-
- /* allocate and initialize a JPEG decompression object (continued) */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSINIT, MNG_LC_JPEG_CREATE_DECOMPRESS)
-#endif
- jpeg_create_decompress (pData->pJPEGdinfo);
-
- pData->bJPEGdecompress = MNG_TRUE; /* indicate it's initialized */
-
- /* specify the source of the compressed data (eg, a file) */
- /* no, not a file; we have buffered input */
- pData->pJPEGdinfo->src = pData->pJPEGdsrc;
- /* use the default handler */
- pData->pJPEGdinfo->src->resync_to_restart = jpeg_resync_to_restart;
- /* setup local source routine & parms */
- pData->pJPEGdinfo->src->init_source = mng_init_source;
- pData->pJPEGdinfo->src->fill_input_buffer = mng_fill_input_buffer;
- pData->pJPEGdinfo->src->skip_input_data = mng_skip_input_data;
- pData->pJPEGdinfo->src->term_source = mng_term_source;
- pData->pJPEGdinfo->src->next_input_byte = pData->pJPEGcurrent;
- pData->pJPEGdinfo->src->bytes_in_buffer = pData->iJPEGbufremain;
-
-#endif /* MNG_INCLUDE_IJG6B */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSINIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-mng_retcode mngjpeg_decompressdata (mng_datap pData,
- mng_uint32 iRawsize,
- mng_uint8p pRawdata)
-{
- mng_retcode iRetcode;
- mng_uint32 iRemain;
- mng_uint8p pWork;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_START);
-#endif
-
-#if defined (MNG_INCLUDE_IJG6B) && defined(MNG_USE_SETJMP)
- iRetcode = setjmp (pData->sErrorbuf);/* initialize local JPEG error-recovery */
- if (iRetcode != 0) /* got here from longjmp ? */
- MNG_ERRORJ (pData, iRetcode); /* then IJG-lib issued an error */
-#endif
-
- pWork = pRawdata;
- iRemain = iRawsize;
-
- if (pData->iJPEGtoskip) /* JPEG-lib told us to skip some more data ? */
- {
- if (iRemain > pData->iJPEGtoskip) /* enough data in this buffer ? */
- {
- iRemain -= pData->iJPEGtoskip; /* skip enough to access the next byte */
- pWork += pData->iJPEGtoskip;
-
- pData->iJPEGtoskip = 0; /* no more to skip then */
- }
- else
- {
- pData->iJPEGtoskip -= iRemain; /* skip all data in the buffer */
- iRemain = 0; /* and indicate this accordingly */
- }
- /* the skip set current-pointer to NULL ! */
- pData->pJPEGcurrent = pData->pJPEGbuf;
- }
-
- while (iRemain) /* repeat until no more input-bytes */
- { /* need to shift anything ? */
- if ((pData->pJPEGcurrent > pData->pJPEGbuf) &&
- (pData->pJPEGcurrent - pData->pJPEGbuf + pData->iJPEGbufremain + iRemain > pData->iJPEGbufmax))
- {
- if (pData->iJPEGbufremain > 0) /* then do so */
- MNG_COPY (pData->pJPEGbuf, pData->pJPEGcurrent, pData->iJPEGbufremain);
-
- pData->pJPEGcurrent = pData->pJPEGbuf;
- }
- /* does the remaining input fit into the buffer ? */
- if (pData->iJPEGbufremain + iRemain <= pData->iJPEGbufmax)
- { /* move the lot */
- MNG_COPY ((pData->pJPEGcurrent + pData->iJPEGbufremain), pWork, iRemain);
-
- pData->iJPEGbufremain += iRemain;/* adjust remaining_bytes counter */
- iRemain = 0; /* and indicate there's no input left */
- }
- else
- { /* calculate what does fit */
- mng_uint32 iFits = pData->iJPEGbufmax - pData->iJPEGbufremain;
-
- if (iFits <= 0) /* no space is just bugger 'm all */
- MNG_ERROR (pData, MNG_JPEGBUFTOOSMALL);
- /* move that */
- MNG_COPY ((pData->pJPEGcurrent + pData->iJPEGbufremain), pWork, iFits);
-
- pData->iJPEGbufremain += iFits; /* adjust remain_bytes counter */
- iRemain -= iFits; /* and the input-parms */
- pWork += iFits;
- }
-
-#ifdef MNG_INCLUDE_IJG6B
- pData->pJPEGdinfo->src->next_input_byte = pData->pJPEGcurrent;
- pData->pJPEGdinfo->src->bytes_in_buffer = pData->iJPEGbufremain;
-
- if (!pData->bJPEGhasheader) /* haven't got the header yet ? */
- {
- /* call jpeg_read_header() to obtain image info */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_HEADER)
-#endif
- if (jpeg_read_header (pData->pJPEGdinfo, TRUE) != JPEG_SUSPENDED)
- { /* indicate the header's oke */
- pData->bJPEGhasheader = MNG_TRUE;
- /* let's do some sanity checks ! */
- if ((pData->pJPEGdinfo->image_width != pData->iDatawidth ) ||
- (pData->pJPEGdinfo->image_height != pData->iDataheight) )
- MNG_ERROR (pData, MNG_JPEGPARMSERR);
-
- if ( ((pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAY ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA) ) &&
- (pData->pJPEGdinfo->jpeg_color_space != JCS_GRAYSCALE ) )
- MNG_ERROR (pData, MNG_JPEGPARMSERR);
-
- if ( ((pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLOR ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA) ) &&
- (pData->pJPEGdinfo->jpeg_color_space != JCS_YCbCr ) )
- MNG_ERROR (pData, MNG_JPEGPARMSERR);
- /* indicate whether or not it's progressive */
- pData->bJPEGprogressive = (mng_bool)jpeg_has_multiple_scans (pData->pJPEGdinfo);
- /* progressive+alpha can't display "on-the-fly"!! */
- if ((pData->bJPEGprogressive) &&
- ((pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA) ))
- pData->fDisplayrow = MNG_NULL;
- /* allocate a row of JPEG-samples */
- if (pData->pJPEGdinfo->jpeg_color_space == JCS_YCbCr)
- pData->iJPEGrowlen = pData->pJPEGdinfo->image_width * RGB_PIXELSIZE;
- else
- pData->iJPEGrowlen = pData->pJPEGdinfo->image_width;
-
- MNG_ALLOC (pData, pData->pJPEGrow, pData->iJPEGrowlen);
-
- pData->iJPEGrgbrow = 0; /* quite empty up to now */
- }
-
- pData->pJPEGcurrent = (mng_uint8p)pData->pJPEGdinfo->src->next_input_byte;
- pData->iJPEGbufremain = (mng_uint32)pData->pJPEGdinfo->src->bytes_in_buffer;
- }
- /* decompress not started ? */
- if ((pData->bJPEGhasheader) && (!pData->bJPEGdecostarted))
- {
- /* set parameters for decompression */
-
- if (pData->bJPEGprogressive) /* progressive display ? */
- pData->pJPEGdinfo->buffered_image = TRUE;
-
- /* jpeg_start_decompress(...); */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_DECOMPRESS)
-#endif
- if (jpeg_start_decompress (pData->pJPEGdinfo) == TRUE)
- /* indicate it started */
- pData->bJPEGdecostarted = MNG_TRUE;
-
- pData->pJPEGcurrent = (mng_uint8p)pData->pJPEGdinfo->src->next_input_byte;
- pData->iJPEGbufremain = (mng_uint32)pData->pJPEGdinfo->src->bytes_in_buffer;
- }
- /* process some scanlines ? */
- if ((pData->bJPEGhasheader) && (pData->bJPEGdecostarted) &&
- ((!jpeg_input_complete (pData->pJPEGdinfo)) ||
- (pData->pJPEGdinfo->output_scanline < pData->pJPEGdinfo->output_height) ||
- ((pData->bJPEGprogressive) && (pData->bJPEGscanending))))
- {
- mng_int32 iLines = 0;
-
- /* for (each output pass) */
- do
- { /* address the row output buffer */
- JSAMPROW pRow = (JSAMPROW)pData->pJPEGrow;
-
- /* init new pass ? */
- if ((pData->bJPEGprogressive) && (!pData->bJPEGscanstarted))
- {
- pData->bJPEGscanstarted = MNG_TRUE;
-
- /* adjust output decompression parameters if required */
- /* nop */
-
- /* start a new output pass */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_OUTPUT)
-#endif
- jpeg_start_output (pData->pJPEGdinfo, pData->pJPEGdinfo->input_scan_number);
-
- pData->iJPEGrow = 0; /* start at row 0 in the image again */
- }
-
- /* while (scan lines remain to be read) */
- if ((!pData->bJPEGprogressive) || (!pData->bJPEGscanending))
- {
- do
- {
- /* jpeg_read_scanlines(...); */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_SCANLINES)
-#endif
- iLines = jpeg_read_scanlines (pData->pJPEGdinfo, (JSAMPARRAY)&pRow, 1);
-
- pData->pJPEGcurrent = (mng_uint8p)pData->pJPEGdinfo->src->next_input_byte;
- pData->iJPEGbufremain = (mng_uint32)pData->pJPEGdinfo->src->bytes_in_buffer;
-
- if (iLines > 0) /* got something ? */
- {
- if (pData->fStorerow2) /* store in object ? */
- {
- iRetcode = ((mng_storerow)pData->fStorerow2) (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
- }
- }
- while ((pData->pJPEGdinfo->output_scanline < pData->pJPEGdinfo->output_height) &&
- (iLines > 0)); /* until end-of-image or not enough input-data */
- }
-
- /* terminate output pass */
- if ((pData->bJPEGprogressive) &&
- (pData->pJPEGdinfo->output_scanline >= pData->pJPEGdinfo->output_height))
- {
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_OUTPUT)
-#endif
- if (jpeg_finish_output (pData->pJPEGdinfo) != JPEG_SUSPENDED)
- { /* this scan has ended */
- pData->bJPEGscanstarted = MNG_FALSE;
- pData->bJPEGscanending = MNG_FALSE;
- }
- else
- {
- pData->bJPEGscanending = MNG_TRUE;
- }
- }
- }
- while ((!jpeg_input_complete (pData->pJPEGdinfo)) &&
- (iLines > 0) && (!pData->bJPEGscanending));
- }
- /* end of image ? */
- if ((pData->bJPEGhasheader) && (pData->bJPEGdecostarted) &&
- (!pData->bJPEGscanending) && (jpeg_input_complete (pData->pJPEGdinfo)) &&
- (pData->pJPEGdinfo->input_scan_number == pData->pJPEGdinfo->output_scan_number))
- {
- /* jpeg_finish_decompress(...); */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_DECOMPRESS)
-#endif
- if (jpeg_finish_decompress (pData->pJPEGdinfo) == TRUE)
- { /* indicate it's done */
- pData->bJPEGhasheader = MNG_FALSE;
- pData->bJPEGdecostarted = MNG_FALSE;
- pData->pJPEGcurrent = (mng_uint8p)pData->pJPEGdinfo->src->next_input_byte;
- pData->iJPEGbufremain = (mng_uint32)pData->pJPEGdinfo->src->bytes_in_buffer;
- /* remaining fluff is an error ! */
- if ((pData->iJPEGbufremain > 0) || (iRemain > 0))
- MNG_ERROR (pData, MNG_TOOMUCHJDAT);
- }
- }
-#endif /* MNG_INCLUDE_IJG6B */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-mng_retcode mngjpeg_decompressfree (mng_datap pData)
-{
-#if defined(MNG_INCLUDE_IJG6B) && defined(MNG_USE_SETJMP)
- mng_retcode iRetcode;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSFREE, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_IJG6B
-#ifdef MNG_USE_SETJMP
- iRetcode = setjmp (pData->sErrorbuf);/* setup local JPEG error-recovery */
- if (iRetcode != 0) /* got here from longjmp ? */
- MNG_ERRORJ (pData, iRetcode); /* then IJG-lib issued an error */
-#endif
- /* free the row of JPEG-samples*/
- MNG_FREE (pData, pData->pJPEGrow, pData->iJPEGrowlen);
-
- /* release the JPEG decompression object */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSFREE, MNG_LC_JPEG_DESTROY_DECOMPRESS)
-#endif
- jpeg_destroy_decompress (pData->pJPEGdinfo);
-
- pData->bJPEGdecompress = MNG_FALSE; /* indicate it's done */
-
-#endif /* MNG_INCLUDE_IJG6B */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSFREE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-/* * * */
-/* * JPEG decompression routines (JDAA) * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-mng_retcode mngjpeg_decompressinit2 (mng_datap pData)
-{
-#if defined(MNG_INCLUDE_IJG6B) && defined(MNG_USE_SETJMP)
- mng_retcode iRetcode;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSINIT, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_IJG6B
- /* allocate and initialize a JPEG decompression object */
- pData->pJPEGdinfo2->err = jpeg_std_error (pData->pJPEGderr2);
-
-#ifdef MNG_USE_SETJMP /* setup local JPEG error-routines */
- pData->pJPEGderr2->error_exit = mng_error_exit;
- pData->pJPEGderr2->output_message = mng_output_message;
-
- iRetcode = setjmp (pData->sErrorbuf);/* setup local JPEG error-recovery */
- if (iRetcode != 0) /* got here from longjmp ? */
- MNG_ERRORJ (pData, iRetcode); /* then IJG-lib issued an error */
-#endif /* MNG_USE_SETJMP */
-
- /* allocate and initialize a JPEG decompression object (continued) */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSINIT, MNG_LC_JPEG_CREATE_DECOMPRESS)
-#endif
- jpeg_create_decompress (pData->pJPEGdinfo2);
-
- pData->bJPEGdecompress2 = MNG_TRUE; /* indicate it's initialized */
-
- /* specify the source of the compressed data (eg, a file) */
- /* no, not a file; we have buffered input */
- pData->pJPEGdinfo2->src = pData->pJPEGdsrc2;
- /* use the default handler */
- pData->pJPEGdinfo2->src->resync_to_restart = jpeg_resync_to_restart;
- /* setup local source routine & parms */
- pData->pJPEGdinfo2->src->init_source = mng_init_source;
- pData->pJPEGdinfo2->src->fill_input_buffer = mng_fill_input_buffer;
- pData->pJPEGdinfo2->src->skip_input_data = mng_skip_input_data2;
- pData->pJPEGdinfo2->src->term_source = mng_term_source;
- pData->pJPEGdinfo2->src->next_input_byte = pData->pJPEGcurrent2;
- pData->pJPEGdinfo2->src->bytes_in_buffer = pData->iJPEGbufremain2;
-
-#endif /* MNG_INCLUDE_IJG6B */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSINIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-mng_retcode mngjpeg_decompressdata2 (mng_datap pData,
- mng_uint32 iRawsize,
- mng_uint8p pRawdata)
-{
- mng_retcode iRetcode;
- mng_uint32 iRemain;
- mng_uint8p pWork;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_START);
-#endif
-
-#if defined (MNG_INCLUDE_IJG6B) && defined(MNG_USE_SETJMP)
- iRetcode = setjmp (pData->sErrorbuf);/* initialize local JPEG error-recovery */
- if (iRetcode != 0) /* got here from longjmp ? */
- MNG_ERRORJ (pData, iRetcode); /* then IJG-lib issued an error */
-#endif
-
- pWork = pRawdata;
- iRemain = iRawsize;
-
- if (pData->iJPEGtoskip2) /* JPEG-lib told us to skip some more data ? */
- {
- if (iRemain > pData->iJPEGtoskip2) /* enough data in this buffer ? */
- {
- iRemain -= pData->iJPEGtoskip2; /* skip enough to access the next byte */
- pWork += pData->iJPEGtoskip2;
-
- pData->iJPEGtoskip2 = 0; /* no more to skip then */
- }
- else
- {
- pData->iJPEGtoskip2 -= iRemain; /* skip all data in the buffer */
- iRemain = 0; /* and indicate this accordingly */
- }
- /* the skip set current-pointer to NULL ! */
- pData->pJPEGcurrent2 = pData->pJPEGbuf2;
- }
-
- while (iRemain) /* repeat until no more input-bytes */
- { /* need to shift anything ? */
- if ((pData->pJPEGcurrent2 > pData->pJPEGbuf2) &&
- (pData->pJPEGcurrent2 - pData->pJPEGbuf2 + pData->iJPEGbufremain2 + iRemain > pData->iJPEGbufmax2))
- {
- if (pData->iJPEGbufremain2 > 0) /* then do so */
- MNG_COPY (pData->pJPEGbuf2, pData->pJPEGcurrent2, pData->iJPEGbufremain2);
-
- pData->pJPEGcurrent2 = pData->pJPEGbuf2;
- }
- /* does the remaining input fit into the buffer ? */
- if (pData->iJPEGbufremain2 + iRemain <= pData->iJPEGbufmax2)
- { /* move the lot */
- MNG_COPY ((pData->pJPEGcurrent2 + pData->iJPEGbufremain2), pWork, iRemain);
- /* adjust remaining_bytes counter */
- pData->iJPEGbufremain2 += iRemain;
- iRemain = 0; /* and indicate there's no input left */
- }
- else
- { /* calculate what does fit */
- mng_uint32 iFits = pData->iJPEGbufmax2 - pData->iJPEGbufremain2;
-
- if (iFits <= 0) /* no space is just bugger 'm all */
- MNG_ERROR (pData, MNG_JPEGBUFTOOSMALL);
- /* move that */
- MNG_COPY ((pData->pJPEGcurrent2 + pData->iJPEGbufremain2), pWork, iFits);
-
- pData->iJPEGbufremain2 += iFits; /* adjust remain_bytes counter */
- iRemain -= iFits; /* and the input-parms */
- pWork += iFits;
- }
-
-#ifdef MNG_INCLUDE_IJG6B
- pData->pJPEGdinfo2->src->next_input_byte = pData->pJPEGcurrent2;
- pData->pJPEGdinfo2->src->bytes_in_buffer = pData->iJPEGbufremain2;
-
- if (!pData->bJPEGhasheader2) /* haven't got the header yet ? */
- {
- /* call jpeg_read_header() to obtain image info */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_HEADER)
-#endif
- if (jpeg_read_header (pData->pJPEGdinfo2, TRUE) != JPEG_SUSPENDED)
- { /* indicate the header's oke */
- pData->bJPEGhasheader2 = MNG_TRUE;
- /* let's do some sanity checks ! */
- if ((pData->pJPEGdinfo2->image_width != pData->iDatawidth ) ||
- (pData->pJPEGdinfo2->image_height != pData->iDataheight) )
- MNG_ERROR (pData, MNG_JPEGPARMSERR);
-
- if (pData->pJPEGdinfo2->jpeg_color_space != JCS_GRAYSCALE)
- MNG_ERROR (pData, MNG_JPEGPARMSERR);
- /* indicate whether or not it's progressive */
- pData->bJPEGprogressive2 = (mng_bool)jpeg_has_multiple_scans (pData->pJPEGdinfo2);
-
- if (pData->bJPEGprogressive2) /* progressive alphachannel not allowed !!! */
- MNG_ERROR (pData, MNG_JPEGPARMSERR);
- /* allocate a row of JPEG-samples */
- if (pData->pJPEGdinfo2->jpeg_color_space == JCS_YCbCr)
- pData->iJPEGrowlen2 = pData->pJPEGdinfo2->image_width * RGB_PIXELSIZE;
- else
- pData->iJPEGrowlen2 = pData->pJPEGdinfo2->image_width;
-
- MNG_ALLOC (pData, pData->pJPEGrow2, pData->iJPEGrowlen2);
-
- pData->iJPEGalpharow = 0; /* quite empty up to now */
- }
-
- pData->pJPEGcurrent2 = (mng_uint8p)pData->pJPEGdinfo2->src->next_input_byte;
- pData->iJPEGbufremain2 = (mng_uint32)pData->pJPEGdinfo2->src->bytes_in_buffer;
- }
- /* decompress not started ? */
- if ((pData->bJPEGhasheader2) && (!pData->bJPEGdecostarted2))
- {
- /* set parameters for decompression */
-
- if (pData->bJPEGprogressive2) /* progressive display ? */
- pData->pJPEGdinfo2->buffered_image = TRUE;
-
- /* jpeg_start_decompress(...); */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_DECOMPRESS)
-#endif
- if (jpeg_start_decompress (pData->pJPEGdinfo2) == TRUE)
- /* indicate it started */
- pData->bJPEGdecostarted2 = MNG_TRUE;
-
- pData->pJPEGcurrent2 = (mng_uint8p)pData->pJPEGdinfo2->src->next_input_byte;
- pData->iJPEGbufremain2 = (mng_uint32)pData->pJPEGdinfo2->src->bytes_in_buffer;
- }
- /* process some scanlines ? */
- if ((pData->bJPEGhasheader2) && (pData->bJPEGdecostarted2) &&
- ((!jpeg_input_complete (pData->pJPEGdinfo2)) ||
- (pData->pJPEGdinfo2->output_scanline < pData->pJPEGdinfo2->output_height)))
- {
- mng_int32 iLines;
-
- /* for (each output pass) */
- do
- { /* address the row output buffer */
- JSAMPROW pRow = (JSAMPROW)pData->pJPEGrow2;
-
- /* init new pass ? */
- if ((pData->bJPEGprogressive2) &&
- ((!pData->bJPEGscanstarted2) ||
- (pData->pJPEGdinfo2->output_scanline >= pData->pJPEGdinfo2->output_height)))
- {
- pData->bJPEGscanstarted2 = MNG_TRUE;
-
- /* adjust output decompression parameters if required */
- /* nop */
-
- /* start a new output pass */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_OUTPUT)
-#endif
- jpeg_start_output (pData->pJPEGdinfo2, pData->pJPEGdinfo2->input_scan_number);
-
- pData->iJPEGrow = 0; /* start at row 0 in the image again */
- }
-
- /* while (scan lines remain to be read) */
- do
- {
- /* jpeg_read_scanlines(...); */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_SCANLINES)
-#endif
- iLines = jpeg_read_scanlines (pData->pJPEGdinfo2, (JSAMPARRAY)&pRow, 1);
-
- pData->pJPEGcurrent2 = (mng_uint8p)pData->pJPEGdinfo2->src->next_input_byte;
- pData->iJPEGbufremain2 = (mng_uint32)pData->pJPEGdinfo2->src->bytes_in_buffer;
-
- if (iLines > 0) /* got something ? */
- {
- if (pData->fStorerow3) /* store in object ? */
- {
- iRetcode = ((mng_storerow)pData->fStorerow3) (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
- }
- }
- while ((pData->pJPEGdinfo2->output_scanline < pData->pJPEGdinfo2->output_height) &&
- (iLines > 0)); /* until end-of-image or not enough input-data */
-
- /* terminate output pass */
- if ((pData->bJPEGprogressive2) &&
- (pData->pJPEGdinfo2->output_scanline >= pData->pJPEGdinfo2->output_height))
- {
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_OUTPUT)
-#endif
- if (jpeg_finish_output (pData->pJPEGdinfo2) == JPEG_SUSPENDED)
- jpeg_finish_output (pData->pJPEGdinfo2);
- /* this scan has ended */
- pData->bJPEGscanstarted2 = MNG_FALSE;
- }
- }
- while ((!jpeg_input_complete (pData->pJPEGdinfo2)) && (iLines > 0));
- }
- /* end of image ? */
- if ((pData->bJPEGhasheader2) && (pData->bJPEGdecostarted2) &&
- (jpeg_input_complete (pData->pJPEGdinfo2)) &&
- (pData->pJPEGdinfo2->input_scan_number == pData->pJPEGdinfo2->output_scan_number))
- {
- /* jpeg_finish_decompress(...); */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_DECOMPRESS)
-#endif
- if (jpeg_finish_decompress (pData->pJPEGdinfo2) == TRUE)
- { /* indicate it's done */
- pData->bJPEGhasheader2 = MNG_FALSE;
- pData->bJPEGdecostarted2 = MNG_FALSE;
- pData->pJPEGcurrent2 = (mng_uint8p)pData->pJPEGdinfo2->src->next_input_byte;
- pData->iJPEGbufremain2 = (mng_uint32)pData->pJPEGdinfo2->src->bytes_in_buffer;
- /* remaining fluff is an error ! */
- if ((pData->iJPEGbufremain2 > 0) || (iRemain > 0))
- MNG_ERROR (pData, MNG_TOOMUCHJDAT);
- }
- }
-#endif /* MNG_INCLUDE_IJG6B */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG_READ
-mng_retcode mngjpeg_decompressfree2 (mng_datap pData)
-{
-#if defined(MNG_INCLUDE_IJG6B) && defined(MNG_USE_SETJMP)
- mng_retcode iRetcode;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSFREE, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_IJG6B
-#ifdef MNG_USE_SETJMP
- iRetcode = setjmp (pData->sErrorbuf);/* setup local JPEG error-recovery */
- if (iRetcode != 0) /* got here from longjmp ? */
- MNG_ERRORJ (pData, iRetcode); /* then IJG-lib issued an error */
-#endif
- /* free the row of JPEG-samples*/
- MNG_FREE (pData, pData->pJPEGrow2, pData->iJPEGrowlen2);
-
- /* release the JPEG decompression object */
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSFREE, MNG_LC_JPEG_DESTROY_DECOMPRESS)
-#endif
- jpeg_destroy_decompress (pData->pJPEGdinfo2);
-
- pData->bJPEGdecompress2 = MNG_FALSE; /* indicate it's done */
-
-#endif /* MNG_INCLUDE_IJG6B */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSFREE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_INCLUDE_JNG_READ */
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_JNG && MNG_INCLUDE_DISPLAY_PROCS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_jpeg.h b/src/3rdparty/libmng/libmng_jpeg.h
deleted file mode 100644
index a072af9c96..0000000000
--- a/src/3rdparty/libmng/libmng_jpeg.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_jpeg.h copyright (c) 2000-2002 G.Juyn * */
-/* * version : 1.0.0 * */
-/* * * */
-/* * purpose : JPEG library interface (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the JPEG library interface * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added support for JDAA * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_jpeg_h_
-#define _libmng_jpeg_h_
-
-/* ************************************************************************** */
-
-mng_retcode mngjpeg_initialize (mng_datap pData);
-mng_retcode mngjpeg_cleanup (mng_datap pData);
-
-mng_retcode mngjpeg_decompressinit (mng_datap pData);
-mng_retcode mngjpeg_decompressdata (mng_datap pData,
- mng_uint32 iRawsize,
- mng_uint8p pRawdata);
-mng_retcode mngjpeg_decompressfree (mng_datap pData);
-
-mng_retcode mngjpeg_decompressinit2 (mng_datap pData);
-mng_retcode mngjpeg_decompressdata2 (mng_datap pData,
- mng_uint32 iRawsize,
- mng_uint8p pRawdata);
-mng_retcode mngjpeg_decompressfree2 (mng_datap pData);
-
-/* ************************************************************************** */
-
-#endif /* _libmng_jpeg_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_memory.h b/src/3rdparty/libmng/libmng_memory.h
deleted file mode 100644
index b92d0c13d9..0000000000
--- a/src/3rdparty/libmng/libmng_memory.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_memory.h copyright (c) 2000-2003 G.Juyn * */
-/* * version : 1.0.0 * */
-/* * * */
-/* * purpose : Memory management (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of memory management functions * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.5.3 - 06/12/2000 - G.Juyn * */
-/* * - swapped MNG_COPY parameter-names * */
-/* * 0.5.3 - 06/27/2000 - G.Juyn * */
-/* * - changed size parameter to mng_size_t * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_memory_h_
-#define _libmng_memory_h_
-
-/* ************************************************************************** */
-/* * * */
-/* * Generic memory manager macros * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INTERNAL_MEMMNGMT
-#define MNG_ALLOC(H,P,L) { P = calloc (1, (mng_size_t)(L)); \
- if (P == 0) { MNG_ERROR (H, MNG_OUTOFMEMORY) } }
-#define MNG_ALLOCX(H,P,L) { P = calloc (1, (mng_size_t)(L)); }
-#define MNG_FREE(H,P,L) { if (P) { free (P); P = 0; } }
-#define MNG_FREEX(H,P,L) { if (P) free (P); }
-#else
-#define MNG_ALLOC(H,P,L) { P = H->fMemalloc ((mng_size_t)(L)); \
- if (P == 0) { MNG_ERROR (H, MNG_OUTOFMEMORY) } }
-#define MNG_ALLOCX(H,P,L) { P = H->fMemalloc ((mng_size_t)(L)); }
-#define MNG_FREE(H,P,L) { if (P) { H->fMemfree (P, (mng_size_t)(L)); P = 0; } }
-#define MNG_FREEX(H,P,L) { if (P) { H->fMemfree (P, (mng_size_t)(L)); } }
-#endif /* mng_internal_memmngmt */
-
-#define MNG_COPY(D,S,L) { memcpy (D, S, (mng_size_t)(L)); }
-
-/* ************************************************************************** */
-
-#endif /* _libmng_memory_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_object_prc.c b/src/3rdparty/libmng/libmng_object_prc.c
deleted file mode 100644
index e1724b411f..0000000000
--- a/src/3rdparty/libmng/libmng_object_prc.c
+++ /dev/null
@@ -1,6998 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_object_prc.c copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Object processing routines (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the internal object processing routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * * */
-/* * 0.5.2 - 05/20/2000 - G.Juyn * */
-/* * - fixed to support JNG objects * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - added support for global color-chunks in animation * */
-/* * - added support for global PLTE,tRNS,bKGD in animation * */
-/* * - added SAVE & SEEK animation objects * */
-/* * 0.5.2 - 05/29/2000 - G.Juyn * */
-/* * - added initialization of framenr/layernr/playtime * */
-/* * - changed ani_object create routines not to return the * */
-/* * created object (wasn't necessary) * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - added object promotion routine (PROM handling) * */
-/* * - added ani-object routines for delta-image processing * */
-/* * - added compression/filter/interlace fields to * */
-/* * object-buffer for delta-image processing * */
-/* * * */
-/* * 0.5.3 - 06/17/2000 - G.Juyn * */
-/* * - changed support for delta-image processing * */
-/* * 0.5.3 - 06/20/2000 - G.Juyn * */
-/* * - fixed some small things (as precaution) * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - added processing of PLTE/tRNS & color-info for * */
-/* * delta-images in the ani_objects chain * */
-/* * 0.5.3 - 06/22/2000 - G.Juyn * */
-/* * - added support for PPLT chunk * */
-/* * * */
-/* * 0.9.1 - 07/07/2000 - G.Juyn * */
-/* * - added support for freeze/restart/resume & go_xxxx * */
-/* * 0.9.1 - 07/16/2000 - G.Juyn * */
-/* * - fixed support for mng_display() after mng_read() * */
-/* * * */
-/* * 0.9.2 - 07/29/2000 - G.Juyn * */
-/* * - fixed small bugs in display processing * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/07/2000 - G.Juyn * */
-/* * - B111300 - fixup for improved portability * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 09/10/2000 - G.Juyn * */
-/* * - fixed DEFI behavior * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - added valid-flag to stored objects for read() / display()* */
-/* * - added routine to discard "invalid" objects * */
-/* * 0.9.3 - 10/18/2000 - G.Juyn * */
-/* * - fixed delta-processing behavior * */
-/* * 0.9.3 - 10/19/2000 - G.Juyn * */
-/* * - added storage for pixel-/alpha-sampledepth for delta's * */
-/* * * */
-/* * 0.9.4 - 1/18/2001 - G.Juyn * */
-/* * - removed "old" MAGN methods 3 & 4 * */
-/* * - added "new" MAGN methods 3, 4 & 5 * */
-/* * * */
-/* * 0.9.5 - 1/22/2001 - G.Juyn * */
-/* * - B129681 - fixed compiler warnings SGI/Irix * */
-/* * * */
-/* * 1.0.2 - 06/23/2001 - G.Juyn * */
-/* * - added optimization option for MNG-video playback * */
-/* * * */
-/* * 1.0.5 - 08/15/2002 - G.Juyn * */
-/* * - completed PROM support * */
-/* * 1.0.5 - 08/16/2002 - G.Juyn * */
-/* * - completed MAGN support (16-bit functions) * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/13/2002 - G.Juyn * */
-/* * - fixed read/write of MAGN chunk * */
-/* * 1.0.5 - 09/15/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - added support for PAST * */
-/* * 1.0.5 - 09/23/2002 - G.Juyn * */
-/* * - fixed reset_object_detail to clear old buffer * */
-/* * - added in-memory color-correction of abstract images * */
-/* * 1.0.5 - 10/05/2002 - G.Juyn * */
-/* * - fixed problem with cloned objects marked as invalid * */
-/* * - fixed problem cloning frozen object_buffers * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - fixed DISC support * */
-/* * 1.0.5 - 11/04/2002 - G.Juyn * */
-/* * - fixed goframe/golayer/gotime processing * */
-/* * 1.0.5 - 11/07/2002 - G.Juyn * */
-/* * - fixed magnification bug with object 0 * */
-/* * 1.0.5 - 01/19/2003 - G.Juyn * */
-/* * - B664911 - fixed buffer overflow during init * */
-/* * * */
-/* * 1.0.6 - 04/19/2003 - G.Juyn * */
-/* * - fixed problem with infinite loops during readdisplay() * */
-/* * 1.0.6 - 05/25/2003 - G.R-P * */
-/* * - added MNG_SKIPCHUNK_cHNK footprint optimizations * */
-/* * 1.0.6 - 06/09/2003 - G. R-P * */
-/* * - added conditionals around 8-bit magn routines * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added conditionals around some JNG-supporting code * */
-/* * - removed conditionals around 8-bit magn routines * */
-/* * - added conditionals around delta-png and 16-bit code * */
-/* * 1.0.6 - 07/14/2003 - G.R-P * */
-/* * - added MNG_NO_LOOP_SIGNALS_SUPPORTED conditional * */
-/* * 1.0.6 - 07/29/2003 - G.Juyn * */
-/* * - fixed invalid test in promote_imageobject * */
-/* * 1.0.6 - 07/29/2003 - G.R-P. * */
-/* * - added conditionals around PAST chunk support * */
-/* * 1.0.6 - 08/17/2003 - G.R-P. * */
-/* * - added conditionals around MAGN chunk support * */
-/* * * */
-/* * 1.0.7 - 03/21/2004 - G.Juyn * */
-/* * - fixed some 64-bit platform compiler warnings * */
-/* * * */
-/* * 1.0.9 - 10/10/2004 - G.R-P. * */
-/* * - added MNG_NO_1_2_4BIT_SUPPORT support * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_OBJCLEANUP * */
-/* * 1.0.9 - 12/11/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_DISPLAYCALLS * */
-/* * 1.0.9 - 12/31/2004 - G.R-P. * */
-/* * - fixed warnings about possible uninitialized pointers * */
-/* * 1.0.9 - 01/02/2005 - G.Juyn * */
-/* * - fixing some compiler-warnings * */
-/* * * */
-/* * 1.0.10 - 02/07/2005 - G.Juyn * */
-/* * - fixed some compiler-warnings * */
-/* * 1.0.10 - 07/30/2005 - G.Juyn * */
-/* * - fixed problem with CLON object during readdisplay() * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_memory.h"
-#include "libmng_chunks.h"
-#include "libmng_objects.h"
-#include "libmng_display.h"
-#include "libmng_pixels.h"
-#include "libmng_object_prc.h"
-#include "libmng_cms.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_DISPLAY_PROCS
-
-/* ************************************************************************** */
-/* * * */
-/* * Generic object routines * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_drop_invalid_objects (mng_datap pData)
-{
- mng_objectp pObject;
- mng_objectp pNext;
- mng_cleanupobject fCleanup;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DROP_INVALID_OBJECTS, MNG_LC_START);
-#endif
-
- pObject = pData->pFirstimgobj; /* get first stored image-object (if any) */
-
- while (pObject) /* more objects to check ? */
- {
- pNext = ((mng_object_headerp)pObject)->pNext;
- /* invalid ? */
- if (!((mng_imagep)pObject)->bValid)
- { /* call appropriate cleanup */
- fCleanup = ((mng_object_headerp)pObject)->fCleanup;
- fCleanup (pData, pObject);
- }
-
- pObject = pNext; /* neeeext */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DROP_INVALID_OBJECTS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
-MNG_LOCAL mng_retcode create_obj_general (mng_datap pData,
- mng_size_t iObjsize,
- mng_cleanupobject fCleanup,
- mng_processobject fProcess,
- mng_ptr *ppObject)
-{
- mng_object_headerp pWork;
-
- MNG_ALLOC (pData, pWork, iObjsize);
-
- pWork->fCleanup = fCleanup;
- pWork->fProcess = fProcess;
- pWork->iObjsize = iObjsize;
- *ppObject = (mng_ptr)pWork;
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode mng_free_obj_general (mng_datap pData,
- mng_objectp pObject)
-{
- MNG_FREEX (pData, pObject, ((mng_object_headerp)pObject)->iObjsize);
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Image-data-object routines * */
-/* * * */
-/* * these handle the "object buffer" as defined by the MNG specification * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_create_imagedataobject (mng_datap pData,
- mng_bool bConcrete,
- mng_bool bViewable,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace,
- mng_imagedatap *ppObject)
-{
- mng_imagedatap pImagedata;
- mng_uint32 iSamplesize = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_IMGDATAOBJECT, MNG_LC_START);
-#endif
- /* get a buffer */
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- {
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_imagedata),
- (mng_cleanupobject)mng_free_imagedataobject,
- MNG_NULL, &pTemp);
- if (iRetcode)
- return iRetcode;
- pImagedata = (mng_imagedatap)pTemp;
- }
-#else
- MNG_ALLOC (pData, pImagedata, sizeof (mng_imagedata));
- /* fill the appropriate fields */
- pImagedata->sHeader.fCleanup = (mng_cleanupobject)mng_free_imagedataobject;
- pImagedata->sHeader.fProcess = MNG_NULL;
-#endif
- pImagedata->iRefcount = 1;
- pImagedata->bFrozen = MNG_FALSE;
- pImagedata->bConcrete = bConcrete;
- pImagedata->bViewable = bViewable;
- pImagedata->iWidth = iWidth;
- pImagedata->iHeight = iHeight;
- pImagedata->iBitdepth = iBitdepth;
- pImagedata->iColortype = iColortype;
- pImagedata->iCompression = iCompression;
- pImagedata->iFilter = iFilter;
- pImagedata->iInterlace = iInterlace;
- pImagedata->bCorrected = MNG_FALSE;
- pImagedata->iAlphabitdepth = 0;
- pImagedata->iJHDRcompression = 0;
- pImagedata->iJHDRinterlace = 0;
- pImagedata->iPixelsampledepth = iBitdepth;
- pImagedata->iAlphasampledepth = iBitdepth;
- /* determine samplesize from color_type/bit_depth */
- switch (iColortype) /* for < 8-bit samples we just reserve 8 bits */
- {
- case 0 : ; /* gray */
- case 8 : { /* JPEG gray */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth > 8)
- iSamplesize = 2;
- else
-#endif
- iSamplesize = 1;
-
- break;
- }
- case 2 : ; /* rgb */
- case 10 : { /* JPEG rgb */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth > 8)
- iSamplesize = 6;
- else
-#endif
- iSamplesize = 3;
-
- break;
- }
- case 3 : { /* indexed */
- iSamplesize = 1;
- break;
- }
- case 4 : ; /* gray+alpha */
- case 12 : { /* JPEG gray+alpha */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth > 8)
- iSamplesize = 4;
- else
-#endif
- iSamplesize = 2;
-
- break;
- }
- case 6 : ; /* rgb+alpha */
- case 14 : { /* JPEG rgb+alpha */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth > 8)
- iSamplesize = 8;
- else
-#endif
- iSamplesize = 4;
-
- break;
- }
- }
- /* make sure we remember all this */
- pImagedata->iSamplesize = iSamplesize;
- pImagedata->iRowsize = iSamplesize * iWidth;
- pImagedata->iImgdatasize = pImagedata->iRowsize * iHeight;
-
- if (pImagedata->iImgdatasize) /* need a buffer ? */
- { /* so allocate it */
- MNG_ALLOCX (pData, pImagedata->pImgdata, pImagedata->iImgdatasize);
-
- if (!pImagedata->pImgdata) /* enough memory ? */
- {
- MNG_FREEX (pData, pImagedata, sizeof (mng_imagedata));
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
- }
- /* check global stuff */
- pImagedata->bHasGAMA = pData->bHasglobalGAMA;
-#ifndef MNG_SKIPCHUNK_cHRM
- pImagedata->bHasCHRM = pData->bHasglobalCHRM;
-#endif
- pImagedata->bHasSRGB = pData->bHasglobalSRGB;
-#ifndef MNG_SKIPCHUNK_iCCP
- pImagedata->bHasICCP = pData->bHasglobalICCP;
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
- pImagedata->bHasBKGD = pData->bHasglobalBKGD;
-#endif
-
- if (pData->bHasglobalGAMA) /* global gAMA present ? */
- pImagedata->iGamma = pData->iGlobalGamma;
-
-#ifndef MNG_SKIPCHUNK_cHRM
- if (pData->bHasglobalCHRM) /* global cHRM present ? */
- {
- pImagedata->iWhitepointx = pData->iGlobalWhitepointx;
- pImagedata->iWhitepointy = pData->iGlobalWhitepointy;
- pImagedata->iPrimaryredx = pData->iGlobalPrimaryredx;
- pImagedata->iPrimaryredy = pData->iGlobalPrimaryredy;
- pImagedata->iPrimarygreenx = pData->iGlobalPrimarygreenx;
- pImagedata->iPrimarygreeny = pData->iGlobalPrimarygreeny;
- pImagedata->iPrimarybluex = pData->iGlobalPrimarybluex;
- pImagedata->iPrimarybluey = pData->iGlobalPrimarybluey;
- }
-#endif
-
- if (pData->bHasglobalSRGB) /* glbal sRGB present ? */
- pImagedata->iRenderingintent = pData->iGlobalRendintent;
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pData->bHasglobalICCP) /* glbal iCCP present ? */
- {
- pImagedata->iProfilesize = pData->iGlobalProfilesize;
-
- if (pImagedata->iProfilesize)
- {
- MNG_ALLOCX (pData, pImagedata->pProfile, pImagedata->iProfilesize);
-
- if (!pImagedata->pProfile) /* enough memory ? */
- {
- MNG_FREEX (pData, pImagedata->pImgdata, pImagedata->iImgdatasize);
- MNG_FREEX (pData, pImagedata, sizeof (mng_imagedata));
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
-
- MNG_COPY (pImagedata->pProfile, pData->pGlobalProfile, pImagedata->iProfilesize);
- }
- }
-#endif
-
-#ifndef MNG_SKIPCHUNK_bKGD
- if (pData->bHasglobalBKGD) /* global bKGD present ? */
- {
- pImagedata->iBKGDred = pData->iGlobalBKGDred;
- pImagedata->iBKGDgreen = pData->iGlobalBKGDgreen;
- pImagedata->iBKGDblue = pData->iGlobalBKGDblue;
- }
-#endif
-
- *ppObject = pImagedata; /* return it */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_IMGDATAOBJECT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_imagedataobject (mng_datap pData,
- mng_imagedatap pImagedata)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IMGDATAOBJECT, MNG_LC_START);
-#endif
-
- if (pImagedata->iRefcount) /* decrease reference count */
- pImagedata->iRefcount--;
-
- if (!pImagedata->iRefcount) /* reached zero ? */
- {
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pImagedata->iProfilesize) /* stored an iCCP profile ? */
- MNG_FREEX (pData, pImagedata->pProfile, pImagedata->iProfilesize);
-#endif
- if (pImagedata->iImgdatasize) /* sample-buffer present ? */
- MNG_FREEX (pData, pImagedata->pImgdata, pImagedata->iImgdatasize);
- /* drop the buffer */
- MNG_FREEX (pData, pImagedata, sizeof (mng_imagedata));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IMGDATAOBJECT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_clone_imagedataobject (mng_datap pData,
- mng_bool bConcrete,
- mng_imagedatap pSource,
- mng_imagedatap *ppClone)
-{
- mng_imagedatap pNewdata;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CLONE_IMGDATAOBJECT, MNG_LC_START);
-#endif
- /* get a buffer */
- MNG_ALLOC (pData, pNewdata, sizeof (mng_imagedata));
- /* blatently copy the original buffer */
- MNG_COPY (pNewdata, pSource, sizeof (mng_imagedata));
-
- pNewdata->iRefcount = 1; /* only the reference count */
- pNewdata->bConcrete = bConcrete; /* and concrete-flag are different */
- pNewdata->bFrozen = MNG_FALSE;
-
- if (pNewdata->iImgdatasize) /* sample buffer present ? */
- {
- MNG_ALLOCX (pData, pNewdata->pImgdata, pNewdata->iImgdatasize);
-
- if (!pNewdata->pImgdata) /* not enough memory ? */
- {
- MNG_FREEX (pData, pNewdata, sizeof (mng_imagedata));
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
- /* make a copy */
- MNG_COPY (pNewdata->pImgdata, pSource->pImgdata, pNewdata->iImgdatasize);
- }
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pNewdata->iProfilesize) /* iCCP profile present ? */
- {
- MNG_ALLOCX (pData, pNewdata->pProfile, pNewdata->iProfilesize);
-
- if (!pNewdata->pProfile) /* enough memory ? */
- {
- MNG_FREEX (pData, pNewdata, sizeof (mng_imagedata));
- MNG_ERROR (pData, MNG_OUTOFMEMORY);
- }
- /* make a copy */
- MNG_COPY (pNewdata->pProfile, pSource->pProfile, pNewdata->iProfilesize);
- }
-#endif
-
- *ppClone = pNewdata; /* return the clone */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CLONE_IMGDATAOBJECT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * Image-object routines * */
-/* * * */
-/* * these handle the "object" as defined by the MNG specification * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_create_imageobject (mng_datap pData,
- mng_uint16 iId,
- mng_bool bConcrete,
- mng_bool bVisible,
- mng_bool bViewable,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace,
- mng_int32 iPosx,
- mng_int32 iPosy,
- mng_bool bClipped,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb,
- mng_imagep *ppObject)
-{
- mng_imagep pImage;
- mng_imagep pPrev, pNext;
- mng_retcode iRetcode;
- mng_imagedatap pImgbuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_IMGOBJECT, MNG_LC_START);
-#endif
- /* get a buffer */
- MNG_ALLOC (pData, pImage, sizeof (mng_image));
- /* now get a new "object buffer" */
- iRetcode = mng_create_imagedataobject (pData, bConcrete, bViewable,
- iWidth, iHeight, iBitdepth, iColortype,
- iCompression, iFilter, iInterlace,
- &pImgbuf);
-
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pImage, sizeof (mng_image));
- return iRetcode;
- }
- /* fill the appropriate fields */
- pImage->sHeader.fCleanup = (mng_cleanupobject)mng_free_imageobject;
- pImage->sHeader.fProcess = MNG_NULL;
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- pImage->sHeader.iObjsize = sizeof (mng_image);
-#endif
- pImage->iId = iId;
- pImage->bFrozen = MNG_FALSE;
- pImage->bVisible = bVisible;
- pImage->bViewable = bViewable;
- pImage->bValid = (mng_bool)((pData->bDisplaying) &&
- ((pData->bRunning) || (pData->bSearching)) &&
- (!pData->bFreezing));
- pImage->iPosx = iPosx;
- pImage->iPosy = iPosy;
- pImage->bClipped = bClipped;
- pImage->iClipl = iClipl;
- pImage->iClipr = iClipr;
- pImage->iClipt = iClipt;
- pImage->iClipb = iClipb;
-#ifndef MNG_SKIPCHUNK_MAGN
- pImage->iMAGN_MethodX = 0;
- pImage->iMAGN_MethodY = 0;
- pImage->iMAGN_MX = 0;
- pImage->iMAGN_MY = 0;
- pImage->iMAGN_ML = 0;
- pImage->iMAGN_MR = 0;
- pImage->iMAGN_MT = 0;
- pImage->iMAGN_MB = 0;
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
- pImage->iPastx = 0;
- pImage->iPasty = 0;
-#endif
- pImage->pImgbuf = pImgbuf;
-
- if (iId) /* only if not object 0 ! */
- { /* find previous lower object-id */
- pPrev = (mng_imagep)pData->pLastimgobj;
-
- while ((pPrev) && (pPrev->iId > iId))
- pPrev = (mng_imagep)pPrev->sHeader.pPrev;
-
- if (pPrev) /* found it ? */
- {
- pImage->sHeader.pPrev = pPrev; /* than link it in place */
- pImage->sHeader.pNext = pPrev->sHeader.pNext;
- pPrev->sHeader.pNext = pImage;
- }
- else /* if not found, it becomes the first ! */
- {
- pImage->sHeader.pNext = pData->pFirstimgobj;
- pData->pFirstimgobj = pImage;
- }
-
- pNext = (mng_imagep)pImage->sHeader.pNext;
-
- if (pNext)
- pNext->sHeader.pPrev = pImage;
- else
- pData->pLastimgobj = pImage;
-
- }
-
- *ppObject = pImage; /* and return the new buffer */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_IMGOBJECT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* okido */
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_imageobject (mng_datap pData,
- mng_imagep pImage)
-{
- mng_retcode iRetcode;
- mng_imagep pPrev = pImage->sHeader.pPrev;
- mng_imagep pNext = pImage->sHeader.pNext;
- mng_imagedatap pImgbuf = pImage->pImgbuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IMGOBJECT, MNG_LC_START);
-#endif
-
- if (pImage->iId) /* not for object 0 */
- {
- if (pPrev) /* unlink from the list first ! */
- pPrev->sHeader.pNext = pImage->sHeader.pNext;
- else
- pData->pFirstimgobj = pImage->sHeader.pNext;
-
- if (pNext)
- pNext->sHeader.pPrev = pImage->sHeader.pPrev;
- else
- pData->pLastimgobj = pImage->sHeader.pPrev;
-
- }
- /* unlink the image-data buffer */
- iRetcode = mng_free_imagedataobject (pData, pImgbuf);
- /* drop its own buffer */
- MNG_FREEX (pData, pImage, sizeof (mng_image));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_IMGOBJECT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-mng_imagep mng_find_imageobject (mng_datap pData,
- mng_uint16 iId)
-{
- mng_imagep pImage = (mng_imagep)pData->pFirstimgobj;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (pData, MNG_FN_FIND_IMGOBJECT, MNG_LC_START);
-#endif
- /* look up the right id */
- while ((pImage) && (pImage->iId != iId))
- pImage = (mng_imagep)pImage->sHeader.pNext;
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- if ((!pImage) && (pData->eImagetype == mng_it_mpng))
- pImage = pData->pObjzero;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (pData, MNG_FN_FIND_IMGOBJECT, MNG_LC_END);
-#endif
-
- return pImage;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_clone_imageobject (mng_datap pData,
- mng_uint16 iId,
- mng_bool bPartial,
- mng_bool bVisible,
- mng_bool bAbstract,
- mng_bool bHasloca,
- mng_uint8 iLocationtype,
- mng_int32 iLocationx,
- mng_int32 iLocationy,
- mng_imagep pSource,
- mng_imagep *ppClone)
-{
- mng_imagep pNew;
- mng_imagep pPrev, pNext;
- mng_retcode iRetcode;
- mng_imagedatap pImgbuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CLONE_IMGOBJECT, MNG_LC_START);
-#endif
-
-#ifndef MNG_SKIPCHUNK_MAGN
- if ((pSource->iId) && /* needs magnification ? */
- ((pSource->iMAGN_MethodX) || (pSource->iMAGN_MethodY)))
- {
- iRetcode = mng_magnify_imageobject (pData, pSource);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif
- /* get a buffer */
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- {
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_image),
- (mng_cleanupobject)mng_free_imageobject,
- MNG_NULL, &pTemp);
- if (iRetcode)
- return iRetcode;
- pNew = (mng_imagep)pTemp;
- }
-#else
- MNG_ALLOC (pData, pNew, sizeof (mng_image));
- /* fill or copy the appropriate fields */
- pNew->sHeader.fCleanup = (mng_cleanupobject)mng_free_imageobject;
- pNew->sHeader.fProcess = MNG_NULL;
-#endif
- pNew->iId = iId;
- pNew->bFrozen = MNG_FALSE;
- pNew->bVisible = bVisible;
- pNew->bViewable = pSource->bViewable;
- pNew->bValid = MNG_TRUE;
-
- if (bHasloca) /* location info available ? */
- {
- if (iLocationtype == 0) /* absolute position ? */
- {
- pNew->iPosx = iLocationx;
- pNew->iPosy = iLocationy;
- }
- else /* relative */
- {
- pNew->iPosx = pSource->iPosx + iLocationx;
- pNew->iPosy = pSource->iPosy + iLocationy;
- }
- }
- else /* copy from source */
- {
- pNew->iPosx = pSource->iPosx;
- pNew->iPosy = pSource->iPosy;
- }
- /* copy clipping info */
- pNew->bClipped = pSource->bClipped;
- pNew->iClipl = pSource->iClipl;
- pNew->iClipr = pSource->iClipr;
- pNew->iClipt = pSource->iClipt;
- pNew->iClipb = pSource->iClipb;
-#ifndef MNG_SKIPCHUNK_MAGN
- /* copy magnification info */
-/* pNew->iMAGN_MethodX = pSource->iMAGN_MethodX; LET'S NOT !!!!!!
- pNew->iMAGN_MethodY = pSource->iMAGN_MethodY;
- pNew->iMAGN_MX = pSource->iMAGN_MX;
- pNew->iMAGN_MY = pSource->iMAGN_MY;
- pNew->iMAGN_ML = pSource->iMAGN_ML;
- pNew->iMAGN_MR = pSource->iMAGN_MR;
- pNew->iMAGN_MT = pSource->iMAGN_MT;
- pNew->iMAGN_MB = pSource->iMAGN_MB; */
-#endif
-
-#ifndef MNG_SKIPCHUNK_PAST
- pNew->iPastx = 0; /* initialize PAST info */
- pNew->iPasty = 0;
-#endif
-
- if (iId) /* not for object 0 */
- { /* find previous lower object-id */
- pPrev = (mng_imagep)pData->pLastimgobj;
- while ((pPrev) && (pPrev->iId > iId))
- pPrev = (mng_imagep)pPrev->sHeader.pPrev;
-
- if (pPrev) /* found it ? */
- {
- pNew->sHeader.pPrev = pPrev; /* than link it in place */
- pNew->sHeader.pNext = pPrev->sHeader.pNext;
- pPrev->sHeader.pNext = pNew;
- }
- else /* if not found, it becomes the first ! */
- {
- pNew->sHeader.pNext = pData->pFirstimgobj;
- pData->pFirstimgobj = pNew;
- }
-
- pNext = (mng_imagep)pNew->sHeader.pNext;
-
- if (pNext)
- pNext->sHeader.pPrev = pNew;
- else
- pData->pLastimgobj = pNew;
-
- }
-
- if (bPartial) /* partial clone ? */
- {
- pNew->pImgbuf = pSource->pImgbuf; /* use the same object buffer */
- pNew->pImgbuf->iRefcount++; /* and increase the reference count */
- }
- else /* create a full clone ! */
- {
- mng_bool bConcrete = MNG_FALSE; /* it's abstract by default (?) */
-
- if (!bAbstract) /* determine concreteness from source ? */
- bConcrete = pSource->pImgbuf->bConcrete;
- /* create a full clone ! */
- iRetcode = mng_clone_imagedataobject (pData, bConcrete, pSource->pImgbuf, &pImgbuf);
-
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pNew, sizeof (mng_image));
- return iRetcode;
- }
-
- pNew->pImgbuf = pImgbuf; /* and remember it */
- }
-
- *ppClone = pNew; /* return it */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CLONE_IMGOBJECT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_renum_imageobject (mng_datap pData,
- mng_imagep pSource,
- mng_uint16 iId,
- mng_bool bVisible,
- mng_bool bAbstract,
- mng_bool bHasloca,
- mng_uint8 iLocationtype,
- mng_int32 iLocationx,
- mng_int32 iLocationy)
-{
- mng_imagep pPrev, pNext;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RENUM_IMGOBJECT, MNG_LC_START);
-#endif
-
- pSource->bVisible = bVisible; /* store the new visibility */
-
- if (bHasloca) /* location info available ? */
- {
- if (iLocationtype == 0) /* absolute position ? */
- {
- pSource->iPosx = iLocationx;
- pSource->iPosy = iLocationy;
- }
- else /* relative */
- {
- pSource->iPosx = pSource->iPosx + iLocationx;
- pSource->iPosy = pSource->iPosy + iLocationy;
- }
- }
-
- if (iId) /* not for object 0 */
- { /* find previous lower object-id */
- pPrev = (mng_imagep)pData->pLastimgobj;
- while ((pPrev) && (pPrev->iId > iId))
- pPrev = (mng_imagep)pPrev->sHeader.pPrev;
- /* different from current ? */
- if (pPrev != (mng_imagep)pSource->sHeader.pPrev)
- {
- if (pSource->sHeader.pPrev) /* unlink from current position !! */
- ((mng_imagep)pSource->sHeader.pPrev)->sHeader.pNext = pSource->sHeader.pNext;
- else
- pData->pFirstimgobj = pSource->sHeader.pNext;
-
- if (pSource->sHeader.pNext)
- ((mng_imagep)pSource->sHeader.pNext)->sHeader.pPrev = pSource->sHeader.pPrev;
- else
- pData->pLastimgobj = pSource->sHeader.pPrev;
-
- if (pPrev) /* found the previous ? */
- { /* than link it in place */
- pSource->sHeader.pPrev = pPrev;
- pSource->sHeader.pNext = pPrev->sHeader.pNext;
- pPrev->sHeader.pNext = pSource;
- }
- else /* if not found, it becomes the first ! */
- {
- pSource->sHeader.pNext = pData->pFirstimgobj;
- pData->pFirstimgobj = pSource;
- }
-
- pNext = (mng_imagep)pSource->sHeader.pNext;
-
- if (pNext)
- pNext->sHeader.pPrev = pSource;
- else
- pData->pLastimgobj = pSource;
-
- }
- }
-
- pSource->iId = iId; /* now set the new id! */
-
- if (bAbstract) /* force it to abstract ? */
- pSource->pImgbuf->bConcrete = MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RENUM_IMGOBJECT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_reset_object_details (mng_datap pData,
- mng_imagep pImage,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace,
- mng_bool bResetall)
-{
- mng_imagedatap pBuf = pImage->pImgbuf;
- mng_uint32 iSamplesize = 0;
- mng_uint32 iRowsize;
- mng_uint32 iImgdatasize;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESET_OBJECTDETAILS, MNG_LC_START);
-#endif
-
- pBuf->iWidth = iWidth; /* set buffer characteristics */
- pBuf->iHeight = iHeight;
- pBuf->iBitdepth = iBitdepth;
- pBuf->iColortype = iColortype;
- pBuf->iCompression = iCompression;
- pBuf->iFilter = iFilter;
- pBuf->iInterlace = iInterlace;
- pBuf->bCorrected = MNG_FALSE;
- pBuf->iAlphabitdepth = 0;
- /* determine samplesize from color_type/bit_depth */
- switch (iColortype) /* for < 8-bit samples we just reserve 8 bits */
- {
- case 0 : ; /* gray */
- case 8 : { /* JPEG gray */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth > 8)
- iSamplesize = 2;
- else
-#endif
- iSamplesize = 1;
-
- break;
- }
- case 2 : ; /* rgb */
- case 10 : { /* JPEG rgb */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth > 8)
- iSamplesize = 6;
- else
-#endif
- iSamplesize = 3;
-
- break;
- }
- case 3 : { /* indexed */
- iSamplesize = 1;
- break;
- }
- case 4 : ; /* gray+alpha */
- case 12 : { /* JPEG gray+alpha */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth > 8)
- iSamplesize = 4;
- else
-#endif
- iSamplesize = 2;
-
- break;
- }
- case 6 : ; /* rgb+alpha */
- case 14 : { /* JPEG rgb+alpha */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth > 8)
- iSamplesize = 8;
- else
-#endif
- iSamplesize = 4;
-
- break;
- }
- }
-
- iRowsize = iSamplesize * iWidth;
- iImgdatasize = iRowsize * iHeight;
- /* buffer size changed ? */
- if (iImgdatasize != pBuf->iImgdatasize)
- { /* drop the old one */
- MNG_FREE (pData, pBuf->pImgdata, pBuf->iImgdatasize);
-
- if (iImgdatasize) /* allocate new sample-buffer ? */
- MNG_ALLOC (pData, pBuf->pImgdata, iImgdatasize);
- }
- else
- {
- if (iImgdatasize) /* clear old buffer */
- {
- mng_uint8p pTemp = pBuf->pImgdata;
- mng_uint32 iX;
-
- for (iX = 0; iX < (iImgdatasize & (mng_uint32)(~3L)); iX += 4)
- {
- *((mng_uint32p)pTemp) = 0x00000000l;
- pTemp += 4;
- }
-
- while (pTemp < (pBuf->pImgdata + iImgdatasize))
- {
- *pTemp = 0;
- pTemp++;
- }
- }
- }
-
- pBuf->iSamplesize = iSamplesize; /* remember new sizes */
- pBuf->iRowsize = iRowsize;
- pBuf->iImgdatasize = iImgdatasize;
-
- if (!pBuf->iPixelsampledepth) /* set delta sampledepths if empty */
- pBuf->iPixelsampledepth = iBitdepth;
- if (!pBuf->iAlphasampledepth)
- pBuf->iAlphasampledepth = iBitdepth;
- /* dimension set and clipping not ? */
- if ((iWidth) && (iHeight) && (!pImage->bClipped))
- {
- pImage->iClipl = 0; /* set clipping to dimension by default */
- pImage->iClipr = iWidth;
- pImage->iClipt = 0;
- pImage->iClipb = iHeight;
- }
-
-#ifndef MNG_SKIPCHUNK_MAGN
- if (pImage->iId) /* reset magnification info ? */
- {
- pImage->iMAGN_MethodX = 0;
- pImage->iMAGN_MethodY = 0;
- pImage->iMAGN_MX = 0;
- pImage->iMAGN_MY = 0;
- pImage->iMAGN_ML = 0;
- pImage->iMAGN_MR = 0;
- pImage->iMAGN_MT = 0;
- pImage->iMAGN_MB = 0;
- }
-#endif
-
- if (bResetall) /* reset the other characteristics ? */
- {
-#ifndef MNG_SKIPCHUNK_PAST
- pImage->iPastx = 0;
- pImage->iPasty = 0;
-#endif
-
- pBuf->bHasPLTE = MNG_FALSE;
- pBuf->bHasTRNS = MNG_FALSE;
- pBuf->bHasGAMA = pData->bHasglobalGAMA;
-#ifndef MNG_SKIPCHUNK_cHRM
- pBuf->bHasCHRM = pData->bHasglobalCHRM;
-#endif
- pBuf->bHasSRGB = pData->bHasglobalSRGB;
-#ifndef MNG_SKIPCHUNK_iCCP
- pBuf->bHasICCP = pData->bHasglobalICCP;
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
- pBuf->bHasBKGD = pData->bHasglobalBKGD;
-#endif
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pBuf->iProfilesize) /* drop possibly old ICC profile */
- {
- MNG_FREE (pData, pBuf->pProfile, pBuf->iProfilesize);
- pBuf->iProfilesize = 0;
- }
-#endif
-
- if (pData->bHasglobalGAMA) /* global gAMA present ? */
- pBuf->iGamma = pData->iGlobalGamma;
-
-#ifndef MNG_SKIPCHUNK_cHRM
- if (pData->bHasglobalCHRM) /* global cHRM present ? */
- {
- pBuf->iWhitepointx = pData->iGlobalWhitepointx;
- pBuf->iWhitepointy = pData->iGlobalWhitepointy;
- pBuf->iPrimaryredx = pData->iGlobalPrimaryredx;
- pBuf->iPrimaryredy = pData->iGlobalPrimaryredy;
- pBuf->iPrimarygreenx = pData->iGlobalPrimarygreenx;
- pBuf->iPrimarygreeny = pData->iGlobalPrimarygreeny;
- pBuf->iPrimarybluex = pData->iGlobalPrimarybluex;
- pBuf->iPrimarybluey = pData->iGlobalPrimarybluey;
- }
-#endif
-
- if (pData->bHasglobalSRGB) /* global sRGB present ? */
- pBuf->iRenderingintent = pData->iGlobalRendintent;
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pData->bHasglobalICCP) /* global iCCP present ? */
- {
- if (pData->iGlobalProfilesize)
- {
- MNG_ALLOC (pData, pBuf->pProfile, pData->iGlobalProfilesize);
- MNG_COPY (pBuf->pProfile, pData->pGlobalProfile, pData->iGlobalProfilesize);
- }
-
- pBuf->iProfilesize = pData->iGlobalProfilesize;
- }
-#endif
-
-#ifndef MNG_SKIPCHUNK_bKGD
- if (pData->bHasglobalBKGD) /* global bKGD present ? */
- {
- pBuf->iBKGDred = pData->iGlobalBKGDred;
- pBuf->iBKGDgreen = pData->iGlobalBKGDgreen;
- pBuf->iBKGDblue = pData->iGlobalBKGDblue;
- }
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESET_OBJECTDETAILS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#if !defined(MNG_NO_DELTA_PNG) || !defined(MNG_SKIPCHUNK_PAST) || !defined(MNG_SKIPCHUNK_MAGN)
-mng_retcode mng_promote_imageobject (mng_datap pData,
- mng_imagep pImage,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iFilltype)
-{
- mng_retcode iRetcode = MNG_NOERROR;
- mng_imagedatap pBuf = pImage->pImgbuf;
- mng_uint32 iW = pBuf->iWidth;
- mng_uint32 iH = pBuf->iHeight;
- mng_uint8p pNewbuf;
- mng_uint32 iNewbufsize;
- mng_uint32 iNewrowsize;
- mng_uint32 iNewsamplesize = pBuf->iSamplesize;
- mng_uint32 iY;
- mng_uint8 iTempdepth;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_IMGOBJECT, MNG_LC_START);
-#endif
-
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (iBitdepth < 8)
- iBitdepth=8;
- if (pBuf->iBitdepth < 8)
- pBuf->iBitdepth=8;
-#endif
-#ifdef MNG_NO_16BIT_SUPPORT
- if (iBitdepth > 8)
- iBitdepth=8;
- if (pBuf->iBitdepth > 8)
- pBuf->iBitdepth=8;
-#endif
-
- pData->fPromoterow = MNG_NULL; /* init promotion fields */
- pData->fPromBitdepth = MNG_NULL;
- pData->iPromColortype = iColortype;
- pData->iPromBitdepth = iBitdepth;
- pData->iPromFilltype = iFilltype;
-
- if (iBitdepth != pBuf->iBitdepth) /* determine bitdepth promotion */
- {
- if (pBuf->iColortype == MNG_COLORTYPE_INDEXED)
- iTempdepth = 8;
- else
- iTempdepth = pBuf->iBitdepth;
-
-#ifndef MNG_NO_DELTA_PNG
- if (iFilltype == MNG_FILLMETHOD_ZEROFILL)
- {
- switch (iTempdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- switch (iBitdepth)
- {
- case 2 : { pData->fPromBitdepth = (mng_fptr)mng_promote_zerofill_1_2; break; }
- case 4 : { pData->fPromBitdepth = (mng_fptr)mng_promote_zerofill_1_4; break; }
- case 8 : { pData->fPromBitdepth = (mng_fptr)mng_promote_zerofill_1_8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fPromBitdepth = (mng_fptr)mng_promote_zerofill_1_16; break; }
-#endif
- }
- break;
- }
- case 2 : {
- switch (iBitdepth)
- {
- case 4 : { pData->fPromBitdepth = (mng_fptr)mng_promote_zerofill_2_4; break; }
- case 8 : { pData->fPromBitdepth = (mng_fptr)mng_promote_zerofill_2_8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fPromBitdepth = (mng_fptr)mng_promote_zerofill_2_16; break; }
-#endif
- }
- break;
- }
- case 4 : {
- switch (iBitdepth)
- {
- case 8 : { pData->fPromBitdepth = (mng_fptr)mng_promote_zerofill_4_8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fPromBitdepth = (mng_fptr)mng_promote_zerofill_4_16; break; }
-#endif
- }
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromBitdepth = (mng_fptr)mng_promote_zerofill_8_16;
-#endif
- break;
- }
- }
- }
- else
-#endif
- {
- switch (iTempdepth)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case 1 : {
- switch (iBitdepth)
- {
- case 2 : { pData->fPromBitdepth = (mng_fptr)mng_promote_replicate_1_2; break; }
- case 4 : { pData->fPromBitdepth = (mng_fptr)mng_promote_replicate_1_4; break; }
- case 8 : { pData->fPromBitdepth = (mng_fptr)mng_promote_replicate_1_8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fPromBitdepth = (mng_fptr)mng_promote_replicate_1_16; break; }
-#endif
- }
- break;
- }
- case 2 : {
- switch (iBitdepth)
- {
- case 4 : { pData->fPromBitdepth = (mng_fptr)mng_promote_replicate_2_4; break; }
- case 8 : { pData->fPromBitdepth = (mng_fptr)mng_promote_replicate_2_8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fPromBitdepth = (mng_fptr)mng_promote_replicate_2_16; break; }
-#endif
- }
- break;
- }
- case 4 : {
- switch (iBitdepth)
- {
- case 8 : { pData->fPromBitdepth = (mng_fptr)mng_promote_replicate_4_8; break; }
-#ifndef MNG_NO_16BIT_SUPPORT
- case 16 : { pData->fPromBitdepth = (mng_fptr)mng_promote_replicate_4_16; break; }
-#endif
- }
- break;
- }
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case 8 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromBitdepth = (mng_fptr)mng_promote_replicate_8_16;
-#endif
- break;
- }
- }
- }
- }
- /* g -> g */
- if ((pBuf->iColortype == MNG_COLORTYPE_GRAY) &&
- (iColortype == MNG_COLORTYPE_GRAY))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_g8_g16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_g8_g8;
- }
-
- iNewsamplesize = 1;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 2;
-#endif
- }
- else /* g -> ga */
- if ((pBuf->iColortype == MNG_COLORTYPE_GRAY) &&
- (iColortype == MNG_COLORTYPE_GRAYA))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_g8_ga16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_g8_ga8;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else /* source = 16 bits */
- pData->fPromoterow = (mng_fptr)mng_promote_g16_ga16;
-#endif
-
- iNewsamplesize = 2;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 4;
-#endif
- }
- else /* g -> rgb */
- if ((pBuf->iColortype == MNG_COLORTYPE_GRAY) &&
- (iColortype == MNG_COLORTYPE_RGB))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_g8_rgb16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_g8_rgb8;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else /* source = 16 bits */
- pData->fPromoterow = (mng_fptr)mng_promote_g16_rgb16;
-#endif
-
- iNewsamplesize = 3;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 6;
-#endif
- }
- else /* g -> rgba */
- if ((pBuf->iColortype == MNG_COLORTYPE_GRAY) &&
- (iColortype == MNG_COLORTYPE_RGBA))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_g8_rgba16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_g8_rgba8;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else /* source = 16 bits */
- pData->fPromoterow = (mng_fptr)mng_promote_g16_rgba16;
-#endif
-
- iNewsamplesize = 4;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 8;
-#endif
- }
- else /* ga -> ga */
- if ((pBuf->iColortype == MNG_COLORTYPE_GRAYA) &&
- (iColortype == MNG_COLORTYPE_GRAYA))
- {
- iNewsamplesize = 2;
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_ga8_ga16;
- if (iBitdepth == 16)
- iNewsamplesize = 4;
-#endif
- }
- else /* ga -> rgba */
- if ((pBuf->iColortype == MNG_COLORTYPE_GRAYA) &&
- (iColortype == MNG_COLORTYPE_RGBA))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_ga8_rgba16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_ga8_rgba8;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else /* source = 16 bits */
- pData->fPromoterow = (mng_fptr)mng_promote_ga16_rgba16;
-#endif
-
- iNewsamplesize = 4;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 8;
-#endif
- }
- else /* rgb -> rgb */
- if ((pBuf->iColortype == MNG_COLORTYPE_RGB) &&
- (iColortype == MNG_COLORTYPE_RGB))
- {
- iNewsamplesize = 3;
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_rgb8_rgb16;
- if (iBitdepth == 16)
- iNewsamplesize = 6;
-#endif
- }
- else /* rgb -> rgba */
- if ((pBuf->iColortype == MNG_COLORTYPE_RGB) &&
- (iColortype == MNG_COLORTYPE_RGBA))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_rgb8_rgba16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_rgb8_rgba8;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else /* source = 16 bits */
- pData->fPromoterow = (mng_fptr)mng_promote_rgb16_rgba16;
-#endif
-
- iNewsamplesize = 4;
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 8;
-#endif
- }
- else /* indexed -> rgb */
- if ((pBuf->iColortype == MNG_COLORTYPE_INDEXED) &&
- (iColortype == MNG_COLORTYPE_RGB))
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_idx8_rgb16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_idx8_rgb8;
-
- iNewsamplesize = 3;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 6;
-#endif
- }
- else /* indexed -> rgba */
- if ((pBuf->iColortype == MNG_COLORTYPE_INDEXED) &&
- (iColortype == MNG_COLORTYPE_RGBA))
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_idx8_rgba16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_idx8_rgba8;
-
- iNewsamplesize = 4;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 8;
-#endif
- }
- else /* rgba -> rgba */
- if ((pBuf->iColortype == MNG_COLORTYPE_RGBA) &&
- (iColortype == MNG_COLORTYPE_RGBA))
- {
- iNewsamplesize = 4;
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_rgba8_rgba16;
- }
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 8;
-#endif
- }
-#ifdef MNG_INCLUDE_JNG
- else /* JPEG g -> g */
- if ((pBuf->iColortype == MNG_COLORTYPE_JPEGGRAY) &&
- (iColortype == MNG_COLORTYPE_JPEGGRAY))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_g8_g16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_g8_g8;
- }
-
- iNewsamplesize = 1;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 2;
-#endif
- }
- else /* JPEG g -> ga */
- if ((pBuf->iColortype == MNG_COLORTYPE_JPEGGRAY) &&
- (iColortype == MNG_COLORTYPE_JPEGGRAYA))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_g8_ga16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_g8_ga8;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else /* source = 16 bits */
- pData->fPromoterow = (mng_fptr)mng_promote_g16_ga16;
-#endif
-
- iNewsamplesize = 2;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 4;
-#endif
- }
- else /* JPEG g -> rgb */
- if ((pBuf->iColortype == MNG_COLORTYPE_JPEGGRAY) &&
- (iColortype == MNG_COLORTYPE_JPEGCOLOR))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_g8_rgb16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_g8_rgb8;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else /* source = 16 bits */
- pData->fPromoterow = (mng_fptr)mng_promote_g16_rgb16;
-#endif
-
- iNewsamplesize = 3;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 6;
-#endif
- }
- else /* JPEG g -> rgba */
- if ((pBuf->iColortype == MNG_COLORTYPE_JPEGGRAY) &&
- (iColortype == MNG_COLORTYPE_JPEGCOLORA))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_g8_rgba16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_g8_rgba8;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else /* source = 16 bits */
- pData->fPromoterow = (mng_fptr)mng_promote_g16_rgba16;
-#endif
-
- iNewsamplesize = 4;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 8;
-#endif
- }
- else /* JPEG ga -> ga */
- if ((pBuf->iColortype == MNG_COLORTYPE_JPEGGRAYA) &&
- (iColortype == MNG_COLORTYPE_JPEGGRAYA))
- {
- iNewsamplesize = 2;
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_ga8_ga16;
- if (iBitdepth == 16)
- iNewsamplesize = 4;
-#endif
-
- }
- else /* JPEG ga -> rgba */
- if ((pBuf->iColortype == MNG_COLORTYPE_JPEGGRAYA) &&
- (iColortype == MNG_COLORTYPE_JPEGCOLORA))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_ga8_rgba16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_ga8_rgba8;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else /* source = 16 bits */
- pData->fPromoterow = (mng_fptr)mng_promote_ga16_rgba16;
-#endif
-
- iNewsamplesize = 4;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 8;
-#endif
- }
- else /* JPEG rgb -> rgb */
- if ((pBuf->iColortype == MNG_COLORTYPE_JPEGCOLOR) &&
- (iColortype == MNG_COLORTYPE_JPEGCOLOR))
- {
- iNewsamplesize = 3;
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_rgb8_rgb16;
- if (iBitdepth == 16)
- iNewsamplesize = 6;
-#endif
-
- }
- else /* JPEG rgb -> rgba */
- if ((pBuf->iColortype == MNG_COLORTYPE_JPEGCOLOR) &&
- (iColortype == MNG_COLORTYPE_JPEGCOLORA))
- {
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_rgb8_rgba16;
- else
-#endif
- pData->fPromoterow = (mng_fptr)mng_promote_rgb8_rgba8;
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else /* source = 16 bits */
- pData->fPromoterow = (mng_fptr)mng_promote_rgb16_rgba16;
-#endif
-
- iNewsamplesize = 4;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (iBitdepth == 16) /* 16-bit wide ? */
- iNewsamplesize = 8;
-#endif
- }
- else /* JPEG rgba -> rgba */
- if ((pBuf->iColortype == MNG_COLORTYPE_JPEGCOLORA) &&
- (iColortype == MNG_COLORTYPE_JPEGCOLORA))
- {
- iNewsamplesize = 4;
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuf->iBitdepth <= 8) /* source <= 8 bits */
- if (iBitdepth == 16)
- pData->fPromoterow = (mng_fptr)mng_promote_rgba8_rgba16;
- if (iBitdepth == 16)
- iNewsamplesize = 8;
-#endif
- }
-#endif /* JNG */
-
- /* found a proper promotion ? */
- if (pData->fPromoterow)
- {
- pData->pPromBuf = (mng_ptr)pBuf;
- pData->iPromWidth = pBuf->iWidth;
- iNewrowsize = iW * iNewsamplesize;
- iNewbufsize = iH * iNewrowsize;
-
- MNG_ALLOC (pData, pNewbuf, iNewbufsize);
-
- pData->pPromSrc = (mng_ptr)pBuf->pImgdata;
- pData->pPromDst = (mng_ptr)pNewbuf;
- iY = 0;
-
- while ((!iRetcode) && (iY < iH))
- {
- iRetcode = ((mng_promoterow)pData->fPromoterow) (pData);
- pData->pPromSrc = (mng_uint8p)pData->pPromSrc + pBuf->iRowsize;
- pData->pPromDst = (mng_uint8p)pData->pPromDst + iNewrowsize;
-/* pData->pPromSrc = (mng_ptr)((mng_uint32)pData->pPromSrc + pBuf->iRowsize); */
-/* pData->pPromDst = (mng_ptr)((mng_uint32)pData->pPromDst + iNewrowsize); */
- iY++;
- }
-
- MNG_FREEX (pData, pBuf->pImgdata, pBuf->iImgdatasize);
-
- pBuf->iBitdepth = iBitdepth;
- pBuf->iColortype = iColortype;
- pBuf->iSamplesize = iNewsamplesize;
- pBuf->iRowsize = iNewrowsize;
- pBuf->iImgdatasize = iNewbufsize;
- pBuf->pImgdata = pNewbuf;
- pBuf->bHasPLTE = MNG_FALSE;
- pBuf->iPLTEcount = 0;
- pBuf->bHasTRNS = MNG_FALSE;
- pBuf->iTRNScount = 0;
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_IMGOBJECT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-mng_retcode mng_magnify_imageobject (mng_datap pData,
- mng_imagep pImage)
-{
- mng_uint8p pNewdata;
- mng_uint8p pSrcline1;
- mng_uint8p pSrcline2;
- mng_uint8p pTempline;
- mng_uint8p pDstline;
- mng_uint32 iNewrowsize;
- mng_uint32 iNewsize;
- mng_uint32 iY;
- mng_int32 iS, iM;
- mng_retcode iRetcode;
-
- mng_imagedatap pBuf = pImage->pImgbuf;
- mng_uint32 iNewW = pBuf->iWidth;
- mng_uint32 iNewH = pBuf->iHeight;
- mng_magnify_x fMagnifyX = MNG_NULL;
- mng_magnify_y fMagnifyY = MNG_NULL;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_IMGOBJECT, MNG_LC_START);
-#endif
-
- if (pBuf->iColortype == MNG_COLORTYPE_INDEXED) /* indexed color ? */
- { /* concrete buffer ? */
- if ((pBuf->bConcrete) && (pImage->iId))
- MNG_ERROR (pData, MNG_INVALIDCOLORTYPE);
-
-#ifndef MNG_OPTIMIZE_FOOTPRINT_MAGN
- if (pBuf->iTRNScount) /* with transparency ? */
- iRetcode = mng_promote_imageobject (pData, pImage, 8, 6, 0);
- else
- iRetcode = mng_promote_imageobject (pData, pImage, 8, 2, 0);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif
- }
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_MAGN
- /* Promote everything to RGBA, using fill method 0 (LBR) */
- iRetcode = mng_promote_imageobject (pData, pImage, 8, 6, 0);
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif
-
- if (pImage->iMAGN_MethodX) /* determine new width */
- {
- if (pImage->iMAGN_MethodX == 1)
- {
- iNewW = pImage->iMAGN_ML;
- if (pBuf->iWidth > 1)
- iNewW = iNewW + pImage->iMAGN_MR;
- if (pBuf->iWidth > 2)
- iNewW = iNewW + (pBuf->iWidth - 2) * (pImage->iMAGN_MX);
- }
- else
- {
- iNewW = pBuf->iWidth + pImage->iMAGN_ML - 1;
- if (pBuf->iWidth > 2)
- iNewW = iNewW + pImage->iMAGN_MR - 1;
- if (pBuf->iWidth > 3)
- iNewW = iNewW + (pBuf->iWidth - 3) * (pImage->iMAGN_MX - 1);
- }
- }
-
- if (pImage->iMAGN_MethodY) /* determine new height */
- {
- if (pImage->iMAGN_MethodY == 1)
- {
- iNewH = pImage->iMAGN_MT;
- if (pBuf->iHeight > 1)
- iNewH = iNewH + pImage->iMAGN_ML;
- if (pBuf->iHeight > 2)
- iNewH = iNewH + (pBuf->iHeight - 2) * (pImage->iMAGN_MY);
- }
- else
- {
- iNewH = pBuf->iHeight + pImage->iMAGN_MT - 1;
- if (pBuf->iHeight > 2)
- iNewH = iNewH + pImage->iMAGN_MB - 1;
- if (pBuf->iHeight > 3)
- iNewH = iNewH + (pBuf->iHeight - 3) * (pImage->iMAGN_MY - 1);
- }
- }
- /* get new buffer */
- iNewrowsize = iNewW * pBuf->iSamplesize;
- iNewsize = iNewH * iNewrowsize;
-
- MNG_ALLOC (pData, pNewdata, iNewsize);
-
- switch (pBuf->iColortype) /* determine magnification routines */
- {
-#ifndef MNG_OPTIMIZE_FOOTPRINT_MAGN
- case 0 : ;
- case 8 : {
- if (pBuf->iBitdepth <= 8)
- {
- switch (pImage->iMAGN_MethodX)
- {
- case 1 : { fMagnifyX = mng_magnify_g8_x1; break; }
- case 2 : { fMagnifyX = mng_magnify_g8_x2; break; }
- case 3 : { fMagnifyX = mng_magnify_g8_x3; break; }
- case 4 : { fMagnifyX = mng_magnify_g8_x2; break; }
- case 5 : { fMagnifyX = mng_magnify_g8_x3; break; }
- }
-
- switch (pImage->iMAGN_MethodY)
- {
- case 1 : { fMagnifyY = mng_magnify_g8_y1; break; }
- case 2 : { fMagnifyY = mng_magnify_g8_y2; break; }
- case 3 : { fMagnifyY = mng_magnify_g8_y3; break; }
- case 4 : { fMagnifyY = mng_magnify_g8_y2; break; }
- case 5 : { fMagnifyY = mng_magnify_g8_y3; break; }
- }
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else
- {
- switch (pImage->iMAGN_MethodX)
- {
- case 1 : { fMagnifyX = mng_magnify_g16_x1; break; }
- case 2 : { fMagnifyX = mng_magnify_g16_x2; break; }
- case 3 : { fMagnifyX = mng_magnify_g16_x3; break; }
- case 4 : { fMagnifyX = mng_magnify_g16_x2; break; }
- case 5 : { fMagnifyX = mng_magnify_g16_x3; break; }
- }
-
- switch (pImage->iMAGN_MethodY)
- {
- case 1 : { fMagnifyY = mng_magnify_g16_y1; break; }
- case 2 : { fMagnifyY = mng_magnify_g16_y2; break; }
- case 3 : { fMagnifyY = mng_magnify_g16_y3; break; }
- case 4 : { fMagnifyY = mng_magnify_g16_y2; break; }
- case 5 : { fMagnifyY = mng_magnify_g16_y3; break; }
- }
- }
-#endif
-
- break;
- }
-
- case 2 : ;
- case 10 : {
- if (pBuf->iBitdepth <= 8)
- {
- switch (pImage->iMAGN_MethodX)
- {
- case 1 : { fMagnifyX = mng_magnify_rgb8_x1; break; }
- case 2 : { fMagnifyX = mng_magnify_rgb8_x2; break; }
- case 3 : { fMagnifyX = mng_magnify_rgb8_x3; break; }
- case 4 : { fMagnifyX = mng_magnify_rgb8_x2; break; }
- case 5 : { fMagnifyX = mng_magnify_rgb8_x3; break; }
- }
-
- switch (pImage->iMAGN_MethodY)
- {
- case 1 : { fMagnifyY = mng_magnify_rgb8_y1; break; }
- case 2 : { fMagnifyY = mng_magnify_rgb8_y2; break; }
- case 3 : { fMagnifyY = mng_magnify_rgb8_y3; break; }
- case 4 : { fMagnifyY = mng_magnify_rgb8_y2; break; }
- case 5 : { fMagnifyY = mng_magnify_rgb8_y3; break; }
- }
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else
- {
- switch (pImage->iMAGN_MethodX)
- {
- case 1 : { fMagnifyX = mng_magnify_rgb16_x1; break; }
- case 2 : { fMagnifyX = mng_magnify_rgb16_x2; break; }
- case 3 : { fMagnifyX = mng_magnify_rgb16_x3; break; }
- case 4 : { fMagnifyX = mng_magnify_rgb16_x2; break; }
- case 5 : { fMagnifyX = mng_magnify_rgb16_x3; break; }
- }
-
- switch (pImage->iMAGN_MethodY)
- {
- case 1 : { fMagnifyY = mng_magnify_rgb16_y1; break; }
- case 2 : { fMagnifyY = mng_magnify_rgb16_y2; break; }
- case 3 : { fMagnifyY = mng_magnify_rgb16_y3; break; }
- case 4 : { fMagnifyY = mng_magnify_rgb16_y2; break; }
- case 5 : { fMagnifyY = mng_magnify_rgb16_y3; break; }
- }
- }
-#endif
-
- break;
- }
-
- case 4 : ;
- case 12 : {
- if (pBuf->iBitdepth <= 8)
- {
- switch (pImage->iMAGN_MethodX)
- {
- case 1 : { fMagnifyX = mng_magnify_ga8_x1; break; }
- case 2 : { fMagnifyX = mng_magnify_ga8_x2; break; }
- case 3 : { fMagnifyX = mng_magnify_ga8_x3; break; }
- case 4 : { fMagnifyX = mng_magnify_ga8_x4; break; }
- case 5 : { fMagnifyX = mng_magnify_ga8_x5; break; }
- }
-
- switch (pImage->iMAGN_MethodY)
- {
- case 1 : { fMagnifyY = mng_magnify_ga8_y1; break; }
- case 2 : { fMagnifyY = mng_magnify_ga8_y2; break; }
- case 3 : { fMagnifyY = mng_magnify_ga8_y3; break; }
- case 4 : { fMagnifyY = mng_magnify_ga8_y4; break; }
- case 5 : { fMagnifyY = mng_magnify_ga8_y5; break; }
- }
- }
-#ifndef MNG_NO_16BIT_SUPPORT
- else
- {
- switch (pImage->iMAGN_MethodX)
- {
- case 1 : { fMagnifyX = mng_magnify_ga16_x1; break; }
- case 2 : { fMagnifyX = mng_magnify_ga16_x2; break; }
- case 3 : { fMagnifyX = mng_magnify_ga16_x3; break; }
- case 4 : { fMagnifyX = mng_magnify_ga16_x4; break; }
- case 5 : { fMagnifyX = mng_magnify_ga16_x5; break; }
- }
-
- switch (pImage->iMAGN_MethodY)
- {
- case 1 : { fMagnifyY = mng_magnify_ga16_y1; break; }
- case 2 : { fMagnifyY = mng_magnify_ga16_y2; break; }
- case 3 : { fMagnifyY = mng_magnify_ga16_y3; break; }
- case 4 : { fMagnifyY = mng_magnify_ga16_y4; break; }
- case 5 : { fMagnifyY = mng_magnify_ga16_y5; break; }
- }
- }
-#endif
-
- break;
- }
-#endif
-
- case 6 : ;
- case 14 : {
- if (pBuf->iBitdepth <= 8)
- {
- switch (pImage->iMAGN_MethodX)
- {
- case 1 : { fMagnifyX = mng_magnify_rgba8_x1; break; }
- case 2 : { fMagnifyX = mng_magnify_rgba8_x2; break; }
- case 3 : { fMagnifyX = mng_magnify_rgba8_x3; break; }
- case 4 : { fMagnifyX = mng_magnify_rgba8_x4; break; }
- case 5 : { fMagnifyX = mng_magnify_rgba8_x5; break; }
- }
-
- switch (pImage->iMAGN_MethodY)
- {
- case 1 : { fMagnifyY = mng_magnify_rgba8_y1; break; }
- case 2 : { fMagnifyY = mng_magnify_rgba8_y2; break; }
- case 3 : { fMagnifyY = mng_magnify_rgba8_y3; break; }
- case 4 : { fMagnifyY = mng_magnify_rgba8_y4; break; }
- case 5 : { fMagnifyY = mng_magnify_rgba8_y5; break; }
- }
- }
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_MAGN
- else
- {
- switch (pImage->iMAGN_MethodX)
- {
- case 1 : { fMagnifyX = mng_magnify_rgba16_x1; break; }
- case 2 : { fMagnifyX = mng_magnify_rgba16_x2; break; }
- case 3 : { fMagnifyX = mng_magnify_rgba16_x3; break; }
- case 4 : { fMagnifyX = mng_magnify_rgba16_x4; break; }
- case 5 : { fMagnifyX = mng_magnify_rgba16_x5; break; }
- }
-
- switch (pImage->iMAGN_MethodY)
- {
- case 1 : { fMagnifyY = mng_magnify_rgba16_y1; break; }
- case 2 : { fMagnifyY = mng_magnify_rgba16_y2; break; }
- case 3 : { fMagnifyY = mng_magnify_rgba16_y3; break; }
- case 4 : { fMagnifyY = mng_magnify_rgba16_y4; break; }
- case 5 : { fMagnifyY = mng_magnify_rgba16_y5; break; }
- }
- }
-#endif
-#endif
- break;
- }
- }
-
- pSrcline1 = pBuf->pImgdata; /* initialize row-loop variables */
- pDstline = pNewdata;
- /* allocate temporary row */
- MNG_ALLOC (pData, pTempline, iNewrowsize);
-
- for (iY = 0; iY < pBuf->iHeight; iY++)
- {
- pSrcline2 = pSrcline1 + pBuf->iRowsize;
-
- if (fMagnifyX) /* magnifying in X-direction ? */
- {
- iRetcode = fMagnifyX (pData, pImage->iMAGN_MX,
- pImage->iMAGN_ML, pImage->iMAGN_MR,
- pBuf->iWidth, pSrcline1, pDstline);
-
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pTempline, iNewrowsize);
- MNG_FREEX (pData, pNewdata, iNewsize);
- return iRetcode;
- }
- }
- else
- {
- MNG_COPY (pDstline, pSrcline1, iNewrowsize);
- }
-
- pDstline += iNewrowsize;
- /* magnifying in Y-direction ? */
- if ((fMagnifyY) &&
- ((iY < pBuf->iHeight - 1) || (pBuf->iHeight == 1) || (pImage->iMAGN_MethodY == 1)))
- {
- if (iY == 0) /* first interval ? */
- {
- if (pBuf->iHeight == 1) /* single row ? */
- pSrcline2 = MNG_NULL;
-
- iM = (mng_int32)pImage->iMAGN_MT;
- }
- else /* last interval ? */
- if (((pImage->iMAGN_MethodY == 1) && (iY == (pBuf->iHeight - 1))) ||
- ((pImage->iMAGN_MethodY != 1) && (iY == (pBuf->iHeight - 2))) )
- iM = (mng_int32)pImage->iMAGN_MB;
- else /* middle interval */
- iM = (mng_int32)pImage->iMAGN_MY;
-
- for (iS = 1; iS < iM; iS++)
- {
- iRetcode = fMagnifyY (pData, iS, iM, pBuf->iWidth,
- pSrcline1, pSrcline2, pTempline);
-
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pTempline, iNewrowsize);
- MNG_FREEX (pData, pNewdata, iNewsize);
- return iRetcode;
- }
-
- if (fMagnifyX) /* magnifying in X-direction ? */
- {
- iRetcode = fMagnifyX (pData, pImage->iMAGN_MX,
- pImage->iMAGN_ML, pImage->iMAGN_MR,
- pBuf->iWidth, pTempline, pDstline);
-
- if (iRetcode) /* on error bail out */
- {
- MNG_FREEX (pData, pTempline, iNewrowsize);
- MNG_FREEX (pData, pNewdata, iNewsize);
- return iRetcode;
- }
- }
- else
- {
- MNG_COPY (pDstline, pTempline, iNewrowsize);
- }
-
- pDstline += iNewrowsize;
- }
- }
-
- pSrcline1 += pBuf->iRowsize;
- }
- /* drop temporary row */
- MNG_FREEX (pData, pTempline, iNewrowsize);
- /* drop old pixel-data */
- MNG_FREEX (pData, pBuf->pImgdata, pBuf->iImgdatasize);
-
- pBuf->pImgdata = pNewdata; /* save new buffer dimensions */
- pBuf->iRowsize = iNewrowsize;
- pBuf->iImgdatasize = iNewsize;
- pBuf->iWidth = iNewW;
- pBuf->iHeight = iNewH;
-
- if (pImage->iId) /* real object ? */
- {
- pImage->iMAGN_MethodX = 0; /* it's done; don't do it again !!! */
- pImage->iMAGN_MethodY = 0;
- pImage->iMAGN_MX = 0;
- pImage->iMAGN_MY = 0;
- pImage->iMAGN_ML = 0;
- pImage->iMAGN_MR = 0;
- pImage->iMAGN_MT = 0;
- pImage->iMAGN_MB = 0;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_IMGOBJECT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_colorcorrect_object (mng_datap pData,
- mng_imagep pImage)
-{
- mng_imagedatap pBuf = pImage->pImgbuf;
- mng_retcode iRetcode;
- mng_uint32 iY;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_COLORCORRECT_OBJECT, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_JNG
- if ((pBuf->iBitdepth < 8) || /* we need 8- or 16-bit RGBA !!! */
- ((pBuf->iColortype != MNG_COLORTYPE_RGBA ) &&
- (pBuf->iColortype != MNG_COLORTYPE_JPEGCOLORA) ))
-#else
- if (pBuf->iBitdepth < 8) /* we need 8- or 16-bit RGBA !!! */
-#endif
- MNG_ERROR (pData, MNG_OBJNOTABSTRACT);
-
- if (!pBuf->bCorrected) /* only if not already done ! */
- { /* so the row routines now to find it */
- pData->pRetrieveobj = (mng_objectp)pImage;
- pData->pStoreobj = (mng_objectp)pImage;
- pData->pStorebuf = (mng_objectp)pImage->pImgbuf;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuf->iBitdepth > 8)
- {
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba16;
- pData->fStorerow = (mng_fptr)mng_store_rgba16;
- }
- else
-#endif
- {
- pData->fRetrieverow = (mng_fptr)mng_retrieve_rgba8;
- pData->fStorerow = (mng_fptr)mng_store_rgba8;
- }
-
- pData->bIsOpaque = MNG_FALSE;
-
- pData->iPass = -1; /* these are the object's dimensions now */
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pBuf->iWidth;
- pData->iRowsize = pData->iRowsamples << 2;
- pData->iPixelofs = 0;
- pData->bIsRGBA16 = MNG_FALSE;
- /* adjust for 16-bit object ? */
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuf->iBitdepth > 8)
- {
- pData->bIsRGBA16 = MNG_TRUE;
- pData->iRowsize = pData->iRowsamples << 3;
- }
-#endif
-
- pData->fCorrectrow = MNG_NULL; /* default no color-correction */
-
-#ifdef MNG_NO_CMS
- iRetcode = MNG_NOERROR;
-#else
-#if defined(MNG_FULL_CMS) /* determine color-management routine */
- iRetcode = mng_init_full_cms (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#elif defined(MNG_GAMMA_ONLY)
- iRetcode = mng_init_gamma_only (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#elif defined(MNG_APP_CMS)
- iRetcode = mng_init_app_cms (pData, MNG_FALSE, MNG_FALSE, MNG_TRUE);
-#endif
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif /* MNG_NO_CMS */
-
- if (pData->fCorrectrow) /* really correct something ? */
- { /* get a temporary row-buffer */
- MNG_ALLOC (pData, pData->pRGBArow, pData->iRowsize);
-
- pData->pWorkrow = pData->pRGBArow;
- iY = 0; /* start from the top */
-
- while ((!iRetcode) && (iY < pBuf->iHeight))
- { /* get a row */
- iRetcode = ((mng_retrieverow)pData->fRetrieverow) (pData);
-
- if (!iRetcode) /* color correct it */
- iRetcode = ((mng_correctrow)pData->fCorrectrow) (pData);
-
- if (!iRetcode) /* store it back ! */
- iRetcode = ((mng_storerow)pData->fStorerow) (pData);
-
- if (!iRetcode) /* adjust variables for next row */
- iRetcode = mng_next_row (pData);
-
- iY++; /* and next line */
- }
- /* drop the temporary row-buffer */
- MNG_FREEX (pData, pData->pRGBArow, pData->iRowsize);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#if defined(MNG_FULL_CMS) /* cleanup cms stuff */
- iRetcode = mng_clear_cms (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-#endif
- }
-
- pBuf->bCorrected = MNG_TRUE; /* let's not go through that again ! */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_COLORCORRECT_OBJECT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * Animation-object routines * */
-/* * * */
-/* * these handle the animation objects used to re-run parts of a MNG. * */
-/* * eg. during LOOP or TERM processing * */
-/* * * */
-/* ************************************************************************** */
-
-void mng_add_ani_object (mng_datap pData,
- mng_object_headerp pObject)
-{
- mng_object_headerp pLast = (mng_object_headerp)pData->pLastaniobj;
-
- if (pLast) /* link it as last in the chain */
- {
- pObject->pPrev = pLast;
- pLast->pNext = pObject;
- }
- else
- {
- pObject->pPrev = MNG_NULL; /* be on the safe side */
- pData->pFirstaniobj = pObject;
- }
-
- pObject->pNext = MNG_NULL; /* be on the safe side */
- pData->pLastaniobj = pObject;
- /* keep track for jumping */
- pObject->iFramenr = pData->iFrameseq;
- pObject->iLayernr = pData->iLayerseq;
- pObject->iPlaytime = pData->iFrametime;
- /* save restart object ? */
- if ((pData->bDisplaying) && (!pData->bRunning) && (!pData->pCurraniobj))
- pData->pCurraniobj = pObject;
-
- return;
-}
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-mng_retcode mng_create_ani_image (mng_datap pData)
-{
- mng_ani_imagep pImage;
- mng_imagep pCurrent;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_IMAGE, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* processing delta-image ? */
- pCurrent = (mng_imagep)pData->pObjzero;
- else /* get the current object */
-#endif
- pCurrent = (mng_imagep)pData->pCurrentobj;
-
- if (!pCurrent) /* otherwise object 0 */
- pCurrent = (mng_imagep)pData->pObjzero;
- /* now just clone the object !!! */
- iRetcode = mng_clone_imageobject (pData, 0, MNG_FALSE, pCurrent->bVisible,
- MNG_FALSE, MNG_FALSE, 0, 0, 0, pCurrent,
- &pImage);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- pImage->sHeader.fCleanup = mng_free_ani_image;
- pImage->sHeader.fProcess = mng_process_ani_image;
-
- mng_add_ani_object (pData, (mng_object_headerp)pImage);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_IMAGE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* okido */
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_ani_image (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_imagep pImage = (mng_ani_imagep)pObject;
- mng_imagedatap pImgbuf = pImage->pImgbuf;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_IMAGE, MNG_LC_START);
-#endif
- /* unlink the image-data buffer */
- iRetcode = mng_free_imagedataobject (pData, pImgbuf);
- /* drop its own buffer */
- MNG_FREEX (pData, pImage, sizeof (mng_ani_image));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_IMAGE, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_image (mng_datap pData,
- mng_objectp pObject)
-{
- mng_retcode iRetcode = MNG_NOERROR;
- mng_ani_imagep pImage = (mng_imagep)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_IMAGE, MNG_LC_START);
-#endif
-
-#ifndef MNG_NO_DELTA_PNG
- if (pData->bHasDHDR) /* processing delta-image ? */
- {
- mng_imagep pDelta = (mng_imagep)pData->pDeltaImage;
-
- if (!pData->iBreakpoint) /* only execute if not broken before */
- { /* make sure to process pixels as well */
- pData->bDeltaimmediate = MNG_FALSE;
- /* execute the delta process */
- iRetcode = mng_execute_delta_image (pData, pDelta, (mng_imagep)pObject);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- /* now go and shoot it off (if required) */
- if ((pDelta->bVisible) && (pDelta->bViewable))
- iRetcode = mng_display_image (pData, pDelta, MNG_FALSE);
-
- if (!pData->bTimerset)
- pData->bHasDHDR = MNG_FALSE; /* this image signifies IEND !! */
-
- }
- else
-#endif
- if (pData->pCurrentobj) /* active object ? */
- {
- mng_imagep pCurrent = (mng_imagep)pData->pCurrentobj;
- mng_imagedatap pBuf = pCurrent->pImgbuf;
-
- if (!pData->iBreakpoint) /* don't copy it again ! */
- {
- if (pBuf->iImgdatasize) /* buffer present in active object ? */
- /* then drop it */
- MNG_FREE (pData, pBuf->pImgdata, pBuf->iImgdatasize);
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pBuf->iProfilesize) /* iCCP profile present ? */
- /* then drop it */
- MNG_FREE (pData, pBuf->pProfile, pBuf->iProfilesize);
-#endif
- /* now blatently copy the animation buffer */
- MNG_COPY (pBuf, pImage->pImgbuf, sizeof (mng_imagedata));
- /* copy viewability */
- pCurrent->bViewable = pImage->bViewable;
-
- if (pBuf->iImgdatasize) /* sample buffer present ? */
- { /* then make a copy */
- MNG_ALLOC (pData, pBuf->pImgdata, pBuf->iImgdatasize);
- MNG_COPY (pBuf->pImgdata, pImage->pImgbuf->pImgdata, pBuf->iImgdatasize);
- }
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pBuf->iProfilesize) /* iCCP profile present ? */
- { /* then make a copy */
- MNG_ALLOC (pData, pBuf->pProfile, pBuf->iProfilesize);
- MNG_COPY (pBuf->pProfile, pImage->pImgbuf->pProfile, pBuf->iProfilesize);
- }
-#endif
- }
- /* now go and shoot it off (if required) */
- if ((pCurrent->bVisible) && (pCurrent->bViewable))
- iRetcode = mng_display_image (pData, pCurrent, MNG_FALSE);
- }
- else
- {
- mng_imagep pObjzero = (mng_imagep)pData->pObjzero;
- mng_imagedatap pBuf = pObjzero->pImgbuf;
-
- if (!pData->iBreakpoint) /* don't copy it again ! */
- {
- if (pBuf->iImgdatasize) /* buffer present in active object ? */
- /* then drop it */
- MNG_FREE (pData, pBuf->pImgdata, pBuf->iImgdatasize);
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pBuf->iProfilesize) /* iCCP profile present ? */
- /* then drop it */
- MNG_FREE (pData, pBuf->pProfile, pBuf->iProfilesize);
-#endif
- /* now blatently copy the animation buffer */
- MNG_COPY (pBuf, pImage->pImgbuf, sizeof (mng_imagedata));
- /* copy viewability */
- pObjzero->bViewable = pImage->bViewable;
-
- if (pBuf->iImgdatasize) /* sample buffer present ? */
- { /* then make a copy */
- MNG_ALLOC (pData, pBuf->pImgdata, pBuf->iImgdatasize);
- MNG_COPY (pBuf->pImgdata, pImage->pImgbuf->pImgdata, pBuf->iImgdatasize);
- }
-
-#ifndef MNG_SKIPCHUNK_iCCP
- if (pBuf->iProfilesize) /* iCCP profile present ? */
- { /* then make a copy */
- MNG_ALLOC (pData, pBuf->pProfile, pBuf->iProfilesize);
- MNG_COPY (pBuf->pProfile, pImage->pImgbuf->pProfile, pBuf->iProfilesize);
- }
-#endif
- }
- /* now go and show it */
- iRetcode = mng_display_image (pData, pObjzero, MNG_FALSE);
- }
-
- if (!iRetcode) /* all's well ? */
- {
- if (pData->bTimerset) /* timer break ? */
- pData->iBreakpoint = 99; /* fictive number; no more processing needed! */
- else
- pData->iBreakpoint = 0; /* else clear it */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_IMAGE, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_plte (mng_datap pData,
- mng_uint32 iEntrycount,
- mng_palette8ep paEntries)
-#else
-mng_retcode mng_create_ani_plte (mng_datap pData)
-#endif
-{
- mng_ani_pltep pPLTE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_PLTE, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_plte),
- mng_free_obj_general,
- mng_process_ani_plte,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pPLTE = (mng_ani_pltep)pTemp;
-#else
- MNG_ALLOC (pData, pPLTE, sizeof (mng_ani_plte));
-
- pPLTE->sHeader.fCleanup = mng_free_ani_plte;
- pPLTE->sHeader.fProcess = mng_process_ani_plte;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pPLTE);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pPLTE->iEntrycount = iEntrycount;
- MNG_COPY (pPLTE->aEntries, paEntries, sizeof (pPLTE->aEntries));
-#else
- pPLTE->iEntrycount = pData->iGlobalPLTEcount;
- MNG_COPY (pPLTE->aEntries, pData->aGlobalPLTEentries, sizeof (pPLTE->aEntries));
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_PLTE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_plte (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_PLTE, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_plte));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_PLTE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_plte (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_pltep pPLTE = (mng_ani_pltep)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_PLTE, MNG_LC_START);
-#endif
-
- pData->bHasglobalPLTE = MNG_TRUE;
- pData->iGlobalPLTEcount = pPLTE->iEntrycount;
-
- MNG_COPY (pData->aGlobalPLTEentries, pPLTE->aEntries, sizeof (pPLTE->aEntries));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_PLTE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_trns (mng_datap pData,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata)
-#else
-mng_retcode mng_create_ani_trns (mng_datap pData)
-#endif
-{
- mng_ani_trnsp pTRNS;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_TRNS, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_trns),
- mng_free_obj_general,
- mng_process_ani_trns,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pTRNS = (mng_ani_trnsp)pTemp;
-#else
- MNG_ALLOC (pData, pTRNS, sizeof (mng_ani_trns));
-
- pTRNS->sHeader.fCleanup = mng_free_ani_trns;
- pTRNS->sHeader.fProcess = mng_process_ani_trns;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pTRNS);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pTRNS->iRawlen = iRawlen;
- MNG_COPY (pTRNS->aRawdata, pRawdata, sizeof (pTRNS->aRawdata));
-#else
- pTRNS->iRawlen = pData->iGlobalTRNSrawlen;
- MNG_COPY (pTRNS->aRawdata, pData->aGlobalTRNSrawdata, sizeof (pTRNS->aRawdata));
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_TRNS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_trns (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_TRNS, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_trns));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_TRNS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_trns (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_trnsp pTRNS = (mng_ani_trnsp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_TRNS, MNG_LC_START);
-#endif
-
- pData->bHasglobalTRNS = MNG_TRUE;
- pData->iGlobalTRNSrawlen = pTRNS->iRawlen;
-
- MNG_COPY (pData->aGlobalTRNSrawdata, pTRNS->aRawdata, sizeof (pTRNS->aRawdata));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_TRNS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_gAMA
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_gama (mng_datap pData,
- mng_bool bEmpty,
- mng_uint32 iGamma)
-#else
-mng_retcode mng_create_ani_gama (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_gamap pGAMA;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_GAMA, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_gama),
- mng_free_obj_general,
- mng_process_ani_gama,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pGAMA = (mng_ani_gamap)pTemp;
-#else
- MNG_ALLOC (pData, pGAMA, sizeof (mng_ani_gama));
-
- pGAMA->sHeader.fCleanup = mng_free_ani_gama;
- pGAMA->sHeader.fProcess = mng_process_ani_gama;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pGAMA);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pGAMA->bEmpty = bEmpty;
- pGAMA->iGamma = iGamma;
-#else
- pGAMA->bEmpty = ((mng_gamap)pChunk)->bEmpty;
- pGAMA->iGamma = ((mng_gamap)pChunk)->iGamma;
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_GAMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_gama (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_GAMA, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_gama));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_GAMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_gama (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_gamap pGAMA = (mng_ani_gamap)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_GAMA, MNG_LC_START);
-#endif
-
- if (pGAMA->bEmpty) /* empty chunk ? */
- { /* clear global gAMA */
- pData->bHasglobalGAMA = MNG_FALSE;
- pData->iGlobalGamma = 0;
- }
- else
- { /* set global gAMA */
- pData->bHasglobalGAMA = MNG_TRUE;
- pData->iGlobalGamma = pGAMA->iGamma;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_GAMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_cHRM
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_chrm (mng_datap pData,
- mng_bool bEmpty,
- mng_uint32 iWhitepointx,
- mng_uint32 iWhitepointy,
- mng_uint32 iRedx,
- mng_uint32 iRedy,
- mng_uint32 iGreenx,
- mng_uint32 iGreeny,
- mng_uint32 iBluex,
- mng_uint32 iBluey)
-#else
-mng_retcode mng_create_ani_chrm (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_chrmp pCHRM;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_CHRM, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_chrm),
- mng_free_obj_general,
- mng_process_ani_chrm,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pCHRM = (mng_ani_chrmp)pTemp;
-#else
- MNG_ALLOC (pData, pCHRM, sizeof (mng_ani_chrm));
-
- pCHRM->sHeader.fCleanup = mng_free_ani_chrm;
- pCHRM->sHeader.fProcess = mng_process_ani_chrm;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pCHRM);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pCHRM->bEmpty = bEmpty;
- pCHRM->iWhitepointx = iWhitepointx;
- pCHRM->iWhitepointy = iWhitepointy;
- pCHRM->iRedx = iRedx;
- pCHRM->iRedy = iRedy;
- pCHRM->iGreenx = iGreenx;
- pCHRM->iGreeny = iGreeny;
- pCHRM->iBluex = iBluex;
- pCHRM->iBluey = iBluey;
-#else
- pCHRM->bEmpty = ((mng_chrmp)pChunk)->bEmpty;
- pCHRM->iWhitepointx = ((mng_chrmp)pChunk)->iWhitepointx;
- pCHRM->iWhitepointy = ((mng_chrmp)pChunk)->iWhitepointy;
- pCHRM->iRedx = ((mng_chrmp)pChunk)->iRedx;
- pCHRM->iRedy = ((mng_chrmp)pChunk)->iRedy;
- pCHRM->iGreenx = ((mng_chrmp)pChunk)->iGreenx;
- pCHRM->iGreeny = ((mng_chrmp)pChunk)->iGreeny;
- pCHRM->iBluex = ((mng_chrmp)pChunk)->iBluex;
- pCHRM->iBluey = ((mng_chrmp)pChunk)->iBluey;
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_CHRM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_chrm (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_CHRM, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_chrm));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_CHRM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_chrm (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_chrmp pCHRM = (mng_ani_chrmp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_CHRM, MNG_LC_START);
-#endif
-
- if (pCHRM->bEmpty) /* empty chunk ? */
- { /* clear global cHRM */
- pData->bHasglobalCHRM = MNG_FALSE;
- pData->iGlobalWhitepointx = 0;
- pData->iGlobalWhitepointy = 0;
- pData->iGlobalPrimaryredx = 0;
- pData->iGlobalPrimaryredy = 0;
- pData->iGlobalPrimarygreenx = 0;
- pData->iGlobalPrimarygreeny = 0;
- pData->iGlobalPrimarybluex = 0;
- pData->iGlobalPrimarybluey = 0;
- }
- else
- { /* set global cHRM */
- pData->bHasglobalCHRM = MNG_TRUE;
- pData->iGlobalWhitepointx = pCHRM->iWhitepointx;
- pData->iGlobalWhitepointy = pCHRM->iWhitepointy;
- pData->iGlobalPrimaryredx = pCHRM->iRedx;
- pData->iGlobalPrimaryredy = pCHRM->iRedy;
- pData->iGlobalPrimarygreenx = pCHRM->iGreenx;
- pData->iGlobalPrimarygreeny = pCHRM->iGreeny;
- pData->iGlobalPrimarybluex = pCHRM->iBluex;
- pData->iGlobalPrimarybluey = pCHRM->iBluey;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_CHRM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_sRGB
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_srgb (mng_datap pData,
- mng_bool bEmpty,
- mng_uint8 iRenderingintent)
-#else
-mng_retcode mng_create_ani_srgb (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_srgbp pSRGB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_SRGB, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_srgb),
- mng_free_obj_general,
- mng_process_ani_srgb,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pSRGB = (mng_ani_srgbp)pTemp;
-#else
- MNG_ALLOC (pData, pSRGB, sizeof (mng_ani_srgb));
-
- pSRGB->sHeader.fCleanup = mng_free_ani_srgb;
- pSRGB->sHeader.fProcess = mng_process_ani_srgb;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pSRGB);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pSRGB->bEmpty = bEmpty;
- pSRGB->iRenderingintent = iRenderingintent;
-#else
- pSRGB->bEmpty = ((mng_srgbp)pChunk)->bEmpty;
- pSRGB->iRenderingintent = ((mng_srgbp)pChunk)->iRenderingintent;
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_SRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_srgb (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_SRGB, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_srgb));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_SRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_srgb (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_srgbp pSRGB = (mng_ani_srgbp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_SRGB, MNG_LC_START);
-#endif
-
- if (pSRGB->bEmpty) /* empty chunk ? */
- { /* clear global sRGB */
- pData->bHasglobalSRGB = MNG_FALSE;
- pData->iGlobalRendintent = 0;
- }
- else
- { /* set global sRGB */
- pData->bHasglobalSRGB = MNG_TRUE;
- pData->iGlobalRendintent = pSRGB->iRenderingintent;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_SRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_iccp (mng_datap pData,
- mng_bool bEmpty,
- mng_uint32 iProfilesize,
- mng_ptr pProfile)
-#else
-mng_retcode mng_create_ani_iccp (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_iccpp pICCP;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_ICCP, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_iccp),
- mng_free_ani_iccp,
- mng_process_ani_iccp,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pICCP = (mng_ani_iccpp)pTemp;
-#else
- MNG_ALLOC (pData, pICCP, sizeof (mng_ani_iccp));
-
- pICCP->sHeader.fCleanup = mng_free_ani_iccp;
- pICCP->sHeader.fProcess = mng_process_ani_iccp;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pICCP);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pICCP->bEmpty = bEmpty;
- pICCP->iProfilesize = iProfilesize;
-
- if (iProfilesize)
- {
- MNG_ALLOC (pData, pICCP->pProfile, iProfilesize);
- MNG_COPY (pICCP->pProfile, pProfile, iProfilesize);
- }
-#else
- pICCP->bEmpty = ((mng_iccpp)pChunk)->bEmpty;
- pICCP->iProfilesize = ((mng_iccpp)pChunk)->iProfilesize;
-
- if (pICCP->iProfilesize)
- {
- MNG_ALLOC (pData, pICCP->pProfile, pICCP->iProfilesize);
- MNG_COPY (pICCP->pProfile, ((mng_iccpp)pChunk)->pProfile, pICCP->iProfilesize);
- }
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_ICCP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_ani_iccp (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_iccpp pICCP = (mng_ani_iccpp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_ICCP, MNG_LC_START);
-#endif
-
- if (pICCP->iProfilesize)
- MNG_FREEX (pData, pICCP->pProfile, pICCP->iProfilesize);
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- MNG_FREEX (pData, pObject, sizeof (mng_ani_iccp));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_ICCP, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- return MNG_NOERROR;
-#else
- return mng_free_obj_general(pData, pObject);
-#endif
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_iccp (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_iccpp pICCP = (mng_ani_iccpp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_ICCP, MNG_LC_START);
-#endif
-
- if (pICCP->bEmpty) /* empty chunk ? */
- { /* clear global iCCP */
- pData->bHasglobalICCP = MNG_FALSE;
-
- if (pData->iGlobalProfilesize)
- MNG_FREEX (pData, pData->pGlobalProfile, pData->iGlobalProfilesize);
-
- pData->iGlobalProfilesize = 0;
- pData->pGlobalProfile = MNG_NULL;
- }
- else
- { /* set global iCCP */
- pData->bHasglobalICCP = MNG_TRUE;
- pData->iGlobalProfilesize = pICCP->iProfilesize;
-
- if (pICCP->iProfilesize)
- {
- MNG_ALLOC (pData, pData->pGlobalProfile, pICCP->iProfilesize);
- MNG_COPY (pData->pGlobalProfile, pICCP->pProfile, pICCP->iProfilesize);
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_ICCP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_bKGD
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_bkgd (mng_datap pData,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue)
-#else
-mng_retcode mng_create_ani_bkgd (mng_datap pData)
-#endif
-{
- mng_ani_bkgdp pBKGD;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_BKGD, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_bkgd),
- mng_free_obj_general,
- mng_process_ani_bkgd,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pBKGD = (mng_ani_bkgdp)pTemp;
-#else
- MNG_ALLOC (pData, pBKGD, sizeof (mng_ani_bkgd));
-
- pBKGD->sHeader.fCleanup = mng_free_ani_bkgd;
- pBKGD->sHeader.fProcess = mng_process_ani_bkgd;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pBKGD);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pBKGD->iRed = iRed;
- pBKGD->iGreen = iGreen;
- pBKGD->iBlue = iBlue;
-#else
- pBKGD->iRed = pData->iGlobalBKGDred;
- pBKGD->iGreen = pData->iGlobalBKGDgreen;
- pBKGD->iBlue = pData->iGlobalBKGDblue;
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_BKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_bkgd (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_BKGD, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_bkgd));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_BKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_bkgd (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_bkgdp pBKGD = (mng_ani_bkgdp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_BKGD, MNG_LC_START);
-#endif
-
- pData->bHasglobalBKGD = MNG_TRUE;
- pData->iGlobalBKGDred = pBKGD->iRed;
- pData->iGlobalBKGDgreen = pBKGD->iGreen;
- pData->iGlobalBKGDblue = pBKGD->iBlue;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_BKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_LOOP
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_loop (mng_datap pData,
- mng_uint8 iLevel,
- mng_uint32 iRepeatcount,
- mng_uint8 iTermcond,
- mng_uint32 iItermin,
- mng_uint32 iItermax,
- mng_uint32 iCount,
- mng_uint32p pSignals)
-#else
-mng_retcode mng_create_ani_loop (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_loopp pLOOP;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_LOOP, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_loop),
- mng_free_ani_loop,
- mng_process_ani_loop,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pLOOP = (mng_ani_loopp)pTemp;
-#else
- MNG_ALLOC (pData, pLOOP, sizeof (mng_ani_loop));
-
- pLOOP->sHeader.fCleanup = mng_free_ani_loop;
- pLOOP->sHeader.fProcess = mng_process_ani_loop;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pLOOP);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pLOOP->iLevel = iLevel;
- pLOOP->iRepeatcount = iRepeatcount;
- pLOOP->iTermcond = iTermcond;
- pLOOP->iItermin = iItermin;
- pLOOP->iItermax = iItermax;
- pLOOP->iCount = iCount;
-
-#ifndef MNG_NO_LOOP_SIGNALS_SUPPORTED
- if (iCount)
- {
- MNG_ALLOC (pData, pLOOP->pSignals, (iCount << 1));
- MNG_COPY (pLOOP->pSignals, pSignals, (iCount << 1));
- }
-#endif
-#else /* MNG_OPTIMIZE_CHUNKREADER */
- pLOOP->iLevel = ((mng_loopp)pChunk)->iLevel;
- pLOOP->iRepeatcount = ((mng_loopp)pChunk)->iRepeat;
- pLOOP->iTermcond = ((mng_loopp)pChunk)->iTermination;
- pLOOP->iItermin = ((mng_loopp)pChunk)->iItermin;
- pLOOP->iItermax = ((mng_loopp)pChunk)->iItermax;
- pLOOP->iCount = ((mng_loopp)pChunk)->iCount;
-
-#ifndef MNG_NO_LOOP_SIGNALS_SUPPORTED
- if (pLOOP->iCount)
- {
- MNG_ALLOC (pData, pLOOP->pSignals, (pLOOP->iCount << 1));
- MNG_COPY (pLOOP->pSignals, ((mng_loopp)pChunk)->pSignals, (pLOOP->iCount << 1));
- }
-#endif
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
- /* running counter starts with repeat_count */
- pLOOP->iRunningcount = pLOOP->iRepeatcount;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_LOOP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_ani_loop (mng_datap pData,
- mng_objectp pObject)
-{
-#ifndef MNG_NO_LOOP_SIGNALS_SUPPORTED
- mng_ani_loopp pLOOP = (mng_ani_loopp)pObject;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_LOOP, MNG_LC_START);
-#endif
-
-#ifndef MNG_NO_LOOP_SIGNALS_SUPPORTED
- if (pLOOP->iCount) /* drop signal buffer ? */
- MNG_FREEX (pData, pLOOP->pSignals, (pLOOP->iCount << 1));
-#endif
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- MNG_FREEX (pData, pObject, sizeof (mng_ani_loop));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_LOOP, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- return MNG_NOERROR;
-#else
- return mng_free_obj_general(pData, pObject);
-#endif
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_loop (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_loopp pLOOP = (mng_ani_loopp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_LOOP, MNG_LC_START);
-#endif
- /* just reset the running counter */
- pLOOP->iRunningcount = pLOOP->iRepeatcount;
- /* iteration=0 means we're skipping ! */
- if ((!pData->bSkipping) && (pLOOP->iRepeatcount == 0))
- pData->bSkipping = MNG_TRUE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_LOOP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-mng_retcode mng_create_ani_endl (mng_datap pData,
- mng_uint8 iLevel)
-{
- mng_ani_endlp pENDL;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_ENDL, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
- mng_retcode iRetcode;
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_endl),
- mng_free_obj_general,
- mng_process_ani_endl,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pENDL = (mng_ani_endlp)pTemp;
-#else
- MNG_ALLOC (pData, pENDL, sizeof (mng_ani_endl));
-
- pENDL->sHeader.fCleanup = mng_free_ani_endl;
- pENDL->sHeader.fProcess = mng_process_ani_endl;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pENDL);
-
- pENDL->iLevel = iLevel;
-
- iRetcode = mng_process_ani_endl (pData, (mng_objectp)pENDL);
- if (iRetcode)
- return iRetcode;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_ENDL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_endl (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_ENDL, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_endl));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_ENDL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_endl (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_endlp pENDL = (mng_ani_endlp)pObject;
- mng_ani_loopp pLOOP;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_ENDL, MNG_LC_START);
-#endif
-
- if (((pData->bDisplaying) && ((pData->bRunning) || (pData->bSearching))) ||
- (pData->bReading) )
- {
- pLOOP = pENDL->pLOOP; /* determine matching LOOP */
-
- if (!pLOOP) /* haven't got it yet ? */
- { /* go and look back in the list */
- pLOOP = (mng_ani_loopp)pENDL->sHeader.pPrev;
-
- while ((pLOOP) &&
- ((pLOOP->sHeader.fCleanup != mng_free_ani_loop) ||
- (pLOOP->iLevel != pENDL->iLevel) ))
- pLOOP = pLOOP->sHeader.pPrev;
- }
- /* got it now ? */
- if ((pLOOP) && (pLOOP->iLevel == pENDL->iLevel))
- {
- pENDL->pLOOP = pLOOP; /* save for next time ! */
- /* decrease running counter ? */
- if ((pLOOP->iRunningcount) && (pLOOP->iRunningcount < 0x7fffffffL))
- pLOOP->iRunningcount--;
-
- if ((!pData->bDisplaying) && (pData->bReading) &&
- (pLOOP->iRunningcount >= 0x7fffffffL))
- {
- pData->iTotalframes = 0x7fffffffL;
- pData->iTotallayers = 0x7fffffffL;
- pData->iTotalplaytime = 0x7fffffffL;
- }
- else
- {
- /* TODO: we're cheating out on the termination_condition,
- iteration_min, iteration_max and possible signals;
- the code is just not ready for that can of worms.... */
-
- if (!pLOOP->iRunningcount) /* reached zero ? */
- { /* was this the outer LOOP ? */
- if (pData->pFirstaniobj == (mng_objectp)pLOOP) /* TODO: THIS IS WRONG!! */
- pData->bHasLOOP = MNG_FALSE;
- }
- else
- {
- if (pData->pCurraniobj) /* was we processing objects ? */
- pData->pCurraniobj = pLOOP;/* then restart with LOOP */
- else /* else restart behind LOOP !!! */
- pData->pCurraniobj = pLOOP->sHeader.pNext;
- }
- }
- /* does this match a 'skipping' LOOP? */
- if ((pData->bSkipping) && (pLOOP->iRepeatcount == 0))
- pData->bSkipping = MNG_FALSE;
- }
- else
- MNG_ERROR (pData, MNG_NOMATCHINGLOOP);
-
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_ENDL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DEFI
-mng_retcode mng_create_ani_defi (mng_datap pData)
-{
- mng_ani_defip pDEFI;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_DEFI, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_defi),
- mng_free_obj_general,
- mng_process_ani_defi,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pDEFI = (mng_ani_defip)pTemp;
-#else
- MNG_ALLOC (pData, pDEFI, sizeof (mng_ani_defi));
-
- pDEFI->sHeader.fCleanup = mng_free_ani_defi;
- pDEFI->sHeader.fProcess = mng_process_ani_defi;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pDEFI);
-
- pDEFI->iId = pData->iDEFIobjectid;
- pDEFI->bHasdonotshow = pData->bDEFIhasdonotshow;
- pDEFI->iDonotshow = pData->iDEFIdonotshow;
- pDEFI->bHasconcrete = pData->bDEFIhasconcrete;
- pDEFI->iConcrete = pData->iDEFIconcrete;
- pDEFI->bHasloca = pData->bDEFIhasloca;
- pDEFI->iLocax = pData->iDEFIlocax;
- pDEFI->iLocay = pData->iDEFIlocay;
- pDEFI->bHasclip = pData->bDEFIhasclip;
- pDEFI->iClipl = pData->iDEFIclipl;
- pDEFI->iClipr = pData->iDEFIclipr;
- pDEFI->iClipt = pData->iDEFIclipt;
- pDEFI->iClipb = pData->iDEFIclipb;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_DEFI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_defi (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_DEFI, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_defi));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_DEFI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_defi (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_defip pDEFI = (mng_ani_defip)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_DEFI, MNG_LC_START);
-#endif
-
- pData->iDEFIobjectid = pDEFI->iId;
- pData->bDEFIhasdonotshow = pDEFI->bHasdonotshow;
- pData->iDEFIdonotshow = pDEFI->iDonotshow;
- pData->bDEFIhasconcrete = pDEFI->bHasconcrete;
- pData->iDEFIconcrete = pDEFI->iConcrete;
- pData->bDEFIhasloca = pDEFI->bHasloca;
- pData->iDEFIlocax = pDEFI->iLocax;
- pData->iDEFIlocay = pDEFI->iLocay;
- pData->bDEFIhasclip = pDEFI->bHasclip;
- pData->iDEFIclipl = pDEFI->iClipl;
- pData->iDEFIclipr = pDEFI->iClipr;
- pData->iDEFIclipt = pDEFI->iClipt;
- pData->iDEFIclipb = pDEFI->iClipb;
-
- iRetcode = mng_process_display_defi (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_DEFI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BASI
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_basi (mng_datap pData,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_bool bHasalpha,
- mng_uint16 iAlpha,
- mng_uint8 iViewable)
-#else
-mng_retcode mng_create_ani_basi (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_basip pBASI;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_BASI, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_basi),
- mng_free_obj_general,
- mng_process_ani_basi,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pBASI = (mng_ani_basip)pTemp;
-#else
- MNG_ALLOC (pData, pBASI, sizeof (mng_ani_basi));
-
- pBASI->sHeader.fCleanup = mng_free_ani_basi;
- pBASI->sHeader.fProcess = mng_process_ani_basi;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pBASI);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pBASI->iRed = iRed;
- pBASI->iGreen = iGreen;
- pBASI->iBlue = iBlue;
- pBASI->bHasalpha = bHasalpha;
- pBASI->iAlpha = iAlpha;
- pBASI->iViewable = iViewable;
-#else
- pBASI->iRed = ((mng_basip)pChunk)->iRed;
- pBASI->iGreen = ((mng_basip)pChunk)->iGreen;
- pBASI->iBlue = ((mng_basip)pChunk)->iBlue;
- pBASI->bHasalpha = ((mng_basip)pChunk)->bHasalpha;
- pBASI->iAlpha = ((mng_basip)pChunk)->iAlpha;
- pBASI->iViewable = ((mng_basip)pChunk)->iViewable;
-#endif
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- iRetcode = mng_process_display_basi (pData, iRed, iGreen, iBlue,
- bHasalpha, iAlpha, iViewable);
-#else
- iRetcode = mng_process_display_basi (pData,
- ((mng_basip)pChunk)->iRed,
- ((mng_basip)pChunk)->iGreen,
- ((mng_basip)pChunk)->iBlue,
- ((mng_basip)pChunk)->bHasalpha,
- ((mng_basip)pChunk)->iAlpha,
- ((mng_basip)pChunk)->iViewable);
-#endif
-#else
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pData->iBASIred = iRed;
- pData->iBASIgreen = iGreen;
- pData->iBASIblue = iBlue;
- pData->bBASIhasalpha = bHasalpha;
- pData->iBASIalpha = iAlpha;
- pData->iBASIviewable = iViewable;
-#else
- pData->iBASIred = ((mng_basip)pChunk)->iRed;
- pData->iBASIgreen = ((mng_basip)pChunk)->iGreen;
- pData->iBASIblue = ((mng_basip)pChunk)->iBlue;
- pData->bBASIhasalpha = ((mng_basip)pChunk)->bHasalpha;
- pData->iBASIalpha = ((mng_basip)pChunk)->iAlpha;
- pData->iBASIviewable = ((mng_basip)pChunk)->iViewable;
-#endif
-
- iRetcode = mng_process_display_basi (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_BASI, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_basi (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_BASI, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_basi));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_BASI, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_basi (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_basip pBASI = (mng_ani_basip)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_BASI, MNG_LC_START);
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_basi (pData, pBASI->iRed, pBASI->iGreen, pBASI->iBlue,
- pBASI->bHasalpha, pBASI->iAlpha, pBASI->iViewable);
-#else
- pData->iBASIred = pBASI->iRed;
- pData->iBASIgreen = pBASI->iGreen;
- pData->iBASIblue = pBASI->iBlue;
- pData->bBASIhasalpha = pBASI->bHasalpha;
- pData->iBASIalpha = pBASI->iAlpha;
- pData->iBASIviewable = pBASI->iViewable;
-
- iRetcode = mng_process_display_basi (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_BASI, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLON
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_clon (mng_datap pData,
- mng_uint16 iSourceid,
- mng_uint16 iCloneid,
- mng_uint8 iClonetype,
- mng_bool bHasdonotshow,
- mng_uint8 iDonotshow,
- mng_uint8 iConcrete,
- mng_bool bHasloca,
- mng_uint8 iLocatype,
- mng_int32 iLocax,
- mng_int32 iLocay)
-#else
-mng_retcode mng_create_ani_clon (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_clonp pCLON;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_CLON, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_clon),
- mng_free_obj_general,
- mng_process_ani_clon,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pCLON = (mng_ani_clonp)pTemp;
-#else
- MNG_ALLOC (pData, pCLON, sizeof (mng_ani_clon));
-
- pCLON->sHeader.fCleanup = mng_free_ani_clon;
- pCLON->sHeader.fProcess = mng_process_ani_clon;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pCLON);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pCLON->iSourceid = iSourceid;
- pCLON->iCloneid = iCloneid;
- pCLON->iClonetype = iClonetype;
- pCLON->bHasdonotshow = bHasdonotshow;
- pCLON->iDonotshow = iDonotshow;
- pCLON->iConcrete = iConcrete;
- pCLON->bHasloca = bHasloca;
- pCLON->iLocatype = iLocatype;
- pCLON->iLocax = iLocax;
- pCLON->iLocay = iLocay;
-#else
- pCLON->iSourceid = ((mng_clonp)pChunk)->iSourceid;
- pCLON->iCloneid = ((mng_clonp)pChunk)->iCloneid;
- pCLON->iClonetype = ((mng_clonp)pChunk)->iClonetype;
- pCLON->bHasdonotshow = ((mng_clonp)pChunk)->bHasdonotshow;
- pCLON->iDonotshow = ((mng_clonp)pChunk)->iDonotshow;
- pCLON->iConcrete = ((mng_clonp)pChunk)->iConcrete;
- pCLON->bHasloca = ((mng_clonp)pChunk)->bHasloca;
- pCLON->iLocatype = ((mng_clonp)pChunk)->iLocationtype;
- pCLON->iLocax = ((mng_clonp)pChunk)->iLocationx;
- pCLON->iLocay = ((mng_clonp)pChunk)->iLocationy;
-#endif
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- iRetcode = mng_process_display_clon (pData, iSourceid, iCloneid, iClonetype,
- bHasdonotshow, iDonotshow, iConcrete,
- bHasloca, iLocatype, iLocax, iLocay);
-#else
- iRetcode = mng_process_display_clon (pData,
- ((mng_clonp)pChunk)->iSourceid,
- ((mng_clonp)pChunk)->iCloneid,
- ((mng_clonp)pChunk)->iClonetype,
- ((mng_clonp)pChunk)->bHasdonotshow,
- ((mng_clonp)pChunk)->iDonotshow,
- ((mng_clonp)pChunk)->iConcrete,
- ((mng_clonp)pChunk)->bHasloca,
- ((mng_clonp)pChunk)->iLocationtype,
- ((mng_clonp)pChunk)->iLocationx,
- ((mng_clonp)pChunk)->iLocationy);
-#endif
-#else
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pData->iCLONsourceid = iSourceid;
- pData->iCLONcloneid = iCloneid;
- pData->iCLONclonetype = iClonetype;
- pData->bCLONhasdonotshow = bHasdonotshow;
- pData->iCLONdonotshow = iDonotshow;
- pData->iCLONconcrete = iConcrete;
- pData->bCLONhasloca = bHasloca;
- pData->iCLONlocationtype = iLocatype;
- pData->iCLONlocationx = iLocax;
- pData->iCLONlocationy = iLocay;
-#else
- pData->iCLONsourceid = ((mng_clonp)pChunk)->iSourceid;
- pData->iCLONcloneid = ((mng_clonp)pChunk)->iCloneid;
- pData->iCLONclonetype = ((mng_clonp)pChunk)->iClonetype;
- pData->bCLONhasdonotshow = ((mng_clonp)pChunk)->bHasdonotshow;
- pData->iCLONdonotshow = ((mng_clonp)pChunk)->iDonotshow;
- pData->iCLONconcrete = ((mng_clonp)pChunk)->iConcrete;
- pData->bCLONhasloca = ((mng_clonp)pChunk)->bHasloca;
- pData->iCLONlocationtype = ((mng_clonp)pChunk)->iLocationtype;
- pData->iCLONlocationx = ((mng_clonp)pChunk)->iLocationx;
- pData->iCLONlocationy = ((mng_clonp)pChunk)->iLocationy;
-#endif
-
- iRetcode = mng_process_display_clon (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_CLON, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_clon (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_CLON, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_clon));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_CLON, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_clon (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_clonp pCLON = (mng_ani_clonp)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_CLON, MNG_LC_START);
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_clon (pData, pCLON->iSourceid, pCLON->iCloneid,
- pCLON->iClonetype, pCLON->bHasdonotshow,
- pCLON->iDonotshow, pCLON->iConcrete,
- pCLON->bHasloca, pCLON->iLocatype,
- pCLON->iLocax, pCLON->iLocay);
-#else
- pData->iCLONcloneid = pCLON->iCloneid;
- pData->iCLONsourceid = pCLON->iSourceid;
- pData->iCLONclonetype = pCLON->iClonetype;
- pData->bCLONhasdonotshow = pCLON->bHasdonotshow;
- pData->iCLONdonotshow = pCLON->iDonotshow;
- pData->iCLONconcrete = pCLON->iConcrete;
- pData->bCLONhasloca = pCLON->bHasloca;
- pData->iCLONlocationtype = pCLON->iLocatype;
- pData->iCLONlocationx = pCLON->iLocax;
- pData->iCLONlocationy = pCLON->iLocay;
-
- iRetcode = mng_process_display_clon (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_CLON, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_BACK
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_back (mng_datap pData,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_uint8 iMandatory,
- mng_uint16 iImageid,
- mng_uint8 iTile)
-#else
-mng_retcode mng_create_ani_back (mng_datap pData)
-#endif
-{
- mng_ani_backp pBACK;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_BACK, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_back),
- mng_free_obj_general,
- mng_process_ani_back,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pBACK = (mng_ani_backp)pTemp;
-#else
- MNG_ALLOC (pData, pBACK, sizeof (mng_ani_back));
-
- pBACK->sHeader.fCleanup = mng_free_ani_back;
- pBACK->sHeader.fProcess = mng_process_ani_back;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pBACK);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pBACK->iRed = iRed;
- pBACK->iGreen = iGreen;
- pBACK->iBlue = iBlue;
- pBACK->iMandatory = iMandatory;
- pBACK->iImageid = iImageid;
- pBACK->iTile = iTile;
-#else
- pBACK->iRed = pData->iBACKred;
- pBACK->iGreen = pData->iBACKgreen;
- pBACK->iBlue = pData->iBACKblue;
- pBACK->iMandatory = pData->iBACKmandatory;
- pBACK->iImageid = pData->iBACKimageid;
- pBACK->iTile = pData->iBACKtile;
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_BACK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_back (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_BACK, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_back));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_BACK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_back (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_backp pBACK = (mng_ani_backp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_BACK, MNG_LC_START);
-#endif
-
- pData->iBACKred = pBACK->iRed;
- pData->iBACKgreen = pBACK->iGreen;
- pData->iBACKblue = pBACK->iBlue;
- pData->iBACKmandatory = pBACK->iMandatory;
- pData->iBACKimageid = pBACK->iImageid;
- pData->iBACKtile = pBACK->iTile;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_BACK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_FRAM
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_fram (mng_datap pData,
- mng_uint8 iFramemode,
- mng_uint8 iChangedelay,
- mng_uint32 iDelay,
- mng_uint8 iChangetimeout,
- mng_uint32 iTimeout,
- mng_uint8 iChangeclipping,
- mng_uint8 iCliptype,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb)
-#else
-mng_retcode mng_create_ani_fram (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_framp pFRAM;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_FRAM, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_fram),
- mng_free_obj_general,
- mng_process_ani_fram,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pFRAM = (mng_ani_framp)pTemp;
-#else
- MNG_ALLOC (pData, pFRAM, sizeof (mng_ani_fram));
-
- pFRAM->sHeader.fCleanup = mng_free_ani_fram;
- pFRAM->sHeader.fProcess = mng_process_ani_fram;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pFRAM);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pFRAM->iFramemode = iFramemode;
- pFRAM->iChangedelay = iChangedelay;
- pFRAM->iDelay = iDelay;
- pFRAM->iChangetimeout = iChangetimeout;
- pFRAM->iTimeout = iTimeout;
- pFRAM->iChangeclipping = iChangeclipping;
- pFRAM->iCliptype = iCliptype;
- pFRAM->iClipl = iClipl;
- pFRAM->iClipr = iClipr;
- pFRAM->iClipt = iClipt;
- pFRAM->iClipb = iClipb;
-#else
- pFRAM->iFramemode = ((mng_framp)pChunk)->iMode;
- pFRAM->iChangedelay = ((mng_framp)pChunk)->iChangedelay;
- pFRAM->iDelay = ((mng_framp)pChunk)->iDelay;
- pFRAM->iChangetimeout = ((mng_framp)pChunk)->iChangetimeout;
- pFRAM->iTimeout = ((mng_framp)pChunk)->iTimeout;
- pFRAM->iChangeclipping = ((mng_framp)pChunk)->iChangeclipping;
- pFRAM->iCliptype = ((mng_framp)pChunk)->iBoundarytype;
- pFRAM->iClipl = ((mng_framp)pChunk)->iBoundaryl;
- pFRAM->iClipr = ((mng_framp)pChunk)->iBoundaryr;
- pFRAM->iClipt = ((mng_framp)pChunk)->iBoundaryt;
- pFRAM->iClipb = ((mng_framp)pChunk)->iBoundaryb;
-#endif
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- iRetcode = mng_process_display_fram (pData, iFramemode,
- iChangedelay, iDelay,
- iChangetimeout, iTimeout,
- iChangeclipping, iCliptype,
- iClipl, iClipr,
- iClipt, iClipb);
-#else
- iRetcode = mng_process_display_fram (pData,
- ((mng_framp)pChunk)->iMode,
- ((mng_framp)pChunk)->iChangedelay,
- ((mng_framp)pChunk)->iDelay,
- ((mng_framp)pChunk)->iChangetimeout,
- ((mng_framp)pChunk)->iTimeout,
- ((mng_framp)pChunk)->iChangeclipping,
- ((mng_framp)pChunk)->iBoundarytype,
- ((mng_framp)pChunk)->iBoundaryl,
- ((mng_framp)pChunk)->iBoundaryr,
- ((mng_framp)pChunk)->iBoundaryt,
- ((mng_framp)pChunk)->iBoundaryb);
-#endif
-#else
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pData->iTempFramemode = iFramemode;
- pData->iTempChangedelay = iChangedelay;
- pData->iTempDelay = iDelay;
- pData->iTempChangetimeout = iChangetimeout;
- pData->iTempTimeout = iTimeout;
- pData->iTempChangeclipping = iChangeclipping;
- pData->iTempCliptype = iCliptype;
- pData->iTempClipl = iClipl;
- pData->iTempClipr = iClipr;
- pData->iTempClipt = iClipt;
- pData->iTempClipb = iClipb;
-#else
- pData->iTempFramemode = ((mng_framp)pChunk)->iMode;
- pData->iTempChangedelay = ((mng_framp)pChunk)->iChangedelay;
- pData->iTempDelay = ((mng_framp)pChunk)->iDelay;
- pData->iTempChangetimeout = ((mng_framp)pChunk)->iChangetimeout;
- pData->iTempTimeout = ((mng_framp)pChunk)->iTimeout;
- pData->iTempChangeclipping = ((mng_framp)pChunk)->iChangeclipping;
- pData->iTempCliptype = ((mng_framp)pChunk)->iBoundarytype;
- pData->iTempClipl = ((mng_framp)pChunk)->iBoundaryl;
- pData->iTempClipr = ((mng_framp)pChunk)->iBoundaryr;
- pData->iTempClipt = ((mng_framp)pChunk)->iBoundaryt;
- pData->iTempClipb = ((mng_framp)pChunk)->iBoundaryb;
-#endif
-
- iRetcode = mng_process_display_fram (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_FRAM, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_fram (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_FRAM, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_fram));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_FRAM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_fram (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_framp pFRAM = (mng_ani_framp)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_FRAM, MNG_LC_START);
-#endif
-
- if (pData->iBreakpoint) /* previously broken ? */
- {
- iRetcode = mng_process_display_fram2 (pData);
- pData->iBreakpoint = 0; /* not again */
- }
- else
- {
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_fram (pData, pFRAM->iFramemode,
- pFRAM->iChangedelay, pFRAM->iDelay,
- pFRAM->iChangetimeout, pFRAM->iTimeout,
- pFRAM->iChangeclipping, pFRAM->iCliptype,
- pFRAM->iClipl, pFRAM->iClipr,
- pFRAM->iClipt, pFRAM->iClipb);
-#else
- pData->iTempFramemode = pFRAM->iFramemode;
- pData->iTempChangedelay = pFRAM->iChangedelay;
- pData->iTempDelay = pFRAM->iDelay;
- pData->iTempChangetimeout = pFRAM->iChangetimeout;
- pData->iTempTimeout = pFRAM->iTimeout;
- pData->iTempChangeclipping = pFRAM->iChangeclipping;
- pData->iTempCliptype = pFRAM->iCliptype;
- pData->iTempClipl = pFRAM->iClipl;
- pData->iTempClipr = pFRAM->iClipr;
- pData->iTempClipt = pFRAM->iClipt;
- pData->iTempClipb = pFRAM->iClipb;
-
- iRetcode = mng_process_display_fram (pData);
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_FRAM, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MOVE
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_move (mng_datap pData,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iType,
- mng_int32 iLocax,
- mng_int32 iLocay)
-#else
-mng_retcode mng_create_ani_move (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_movep pMOVE;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_MOVE, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_move),
- mng_free_obj_general,
- mng_process_ani_move,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pMOVE = (mng_ani_movep)pTemp;
-#else
- MNG_ALLOC (pData, pMOVE, sizeof (mng_ani_move));
-
- pMOVE->sHeader.fCleanup = mng_free_ani_move;
- pMOVE->sHeader.fProcess = mng_process_ani_move;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pMOVE);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pMOVE->iFirstid = iFirstid;
- pMOVE->iLastid = iLastid;
- pMOVE->iType = iType;
- pMOVE->iLocax = iLocax;
- pMOVE->iLocay = iLocay;
-#else
- pMOVE->iFirstid = ((mng_movep)pChunk)->iFirstid;
- pMOVE->iLastid = ((mng_movep)pChunk)->iLastid;
- pMOVE->iType = ((mng_movep)pChunk)->iMovetype;
- pMOVE->iLocax = ((mng_movep)pChunk)->iMovex;
- pMOVE->iLocay = ((mng_movep)pChunk)->iMovey;
-#endif
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- iRetcode = mng_process_display_move (pData, iFirstid, iLastid,
- iType, iLocax, iLocay);
-#else
- iRetcode = mng_process_display_move (pData,
- ((mng_movep)pChunk)->iFirstid,
- ((mng_movep)pChunk)->iLastid,
- ((mng_movep)pChunk)->iMovetype,
- ((mng_movep)pChunk)->iMovex,
- ((mng_movep)pChunk)->iMovey);
-#endif
-#else
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pData->iMOVEfromid = iFirstid;
- pData->iMOVEtoid = iLastid;
- pData->iMOVEmovetype = iType;
- pData->iMOVEmovex = iLocax;
- pData->iMOVEmovey = iLocay;
-#else
- pData->iMOVEfromid = ((mng_movep)pChunk)->iFirstid;
- pData->iMOVEtoid = ((mng_movep)pChunk)->iLastid;
- pData->iMOVEmovetype = ((mng_movep)pChunk)->iMovetype;
- pData->iMOVEmovex = ((mng_movep)pChunk)->iMovex;
- pData->iMOVEmovey = ((mng_movep)pChunk)->iMovey;
-#endif
-
- iRetcode = mng_process_display_move (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_MOVE, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_move (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_MOVE, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_move));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_MOVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_move (mng_datap pData,
- mng_objectp pObject)
-{
- mng_retcode iRetcode;
- mng_ani_movep pMOVE = (mng_ani_movep)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_MOVE, MNG_LC_START);
-#endif
- /* re-process the MOVE chunk */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_move (pData, pMOVE->iFirstid, pMOVE->iLastid,
- pMOVE->iType, pMOVE->iLocax, pMOVE->iLocay);
-#else
- pData->iMOVEfromid = pMOVE->iFirstid;
- pData->iMOVEtoid = pMOVE->iLastid;
- pData->iMOVEmovetype = pMOVE->iType;
- pData->iMOVEmovex = pMOVE->iLocax;
- pData->iMOVEmovey = pMOVE->iLocay;
-
- iRetcode = mng_process_display_move (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_MOVE, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_CLIP
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_clip (mng_datap pData,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iType,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb)
-#else
-mng_retcode mng_create_ani_clip (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_clipp pCLIP;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_CLIP, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_clip),
- mng_free_obj_general,
- mng_process_ani_clip,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pCLIP = (mng_ani_clipp)pTemp;
-#else
- MNG_ALLOC (pData, pCLIP, sizeof (mng_ani_clip));
-
- pCLIP->sHeader.fCleanup = mng_free_ani_clip;
- pCLIP->sHeader.fProcess = mng_process_ani_clip;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pCLIP);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pCLIP->iFirstid = iFirstid;
- pCLIP->iLastid = iLastid;
- pCLIP->iType = iType;
- pCLIP->iClipl = iClipl;
- pCLIP->iClipr = iClipr;
- pCLIP->iClipt = iClipt;
- pCLIP->iClipb = iClipb;
-#else
- pCLIP->iFirstid = ((mng_clipp)pChunk)->iFirstid;
- pCLIP->iLastid = ((mng_clipp)pChunk)->iLastid;
- pCLIP->iType = ((mng_clipp)pChunk)->iCliptype;
- pCLIP->iClipl = ((mng_clipp)pChunk)->iClipl;
- pCLIP->iClipr = ((mng_clipp)pChunk)->iClipr;
- pCLIP->iClipt = ((mng_clipp)pChunk)->iClipt;
- pCLIP->iClipb = ((mng_clipp)pChunk)->iClipb;
-#endif
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- iRetcode = mng_process_display_clip (pData, iFirstid, iLastid,
- iType, iClipl, iClipr,
- iClipt, iClipb);
-#else
- iRetcode = mng_process_display_clip (pData,
- ((mng_clipp)pChunk)->iFirstid,
- ((mng_clipp)pChunk)->iLastid,
- ((mng_clipp)pChunk)->iCliptype,
- ((mng_clipp)pChunk)->iClipl,
- ((mng_clipp)pChunk)->iClipr,
- ((mng_clipp)pChunk)->iClipt,
- ((mng_clipp)pChunk)->iClipb);
-#endif
-#else
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pData->iCLIPfromid = iFirstid;
- pData->iCLIPtoid = iLastid;
- pData->iCLIPcliptype = iType;
- pData->iCLIPclipl = iClipl;
- pData->iCLIPclipr = iClipr;
- pData->iCLIPclipt = iClipt;
- pData->iCLIPclipb = iClipb;
-#else
- pData->iCLIPfromid = ((mng_clipp)pChunk)->iFirstid;
- pData->iCLIPtoid = ((mng_clipp)pChunk)->iLastid;
- pData->iCLIPcliptype = ((mng_clipp)pChunk)->iCliptype;
- pData->iCLIPclipl = ((mng_clipp)pChunk)->iClipl;
- pData->iCLIPclipr = ((mng_clipp)pChunk)->iClipr;
- pData->iCLIPclipt = ((mng_clipp)pChunk)->iClipt;
- pData->iCLIPclipb = ((mng_clipp)pChunk)->iClipb;
-#endif
-
- iRetcode = mng_process_display_clip (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_CLIP, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_clip (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_CLIP, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_clip));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_CLIP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_clip (mng_datap pData,
- mng_objectp pObject)
-{
- mng_retcode iRetcode;
- mng_ani_clipp pCLIP = (mng_ani_clipp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_CLIP, MNG_LC_START);
-#endif
- /* re-process the CLIP chunk */
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_clip (pData, pCLIP->iFirstid, pCLIP->iLastid,
- pCLIP->iType, pCLIP->iClipl, pCLIP->iClipr,
- pCLIP->iClipt, pCLIP->iClipb);
-#else
- pData->iCLIPfromid = pCLIP->iFirstid;
- pData->iCLIPtoid = pCLIP->iLastid;
- pData->iCLIPcliptype = pCLIP->iType;
- pData->iCLIPclipl = pCLIP->iClipl;
- pData->iCLIPclipr = pCLIP->iClipr;
- pData->iCLIPclipt = pCLIP->iClipt;
- pData->iCLIPclipb = pCLIP->iClipb;
-
- iRetcode = mng_process_display_clip (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_CLIP, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SHOW
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_show (mng_datap pData,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iMode)
-#else
-mng_retcode mng_create_ani_show (mng_datap pData)
-#endif
-{
- mng_ani_showp pSHOW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_SHOW, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_show),
- mng_free_obj_general,
- mng_process_ani_show,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pSHOW = (mng_ani_showp)pTemp;
-#else
- MNG_ALLOC (pData, pSHOW, sizeof (mng_ani_show));
-
- pSHOW->sHeader.fCleanup = mng_free_ani_show;
- pSHOW->sHeader.fProcess = mng_process_ani_show;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pSHOW);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pSHOW->iFirstid = iFirstid;
- pSHOW->iLastid = iLastid;
- pSHOW->iMode = iMode;
-#else
- pSHOW->iFirstid = pData->iSHOWfromid;
- pSHOW->iLastid = pData->iSHOWtoid;
- pSHOW->iMode = pData->iSHOWmode;
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_SHOW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_show (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_SHOW, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_show));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_SHOW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_show (mng_datap pData,
- mng_objectp pObject)
-{
- mng_retcode iRetcode;
- mng_ani_showp pSHOW = (mng_ani_showp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_SHOW, MNG_LC_START);
-#endif
-
- if (pData->iBreakpoint) /* returning from breakpoint ? */
- {
- iRetcode = mng_process_display_show (pData);
- }
- else
- { /* "re-run" SHOW chunk */
- pData->iSHOWmode = pSHOW->iMode;
- pData->iSHOWfromid = pSHOW->iFirstid;
- pData->iSHOWtoid = pSHOW->iLastid;
-
- iRetcode = mng_process_display_show (pData);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_SHOW, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_TERM
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_term (mng_datap pData,
- mng_uint8 iTermaction,
- mng_uint8 iIteraction,
- mng_uint32 iDelay,
- mng_uint32 iItermax)
-#else
-mng_retcode mng_create_ani_term (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_termp pTERM;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_TERM, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_term),
- mng_free_obj_general,
- mng_process_ani_term,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pTERM = (mng_ani_termp)pTemp;
-#else
- MNG_ALLOC (pData, pTERM, sizeof (mng_ani_term));
-
- pTERM->sHeader.fCleanup = mng_free_ani_term;
- pTERM->sHeader.fProcess = mng_process_ani_term;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pTERM);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pTERM->iTermaction = iTermaction;
- pTERM->iIteraction = iIteraction;
- pTERM->iDelay = iDelay;
- pTERM->iItermax = iItermax;
-#else
- pTERM->iTermaction = ((mng_termp)pChunk)->iTermaction;
- pTERM->iIteraction = ((mng_termp)pChunk)->iIteraction;
- pTERM->iDelay = ((mng_termp)pChunk)->iDelay;
- pTERM->iItermax = ((mng_termp)pChunk)->iItermax;
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_TERM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_term (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_TERM, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_term));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_TERM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_term (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_TERM, MNG_LC_START);
-#endif
-
- /* dummy: no action required! */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_TERM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode mng_create_ani_save (mng_datap pData)
-{
- mng_ani_savep pSAVE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_SAVE, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_save),
- mng_free_obj_general,
- mng_process_ani_save,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pSAVE = (mng_ani_savep)pTemp;
-#else
- MNG_ALLOC (pData, pSAVE, sizeof (mng_ani_save));
-
- pSAVE->sHeader.fCleanup = mng_free_ani_save;
- pSAVE->sHeader.fProcess = mng_process_ani_save;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pSAVE);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_SAVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_save (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_SAVE, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_save));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_SAVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_save (mng_datap pData,
- mng_objectp pObject)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_SAVE, MNG_LC_START);
-#endif
-
- iRetcode = mng_process_display_save (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_SAVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_SEEK
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_seek (mng_datap pData,
- mng_uint32 iSegmentnamesize,
- mng_pchar zSegmentname)
-#else
-mng_retcode mng_create_ani_seek (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_seekp pSEEK;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_SEEK, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_seek),
- mng_free_ani_seek,
- mng_process_ani_seek,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pSEEK = (mng_ani_seekp)pTemp;
-#else
- MNG_ALLOC (pData, pSEEK, sizeof (mng_ani_seek));
-
- pSEEK->sHeader.fCleanup = mng_free_ani_seek;
- pSEEK->sHeader.fProcess = mng_process_ani_seek;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pSEEK);
-
- pData->pLastseek = (mng_objectp)pSEEK;
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pSEEK->iSegmentnamesize = iSegmentnamesize;
- if (iSegmentnamesize)
- {
- MNG_ALLOC (pData, pSEEK->zSegmentname, iSegmentnamesize + 1);
- MNG_COPY (pSEEK->zSegmentname, zSegmentname, iSegmentnamesize);
- }
-#else
- pSEEK->iSegmentnamesize = ((mng_seekp)pChunk)->iNamesize;
- if (pSEEK->iSegmentnamesize)
- {
- MNG_ALLOC (pData, pSEEK->zSegmentname, pSEEK->iSegmentnamesize + 1);
- MNG_COPY (pSEEK->zSegmentname, ((mng_seekp)pChunk)->zName, pSEEK->iSegmentnamesize);
- }
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_SEEK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_ani_seek (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_seekp pSEEK = (mng_ani_seekp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_SEEK, MNG_LC_START);
-#endif
-
- if (pSEEK->iSegmentnamesize)
- MNG_FREEX (pData, pSEEK->zSegmentname, pSEEK->iSegmentnamesize + 1);
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- MNG_FREEX (pData, pObject, sizeof (mng_ani_seek));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_SEEK, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- return MNG_NOERROR;
-#else
- return mng_free_obj_general(pData, pObject);
-#endif
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_seek (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_seekp pSEEK = (mng_ani_seekp)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_SEEK, MNG_LC_START);
-#endif
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
- if (!pData->bStopafterseek) /* can we really process this one ? */
-#endif
- {
- pData->pLastseek = pObject;
-
- if (pData->fProcessseek) /* inform the app ? */
- {
- mng_bool bOke;
- mng_pchar zName;
-
- MNG_ALLOC (pData, zName, pSEEK->iSegmentnamesize + 1);
-
- if (pSEEK->iSegmentnamesize)
- MNG_COPY (zName, pSEEK->zSegmentname, pSEEK->iSegmentnamesize);
-
- bOke = pData->fProcessseek ((mng_handle)pData, zName);
-
- MNG_FREEX (pData, zName, pSEEK->iSegmentnamesize + 1);
-
- if (!bOke)
- MNG_ERROR (pData, MNG_APPMISCERROR);
- }
- }
-
- iRetcode = mng_process_display_seek (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_SEEK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_dhdr (mng_datap pData,
- mng_uint16 iObjectid,
- mng_uint8 iImagetype,
- mng_uint8 iDeltatype,
- mng_uint32 iBlockwidth,
- mng_uint32 iBlockheight,
- mng_uint32 iBlockx,
- mng_uint32 iBlocky)
-#else
-mng_retcode mng_create_ani_dhdr (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_dhdrp pDHDR;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_DHDR, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_dhdr),
- mng_free_obj_general,
- mng_process_ani_dhdr,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pDHDR = (mng_ani_dhdrp)pTemp;
-#else
- MNG_ALLOC (pData, pDHDR, sizeof (mng_ani_dhdr));
-
- pDHDR->sHeader.fCleanup = mng_free_ani_dhdr;
- pDHDR->sHeader.fProcess = mng_process_ani_dhdr;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pDHDR);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pDHDR->iObjectid = iObjectid;
- pDHDR->iImagetype = iImagetype;
- pDHDR->iDeltatype = iDeltatype;
- pDHDR->iBlockwidth = iBlockwidth;
- pDHDR->iBlockheight = iBlockheight;
- pDHDR->iBlockx = iBlockx;
- pDHDR->iBlocky = iBlocky;
-#else
- pDHDR->iObjectid = ((mng_dhdrp)pChunk)->iObjectid;
- pDHDR->iImagetype = ((mng_dhdrp)pChunk)->iImagetype;
- pDHDR->iDeltatype = ((mng_dhdrp)pChunk)->iDeltatype;
- pDHDR->iBlockwidth = ((mng_dhdrp)pChunk)->iBlockwidth;
- pDHDR->iBlockheight = ((mng_dhdrp)pChunk)->iBlockheight;
- pDHDR->iBlockx = ((mng_dhdrp)pChunk)->iBlockx;
- pDHDR->iBlocky = ((mng_dhdrp)pChunk)->iBlocky;
-#endif
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- iRetcode = mng_process_display_dhdr (pData, iObjectid,
- iImagetype, iDeltatype,
- iBlockwidth, iBlockheight,
- iBlockx, iBlocky);
-#else
- iRetcode = mng_process_display_dhdr (pData,
- ((mng_dhdrp)pChunk)->iObjectid,
- ((mng_dhdrp)pChunk)->iImagetype,
- ((mng_dhdrp)pChunk)->iDeltatype,
- ((mng_dhdrp)pChunk)->iBlockwidth,
- ((mng_dhdrp)pChunk)->iBlockheight,
- ((mng_dhdrp)pChunk)->iBlockx,
- ((mng_dhdrp)pChunk)->iBlocky);
-#endif
-#else
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pData->iDHDRobjectid = iObjectid;
- pData->iDHDRimagetype = iImagetype;
- pData->iDHDRdeltatype = iDeltatype;
- pData->iDHDRblockwidth = iBlockwidth;
- pData->iDHDRblockheight = iBlockheight;
- pData->iDHDRblockx = iBlockx;
- pData->iDHDRblocky = iBlocky;
-#else
- pData->iDHDRobjectid = ((mng_dhdrp)pChunk)->iObjectid;
- pData->iDHDRimagetype = ((mng_dhdrp)pChunk)->iImagetype;
- pData->iDHDRdeltatype = ((mng_dhdrp)pChunk)->iDeltatype;
- pData->iDHDRblockwidth = ((mng_dhdrp)pChunk)->iBlockwidth;
- pData->iDHDRblockheight = ((mng_dhdrp)pChunk)->iBlockheight;
- pData->iDHDRblockx = ((mng_dhdrp)pChunk)->iBlockx;
- pData->iDHDRblocky = ((mng_dhdrp)pChunk)->iBlocky;
-#endif
-
- iRetcode = mng_process_display_dhdr (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_DHDR, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_dhdr (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_DHDR, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_dhdr));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_DHDR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_dhdr (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_dhdrp pDHDR = (mng_ani_dhdrp)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_DHDR, MNG_LC_START);
-#endif
-
- pData->bHasDHDR = MNG_TRUE; /* let everyone know we're inside a DHDR */
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_dhdr (pData, pDHDR->iObjectid,
- pDHDR->iImagetype, pDHDR->iDeltatype,
- pDHDR->iBlockwidth, pDHDR->iBlockheight,
- pDHDR->iBlockx, pDHDR->iBlocky);
-#else
- pData->iDHDRobjectid = pDHDR->iObjectid;
- pData->iDHDRimagetype = pDHDR->iImagetype;
- pData->iDHDRdeltatype = pDHDR->iDeltatype;
- pData->iDHDRblockwidth = pDHDR->iBlockwidth;
- pData->iDHDRblockheight = pDHDR->iBlockheight;
- pData->iDHDRblockx = pDHDR->iBlockx;
- pData->iDHDRblocky = pDHDR->iBlocky;
-
- iRetcode = mng_process_display_dhdr (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_DHDR, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_prom (mng_datap pData,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iFilltype)
-#else
-mng_retcode mng_create_ani_prom (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_promp pPROM=NULL;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_PROM, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_prom),
- mng_free_obj_general,
- mng_process_ani_prom,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pPROM = (mng_ani_promp)pTemp;
-#else
- MNG_ALLOC (pData, pPROM, sizeof (mng_ani_prom));
-
- pPROM->sHeader.fCleanup = mng_free_ani_prom;
- pPROM->sHeader.fProcess = mng_process_ani_prom;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pPROM);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pPROM->iBitdepth = iBitdepth;
- pPROM->iColortype = iColortype;
- pPROM->iFilltype = iFilltype;
-#else
- pPROM->iBitdepth = ((mng_promp)pChunk)->iSampledepth;
- pPROM->iColortype = ((mng_promp)pChunk)->iColortype;
- pPROM->iFilltype = ((mng_promp)pChunk)->iFilltype;
-#endif
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- iRetcode = mng_process_display_prom (pData, iBitdepth,
- iColortype, iFilltype);
-#else
- iRetcode = mng_process_display_prom (pData,
- ((mng_promp)pChunk)->iSampledepth,
- ((mng_promp)pChunk)->iColortype,
- ((mng_promp)pChunk)->iFilltype);
-#endif
-#else
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pData->iPROMbitdepth = iBitdepth;
- pData->iPROMcolortype = iColortype;
- pData->iPROMfilltype = iFilltype;
-#else
- pData->iPROMbitdepth = ((mng_promp)pChunk)->iSampledepth;
- pData->iPROMcolortype = ((mng_promp)pChunk)->iColortype;
- pData->iPROMfilltype = ((mng_promp)pChunk)->iFilltype;
-#endif
-
- iRetcode = mng_process_display_prom (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_PROM, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_prom (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_PROM, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_prom));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_PROM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_prom (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_promp pPROM = (mng_ani_promp)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_PROM, MNG_LC_START);
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_prom (pData, pPROM->iBitdepth,
- pPROM->iColortype, pPROM->iFilltype);
-#else
- pData->iPROMbitdepth = pPROM->iBitdepth;
- pData->iPROMcolortype = pPROM->iColortype;
- pData->iPROMfilltype = pPROM->iFilltype;
-
- iRetcode = mng_process_display_prom (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_PROM, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_create_ani_ipng (mng_datap pData)
-{
- mng_ani_ipngp pIPNG;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_IPNG, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_ipng),
- mng_free_obj_general,
- mng_process_ani_ipng,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pIPNG = (mng_ani_ipngp)pTemp;
-#else
- MNG_ALLOC (pData, pIPNG, sizeof (mng_ani_ipng));
-
- pIPNG->sHeader.fCleanup = mng_free_ani_ipng;
- pIPNG->sHeader.fProcess = mng_process_ani_ipng;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pIPNG);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_IPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_ipng (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_IPNG, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_ipng));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_IPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_ipng (mng_datap pData,
- mng_objectp pObject)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_IPNG, MNG_LC_START);
-#endif
-
- iRetcode = mng_process_display_ipng (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_IPNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
-mng_retcode mng_create_ani_ijng (mng_datap pData)
-{
- mng_ani_ijngp pIJNG;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_IJNG, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_ani_ijng),
- mng_free_obj_general,
- mng_process_ani_ijng,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pIJNG = (mng_ani_ijngp)pTemp;
-#else
- MNG_ALLOC (pData, pIJNG, sizeof (mng_ani_ijng));
-
- pIJNG->sHeader.fCleanup = mng_free_ani_ijng;
- pIJNG->sHeader.fProcess = mng_process_ani_ijng;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pIJNG);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_IJNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_ijng (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_IJNG, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_ijng));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_IJNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_ijng (mng_datap pData,
- mng_objectp pObject)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_IJNG, MNG_LC_START);
-#endif
-
- iRetcode = mng_process_display_ijng (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_IJNG, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_create_ani_pplt (mng_datap pData,
- mng_uint8 iType,
- mng_uint32 iCount,
- mng_palette8ep paIndexentries,
- mng_uint8p paAlphaentries,
- mng_uint8p paUsedentries)
-{
- mng_ani_ppltp pPPLT;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_PPLT, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_pplt),
- mng_free_obj_general,
- mng_process_ani_pplt,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pPPLT = (mng_ani_ppltp)pTemp;
-#else
- MNG_ALLOC (pData, pPPLT, sizeof (mng_ani_pplt));
-
- pPPLT->sHeader.fCleanup = mng_free_ani_pplt;
- pPPLT->sHeader.fProcess = mng_process_ani_pplt;
-#endif
-
- pPPLT->iType = iType;
- pPPLT->iCount = iCount;
-
- MNG_COPY (pPPLT->aIndexentries, paIndexentries, sizeof (pPPLT->aIndexentries));
- MNG_COPY (pPPLT->aAlphaentries, paAlphaentries, sizeof (pPPLT->aAlphaentries));
- MNG_COPY (pPPLT->aUsedentries, paUsedentries, sizeof (pPPLT->aUsedentries ));
-
- mng_add_ani_object (pData, (mng_object_headerp)pPPLT);
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_pplt (pData, iType, iCount,
- paIndexentries, paAlphaentries, paUsedentries);
-#else
- pData->iPPLTtype = iType;
- pData->iPPLTcount = iCount;
- pData->paPPLTindexentries = paIndexentries;
- pData->paPPLTalphaentries = paAlphaentries;
- pData->paPPLTusedentries = paUsedentries;
-
- iRetcode = mng_process_display_pplt (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_PPLT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_pplt (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_PPLT, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_pplt));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_PPLT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_pplt (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_ppltp pPPLT = (mng_ani_ppltp)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_PPLT, MNG_LC_START);
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_pplt (pData, pPPLT->iType, pPPLT->iCount,
- pPPLT->aIndexentries, pPPLT->aAlphaentries,
- pPPLT->aUsedentries);
-#else
- pData->iPPLTtype = pPPLT->iType;
- pData->iPPLTcount = pPPLT->iCount;
- pData->paPPLTindexentries = &pPPLT->aIndexentries;
- pData->paPPLTalphaentries = &pPPLT->aAlphaentries;
- pData->paPPLTusedentries = &pPPLT->aUsedentries;
-
- iRetcode = mng_process_display_pplt (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_PPLT, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_magn (mng_datap pData,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iMethodX,
- mng_uint16 iMX,
- mng_uint16 iMY,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint16 iMT,
- mng_uint16 iMB,
- mng_uint8 iMethodY)
-#else
-mng_retcode mng_create_ani_magn (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_magnp pMAGN=NULL;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_MAGN, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_magn),
- mng_free_obj_general,
- mng_process_ani_magn,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pMAGN = (mng_ani_magnp)pTemp;
-#else
- MNG_ALLOC (pData, pMAGN, sizeof (mng_ani_magn));
-
- pMAGN->sHeader.fCleanup = mng_free_ani_magn;
- pMAGN->sHeader.fProcess = mng_process_ani_magn;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pMAGN);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pMAGN->iFirstid = iFirstid;
- pMAGN->iLastid = iLastid;
- pMAGN->iMethodX = iMethodX;
- pMAGN->iMX = iMX;
- pMAGN->iMY = iMY;
- pMAGN->iML = iML;
- pMAGN->iMR = iMR;
- pMAGN->iMT = iMT;
- pMAGN->iMB = iMB;
- pMAGN->iMethodY = iMethodY;
-#else
- pMAGN->iFirstid = ((mng_magnp)pChunk)->iFirstid;
- pMAGN->iLastid = ((mng_magnp)pChunk)->iLastid;
- pMAGN->iMethodX = ((mng_magnp)pChunk)->iMethodX;
- pMAGN->iMX = ((mng_magnp)pChunk)->iMX;
- pMAGN->iMY = ((mng_magnp)pChunk)->iMY;
- pMAGN->iML = ((mng_magnp)pChunk)->iML;
- pMAGN->iMR = ((mng_magnp)pChunk)->iMR;
- pMAGN->iMT = ((mng_magnp)pChunk)->iMT;
- pMAGN->iMB = ((mng_magnp)pChunk)->iMB;
- pMAGN->iMethodY = ((mng_magnp)pChunk)->iMethodY;
-#endif
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- iRetcode = mng_process_display_magn (pData, pMAGN->iFirstid, pMAGN->iLastid,
- pMAGN->iMethodX, pMAGN->iMX, pMAGN->iMY,
- pMAGN->iML, pMAGN->iMR, pMAGN->iMT,
- pMAGN->iMB, pMAGN->iMethodY);
-#else
- iRetcode = mng_process_display_magn (pData,
- ((mng_magnp)pChunk)->iFirstid,
- ((mng_magnp)pChunk)->iLastid,
- ((mng_magnp)pChunk)->iMethodX,
- ((mng_magnp)pChunk)->iMX,
- ((mng_magnp)pChunk)->iMY,
- ((mng_magnp)pChunk)->iML,
- ((mng_magnp)pChunk)->iMR,
- ((mng_magnp)pChunk)->iMT,
- ((mng_magnp)pChunk)->iMB,
- ((mng_magnp)pChunk)->iMethodY);
-#endif
-#else
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pData->iMAGNfirstid = iFirstid;
- pData->iMAGNlastid = iLastid;
- pData->iMAGNmethodX = iMethodX;
- pData->iMAGNmX = iMX;
- pData->iMAGNmY = iMY;
- pData->iMAGNmL = iML;
- pData->iMAGNmR = iMR;
- pData->iMAGNmT = iMT;
- pData->iMAGNmB = iMB;
- pData->iMAGNmethodY = iMethodY;
-#else
- pData->iMAGNfirstid = ((mng_magnp)pChunk)->iFirstid;
- pData->iMAGNlastid = ((mng_magnp)pChunk)->iLastid;
- pData->iMAGNmethodX = ((mng_magnp)pChunk)->iMethodX;
- pData->iMAGNmX = ((mng_magnp)pChunk)->iMX;
- pData->iMAGNmY = ((mng_magnp)pChunk)->iMY;
- pData->iMAGNmL = ((mng_magnp)pChunk)->iML;
- pData->iMAGNmR = ((mng_magnp)pChunk)->iMR;
- pData->iMAGNmT = ((mng_magnp)pChunk)->iMT;
- pData->iMAGNmB = ((mng_magnp)pChunk)->iMB;
- pData->iMAGNmethodY = ((mng_magnp)pChunk)->iMethodY;
-#endif
-
- iRetcode = mng_process_display_magn (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_MAGN, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-mng_retcode mng_free_ani_magn (mng_datap pData,
- mng_objectp pObject)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_MAGN, MNG_LC_START);
-#endif
-
- MNG_FREEX (pData, pObject, sizeof (mng_ani_magn));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_MAGN, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_magn (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_magnp pMAGN = (mng_ani_magnp)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_MAGN, MNG_LC_START);
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_magn (pData, pMAGN->iFirstid, pMAGN->iLastid,
- pMAGN->iMethodX, pMAGN->iMX, pMAGN->iMY,
- pMAGN->iML, pMAGN->iMR, pMAGN->iMT,
- pMAGN->iMB, pMAGN->iMethodY);
-#else
- pData->iMAGNfirstid = pMAGN->iFirstid;
- pData->iMAGNlastid = pMAGN->iLastid;
- pData->iMAGNmethodX = pMAGN->iMethodX;
- pData->iMAGNmX = pMAGN->iMX;
- pData->iMAGNmY = pMAGN->iMY;
- pData->iMAGNmL = pMAGN->iML;
- pData->iMAGNmR = pMAGN->iMR;
- pData->iMAGNmT = pMAGN->iMT;
- pData->iMAGNmB = pMAGN->iMB;
- pData->iMAGNmethodY = pMAGN->iMethodY;
-
- iRetcode = mng_process_display_magn (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_MAGN, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_past (mng_datap pData,
- mng_uint16 iTargetid,
- mng_uint8 iTargettype,
- mng_int32 iTargetx,
- mng_int32 iTargety,
- mng_uint32 iCount,
- mng_ptr pSources)
-#else
-mng_retcode mng_create_ani_past (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_pastp pPAST;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_PAST, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_past),
- mng_free_ani_past,
- mng_process_ani_past,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pPAST = (mng_ani_pastp)pTemp;
-#else
- MNG_ALLOC (pData, pPAST, sizeof (mng_ani_past));
-
- pPAST->sHeader.fCleanup = mng_free_ani_past;
- pPAST->sHeader.fProcess = mng_process_ani_past;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pPAST);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pPAST->iTargetid = iTargetid;
- pPAST->iTargettype = iTargettype;
- pPAST->iTargetx = iTargetx;
- pPAST->iTargety = iTargety;
- pPAST->iCount = iCount;
-
- if (iCount)
- {
- MNG_ALLOC (pData, pPAST->pSources, (iCount * sizeof (mng_past_source)));
- MNG_COPY (pPAST->pSources, pSources, (iCount * sizeof (mng_past_source)));
- }
-#else
- pPAST->iTargetid = ((mng_pastp)pChunk)->iDestid;
- pPAST->iTargettype = ((mng_pastp)pChunk)->iTargettype;
- pPAST->iTargetx = ((mng_pastp)pChunk)->iTargetx;
- pPAST->iTargety = ((mng_pastp)pChunk)->iTargety;
- pPAST->iCount = ((mng_pastp)pChunk)->iCount;
-
- if (pPAST->iCount)
- {
- mng_size_t iSize = (mng_size_t)(pPAST->iCount * sizeof (mng_past_source));
- MNG_ALLOC (pData, pPAST->pSources, iSize);
- MNG_COPY (pPAST->pSources, ((mng_pastp)pChunk)->pSources, iSize);
- }
-#endif
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- iRetcode = mng_process_display_past (pData, iTargetid, iTargettype,
- iTargetx, iTargety,
- iCount, pSources);
-#else
- iRetcode = mng_process_display_past (pData,
- ((mng_pastp)pChunk)->iDestid,
- ((mng_pastp)pChunk)->iTargettype,
- ((mng_pastp)pChunk)->iTargetx,
- ((mng_pastp)pChunk)->iTargety,
- ((mng_pastp)pChunk)->iCount,
- ((mng_pastp)pChunk)->pSources);
-#endif
-#else
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pData->iPASTtargetid = iTargetid;
- pData->iPASTtargettype = iTargettype;
- pData->iPASTtargetx = iTargetx;
- pData->iPASTtargety = iTargety;
- pData->iPASTcount = iCount;
- pData->pPASTsources = pSources;
-#else
- pData->iPASTtargetid = ((mng_pastp)pChunk)->iDestid;
- pData->iPASTtargettype = ((mng_pastp)pChunk)->iTargettype;
- pData->iPASTtargetx = ((mng_pastp)pChunk)->iTargetx;
- pData->iPASTtargety = ((mng_pastp)pChunk)->iTargety;
- pData->iPASTcount = ((mng_pastp)pChunk)->iCount;
- pData->pPASTsources = ((mng_pastp)pChunk)->pSources;
-#endif
-
- iRetcode = mng_process_display_past (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_PAST, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_free_ani_past (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_pastp pPAST = (mng_ani_pastp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_PAST, MNG_LC_START);
-#endif
-
- if (pPAST->iCount)
- MNG_FREEX (pData, pPAST->pSources, (pPAST->iCount * sizeof (mng_past_source)));
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- MNG_FREEX (pData, pObject, sizeof (mng_ani_past));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_PAST, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- return MNG_NOERROR;
-#else
- return mng_free_obj_general(pData, pObject);
-#endif
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_process_ani_past (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_pastp pPAST = (mng_ani_pastp)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_PAST, MNG_LC_START);
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_past (pData, pPAST->iTargetid, pPAST->iTargettype,
- pPAST->iTargetx, pPAST->iTargety,
- pPAST->iCount, pPAST->pSources);
-#else
- pData->iPASTtargetid = pPAST->iTargetid;
- pData->iPASTtargettype = pPAST->iTargettype;
- pData->iPASTtargetx = pPAST->iTargetx;
- pData->iPASTtargety = pPAST->iTargety;
- pData->iPASTcount = pPAST->iCount;
- pData->pPASTsources = pPAST->pSources;
-
- iRetcode = mng_process_display_past (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_PAST, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ani_disc (mng_datap pData,
- mng_uint32 iCount,
- mng_uint16p pIds)
-#else
-mng_retcode mng_create_ani_disc (mng_datap pData,
- mng_chunkp pChunk)
-#endif
-{
- mng_ani_discp pDISC;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_DISC, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- iRetcode = create_obj_general (pData, sizeof (mng_ani_disc),
- mng_free_ani_disc,
- mng_process_ani_disc,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pDISC = (mng_ani_discp)pTemp;
-#else
- MNG_ALLOC (pData, pDISC, sizeof (mng_ani_disc));
-
- pDISC->sHeader.fCleanup = mng_free_ani_disc;
- pDISC->sHeader.fProcess = mng_process_ani_disc;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pDISC);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pDISC->iCount = iCount;
-
- if (iCount)
- {
- MNG_ALLOC (pData, pDISC->pIds, (iCount << 1));
- MNG_COPY (pDISC->pIds, pIds, (iCount << 1));
- }
-#else
- pDISC->iCount = ((mng_discp)pChunk)->iCount;
-
- if (pDISC->iCount)
- {
- mng_size_t iSize = (mng_size_t)(pDISC->iCount << 1);
- MNG_ALLOC (pData, pDISC->pIds, iSize);
- MNG_COPY (pDISC->pIds, ((mng_discp)pChunk)->pObjectids, iSize);
- }
-#endif
- }
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- iRetcode = mng_process_display_disc (pData, iCount, pIds);
-#else
- iRetcode = mng_process_display_disc (pData,
- ((mng_discp)pChunk)->iCount,
- ((mng_discp)pChunk)->pObjectids);
-#endif
-#else
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pData->iDISCcount = iCount;
- pData->pDISCids = pIds;
-#else
- pData->iDISCcount = ((mng_discp)pChunk)->iCount;
- pData->pDISCids = ((mng_discp)pChunk)->pObjectids;
-#endif
-
- iRetcode = mng_process_display_disc (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANI_DISC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_ani_disc (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_discp pDISC = (mng_ani_discp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_DISC, MNG_LC_START);
-#endif
-
- if (pDISC->iCount)
- MNG_FREEX (pData, pDISC->pIds, (pDISC->iCount << 1));
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- MNG_FREEX (pData, pObject, sizeof (mng_ani_disc));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANI_DISC, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- return MNG_NOERROR;
-#else
- return mng_free_obj_general(pData, pObject);
-#endif
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_disc (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ani_discp pDISC = (mng_ani_discp)pObject;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_DISC, MNG_LC_START);
-#endif
-
-#ifndef MNG_OPTIMIZE_DISPLAYCALLS
- iRetcode = mng_process_display_disc (pData, pDISC->iCount, pDISC->pIds);
-#else
- pData->iDISCcount = pDISC->iCount;
- pData->pDISCids = pDISC->pIds;
-
- iRetcode = mng_process_display_disc (pData);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANI_DISC, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-#endif
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_event (mng_datap pData,
- mng_uint8 iEventtype,
- mng_uint8 iMasktype,
- mng_int32 iLeft,
- mng_int32 iRight,
- mng_int32 iTop,
- mng_int32 iBottom,
- mng_uint16 iObjectid,
- mng_uint8 iIndex,
- mng_uint32 iSegmentnamesize,
- mng_pchar zSegmentname)
-#else
-mng_retcode mng_create_event (mng_datap pData,
- mng_ptr pEntry)
-#endif
-{
- mng_eventp pEvent;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_EVENT, MNG_LC_START);
-#endif
-
- if (pData->bCacheplayback) /* caching playback info ? */
- {
- mng_object_headerp pLast;
-
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_ptr pTemp;
- mng_retcode iRetcode = create_obj_general (pData, sizeof (mng_event),
- mng_free_event,
- mng_process_event,
- &pTemp);
- if (iRetcode)
- return iRetcode;
- pEvent = (mng_eventp)pTemp;
-#else
- MNG_ALLOC (pData, pEvent, sizeof (mng_event));
-
- pEvent->sHeader.fCleanup = mng_free_event;
- pEvent->sHeader.fProcess = mng_process_event;
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pEvent->iEventtype = iEventtype;
- pEvent->iMasktype = iMasktype;
- pEvent->iLeft = iLeft;
- pEvent->iRight = iRight;
- pEvent->iTop = iTop;
- pEvent->iBottom = iBottom;
- pEvent->iObjectid = iObjectid;
- pEvent->iIndex = iIndex;
- pEvent->iSegmentnamesize = iSegmentnamesize;
-
- if (iSegmentnamesize)
- {
- MNG_ALLOC (pData, pEvent->zSegmentname, iSegmentnamesize+1);
- MNG_COPY (pEvent->zSegmentname, zSegmentname, iSegmentnamesize);
- }
-#else
- pEvent->iEventtype = ((mng_evnt_entryp)pEntry)->iEventtype;
- pEvent->iMasktype = ((mng_evnt_entryp)pEntry)->iMasktype;
- pEvent->iLeft = ((mng_evnt_entryp)pEntry)->iLeft;
- pEvent->iRight = ((mng_evnt_entryp)pEntry)->iRight;
- pEvent->iTop = ((mng_evnt_entryp)pEntry)->iTop;
- pEvent->iBottom = ((mng_evnt_entryp)pEntry)->iBottom;
- pEvent->iObjectid = ((mng_evnt_entryp)pEntry)->iObjectid;
- pEvent->iIndex = ((mng_evnt_entryp)pEntry)->iIndex;
- pEvent->iSegmentnamesize = ((mng_evnt_entryp)pEntry)->iSegmentnamesize;
-
- if (pEvent->iSegmentnamesize)
- {
- MNG_ALLOC (pData, pEvent->zSegmentname, pEvent->iSegmentnamesize+1);
- MNG_COPY (pEvent->zSegmentname, ((mng_evnt_entryp)pEntry)->zSegmentname, pEvent->iSegmentnamesize);
- }
-#endif
- /* fixup the double-linked list */
- pLast = (mng_object_headerp)pData->pLastevent;
-
- if (pLast) /* link it as last in the chain */
- {
- pEvent->sHeader.pPrev = pLast;
- pLast->pNext = pEvent;
- }
- else
- {
- pData->pFirstevent = pEvent;
- }
-
- pData->pLastevent = pEvent;
- pData->bDynamic = MNG_TRUE;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_EVENT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_event (mng_datap pData,
- mng_objectp pObject)
-{
- mng_eventp pEvent = (mng_eventp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_EVENT, MNG_LC_START);
-#endif
-
- if (pEvent->iSegmentnamesize)
- MNG_FREEX (pData, pEvent->zSegmentname, pEvent->iSegmentnamesize + 1);
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- MNG_FREEX (pData, pEvent, sizeof (mng_event));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_EVENT, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- return MNG_NOERROR;
-#else
- return mng_free_obj_general(pData, pObject);
-#endif
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_event (mng_datap pData,
- mng_objectp pObject)
-{
-#ifndef MNG_SKIPCHUNK_SEEK
- mng_eventp pEvent = (mng_eventp)pObject;
- mng_object_headerp pAni;
- mng_bool bFound = MNG_FALSE;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_EVENT, MNG_LC_START);
-#endif
-
-#ifndef MNG_SKIPCHUNK_SEEK
- if (!pEvent->pSEEK) /* need to find SEEK first ? */
- {
- pAni = (mng_object_headerp)pData->pFirstaniobj;
-
- while ((pAni) && (!bFound))
- {
- if ((pAni->fCleanup == mng_free_ani_seek) &&
- (strcmp(pEvent->zSegmentname, ((mng_ani_seekp)pAni)->zSegmentname) == 0))
- bFound = MNG_TRUE;
- else
- pAni = (mng_object_headerp)pAni->pNext;
- }
-
- if (pAni)
- pEvent->pSEEK = (mng_ani_seekp)pAni;
- }
-
- if (pEvent->pSEEK) /* anything to do ? */
- {
- pEvent->iLastx = pData->iEventx;
- pEvent->iLasty = pData->iEventy;
- /* let's start from this SEEK then */
- pData->pCurraniobj = (mng_objectp)pEvent->pSEEK;
- pData->bRunningevent = MNG_TRUE;
- /* wake-up the app ! */
- if (!pData->fSettimer ((mng_handle)pData, 5))
- MNG_ERROR (pData, MNG_APPTIMERERROR);
-
- }
- else
- MNG_ERROR (pData, MNG_SEEKNOTFOUND);
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_EVENT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_SUPPORT_DYNAMICMNG */
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_mpng_obj (mng_datap pData,
- mng_uint32 iFramewidth,
- mng_uint32 iFrameheight,
- mng_uint16 iNumplays,
- mng_uint16 iTickspersec,
- mng_uint32 iFramessize,
- mng_ptr pFrames)
-#else
-mng_retcode mng_create_mpng_obj (mng_datap pData,
- mng_ptr pEntry)
-#endif
-{
- mng_mpng_objp pMPNG;
- mng_ptr pTemp;
- mng_retcode iRetcode;
- mng_uint8p pFrame;
- mng_int32 iCnt, iMax;
- mng_uint32 iX, iY, iWidth, iHeight;
- mng_int32 iXoffset, iYoffset;
- mng_uint16 iTicks;
- mng_uint16 iDelay;
- mng_bool bNewframe;
- mng_ani_loopp pLOOP;
- mng_ani_endlp pENDL;
- mng_ani_framp pFRAM;
- mng_ani_movep pMOVE;
- mng_ani_clipp pCLIP;
- mng_ani_showp pSHOW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_MPNG_OBJ, MNG_LC_START);
-#endif
-
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_mpng_obj), mng_free_mpng_obj,
- mng_process_mpng_obj, &pTemp);
- if (iRetcode)
- return iRetcode;
- pMPNG = (mng_mpng_objp)pTemp;
-#else
- MNG_ALLOC (pData, pMPNG, sizeof (mng_mpng_obj));
-
- pMPNG->sHeader.fCleanup = mng_free_mpng_obj;
- pMPNG->sHeader.fProcess = mng_process_mpng_obj;
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pMPNG->iFramewidth = iFramewidth;
- pMPNG->iFrameheight = iFrameheight;
- pMPNG->iNumplays = iNumplays;
- pMPNG->iTickspersec = iTickspersec;
- pMPNG->iFramessize = iFramessize;
-
- if (iFramessize)
- {
- MNG_ALLOC (pData, pMPNG->pFrames, iFramessize);
- MNG_COPY (pMPNG->pFrames, pFrames, iFramessize);
- }
-#else
- pMPNG->iFramewidth = ((mng_mpngp)pEntry)->iFramewidth;
- pMPNG->iFrameheight = ((mng_mpngp)pEntry)->iFrameheight;
- pMPNG->iNumplays = ((mng_mpngp)pEntry)->iNumplays;
- pMPNG->iTickspersec = ((mng_mpngp)pEntry)->iTickspersec;
- pMPNG->iFramessize = ((mng_mpngp)pEntry)->iFramessize;
-
- if (pMPNG->iFramessize)
- {
- MNG_ALLOC (pData, pMPNG->pFrames, pMPNG->iFramessize);
- MNG_COPY (pMPNG->pFrames, ((mng_mpngp)pEntry)->pFrames, pMPNG->iFramessize);
- }
-#endif
-
- pData->pMPNG = pMPNG;
- pData->eImagetype = mng_it_mpng;
-
- iRetcode = mng_process_display_mpng (pData);
- if (iRetcode)
- return iRetcode;
-
- /* now let's create the MNG animation directives from this */
-
- pFrame = (mng_uint8p)pMPNG->pFrames;
- iMax = pMPNG->iFramessize / 26;
- /* set up MNG impersonation */
- pData->iTicks = pMPNG->iTickspersec;
- pData->iLayercount = iMax;
-
- if (pMPNG->iNumplays != 1) /* create a LOOP/ENDL pair ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_loop),
- mng_free_ani_loop, mng_process_ani_loop,
- &((mng_ptr)pLOOP));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pLOOP, sizeof (mng_ani_loop));
-
- pLOOP->sHeader.fCleanup = mng_free_ani_loop;
- pLOOP->sHeader.fProcess = mng_process_ani_loop;
-#endif
-
- pLOOP->iLevel = 1;
- if (pMPNG->iNumplays)
- pLOOP->iRepeatcount = pMPNG->iNumplays;
- else
- pLOOP->iRepeatcount = 0xFFFFFFFFl;
-
- mng_add_ani_object (pData, (mng_object_headerp)pLOOP);
- }
-
- bNewframe = MNG_TRUE; /* create the frame display objects */
-
- for (iCnt = 0; iCnt < iMax; iCnt++)
- {
- iX = mng_get_uint32 (pFrame);
- iY = mng_get_uint32 (pFrame+4);
- iWidth = mng_get_uint32 (pFrame+8);
- iHeight = mng_get_uint32 (pFrame+12);
- iXoffset = mng_get_int32 (pFrame+16);
- iYoffset = mng_get_int32 (pFrame+20);
- iTicks = mng_get_uint16 (pFrame+24);
-
- iDelay = iTicks;
- if (!iDelay)
- {
- mng_uint8p pTemp = pFrame+26;
- mng_int32 iTemp = iCnt+1;
-
- while ((iTemp < iMax) && (!iDelay))
- {
- iDelay = mng_get_uint16 (pTemp+24);
- pTemp += 26;
- iTemp++;
- }
- }
-
- if (bNewframe)
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_fram),
- mng_free_obj_general, mng_process_ani_fram,
- &((mng_ptr)pFRAM));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pFRAM, sizeof (mng_ani_fram));
-
- pFRAM->sHeader.fCleanup = mng_free_ani_fram;
- pFRAM->sHeader.fProcess = mng_process_ani_fram;
-#endif
-
- pFRAM->iFramemode = 4;
- pFRAM->iChangedelay = 1;
- pFRAM->iDelay = iDelay;
-
- mng_add_ani_object (pData, (mng_object_headerp)pFRAM);
- }
-
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_move),
- mng_free_obj_general,
- mng_process_ani_move,
- &((mng_ptr)pMOVE));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pMOVE, sizeof (mng_ani_move));
-
- pMOVE->sHeader.fCleanup = mng_free_ani_move;
- pMOVE->sHeader.fProcess = mng_process_ani_move;
-#endif
-
- pMOVE->iLocax = iXoffset - (mng_int32)iX;
- pMOVE->iLocay = iYoffset - (mng_int32)iY;
-
- mng_add_ani_object (pData, (mng_object_headerp)pMOVE);
-
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_clip),
- mng_free_obj_general,
- mng_process_ani_clip,
- &((mng_ptr)pCLIP));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pCLIP, sizeof (mng_ani_clip));
-
- pCLIP->sHeader.fCleanup = mng_free_ani_clip;
- pCLIP->sHeader.fProcess = mng_process_ani_clip;
-#endif
-
- pCLIP->iClipl = iXoffset;
- pCLIP->iClipr = iXoffset + (mng_int32)iWidth;
- pCLIP->iClipt = iYoffset;
- pCLIP->iClipb = iYoffset + (mng_int32)iHeight;
-
- mng_add_ani_object (pData, (mng_object_headerp)pCLIP);
-
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_show),
- mng_free_obj_general, mng_process_ani_show,
- &((mng_ptr)pSHOW));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pSHOW, sizeof (mng_ani_show));
-
- pSHOW->sHeader.fCleanup = mng_free_ani_show;
- pSHOW->sHeader.fProcess = mng_process_ani_show;
-#endif
-
- mng_add_ani_object (pData, (mng_object_headerp)pSHOW);
-
- bNewframe = (mng_bool)iTicks;
- pFrame += 26;
- }
-
- if (pMPNG->iNumplays != 1) /* create a LOOP/ENDL pair ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_endl),
- mng_free_obj_general, mng_process_ani_endl,
- &((mng_ptr)pENDL));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pENDL, sizeof (mng_ani_endl));
-
- pENDL->sHeader.fCleanup = mng_free_ani_endl;
- pENDL->sHeader.fProcess = mng_process_ani_endl;
-#endif
-
- pENDL->iLevel = 1;
-
- mng_add_ani_object (pData, (mng_object_headerp)pENDL);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_MPNG_OBJ, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_mpng_obj (mng_datap pData,
- mng_objectp pObject)
-{
- mng_mpng_objp pMPNG = (mng_mpng_objp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MPNG_OBJ, MNG_LC_START);
-#endif
-
- if (pMPNG->iFramessize)
- MNG_FREEX (pData, pMPNG->pFrames, pMPNG->iFramessize);
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- MNG_FREEX (pData, pMPNG, sizeof (mng_mpng_obj));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_MPNG_OBJ, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- return MNG_NOERROR;
-#else
- return mng_free_obj_general(pData, pObject);
-#endif
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_mpng_obj (mng_datap pData,
- mng_objectp pObject)
-{
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_MPNG_PROPOSAL */
-
-/* ************************************************************************** */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ang_obj (mng_datap pData,
- mng_uint32 iNumframes,
- mng_uint32 iTickspersec,
- mng_uint32 iNumplays,
- mng_uint32 iTilewidth,
- mng_uint32 iTileheight,
- mng_uint8 iInterlace,
- mng_uint8 iStillused)
-#else
-mng_retcode mng_create_ang_obj (mng_datap pData,
- mng_ptr pEntry)
-#endif
-{
- mng_ang_objp pANG;
- mng_ptr pTemp;
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANG_OBJ, MNG_LC_START);
-#endif
-
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ang_obj), mng_free_ang_obj,
- mng_process_ang_obj, &pTemp);
- if (iRetcode)
- return iRetcode;
- pANG = (mng_ang_objp)pTemp;
-#else
- MNG_ALLOC (pData, pANG, sizeof (mng_ang_obj));
-
- pANG->sHeader.fCleanup = mng_free_ang_obj;
- pANG->sHeader.fProcess = mng_process_ang_obj;
-#endif
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- pANG->iNumframes = iNumframes;
- pANG->iTickspersec = iTickspersec;
- pANG->iNumplays = iNumplays;
- pANG->iTilewidth = iTilewidth;
- pANG->iTileheight = iTileheight;
- pANG->iInterlace = iInterlace;
- pANG->iStillused = iStillused;
-#else
- pANG->iNumframes = ((mng_ahdrp)pEntry)->iNumframes;
- pANG->iTickspersec = ((mng_ahdrp)pEntry)->iTickspersec;
- pANG->iNumplays = ((mng_ahdrp)pEntry)->iNumplays;
- pANG->iTilewidth = ((mng_ahdrp)pEntry)->iTilewidth;
- pANG->iTileheight = ((mng_ahdrp)pEntry)->iTileheight;
- pANG->iInterlace = ((mng_ahdrp)pEntry)->iInterlace;
- pANG->iStillused = ((mng_ahdrp)pEntry)->iStillused;
-#endif
-
- pData->pANG = pANG;
- pData->eImagetype = mng_it_ang;
-
- iRetcode = mng_process_display_ang (pData);
- if (iRetcode)
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CREATE_ANG_OBJ, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_ang_obj (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ang_objp pANG = (mng_ang_objp)pObject;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANG_OBJ, MNG_LC_START);
-#endif
-
- if (pANG->iTilessize)
- MNG_FREEX (pData, pANG->pTiles, pANG->iTilessize);
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- MNG_FREEX (pData, pANG, sizeof (mng_ang_obj));
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FREE_ANG_OBJ, MNG_LC_END);
-#endif
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
- return MNG_NOERROR;
-#else
- return mng_free_obj_general(pData, pObject);
-#endif
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ang_obj (mng_datap pData,
- mng_objectp pObject)
-{
- mng_ang_objp pANG = (mng_ang_objp)pObject;
- mng_uint8p pTile = (mng_uint8p)pANG->pTiles;
- mng_retcode iRetcode;
- mng_int32 iCnt, iMax;
- mng_uint32 iTicks;
- mng_int32 iXoffset, iYoffset;
- mng_uint8 iSource;
- mng_ani_loopp pLOOP;
- mng_ani_endlp pENDL;
- mng_ani_framp pFRAM;
- mng_ani_movep pMOVE;
- mng_ani_showp pSHOW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANG_OBJ, MNG_LC_START);
-#endif
-
- /* let's create the MNG animation directives from this */
-
- iMax = pANG->iNumframes;
- /* set up MNG impersonation */
- pData->iTicks = pANG->iTickspersec;
- pData->iLayercount = iMax;
-
- if (pANG->iNumplays != 1) /* create a LOOP/ENDL pair ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_loop),
- mng_free_ani_loop, mng_process_ani_loop,
- &((mng_ptr)pLOOP));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pLOOP, sizeof (mng_ani_loop));
-
- pLOOP->sHeader.fCleanup = mng_free_ani_loop;
- pLOOP->sHeader.fProcess = mng_process_ani_loop;
-#endif
-
- pLOOP->iLevel = 1;
- if (pANG->iNumplays)
- pLOOP->iRepeatcount = pANG->iNumplays;
- else
- pLOOP->iRepeatcount = 0xFFFFFFFFl;
-
- mng_add_ani_object (pData, (mng_object_headerp)pLOOP);
- }
-
- for (iCnt = 0; iCnt < iMax; iCnt++)
- {
- iTicks = mng_get_uint32 (pTile);
- iXoffset = mng_get_int32 (pTile+4);
- iYoffset = mng_get_int32 (pTile+8);
- iSource = *(pTile+12);
-
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_fram),
- mng_free_obj_general, mng_process_ani_fram,
- &((mng_ptr)pFRAM));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pFRAM, sizeof (mng_ani_fram));
-
- pFRAM->sHeader.fCleanup = mng_free_ani_fram;
- pFRAM->sHeader.fProcess = mng_process_ani_fram;
-#endif
-
- pFRAM->iFramemode = 4;
- pFRAM->iChangedelay = 1;
- pFRAM->iDelay = iTicks;
-
- mng_add_ani_object (pData, (mng_object_headerp)pFRAM);
-
- if (!iSource)
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_move),
- mng_free_obj_general,
- mng_process_ani_move,
- &((mng_ptr)pMOVE));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pMOVE, sizeof (mng_ani_move));
-
- pMOVE->sHeader.fCleanup = mng_free_ani_move;
- pMOVE->sHeader.fProcess = mng_process_ani_move;
-#endif
-
- pMOVE->iFirstid = 1;
- pMOVE->iLastid = 1;
- pMOVE->iLocax = -iXoffset;
- pMOVE->iLocay = -iYoffset;
-
- mng_add_ani_object (pData, (mng_object_headerp)pMOVE);
- }
-
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_show),
- mng_free_obj_general, mng_process_ani_show,
- &((mng_ptr)pSHOW));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pSHOW, sizeof (mng_ani_show));
-
- pSHOW->sHeader.fCleanup = mng_free_ani_show;
- pSHOW->sHeader.fProcess = mng_process_ani_show;
-#endif
-
- if (iSource)
- pSHOW->iFirstid = 0;
- else
- pSHOW->iFirstid = 1;
- pSHOW->iLastid = pSHOW->iFirstid;
-
- mng_add_ani_object (pData, (mng_object_headerp)pSHOW);
-
- pTile += sizeof(mng_adat_tile);
- }
-
- if (pANG->iNumplays != 1) /* create a LOOP/ENDL pair ? */
- {
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- iRetcode = create_obj_general (pData, sizeof (mng_ani_endl),
- mng_free_obj_general, mng_process_ani_endl,
- &((mng_ptr)pENDL));
- if (iRetcode)
- return iRetcode;
-#else
- MNG_ALLOC (pData, pENDL, sizeof (mng_ani_endl));
-
- pENDL->sHeader.fCleanup = mng_free_ani_endl;
- pENDL->sHeader.fProcess = mng_process_ani_endl;
-#endif
-
- pENDL->iLevel = 1;
-
- mng_add_ani_object (pData, (mng_object_headerp)pENDL);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_ANG_OBJ, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_ANG_PROPOSAL */
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_DISPLAY_PROCS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_object_prc.h b/src/3rdparty/libmng/libmng_object_prc.h
deleted file mode 100644
index ffd20c8718..0000000000
--- a/src/3rdparty/libmng/libmng_object_prc.h
+++ /dev/null
@@ -1,690 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_object_prc.h copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Object processing routines (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the internal object processing routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - added support for global color-chunks in animation * */
-/* * - added support for global PLTE,tRNS,bKGD in animation * */
-/* * - added SAVE & SEEK animation objects * */
-/* * 0.5.2 - 05/29/2000 - G.Juyn * */
-/* * - changed ani_object create routines not to return the * */
-/* * created object (wasn't necessary) * */
-/* * - added compression/filter/interlace fields to * */
-/* * object-buffer for delta-image processing * */
-/* * * */
-/* * 0.5.3 - 06/22/2000 - G.Juyn * */
-/* * - added support for PPLT chunk * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - added routine to discard "invalid" objects * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/13/2002 - G.Juyn * */
-/* * - fixed read/write of MAGN chunk * */
-/* * 1.0.5 - 09/15/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - added support for PAST * */
-/* * 1.0.5 - 09/23/2002 - G.Juyn * */
-/* * - added in-memory color-correction of abstract images * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - fixed DISC support * */
-/* * * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added conditionals around Delta-PNG code * */
-/* * - added SKIPCHUNK feature * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * * */
-/* * 1.0.7 - 03/24/2004 - G.R-P * */
-/* * - added more SKIPCHUNK conditionals * */
-/* * * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_OBJCLEANUP * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_object_prc_h_
-#define _libmng_object_prc_h_
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_DISPLAY_PROCS
-
-/* ************************************************************************** */
-
-mng_retcode mng_drop_invalid_objects (mng_datap pData);
-
-/* ************************************************************************** */
-
-mng_retcode mng_create_imagedataobject (mng_datap pData,
- mng_bool bConcrete,
- mng_bool bViewable,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace,
- mng_imagedatap *ppObject);
-
-mng_retcode mng_free_imagedataobject (mng_datap pData,
- mng_imagedatap pImagedata);
-
-mng_retcode mng_clone_imagedataobject (mng_datap pData,
- mng_bool bConcrete,
- mng_imagedatap pSource,
- mng_imagedatap *ppClone);
-
-/* ************************************************************************** */
-
-mng_retcode mng_create_imageobject (mng_datap pData,
- mng_uint16 iId,
- mng_bool bConcrete,
- mng_bool bVisible,
- mng_bool bViewable,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace,
- mng_int32 iPosx,
- mng_int32 iPosy,
- mng_bool bClipped,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb,
- mng_imagep *ppObject);
-
-mng_retcode mng_free_imageobject (mng_datap pData,
- mng_imagep pImage);
-
-mng_imagep mng_find_imageobject (mng_datap pData,
- mng_uint16 iId);
-
-mng_retcode mng_clone_imageobject (mng_datap pData,
- mng_uint16 iId,
- mng_bool bPartial,
- mng_bool bVisible,
- mng_bool bAbstract,
- mng_bool bHasloca,
- mng_uint8 iLocationtype,
- mng_int32 iLocationx,
- mng_int32 iLocationy,
- mng_imagep pSource,
- mng_imagep *ppClone);
-
-mng_retcode mng_renum_imageobject (mng_datap pData,
- mng_imagep pSource,
- mng_uint16 iId,
- mng_bool bVisible,
- mng_bool bAbstract,
- mng_bool bHasloca,
- mng_uint8 iLocationtype,
- mng_int32 iLocationx,
- mng_int32 iLocationy);
-
-mng_retcode mng_reset_object_details (mng_datap pData,
- mng_imagep pImage,
- mng_uint32 iWidth,
- mng_uint32 iHeight,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iCompression,
- mng_uint8 iFilter,
- mng_uint8 iInterlace,
- mng_bool bResetall);
-
-mng_retcode mng_promote_imageobject (mng_datap pData,
- mng_imagep pImage,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iFilltype);
-
-mng_retcode mng_magnify_imageobject (mng_datap pData,
- mng_imagep pImage);
-
-mng_retcode mng_colorcorrect_object (mng_datap pData,
- mng_imagep pImage);
-
-/* ************************************************************************** */
-
-mng_retcode mng_create_ani_image (mng_datap pData);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-
-mng_retcode mng_create_ani_plte (mng_datap pData,
- mng_uint32 iEntrycount,
- mng_palette8ep paEntries);
-
-mng_retcode mng_create_ani_trns (mng_datap pData,
- mng_uint32 iRawlen,
- mng_uint8p pRawdata);
-
-mng_retcode mng_create_ani_gama (mng_datap pData,
- mng_bool bEmpty,
- mng_uint32 iGamma);
-
-mng_retcode mng_create_ani_chrm (mng_datap pData,
- mng_bool bEmpty,
- mng_uint32 iWhitepointx,
- mng_uint32 iWhitepointy,
- mng_uint32 iRedx,
- mng_uint32 iRedy,
- mng_uint32 iGreenx,
- mng_uint32 iGreeny,
- mng_uint32 iBluex,
- mng_uint32 iBluey);
-
-mng_retcode mng_create_ani_srgb (mng_datap pData,
- mng_bool bEmpty,
- mng_uint8 iRenderinginent);
-
-mng_retcode mng_create_ani_iccp (mng_datap pData,
- mng_bool bEmpty,
- mng_uint32 iProfilesize,
- mng_ptr pProfile);
-
-mng_retcode mng_create_ani_bkgd (mng_datap pData,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue);
-
-mng_retcode mng_create_ani_loop (mng_datap pData,
- mng_uint8 iLevel,
- mng_uint32 iRepeatcount,
- mng_uint8 iTermcond,
- mng_uint32 iItermin,
- mng_uint32 iItermax,
- mng_uint32 iCount,
- mng_uint32p pSignals);
-
-mng_retcode mng_create_ani_endl (mng_datap pData,
- mng_uint8 iLevel);
-
-mng_retcode mng_create_ani_defi (mng_datap pData);
-
-mng_retcode mng_create_ani_basi (mng_datap pData,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_bool bHasalpha,
- mng_uint16 iAlpha,
- mng_uint8 iViewable);
-
-mng_retcode mng_create_ani_clon (mng_datap pData,
- mng_uint16 iSourceid,
- mng_uint16 iCloneid,
- mng_uint8 iClonetype,
- mng_bool bHasdonotshow,
- mng_uint8 iDonotshow,
- mng_uint8 iConcrete,
- mng_bool bHasloca,
- mng_uint8 iLocatype,
- mng_int32 iLocax,
- mng_int32 iLocay);
-
-mng_retcode mng_create_ani_back (mng_datap pData,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue,
- mng_uint8 iMandatory,
- mng_uint16 iImageid,
- mng_uint8 iTile);
-
-mng_retcode mng_create_ani_fram (mng_datap pData,
- mng_uint8 iFramemode,
- mng_uint8 iChangedelay,
- mng_uint32 iDelay,
- mng_uint8 iChangetimeout,
- mng_uint32 iTimeout,
- mng_uint8 iChangeclipping,
- mng_uint8 iCliptype,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb);
-
-mng_retcode mng_create_ani_move (mng_datap pData,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iType,
- mng_int32 iLocax,
- mng_int32 iLocay);
-
-mng_retcode mng_create_ani_clip (mng_datap pData,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iType,
- mng_int32 iClipl,
- mng_int32 iClipr,
- mng_int32 iClipt,
- mng_int32 iClipb);
-
-mng_retcode mng_create_ani_show (mng_datap pData,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iMode);
-
-mng_retcode mng_create_ani_term (mng_datap pData,
- mng_uint8 iTermaction,
- mng_uint8 iIteraction,
- mng_uint32 iDelay,
- mng_uint32 iItermax);
-
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode mng_create_ani_save (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
-mng_retcode mng_create_ani_seek (mng_datap pData,
- mng_uint32 iSegmentnamesize,
- mng_pchar zSegmentname);
-#endif
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_create_ani_dhdr (mng_datap pData,
- mng_uint16 iObjectid,
- mng_uint8 iImagetype,
- mng_uint8 iDeltatype,
- mng_uint32 iBlockwidth,
- mng_uint32 iBlockheight,
- mng_uint32 iBlockx,
- mng_uint32 iBlocky);
-
-mng_retcode mng_create_ani_prom (mng_datap pData,
- mng_uint8 iBitdepth,
- mng_uint8 iColortype,
- mng_uint8 iFilltype);
-
-mng_retcode mng_create_ani_ipng (mng_datap pData);
-mng_retcode mng_create_ani_ijng (mng_datap pData);
-
-mng_retcode mng_create_ani_pplt (mng_datap pData,
- mng_uint8 iType,
- mng_uint32 iCount,
- mng_palette8ep paIndexentries,
- mng_uint8p paAlphaentries,
- mng_uint8p paUsedentries);
-#endif
-
-#ifndef MNG_SKIPCHUNK_MAGN
-mng_retcode mng_create_ani_magn (mng_datap pData,
- mng_uint16 iFirstid,
- mng_uint16 iLastid,
- mng_uint8 iMethodX,
- mng_uint16 iMX,
- mng_uint16 iMY,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint16 iMT,
- mng_uint16 iMB,
- mng_uint8 iMethodY);
-#endif
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_create_ani_past (mng_datap pData,
- mng_uint16 iTargetid,
- mng_uint8 iTargettype,
- mng_int32 iTargetx,
- mng_int32 iTargety,
- mng_uint32 iCount,
- mng_ptr pSources);
-#endif
-
-#ifndef MNG_SKIPCHUNK_DISC
-mng_retcode mng_create_ani_disc (mng_datap pData,
- mng_uint32 iCount,
- mng_uint16p pIds);
-#endif
-
-#else /* MNG_OPTIMIZE_CHUNKREADER */
-
-mng_retcode mng_create_ani_plte (mng_datap pData);
-mng_retcode mng_create_ani_trns (mng_datap pData);
-mng_retcode mng_create_ani_gama (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_chrm (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_srgb (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_iccp (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_bkgd (mng_datap pData);
-mng_retcode mng_create_ani_loop (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_endl (mng_datap pData,
- mng_uint8 iLevel);
-mng_retcode mng_create_ani_defi (mng_datap pData);
-mng_retcode mng_create_ani_basi (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_clon (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_back (mng_datap pData);
-mng_retcode mng_create_ani_fram (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_move (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_clip (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_show (mng_datap pData);
-mng_retcode mng_create_ani_term (mng_datap pData,
- mng_chunkp pChunk);
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode mng_create_ani_save (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
-mng_retcode mng_create_ani_seek (mng_datap pData,
- mng_chunkp pChunk);
-#endif
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_create_ani_dhdr (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_prom (mng_datap pData,
- mng_chunkp pChunk);
-mng_retcode mng_create_ani_ipng (mng_datap pData);
-mng_retcode mng_create_ani_ijng (mng_datap pData);
-
-mng_retcode mng_create_ani_pplt (mng_datap pData,
- mng_uint8 iType,
- mng_uint32 iCount,
- mng_palette8ep paIndexentries,
- mng_uint8p paAlphaentries,
- mng_uint8p paUsedentries);
-#endif
-
-#ifndef MNG_SKIPCHUNK_MAGN
-mng_retcode mng_create_ani_magn (mng_datap pData,
- mng_chunkp pChunk);
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_create_ani_past (mng_datap pData,
- mng_chunkp pChunk);
-#endif
-#ifndef MNG_SKIPCHUNK_DISC
-mng_retcode mng_create_ani_disc (mng_datap pData,
- mng_chunkp pChunk);
-#endif
-
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
-
-/* ************************************************************************** */
-
-mng_retcode mng_free_ani_image (mng_datap pData,
- mng_objectp pObject);
-
-#ifndef MNG_OPTIMIZE_OBJCLEANUP
-
-mng_retcode mng_free_ani_plte (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_trns (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_gama (mng_datap pData,
- mng_objectp pObject);
-#ifndef MNG_SKIPCHUNK_cHRM
-mng_retcode mng_free_ani_chrm (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_sRGB
-mng_retcode mng_free_ani_srgb (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
-mng_retcode mng_free_ani_bkgd (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_LOOP
-mng_retcode mng_free_ani_endl (mng_datap pData,
- mng_objectp pObject);
-#endif
-mng_retcode mng_free_ani_defi (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_basi (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_clon (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_back (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_fram (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_move (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_clip (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_show (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_term (mng_datap pData,
- mng_objectp pObject);
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode mng_free_ani_save (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_free_ani_dhdr (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_prom (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_ipng (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_ijng (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_free_ani_pplt (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_MAGN
-mng_retcode mng_free_ani_magn (mng_datap pData,
- mng_objectp pObject);
-#endif
-
-#endif /* MNG_OPTIMIZE_OBJCLEANUP */
-
-
-#ifndef MNG_SKIPCHUNK_iCCP
-mng_retcode mng_free_ani_iccp (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_LOOP
-mng_retcode mng_free_ani_loop (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode mng_free_ani_seek (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_free_ani_past (mng_datap pData,
- mng_objectp pObject);
-#endif
-mng_retcode mng_free_ani_disc (mng_datap pData,
- mng_objectp pObject);
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ani_image (mng_datap pData,
- mng_objectp pObject);
-
-mng_retcode mng_process_ani_plte (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_trns (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_gama (mng_datap pData,
- mng_objectp pObject);
-#ifndef MNG_SKIPCHUNK_cHRM
-mng_retcode mng_process_ani_chrm (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_sRGB
-mng_retcode mng_process_ani_srgb (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_iCCP
-mng_retcode mng_process_ani_iccp (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
-mng_retcode mng_process_ani_bkgd (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_LOOP
-mng_retcode mng_process_ani_loop (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_endl (mng_datap pData,
- mng_objectp pObject);
-#endif
-mng_retcode mng_process_ani_defi (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_basi (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_clon (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_back (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_fram (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_move (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_clip (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_show (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_term (mng_datap pData,
- mng_objectp pObject);
-#ifndef MNG_SKIPCHUNK_SAVE
-mng_retcode mng_process_ani_save (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
-mng_retcode mng_process_ani_seek (mng_datap pData,
- mng_objectp pObject);
-#endif
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_process_ani_dhdr (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_prom (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_ipng (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_ijng (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ani_pplt (mng_datap pData,
- mng_objectp pObject);
-#endif
-mng_retcode mng_process_ani_magn (mng_datap pData,
- mng_objectp pObject);
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_process_ani_past (mng_datap pData,
- mng_objectp pObject);
-#endif
-mng_retcode mng_process_ani_disc (mng_datap pData,
- mng_objectp pObject);
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_event (mng_datap pData,
- mng_uint8 iEventtype,
- mng_uint8 iMasktype,
- mng_int32 iLeft,
- mng_int32 iRight,
- mng_int32 iTop,
- mng_int32 iBottom,
- mng_uint16 iObjectid,
- mng_uint8 iIndex,
- mng_uint32 iSegmentnamesize,
- mng_pchar zSegmentname);
-#else
-mng_retcode mng_create_event (mng_datap pData,
- mng_ptr pEntry);
-#endif
-mng_retcode mng_free_event (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_event (mng_datap pData,
- mng_objectp pObject);
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_mpng_obj (mng_datap pData,
- mng_uint32 iFramewidth,
- mng_uint32 iFrameheight,
- mng_uint16 iNumplays,
- mng_uint16 iTickspersec,
- mng_uint32 iFramessize,
- mng_ptr pFrames);
-#else
-mng_retcode mng_create_mpng_obj (mng_datap pData,
- mng_ptr pEntry);
-#endif
-mng_retcode mng_free_mpng_obj (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_mpng_obj (mng_datap pData,
- mng_objectp pObject);
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-#ifndef MNG_OPTIMIZE_CHUNKREADER
-mng_retcode mng_create_ang_obj (mng_datap pData,
- mng_uint32 iNumframes,
- mng_uint32 iTickspersec,
- mng_uint32 iNumplays,
- mng_uint32 iTilewidth,
- mng_uint32 iTileheight,
- mng_uint8 iInterlace,
- mng_uint8 iStillused);
-#else
-mng_retcode mng_create_ang_obj (mng_datap pData,
- mng_ptr pEntry);
-#endif
-mng_retcode mng_free_ang_obj (mng_datap pData,
- mng_objectp pObject);
-mng_retcode mng_process_ang_obj (mng_datap pData,
- mng_objectp pObject);
-#endif
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_DISPLAY_PROCS */
-
-/* ************************************************************************** */
-
-#endif /* _libmng_object_prc_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_objects.h b/src/3rdparty/libmng/libmng_objects.h
deleted file mode 100644
index 053e6b4b2e..0000000000
--- a/src/3rdparty/libmng/libmng_objects.h
+++ /dev/null
@@ -1,635 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_objects.h copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Internal object structures (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the internal object structures * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.5.2 - 05/23/2000 - G.Juyn * */
-/* * - changed inclusion to DISPLAY_PROCS * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - added global color-chunks for animations * */
-/* * - added global PLTE,tRNS,bKGD chunks for animation * */
-/* * - added SAVE & SEEK animation objects * */
-/* * 0.5.2 - 05/29/2000 - G.Juyn * */
-/* * - added framenr/layernr/playtime to object header * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - added ani-objects for delta-image processing * */
-/* * - added compression/filter/interlace fields to * */
-/* * object-buffer for delta-image processing * */
-/* * * */
-/* * 0.5.3 - 06/17/2000 - G.Juyn * */
-/* * - changed definition of aTRNSentries * */
-/* * 0.5.3 - 06/22/2000 - G.Juyn * */
-/* * - added definition for PPLT animation-processing * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 09/10/2000 - G.Juyn * */
-/* * - fixed DEFI behavior * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added support for delta-JNG * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - added valid-flag to stored objects for read() / display()* */
-/* * 0.9.3 - 10/19/2000 - G.Juyn * */
-/* * - added storage for pixel-/alpha-sampledepth for delta's * */
-/* * * */
-/* * 1.0.5 - 09/13/2002 - G.Juyn * */
-/* * - fixed read/write of MAGN chunk * */
-/* * 1.0.5 - 09/15/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - added support for PAST * */
-/* * 1.0.5 - 09/23/2002 - G.Juyn * */
-/* * - added in-memory color-correction of abstract images * */
-/* * 1.0.5 - 10/07/2002 - G.Juyn * */
-/* * - fixed DISC support * */
-/* * * */
-/* * 1.0.6 - 10/07/2003 - G.R-P * */
-/* * - added SKIPCHUNK conditionals * */
-/* * * */
-/* * 1.0.7 - 03/24/2004 - G.R-P * */
-/* * - added more SKIPCHUNK conditionals * */
-/* * * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_OBJCLEANUP * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_objects_h_
-#define _libmng_objects_h_
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_DISPLAY_PROCS
-
-/* ************************************************************************** */
-
-typedef mng_retcode (*mng_cleanupobject) (mng_datap pData,
- mng_objectp pHeader);
-
-typedef mng_retcode (*mng_processobject) (mng_datap pData,
- mng_objectp pHeader);
-
-/* ************************************************************************** */
-
-typedef struct {
- mng_cleanupobject fCleanup;
- mng_processobject fProcess;
- mng_objectp pNext; /* for double-linked list */
- mng_objectp pPrev;
- mng_uint32 iFramenr;
- mng_uint32 iLayernr;
- mng_uint32 iPlaytime;
-#ifdef MNG_OPTIMIZE_OBJCLEANUP
- mng_size_t iObjsize;
-#endif
- } mng_object_header;
-typedef mng_object_header * mng_object_headerp;
-
-/* ************************************************************************** */
-
-typedef struct { /* MNG specification "object-buffer" */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint32 iRefcount; /* reference counter */
- mng_bool bFrozen; /* frozen flag */
- mng_bool bConcrete; /* concrete flag */
- mng_bool bViewable; /* viewable flag */
- mng_uint32 iWidth; /* image specifics */
- mng_uint32 iHeight;
- mng_uint8 iBitdepth;
- mng_uint8 iColortype;
- mng_uint8 iCompression;
- mng_uint8 iFilter;
- mng_uint8 iInterlace;
-
- mng_bool bCorrected; /* indicates if an abstract image
- has already been color-corrected */
-
- mng_uint8 iAlphabitdepth; /* used only for JNG images */
- mng_uint8 iJHDRcompression;
- mng_uint8 iJHDRinterlace;
-
- mng_uint8 iPixelsampledepth; /* used with delta-images */
- mng_uint8 iAlphasampledepth;
-
- mng_bool bHasPLTE; /* PLTE chunk present */
- mng_bool bHasTRNS; /* tRNS chunk present */
- mng_bool bHasGAMA; /* gAMA chunk present */
- mng_bool bHasCHRM; /* cHRM chunk present */
- mng_bool bHasSRGB; /* sRGB chunk present */
- mng_bool bHasICCP; /* iCCP chunk present */
- mng_bool bHasBKGD; /* bKGD chunk present */
-
- mng_uint32 iPLTEcount; /* PLTE fields */
- mng_rgbpaltab aPLTEentries;
-
- mng_uint16 iTRNSgray; /* tRNS fields */
- mng_uint16 iTRNSred;
- mng_uint16 iTRNSgreen;
- mng_uint16 iTRNSblue;
- mng_uint32 iTRNScount;
- mng_uint8arr aTRNSentries;
-
- mng_uint32 iGamma; /* gAMA fields */
-
- mng_uint32 iWhitepointx; /* cHRM fields */
- mng_uint32 iWhitepointy;
- mng_uint32 iPrimaryredx;
- mng_uint32 iPrimaryredy;
- mng_uint32 iPrimarygreenx;
- mng_uint32 iPrimarygreeny;
- mng_uint32 iPrimarybluex;
- mng_uint32 iPrimarybluey;
-
- mng_uint8 iRenderingintent; /* sRGB fields */
-
- mng_uint32 iProfilesize; /* iCCP fields */
- mng_ptr pProfile;
-
- mng_uint8 iBKGDindex; /* bKGD fields */
- mng_uint16 iBKGDgray;
- mng_uint16 iBKGDred;
- mng_uint16 iBKGDgreen;
- mng_uint16 iBKGDblue;
-
- mng_uint32 iSamplesize; /* size of a sample */
- mng_uint32 iRowsize; /* size of a row of samples */
- mng_uint32 iImgdatasize; /* size of the sample data buffer */
- mng_uint8p pImgdata; /* actual sample data buffer */
-
- } mng_imagedata;
-typedef mng_imagedata * mng_imagedatap;
-
-/* ************************************************************************** */
-
-typedef struct { /* MNG specification "object" */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iId; /* object-id */
- mng_bool bFrozen; /* frozen flag */
- mng_bool bVisible; /* potential visibility flag */
- mng_bool bViewable; /* viewable flag */
- mng_bool bValid; /* marks invalid when only reading */
- mng_int32 iPosx; /* location fields */
- mng_int32 iPosy;
- mng_bool bClipped; /* clipping fields */
- mng_int32 iClipl;
- mng_int32 iClipr;
- mng_int32 iClipt;
- mng_int32 iClipb;
-#ifndef MNG_SKIPCHUNK_MAGN
- mng_uint8 iMAGN_MethodX; /* magnification (MAGN) */
- mng_uint8 iMAGN_MethodY;
- mng_uint16 iMAGN_MX;
- mng_uint16 iMAGN_MY;
- mng_uint16 iMAGN_ML;
- mng_uint16 iMAGN_MR;
- mng_uint16 iMAGN_MT;
- mng_uint16 iMAGN_MB;
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
- mng_int32 iPastx; /* target x/y from previous PAST */
- mng_int32 iPasty;
-#endif
- mng_imagedatap pImgbuf; /* the image-data buffer */
- } mng_image;
-typedef mng_image * mng_imagep;
-
-/* ************************************************************************** */
-
- /* "on-the-fly" image (= object 0) */
-typedef mng_image mng_ani_image; /* let's (ab)use the general "object" */
-typedef mng_ani_image * mng_ani_imagep; /* that's actualy crucial, so don't change it! */
-
-/* ************************************************************************** */
-
-typedef struct { /* global PLTE object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint32 iEntrycount;
- mng_rgbpaltab aEntries;
- } mng_ani_plte;
-typedef mng_ani_plte * mng_ani_pltep;
-
-/* ************************************************************************** */
-
-typedef struct { /* global tRNS object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint32 iRawlen;
- mng_uint8arr aRawdata;
- } mng_ani_trns;
-typedef mng_ani_trns * mng_ani_trnsp;
-
-/* ************************************************************************** */
-
-typedef struct { /* global gAMA object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_bool bEmpty;
- mng_uint32 iGamma;
- } mng_ani_gama;
-typedef mng_ani_gama * mng_ani_gamap;
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_cHRM
-typedef struct { /* global cHRM object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_bool bEmpty;
- mng_uint32 iWhitepointx;
- mng_uint32 iWhitepointy;
- mng_uint32 iRedx;
- mng_uint32 iRedy;
- mng_uint32 iGreenx;
- mng_uint32 iGreeny;
- mng_uint32 iBluex;
- mng_uint32 iBluey;
- } mng_ani_chrm;
-typedef mng_ani_chrm * mng_ani_chrmp;
-#endif
-
-/* ************************************************************************** */
-
-typedef struct { /* global sRGB object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_bool bEmpty;
- mng_uint8 iRenderingintent;
- } mng_ani_srgb;
-typedef mng_ani_srgb * mng_ani_srgbp;
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_iCCP
-typedef struct { /* global iCCP object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_bool bEmpty;
- mng_uint32 iProfilesize;
- mng_ptr pProfile;
- } mng_ani_iccp;
-typedef mng_ani_iccp * mng_ani_iccpp;
-#endif
-
-/* ************************************************************************** */
-
-typedef struct { /* global bKGD object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iRed;
- mng_uint16 iGreen;
- mng_uint16 iBlue;
- } mng_ani_bkgd;
-typedef mng_ani_bkgd * mng_ani_bkgdp;
-
-/* ************************************************************************** */
-
-typedef struct { /* LOOP object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint8 iLevel;
- mng_uint32 iRepeatcount;
- mng_uint8 iTermcond;
- mng_uint32 iItermin;
- mng_uint32 iItermax;
- mng_uint32 iCount;
- mng_uint32p pSignals;
-
- mng_uint32 iRunningcount; /* running counter */
- } mng_ani_loop;
-typedef mng_ani_loop * mng_ani_loopp;
-
-/* ************************************************************************** */
-
-typedef struct { /* ENDL object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint8 iLevel;
-
- mng_ani_loopp pLOOP; /* matching LOOP */
- } mng_ani_endl;
-typedef mng_ani_endl * mng_ani_endlp;
-
-/* ************************************************************************** */
-
-typedef struct { /* DEFI object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iId;
- mng_bool bHasdonotshow;
- mng_uint8 iDonotshow;
- mng_bool bHasconcrete;
- mng_uint8 iConcrete;
- mng_bool bHasloca;
- mng_int32 iLocax;
- mng_int32 iLocay;
- mng_bool bHasclip;
- mng_int32 iClipl;
- mng_int32 iClipr;
- mng_int32 iClipt;
- mng_int32 iClipb;
- } mng_ani_defi;
-typedef mng_ani_defi * mng_ani_defip;
-
-/* ************************************************************************** */
-
-typedef struct { /* BASI object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iRed;
- mng_uint16 iGreen;
- mng_uint16 iBlue;
- mng_bool bHasalpha;
- mng_uint16 iAlpha;
- mng_uint8 iViewable;
- } mng_ani_basi;
-typedef mng_ani_basi * mng_ani_basip;
-
-/* ************************************************************************** */
-
-typedef struct { /* CLON object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iCloneid;
- mng_uint16 iSourceid;
- mng_uint8 iClonetype;
- mng_bool bHasdonotshow;
- mng_uint8 iDonotshow;
- mng_uint8 iConcrete;
- mng_bool bHasloca;
- mng_uint8 iLocatype;
- mng_int32 iLocax;
- mng_int32 iLocay;
- } mng_ani_clon;
-typedef mng_ani_clon * mng_ani_clonp;
-
-/* ************************************************************************** */
-
-typedef struct { /* BACK object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iRed;
- mng_uint16 iGreen;
- mng_uint16 iBlue;
- mng_uint8 iMandatory;
- mng_uint16 iImageid;
- mng_uint8 iTile;
- } mng_ani_back;
-typedef mng_ani_back * mng_ani_backp;
-
-/* ************************************************************************** */
-
-typedef struct { /* FRAM object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint8 iFramemode;
- mng_uint8 iChangedelay;
- mng_uint32 iDelay;
- mng_uint8 iChangetimeout;
- mng_uint32 iTimeout;
- mng_uint8 iChangeclipping;
- mng_uint8 iCliptype;
- mng_int32 iClipl;
- mng_int32 iClipr;
- mng_int32 iClipt;
- mng_int32 iClipb;
- } mng_ani_fram;
-typedef mng_ani_fram * mng_ani_framp;
-
-/* ************************************************************************** */
-
-typedef struct { /* MOVE object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iFirstid;
- mng_uint16 iLastid;
- mng_uint8 iType;
- mng_int32 iLocax;
- mng_int32 iLocay;
- } mng_ani_move;
-typedef mng_ani_move * mng_ani_movep;
-
-/* ************************************************************************** */
-
-typedef struct { /* CLIP object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iFirstid;
- mng_uint16 iLastid;
- mng_uint8 iType;
- mng_int32 iClipl;
- mng_int32 iClipr;
- mng_int32 iClipt;
- mng_int32 iClipb;
- } mng_ani_clip;
-typedef mng_ani_clip * mng_ani_clipp;
-
-/* ************************************************************************** */
-
-typedef struct { /* SHOW object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iFirstid;
- mng_uint16 iLastid;
- mng_uint8 iMode;
- } mng_ani_show;
-typedef mng_ani_show * mng_ani_showp;
-
-/* ************************************************************************** */
-
-typedef struct { /* TERM object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint8 iTermaction;
- mng_uint8 iIteraction;
- mng_uint32 iDelay;
- mng_uint32 iItermax;
- } mng_ani_term;
-typedef mng_ani_term * mng_ani_termp;
-
-/* ************************************************************************** */
-
-typedef struct { /* SAVE object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- } mng_ani_save;
-typedef mng_ani_save * mng_ani_savep;
-
-/* ************************************************************************** */
-
-typedef struct { /* SEEK object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint32 iSegmentnamesize;
- mng_pchar zSegmentname;
- } mng_ani_seek;
-typedef mng_ani_seek * mng_ani_seekp;
-
-/* ************************************************************************** */
-#ifndef MNG_NO_DELTA_PNG
-typedef struct { /* DHDR object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iObjectid;
- mng_uint8 iImagetype;
- mng_uint8 iDeltatype;
- mng_uint32 iBlockwidth;
- mng_uint32 iBlockheight;
- mng_uint32 iBlockx;
- mng_uint32 iBlocky;
- } mng_ani_dhdr;
-typedef mng_ani_dhdr * mng_ani_dhdrp;
-
-/* ************************************************************************** */
-
-typedef struct { /* PROM object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint8 iBitdepth;
- mng_uint8 iColortype;
- mng_uint8 iFilltype;
- } mng_ani_prom;
-typedef mng_ani_prom * mng_ani_promp;
-
-/* ************************************************************************** */
-
-typedef struct { /* IPNG object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- } mng_ani_ipng;
-typedef mng_ani_ipng * mng_ani_ipngp;
-
-/* ************************************************************************** */
-
-typedef struct { /* IJNG object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- } mng_ani_ijng;
-typedef mng_ani_ijng * mng_ani_ijngp;
-
-/* ************************************************************************** */
-
-typedef struct { /* PPLT object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint8 iType;
- mng_uint32 iCount;
- mng_rgbpaltab aIndexentries;
- mng_uint8arr aAlphaentries;
- mng_uint8arr aUsedentries;
- } mng_ani_pplt;
-typedef mng_ani_pplt * mng_ani_ppltp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-typedef struct { /* MAGN object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iFirstid;
- mng_uint16 iLastid;
- mng_uint8 iMethodX;
- mng_uint16 iMX;
- mng_uint16 iMY;
- mng_uint16 iML;
- mng_uint16 iMR;
- mng_uint16 iMT;
- mng_uint16 iMB;
- mng_uint8 iMethodY;
- } mng_ani_magn;
-typedef mng_ani_magn * mng_ani_magnp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-typedef struct { /* PAST object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint16 iTargetid;
- mng_uint8 iTargettype;
- mng_int32 iTargetx;
- mng_int32 iTargety;
- mng_uint32 iCount;
- mng_ptr pSources;
- } mng_ani_past;
-typedef mng_ani_past * mng_ani_pastp;
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_DISC
-typedef struct { /* DISC object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint32 iCount;
- mng_uint16p pIds;
- } mng_ani_disc;
-typedef mng_ani_disc * mng_ani_discp;
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
-typedef struct { /* event object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint8 iEventtype;
- mng_uint8 iMasktype;
- mng_int32 iLeft;
- mng_int32 iRight;
- mng_int32 iTop;
- mng_int32 iBottom;
- mng_uint16 iObjectid;
- mng_uint8 iIndex;
- mng_uint32 iSegmentnamesize;
- mng_pchar zSegmentname;
-
- mng_ani_seekp pSEEK; /* SEEK ani object */
- mng_int32 iLastx; /* last X/Y coordinates */
- mng_int32 iLasty;
- } mng_event;
-typedef mng_event * mng_eventp;
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
-typedef struct { /* mPNG object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint32 iFramewidth;
- mng_uint32 iFrameheight;
- mng_uint32 iNumplays;
- mng_uint16 iTickspersec;
- mng_uint32 iFramessize;
- mng_ptr pFrames;
- } mng_mpng_obj;
-typedef mng_mpng_obj * mng_mpng_objp;
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
-typedef struct { /* ANG object */
- mng_object_header sHeader; /* default header (DO NOT REMOVE) */
- mng_uint32 iNumframes;
- mng_uint32 iTickspersec;
- mng_uint32 iNumplays;
- mng_uint32 iTilewidth;
- mng_uint32 iTileheight;
- mng_uint8 iInterlace;
- mng_uint8 iStillused;
- mng_uint32 iTilessize;
- mng_ptr pTiles;
- } mng_ang_obj;
-typedef mng_ang_obj * mng_ang_objp;
-#endif
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_DISPLAY_PROCS */
-
-/* ************************************************************************** */
-
-#endif /* _libmng_objects_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_pixels.c b/src/3rdparty/libmng/libmng_pixels.c
deleted file mode 100644
index ce5637be95..0000000000
--- a/src/3rdparty/libmng/libmng_pixels.c
+++ /dev/null
@@ -1,24610 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_pixels.c copyright (c) 2000-2005 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Pixel-row management routines (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the pixel-row management routines * */
-/* * * */
-/* * the dual alpha-composing for RGBA/BGRA/etc output-canvas' * */
-/* * is based on the Note on Compositing chapter of the * */
-/* * DOH-3 draft, noted to me by Adam M. Costello * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - added callback error-reporting support * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * * */
-/* * 0.5.2 - 05/22/2000 - G.Juyn * */
-/* * - added JNG support * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - fixed minor bugs 16-bit pixel-handling * */
-/* * - added delta-image row-processing routines * */
-/* * 0.5.2 - 06/02/2000 - G.Juyn * */
-/* * - fixed endian support (hopefully) * */
-/* * 0.5.2 - 06/03/2000 - G.Juyn * */
-/* * - fixed makeup for Linux gcc compile * */
-/* * 0.5.2 - 06/05/2000 - G.Juyn * */
-/* * - implemented app bkgd restore routines * */
-/* * - implemented RGBA8, ARGB8, BGRA8 & ABGR8 display routines * */
-/* * - added support for RGB8_A8 canvasstyle * */
-/* * 0.5.2 - 06/09/2000 - G.Juyn * */
-/* * - fixed alpha-handling for alpha canvasstyles * */
-/* * * */
-/* * 0.5.3 - 06/16/2000 - G.Juyn * */
-/* * - changed progressive-display processing * */
-/* * 0.5.3 - 06/17/2000 - G.Juyn * */
-/* * - changed to support delta-images * */
-/* * - optimized some store_xxx routines * */
-/* * 0.5.3 - 06/20/2000 - G.Juyn * */
-/* * - fixed nasty bug with embedded PNG after delta-image * */
-/* * 0.5.3 - 06/24/2000 - G.Juyn * */
-/* * - fixed problem with 16-bit GA format * */
-/* * 0.5.3 - 06/25/2000 - G.Juyn * */
-/* * - fixed problem with cheap transparency for 4-bit gray * */
-/* * - fixed display_xxxx routines for interlaced images * */
-/* * 0.5.3 - 06/28/2000 - G.Juyn * */
-/* * - fixed compiler-warning for non-initialized iB variable * */
-/* * * */
-/* * 0.9.1 - 07/05/2000 - G.Juyn * */
-/* * - fixed mandatory BACK color to be opaque * */
-/* * * */
-/* * 0.9.2 - 07/31/2000 - G.Juyn * */
-/* * - B110547 - fixed bug in interlace code * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/20/2000 - G.Juyn * */
-/* * - fixed app-supplied background restore * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * 0.9.3 - 09/30/2000 - G.Juyn * */
-/* * - fixed MAGN rounding errors (thanks Matthias!) * */
-/* * 0.9.3 - 10/10/2000 - G.Juyn * */
-/* * - fixed alpha-blending for RGBA canvasstyle * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - fixed alpha-blending for other alpha-canvasstyles * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added optional support for bKGD for PNG images * */
-/* * - added support for JDAA * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - fixed support for bKGD * */
-/* * 0.9.3 - 10/19/2000 - G.Juyn * */
-/* * - implemented delayed delta-processing * */
-/* * 0.9.3 - 10/28/2000 - G.Juyn * */
-/* * - fixed tRNS processing for gray-image < 8-bits * */
-/* * * */
-/* * 0.9.4 - 12/16/2000 - G.Juyn * */
-/* * - fixed mixup of data- & function-pointers (thanks Dimitri)* */
-/* * 0.9.4 - 1/18/2001 - G.Juyn * */
-/* * - removed "old" MAGN methods 3 & 4 * */
-/* * - added "new" MAGN methods 3, 4 & 5 * */
-/* * - removed test filter-methods 1 & 65 * */
-/* * * */
-/* * 1.0.1 - 04/21/2001 - G.Juyn (code by G.Kelly) * */
-/* * - added BGRA8 canvas with premultiplied alpha * */
-/* * 1.0.1 - 04/25/2001 - G.Juyn * */
-/* * - moved mng_clear_cms to libmng_cms * */
-/* * * */
-/* * 1.0.2 - 06/25/2001 - G.Juyn * */
-/* * - added option to turn off progressive refresh * */
-/* * * */
-/* * 1.0.4 - 11/04/2001 - G.Juyn * */
-/* * - fixed possible compile-problem in cleanup_rowproc * */
-/* * 1.0.4 - 06/22/2002 - G.Juyn * */
-/* * - B558212 - off by one error * */
-/* * - MNG subimage alpha composite wrong for rgba8 images * */
-/* * * */
-/* * 1.0.5 - 08/07/2002 - G.Juyn * */
-/* * - added test-option for PNG filter method 193 (=no filter) * */
-/* * 1.0.5 - 08/15/2002 - G.Juyn * */
-/* * - completed PROM support * */
-/* * - completed delta-image support * */
-/* * 1.0.5 - 08/16/2002 - G.Juyn * */
-/* * - completed MAGN support (16-bit functions) * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/19/2002 - G.Juyn * */
-/* * - optimized restore-background for bKGD cases * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - finished support for BACK image & tiling * */
-/* * 1.0.5 - 09/22/2002 - G.Juyn * */
-/* * - added bgrx8 canvas (filler byte) * */
-/* * 1.0.5 - 09/23/2002 - G.Juyn * */
-/* * - added compose over/under routines for PAST processing * */
-/* * - added flip & tile routines for PAST processing * */
-/* * * */
-/* * 1.0.6 - 03/09/2003 - G.Juyn * */
-/* * - hiding 12-bit JPEG stuff * */
-/* * 1.0.6 - 05/11/2003 - Glenn RP * */
-/* * - added size-optimization COMPOSE routine usage * */
-/* * 1.0.6 - 05/11/2003 - G. Juyn * */
-/* * - added conditionals around canvas update routines * */
-/* * 1.0.6 - 05/25/2003 - Glenn RP * */
-/* * - added size-optimization DIV255B8 routine usage * */
-/* * 1.0.6 - 06/09/2003 - G. R-P * */
-/* * - added conditionals around 8-bit magn routines * */
-/* * 1.0.6 - 07/07/2003 - G. R-P * */
-/* * - removed conditionals around 8-bit magn routines * */
-/* * - added MNG_NO_16BIT_SUPPORT and MNG_NO_DELTA_PNG * */
-/* * conditionals * */
-/* * - reversed many loops to use decrementing counter * */
-/* * - combined init functions * */
-/* * - converted some switches to array references * */
-/* * 1.0.6 - 07/29/2003 - G.Juyn * */
-/* * - fixed duplicate for-loop * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added SKIPCHUNK conditionals around PAST chunk support * */
-/* * - fixed "FOOTPRINT_COMPOSEIV" typo (now "FOOTPRINT_DIV") * */
-/* * 1.0.6 - 08/17/2003 - G.R-P * */
-/* * - added more conditionals around "promote" functions * */
-/* * * */
-/* * 1.0.7 - 11/27/2003 - R.A * */
-/* * - added CANVAS_RGB565 and CANVAS_BGR565 * */
-/* * 1.0.7 - 12/06/2003 - R.A * */
-/* * - added CANVAS_RGBA565 and CANVAS_BGRA565 * */
-/* * 1.0.7 - 01/25/2004 - J.S * */
-/* * - added premultiplied alpha canvas' for RGBA, ARGB, ABGR * */
-/* * 1.0.7 - 03/08/2004 - G.R-P * */
-/* * - added more conditionals around 16-bit-supporting code * */
-/* * 1.0.7 - 03/09/2004 - G.Juyn * */
-/* * - fixed bug in promote_g8_g8 with 16bit support off * */
-/* * 1.0.7 - 03/09/2004 - G.R-P * */
-/* * - more optimizations with 16bit support off * */
-/* * 1.0.7 - 03/10/2004 - G.Juyn * */
-/* * - fixed some warnings for 16bit optimizations * */
-/* * 1.0.7 - 03/21/2004 - G.Juyn * */
-/* * - fixed some 64-bit platform compiler warnings * */
-/* * * */
-/* * 1.0.8 - 06/20/2004 - G.Juyn * */
-/* * - some speed optimizations (thanks to John Stiles) * */
-/* * 1.0.8 - 08/01/2004 - G.Juyn * */
-/* * - added support for 3+byte pixelsize for JPEG's * */
-/* * * */
-/* * 1.0.9 - 10/10/2004 - G.R-P. * */
-/* * - added MNG_NO_1_2_4BIT_SUPPORT * */
-/* * 1.0.9 - 10/14/2004 - G.Juyn * */
-/* * - added bgr565_a8 canvas-style (thanks to J. Elvander) * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - added LITTLEENDIAN/BIGENDIAN fixtures (thanks J.Stiles) * */
-/* * - fixed MNG_NO_1_2_4BIT_SUPPORT for TBBN1G04.PNG * */
-/* * 1.0.9 - 12/31/2004 - G.R-P. * */
-/* * - fixed warnings about C++ style (//) comments * */
-/* * * */
-/* * 1.0.10 - 07/06/2005 - G.R-P. * */
-/* * - added MORE MNG_NO_1_2_4BIT_SUPPORT * */
-/* * 1.0.10 - 10/06/2005 - G.R-P. * */
-/* * - alloc more memory for MNG_NO_1_2_4BIT_SUPPORT * */
-/* * 1.0.10 - 12/07/2005 - G.R-P. * */
-/* * - optimized footprint of 16bit support * */
-/* * 1.0.10 - 03/07/2006 - (thanks to W. Manthey) * */
-/* * - added CANVAS_RGB555 and CANVAS_BGR555 * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_objects.h"
-#include "libmng_object_prc.h"
-#include "libmng_memory.h"
-#include "libmng_cms.h"
-#include "libmng_filter.h"
-#include "libmng_pixels.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_DISPLAY_PROCS
-
-/* TODO: magnification & canvas-positioning/-clipping */
-
-/* TODO: major optimization of pixel-loops by using assembler (?) */
-
-/* ************************************************************************** */
-/* * * */
-/* * Interlace tables * */
-/* * * */
-/* ************************************************************************** */
-
-MNG_LOCAL mng_uint32 const interlace_row [7] = { 0, 0, 4, 0, 2, 0, 1 };
-MNG_LOCAL mng_uint32 const interlace_rowskip [7] = { 8, 8, 8, 4, 4, 2, 2 };
-MNG_LOCAL mng_uint32 const interlace_col [7] = { 0, 4, 0, 2, 0, 1, 0 };
-MNG_LOCAL mng_uint32 const interlace_colskip [7] = { 8, 8, 4, 4, 2, 2, 1 };
-MNG_LOCAL mng_uint32 const interlace_roundoff [7] = { 7, 7, 3, 3, 1, 1, 0 };
-MNG_LOCAL mng_uint32 const interlace_divider [7] = { 3, 3, 2, 2, 1, 1, 0 };
-
-/* ************************************************************************** */
-/* * * */
-/* * Alpha composing macros * */
-/* * the code below is slightly modified from the libpng package * */
-/* * the original was last optimized by Greg Roelofs & Mark Adler * */
-/* * * */
-/* ************************************************************************** */
-
-#define MNG_COMPOSE8(RET,FG,ALPHA,BG) { \
- mng_uint16 iH = (mng_uint16)((mng_uint16)(FG) * (mng_uint16)(ALPHA) \
- + (mng_uint16)(BG)*(mng_uint16)(255 - \
- (mng_uint16)(ALPHA)) + (mng_uint16)128); \
- (RET) = (mng_uint8)((iH + (iH >> 8)) >> 8); }
-
-#define MNG_COMPOSE16(RET,FG,ALPHA,BG) { \
- mng_uint32 iH = (mng_uint32)((mng_uint32)(FG) * (mng_uint32)(ALPHA) \
- + (mng_uint32)(BG)*(mng_uint32)(65535L - \
- (mng_uint32)(ALPHA)) + (mng_uint32)32768L); \
- (RET) = (mng_uint16)((iH + (iH >> 16)) >> 16); }
-
-/* ************************************************************************** */
-/* * * */
-/* * Alpha blending macros * */
-/* * this code is based on Adam Costello's "Note on Compositing" from the * */
-/* * mng-list which gives the following formula: * */
-/* * * */
-/* * top pixel = (Rt, Gt, Bt, At) * */
-/* * bottom pixel = (Rb, Gb, Bb, Ab) * */
-/* * composite pixel = (Rc, Gc, Bc, Ac) * */
-/* * * */
-/* * all values in the range 0..1 * */
-/* * * */
-/* * Ac = 1 - (1 - At)(1 - Ab) * */
-/* * s = At / Ac * */
-/* * t = (1 - At) Ab / Ac * */
-/* * Rc = s Rt + t Rb * */
-/* * Gc = s Gt + t Gb * */
-/* * Bc = s Bt + t Bb * */
-/* * * */
-/* * (I just hope I coded it correctly in integer arithmetic...) * */
-/* * * */
-/* ************************************************************************** */
-
-#define MNG_BLEND8(RT, GT, BT, AT, RB, GB, BB, AB, RC, GC, BC, AC) { \
- mng_uint32 S, T; \
- (AC) = (mng_uint8)((mng_uint32)255 - \
- ((((mng_uint32)255 - (mng_uint32)(AT)) * \
- ((mng_uint32)255 - (mng_uint32)(AB)) ) >> 8)); \
- S = (mng_uint32)(((mng_uint32)(AT) << 8) / \
- (mng_uint32)(AC)); \
- T = (mng_uint32)(((mng_uint32)255 - (mng_uint32)(AT)) * \
- (mng_uint32)(AB) / (mng_uint32)(AC)); \
- (RC) = (mng_uint8)((S * (mng_uint32)(RT) + \
- T * (mng_uint32)(RB) + (mng_uint32)127) >> 8); \
- (GC) = (mng_uint8)((S * (mng_uint32)(GT) + \
- T * (mng_uint32)(GB) + (mng_uint32)127) >> 8); \
- (BC) = (mng_uint8)((S * (mng_uint32)(BT) + \
- T * (mng_uint32)(BB) + (mng_uint32)127) >> 8); }
-
-#define MNG_BLEND16(RT, GT, BT, AT, RB, GB, BB, AB, RC, GC, BC, AC) { \
- mng_uint32 S, T; \
- (AC) = (mng_uint16)((mng_uint32)65535 - \
- ((((mng_uint32)65535 - (mng_uint32)(AT)) * \
- ((mng_uint32)65535 - (mng_uint32)(AB)) ) >> 16)); \
- S = (mng_uint32)(((mng_uint32)(AT) << 16) / \
- (mng_uint32)(AC)); \
- T = (mng_uint32)(((mng_uint32)65535 - (mng_uint32)(AT)) * \
- (mng_uint32)(AB) / (mng_uint32)(AC)); \
- (RC) = (mng_uint16)((S * (mng_uint32)(RT) + \
- T * (mng_uint32)(RB) + (mng_uint32)32767) >> 16); \
- (GC) = (mng_uint16)((S * (mng_uint32)(GT) + \
- T * (mng_uint32)(GB) + (mng_uint32)32767) >> 16); \
- (BC) = (mng_uint16)((S * (mng_uint32)(BT) + \
- T * (mng_uint32)(BB) + (mng_uint32)32767) >> 16); }
-
-/* ************************************************************************** */
-
-/* note a good optimizing compiler will optimize this */
-#define DIV255B8(x) (mng_uint8)(((x) + 127) / 255)
-#define DIV255B16(x) (mng_uint16)(((x) + 32767) / 65535)
-
-/* ************************************************************************** */
-/* * * */
-/* * Progressive display check - checks to see if progressive display is * */
-/* * in order & indicates so * */
-/* * * */
-/* * The routine is called after a call to one of the display_xxx routines * */
-/* * if appropriate * */
-/* * * */
-/* * The refresh is warrented in the read_chunk routine (mng_read.c) * */
-/* * and only during read&display processing, since there's not much point * */
-/* * doing it from memory! * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_display_progressive_check (mng_datap pData)
-{
- if ((pData->bDoProgressive) && /* need progressive display? */
- ((pData->eImagetype != mng_it_mng) || (pData->iDataheight > 300)) &&
- (pData->iDestb - pData->iDestt > 50) && (!pData->pCurraniobj))
- {
- mng_int32 iC = pData->iRow + pData->iDestt - pData->iSourcet;
-
- if (iC % 20 == 0) /* every 20th line */
- pData->bNeedrefresh = MNG_TRUE;
-
- }
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * Display routines - convert rowdata (which is already color-corrected) * */
-/* * to the output canvas, respecting the opacity information * */
-/* * * */
-/* ************************************************************************** */
-
-MNG_LOCAL void check_update_region (mng_datap pData)
-{ /* determine actual canvas row */
- mng_int32 iRow = pData->iRow + pData->iDestt - pData->iSourcet;
- /* check for change in update-region */
- if ((pData->iDestl < (mng_int32)pData->iUpdateleft) || (pData->iUpdateright == 0))
- pData->iUpdateleft = pData->iDestl;
-
- if (pData->iDestr > (mng_int32)pData->iUpdateright)
- pData->iUpdateright = pData->iDestr;
-
- if ((iRow < (mng_int32)pData->iUpdatetop) || (pData->iUpdatebottom == 0))
- pData->iUpdatetop = iRow;
-
- if (iRow+1 > (mng_int32)pData->iUpdatebottom)
- pData->iUpdatebottom = iRow+1;
-
- return;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_RGB8
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_rgb8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 3) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+4);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+4);
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGr16 = (mng_uint16)(*pScanline );
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*(pScanline+2));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iFGr16 >> 8);
- *(pScanline+1) = (mng_uint8)(iFGg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iFGb16 >> 8);
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- }
- else
- { /* do alpha composing */
- MNG_COMPOSE8 (*pScanline, *pDataline, iA8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iA8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *(pDataline+2), iA8, *(pScanline+2));
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_rgb8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGg16;
- mng_uint16 iBGg16;
- mng_uint8 iA8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 3) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+iBps);
- *(pScanline+2) = *(pDataline+2*iBps);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4*iBps;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+4);
- }
- else
- { /* get the proper values */
- int i;
- for (i=2; i >= 0; i--)
- {
- iFGg16 = mng_get_uint16 (pDataline+i+i);
- /* scale background up */
- iBGg16 = (mng_uint16)(*(pScanline+i));
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- /* now compose */
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- /* and return the composed values */
- *(pScanline+i) = (mng_uint8)(iFGg16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- }
- else
- { /* do alpha composing */
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+i), iA8, *(pScanline+i));
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_rgb8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 3) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- }
- else
- { /* do alpha composing */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+i), iA8, *(pScanline+i));
- }
-#else
- MNG_COMPOSE8 (*pScanline, *pDataline, iA8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iA8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *(pDataline+2), iA8, *(pScanline+2));
-#endif
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_RGB8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_RGBA8
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_rgba8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+4);
- *(pScanline+3) = *(pDataline+6);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *(pDataline+3);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*(pScanline+3));
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+4);
- *(pScanline+3) = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGr16 = (mng_uint16)(*pScanline );
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*(pScanline+2));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iFGa16, iBGb16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iFGr16 >> 8);
- *(pScanline+1) = (mng_uint8)(iFGg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iFGb16 >> 8);
- /* alpha remains fully opaque !!! */
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)(*pScanline );
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*(pScanline+2));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iCr16 >> 8);
- *(pScanline+1) = (mng_uint8)(iCg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iCb16 >> 8);
- *(pScanline+3) = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+3);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE8 (*pScanline, *pDataline, iFGa8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iFGa8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *(pDataline+2), iFGa8, *(pScanline+2));
- /* alpha remains fully opaque !!! */
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *pScanline, *(pScanline+1), *(pScanline+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCr8;
- *(pScanline+1) = iCg8;
- *(pScanline+2) = iCb8;
- *(pScanline+3) = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_rgba8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGg16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+iBps);
- *(pScanline+2) = *(pDataline+2*iBps);
- *(pScanline+3) = *(pDataline+3*iBps);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*(pScanline+3));
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+4);
- *(pScanline+3) = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- int i;
- for (i=2; i >= 0; i--)
- {
- iFGg16 = mng_get_uint16 (pDataline+i+i);
- /* scale background up */
- iBGg16 = (mng_uint16)(*(pScanline+i));
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- /* now compose */
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- /* and return the composed values */
- *(pScanline+i) = (mng_uint8)(iFGg16 >> 8);
- /* alpha remains fully opaque !!! */
- }
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)(*pScanline );
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*(pScanline+2));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iCr16 >> 8);
- *(pScanline+1) = (mng_uint8)(iCg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iCb16 >> 8);
- *(pScanline+3) = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+3);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+i), iFGa8, *(pScanline+i));
- }
- /* alpha remains fully opaque !!! */
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *pScanline, *(pScanline+1), *(pScanline+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCr8;
- *(pScanline+1) = iCg8;
- *(pScanline+2) = iCb8;
- *(pScanline+3) = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_rgba8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *(pDataline+3);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+3);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+i), iFGa8, *(pScanline+i));
- }
-#else
- MNG_COMPOSE8 (*pScanline, *pDataline, iFGa8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iFGa8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *(pDataline+2), iFGa8, *(pScanline+2));
-#endif
- /* alpha remains fully opaque !!! */
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *pScanline, *(pScanline+1), *(pScanline+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCr8;
- *(pScanline+1) = iCg8;
- *(pScanline+2) = iCb8;
- *(pScanline+3) = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_RGBA8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_RGBA8_PM
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_rgba8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8_PM, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- if ((s = pDataline[6]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = pDataline[0];
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[4];
- pScanline[3] = 255;
- }
- else
- {
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[2-i] = DIV255B8(s * pDataline[4-i-i]);
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[0]);
- pScanline[1] = DIV255B8(s * pDataline[2]);
- pScanline[2] = DIV255B8(s * pDataline[4]);
-#endif
- pScanline[3] = (mng_uint8)s;
- }
- }
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
-#ifdef MNG_BIGENDIAN_SUPPORTED
- *(mng_uint32*)pScanline = (*(mng_uint32*)pDataline) | 0x000000FF;
-#else
- pScanline[0] = pDataline[0];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[2];
- pScanline[3] = 255;
-#endif
- }
- else
- {
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[2-i] = DIV255B8(s * pDataline[2-i]);
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[0]);
- pScanline[1] = DIV255B8(s * pDataline[1]);
- pScanline[2] = DIV255B8(s * pDataline[2]);
-#endif
- pScanline[3] = (mng_uint8)s;
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- if ((s = pDataline[6]) != 0) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if (s == 255)
- { /* plain copy it */
- pScanline[0] = pDataline[0];
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[4];
- pScanline[3] = 255;
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[2-i] = DIV255B8(s * pDataline[4-i-i] + t *
- pScanline[2-i]);
- }
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[0] + t * pScanline[0]);
- pScanline[1] = DIV255B8(s * pDataline[2] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[4] + t * pScanline[2]);
-#endif
- pScanline[3] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[3])));
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
-#ifdef MNG_BIGENDIAN_SUPPORTED
- *(mng_uint32*)pScanline = (*(mng_uint32*)pDataline) | 0x000000FF;
-#else
- pScanline[0] = pDataline[0];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[2];
- pScanline[3] = 255;
-#endif
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[2-i] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[2-i]);
- }
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[0] + t * pScanline[0]);
- pScanline[1] = DIV255B8(s * pDataline[1] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[2] + t * pScanline[2]);
-#endif
- pScanline[3] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[3])));
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8_PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_rgba8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8_PM, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- if ((s = pDataline[6]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = pDataline[0];
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[4];
- pScanline[3] = 255;
- }
- else
- {
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[2-i] = DIV255B8(s * pDataline[4-i-i]);
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[0]);
- pScanline[1] = DIV255B8(s * pDataline[2]);
- pScanline[2] = DIV255B8(s * pDataline[4]);
-#endif
- pScanline[3] = (mng_uint8)s;
- }
- }
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
-#ifdef MNG_BIGENDIAN_SUPPORTED
- *(mng_uint32*)pScanline = (*(mng_uint32*)pDataline) | 0x000000FF;
-#else
- pScanline[0] = pDataline[0];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[2];
- pScanline[3] = 255;
-#endif
- }
- else
- {
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[2-i] = DIV255B8(s * pDataline[2-i]);
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[0]);
- pScanline[1] = DIV255B8(s * pDataline[1]);
- pScanline[2] = DIV255B8(s * pDataline[2]);
-#endif
- pScanline[3] = (mng_uint8)s;
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- if ((s = pDataline[6]) != 0) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if (s == 255)
- { /* plain copy it */
- pScanline[0] = pDataline[0];
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[4];
- pScanline[3] = 255;
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[2-i] = DIV255B8(s * pDataline[4-i-i] + t *
- pScanline[2-i]);
- }
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[0] + t * pScanline[0]);
- pScanline[1] = DIV255B8(s * pDataline[2] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[4] + t * pScanline[2]);
-#endif
- pScanline[3] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[3])));
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
-#ifdef MNG_BIGENDIAN_SUPPORTED
- *(mng_uint32*)pScanline = (*(mng_uint32*)pDataline) | 0x000000FF;
-#else
- pScanline[0] = pDataline[0];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[2];
- pScanline[3] = 255;
-#endif
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[2-i] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[2-i]);
- }
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[0] + t * pScanline[0]);
- pScanline[1] = DIV255B8(s * pDataline[1] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[2] + t * pScanline[2]);
-#endif
- pScanline[3] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[3])));
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8_PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_rgba8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8_PM, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
-#ifdef MNG_BIGENDIAN_SUPPORTED
- *(mng_uint32*)pScanline = (*(mng_uint32*)pDataline) | 0x000000FF;
-#else
- pScanline[0] = pDataline[0];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[2];
- pScanline[3] = 255;
-#endif
- }
- else
- {
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[2-i] = DIV255B8(s * pDataline[2-i]);
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[0]);
- pScanline[1] = DIV255B8(s * pDataline[1]);
- pScanline[2] = DIV255B8(s * pDataline[2]);
-#endif
- pScanline[3] = (mng_uint8)s;
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
-#ifdef MNG_BIGENDIAN_SUPPORTED
- *(mng_uint32*)pScanline = (*(mng_uint32*)pDataline) | 0x000000FF;
-#else
- pScanline[0] = pDataline[0];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[2];
- pScanline[3] = 255;
-#endif
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[2-i] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[2-i]);
- }
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[0] + t * pScanline[0]);
- pScanline[1] = DIV255B8(s * pDataline[1] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[2] + t * pScanline[2]);
-#endif
- pScanline[3] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[3])));
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA8_PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_RGBA8_PM */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_ARGB8
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_argb8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8, MNG_LC_START);
-#endif
-
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+6);
- *(pScanline+1) = *pDataline;
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *(pDataline+4);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *(pDataline+3);
- *(pScanline+1) = *pDataline;
- *(pScanline+2) = *(pDataline+1);
- *(pScanline+3) = *(pDataline+2);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*pScanline);
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *pScanline = *(pDataline+6);
- *(pScanline+1) = *pDataline;
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *(pDataline+4);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+1));
- iBGg16 = (mng_uint16)(*(pScanline+2));
- iBGb16 = (mng_uint16)(*(pScanline+3));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iFGa16, iBGb16);
- /* and return the composed values */
- /* alpha remains fully opaque !!! */
- *(pScanline+1) = (mng_uint8)(iFGr16 >> 8);
- *(pScanline+2) = (mng_uint8)(iFGg16 >> 8);
- *(pScanline+3) = (mng_uint8)(iFGb16 >> 8);
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+1));
- iBGg16 = (mng_uint16)(*(pScanline+2));
- iBGb16 = (mng_uint16)(*(pScanline+3));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iCa16 >> 8);
- *(pScanline+1) = (mng_uint8)(iCr16 >> 8);
- *(pScanline+2) = (mng_uint8)(iCg16 >> 8);
- *(pScanline+3) = (mng_uint8)(iCb16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *pScanline;
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *(pDataline+3);
- *(pScanline+1) = *pDataline;
- *(pScanline+2) = *(pDataline+1);
- *(pScanline+3) = *(pDataline+2);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do simple alpha composing */
- /* alpha itself remains fully opaque !!! */
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *(pScanline+1), *(pScanline+2), *(pScanline+3), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCa8;
- *(pScanline+1) = iCr8;
- *(pScanline+2) = iCg8;
- *(pScanline+3) = iCb8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_argb8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGg16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+3*iBps);
- *(pScanline+1) = *pDataline;
- *(pScanline+2) = *(pDataline+iBps);
- *(pScanline+3) = *(pDataline+2*iBps);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*pScanline);
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *pScanline = *(pDataline+6);
- *(pScanline+1) = *pDataline;
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *(pDataline+4);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- int i;
- for (i=2; i >= 0; i--)
- {
- iFGg16 = mng_get_uint16 (pDataline+i+i);
- /* scale background up */
- iBGg16 = (mng_uint16)(*(pScanline+i+1));
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- /* now compose */
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- /* and return the composed values */
- /* alpha remains fully opaque !!! */
- *(pScanline+i+1) = (mng_uint8)(iFGg16 >> 8);
- }
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+1));
- iBGg16 = (mng_uint16)(*(pScanline+2));
- iBGb16 = (mng_uint16)(*(pScanline+3));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iCa16 >> 8);
- *(pScanline+1) = (mng_uint8)(iCr16 >> 8);
- *(pScanline+2) = (mng_uint8)(iCg16 >> 8);
- *(pScanline+3) = (mng_uint8)(iCb16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *pScanline;
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *(pDataline+3);
- *(pScanline+1) = *pDataline;
- *(pScanline+2) = *(pDataline+1);
- *(pScanline+3) = *(pDataline+2);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do simple alpha composing */
- /* alpha itself remains fully opaque !!! */
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i+1), *(pDataline+i), iFGa8, *(pScanline+i+1));
- }
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *(pScanline+1), *(pScanline+2), *(pScanline+3), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCa8;
- *(pScanline+1) = iCr8;
- *(pScanline+2) = iCg8;
- *(pScanline+3) = iCb8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_argb8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8, MNG_LC_START);
-#endif
-
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *(pDataline+3);
- *(pScanline+1) = *pDataline;
- *(pScanline+2) = *(pDataline+1);
- *(pScanline+3) = *(pDataline+2);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *pScanline;
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *(pDataline+3);
- *(pScanline+1) = *pDataline;
- *(pScanline+2) = *(pDataline+1);
- *(pScanline+3) = *(pDataline+2);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do simple alpha composing */
- /* alpha itself remains fully opaque !!! */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i+1), *(pDataline+i), iFGa8, *(pScanline+i+1));
- }
-#else
- MNG_COMPOSE8 (*(pScanline+1), *pDataline, iFGa8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *(pDataline+1), iFGa8, *(pScanline+2));
- MNG_COMPOSE8 (*(pScanline+3), *(pDataline+2), iFGa8, *(pScanline+3));
-#endif
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *(pScanline+1), *(pScanline+2), *(pScanline+3), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCa8;
- *(pScanline+1) = iCr8;
- *(pScanline+2) = iCg8;
- *(pScanline+3) = iCb8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_ARGB8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_ARGB8_PM
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_argb8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8_PM, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- if ((s = pDataline[6]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = 255;
- pScanline[1] = pDataline[0];
- pScanline[2] = pDataline[2];
- pScanline[3] = pDataline[4];
- }
- else
- {
- pScanline[0] = (mng_uint8)s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[3-i] = DIV255B8(s * pDataline[4-i-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[0]);
- pScanline[2] = DIV255B8(s * pDataline[2]);
- pScanline[3] = DIV255B8(s * pDataline[4]);
-#endif
- }
- }
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = 255;
- pScanline[1] = pDataline[0];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[2];
- }
- else
- {
- pScanline[0] = (mng_uint8)s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[3-i] = DIV255B8(s * pDataline[2-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[0]);
- pScanline[2] = DIV255B8(s * pDataline[1]);
- pScanline[3] = DIV255B8(s * pDataline[2]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- if ((s = pDataline[6]) != 0) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if (s == 255)
- { /* plain copy it */
- pScanline[0] = 255;
- pScanline[1] = pDataline[0];
- pScanline[2] = pDataline[2];
- pScanline[3] = pDataline[4];
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
- pScanline[0] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[0])));
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[3-i] = DIV255B8(s * pDataline[4-i-i] + t *
- pScanline[3-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[0] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[2] + t * pScanline[2]);
- pScanline[3] = DIV255B8(s * pDataline[4] + t * pScanline[3]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
- pScanline[0] = 255;
- pScanline[1] = pDataline[0];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[2];
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
- pScanline[0] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[0])));
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[3-i] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[3-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[0] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[1] + t * pScanline[2]);
- pScanline[3] = DIV255B8(s * pDataline[2] + t * pScanline[3]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8_PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_argb8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8_PM, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- if ((s = pDataline[6]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = 255;
- pScanline[1] = pDataline[0];
- pScanline[2] = pDataline[2];
- pScanline[3] = pDataline[4];
- }
- else
- {
- pScanline[0] = (mng_uint8)s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[3-i] = DIV255B8(s * pDataline[4-i-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[0]);
- pScanline[2] = DIV255B8(s * pDataline[2]);
- pScanline[3] = DIV255B8(s * pDataline[4]);
-#endif
- }
- }
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = 255;
- pScanline[1] = pDataline[0];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[2];
- }
- else
- {
- pScanline[0] = (mng_uint8)s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[3-i] = DIV255B8(s * pDataline[2-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[0]);
- pScanline[2] = DIV255B8(s * pDataline[1]);
- pScanline[3] = DIV255B8(s * pDataline[2]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- if ((s = pDataline[6]) != 0) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if (s == 255)
- { /* plain copy it */
- pScanline[0] = 255;
- pScanline[1] = pDataline[0];
- pScanline[2] = pDataline[2];
- pScanline[3] = pDataline[4];
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
- pScanline[0] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[0])));
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[3-i] = DIV255B8(s * pDataline[4-i-i] + t *
- pScanline[3-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[0] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[2] + t * pScanline[2]);
- pScanline[3] = DIV255B8(s * pDataline[4] + t * pScanline[3]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
- pScanline[0] = 255;
- pScanline[1] = pDataline[0];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[2];
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
- pScanline[0] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[0])));
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[3-i] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[3-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[0] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[1] + t * pScanline[2]);
- pScanline[3] = DIV255B8(s * pDataline[2] + t * pScanline[3]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8_PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_argb8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8_PM, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = 255;
- pScanline[1] = pDataline[0];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[2];
- }
- else
- {
- pScanline[0] = (mng_uint8)s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[3-i] = DIV255B8(s * pDataline[2-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[0]);
- pScanline[2] = DIV255B8(s * pDataline[1]);
- pScanline[3] = DIV255B8(s * pDataline[2]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
- pScanline[0] = 255;
- pScanline[1] = pDataline[0];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[2];
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
- pScanline[0] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[0])));
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[3-i] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[3-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[0] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[1] + t * pScanline[2]);
- pScanline[3] = DIV255B8(s * pDataline[2] + t * pScanline[3]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ARGB8_PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_ARGB8_PM */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_RGB8_A8
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_rgb8_a8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pAlphaline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8_A8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination rows */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- pAlphaline = (mng_uint8p)pData->fGetalphaline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination rows starting-point */
- pScanline = pScanline + (pData->iCol * 3) + (pData->iDestl * 3);
- pAlphaline = pAlphaline + pData->iCol + pData->iDestl;
-
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+4);
- *pAlphaline = *(pDataline+6);
-
- pScanline += (pData->iColinc * 3);
- pAlphaline += pData->iColinc;
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- *pAlphaline = *(pDataline+3);
-
- pScanline += (pData->iColinc * 3);
- pAlphaline += pData->iColinc;
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*pAlphaline);
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+4);
- *pAlphaline = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGr16 = (mng_uint16)(*pScanline );
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*(pScanline+2));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iFGa16, iBGb16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iFGr16 >> 8);
- *(pScanline+1) = (mng_uint8)(iFGg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iFGb16 >> 8);
- /* alpha remains fully opaque !!! */
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)(*pScanline );
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*(pScanline+2));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iCr16 >> 8);
- *(pScanline+1) = (mng_uint8)(iCg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iCb16 >> 8);
- *pAlphaline = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pAlphaline += pData->iColinc;
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *pAlphaline;
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- *pAlphaline = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE8 (*pScanline, *pDataline, iFGa8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iFGa8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *(pDataline+2), iFGa8, *(pScanline+2));
- /* alpha remains fully opaque !!! */
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *pScanline, *(pScanline+1), *(pScanline+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCr8;
- *(pScanline+1) = iCg8;
- *(pScanline+2) = iCb8;
- *pAlphaline = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pAlphaline += pData->iColinc;
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8_A8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_rgb8_a8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pAlphaline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGg16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8_A8, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination rows */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- pAlphaline = (mng_uint8p)pData->fGetalphaline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination rows starting-point */
- pScanline = pScanline + (pData->iCol * 3) + (pData->iDestl * 3);
- pAlphaline = pAlphaline + pData->iCol + pData->iDestl;
-
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+iBps);
- *(pScanline+2) = *(pDataline+2*iBps);
- *pAlphaline = *(pDataline+3*iBps);
-
- pScanline += (pData->iColinc * 3);
- pAlphaline += pData->iColinc;
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*pAlphaline);
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+4);
- *pAlphaline = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- int i;
- for (i=2; i >= 0; i--)
- {
- iFGg16 = mng_get_uint16 (pDataline+i+i);
- /* scale background up */
- iBGg16 = (mng_uint16)(*(pScanline+i));
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- /* now compose */
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- /* and return the composed values */
- *(pScanline+i) = (mng_uint8)(iFGg16 >> 8);
- /* alpha remains fully opaque !!! */
- }
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)(*pScanline );
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*(pScanline+2));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iCr16 >> 8);
- *(pScanline+1) = (mng_uint8)(iCg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iCb16 >> 8);
- *pAlphaline = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pAlphaline += pData->iColinc;
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *pAlphaline;
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- *pAlphaline = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+i), iFGa8, *(pScanline+i));
- }
- /* alpha remains fully opaque !!! */
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *pScanline, *(pScanline+1), *(pScanline+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCr8;
- *(pScanline+1) = iCg8;
- *(pScanline+2) = iCb8;
- *pAlphaline = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pAlphaline += pData->iColinc;
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8_A8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_rgb8_a8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pAlphaline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8_A8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination rows */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- pAlphaline = (mng_uint8p)pData->fGetalphaline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination rows starting-point */
- pScanline = pScanline + (pData->iCol * 3) + (pData->iDestl * 3);
- pAlphaline = pAlphaline + pData->iCol + pData->iDestl;
-
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- *pAlphaline = *(pDataline+3);
-
- pScanline += (pData->iColinc * 3);
- pAlphaline += pData->iColinc;
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *pAlphaline;
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *pDataline;
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *(pDataline+2);
- *pAlphaline = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+i), iFGa8, *(pScanline+i));
- }
-#else
- MNG_COMPOSE8 (*pScanline, *pDataline, iFGa8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iFGa8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *(pDataline+2), iFGa8, *(pScanline+2));
-#endif
- /* alpha remains fully opaque !!! */
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *pScanline, *(pScanline+1), *(pScanline+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCr8;
- *(pScanline+1) = iCg8;
- *(pScanline+2) = iCb8;
- *pAlphaline = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pAlphaline += pData->iColinc;
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB8_A8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_RGB8_A8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGR8
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_bgr8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 3) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + (pData->iSourcel / pData->iColinc) * 8;
- else
- pDataline = pDataline + (pData->iSourcel / pData->iColinc) * 4;
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+4);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *pDataline;
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha value */
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+4);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *pDataline;
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+2));
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*pScanline );
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iFGb16 >> 8);
- *(pScanline+1) = (mng_uint8)(iFGg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iFGr16 >> 8);
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- }
- else
- { /* do alpha composing */
- MNG_COMPOSE8 (*pScanline, *(pDataline+2), iA8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iA8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *pDataline, iA8, *(pScanline+2));
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_bgr8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGg16;
- mng_uint16 iBGg16;
- mng_uint8 iA8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR8, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 3) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+2*iBps);
- *(pScanline+1) = *(pDataline+iBps);
- *(pScanline+2) = *pDataline;
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha value */
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+4);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *pDataline;
- }
- else
- { /* get the proper values */
- int i;
- for (i=2; i >= 0; i--)
- {
- iFGg16 = mng_get_uint16 (pDataline+i+i);
- /* scale background up */
- iBGg16 = (mng_uint16)(*(pScanline+2-i));
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- /* now compose */
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- /* and return the composed values */
- *(pScanline+2-i) = (mng_uint8)(iFGg16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- }
- else
- { /* do alpha composing */
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+2-i), iA8, *(pScanline+i));
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_bgr8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 3) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + (pData->iSourcel / pData->iColinc) * 4;
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- }
- else
- { /* do alpha composing */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+2-i), iA8, *(pScanline+i));
- }
-#else
- MNG_COMPOSE8 (*pScanline, *(pDataline+2), iA8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iA8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *pDataline, iA8, *(pScanline+2));
-#endif
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_BGR8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGRX8
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_bgrx8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRX8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + (pData->iSourcel / pData->iColinc) * 8;
- else
- pDataline = pDataline + (pData->iSourcel / pData->iColinc) * 4;
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+4);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = 0xFF; /* filler byte */
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = 0xFF; /* filler byte */
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha value */
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+4);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = 0xFF; /* filler byte */
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+2));
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*pScanline );
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iFGb16 >> 8);
- *(pScanline+1) = (mng_uint8)(iFGg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iFGr16 >> 8);
- *(pScanline+3) = 0xFF; /* filler byte */
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = 0xFF; /* filler byte */
- }
- else
- { /* do alpha composing */
- MNG_COMPOSE8 (*pScanline, *(pDataline+2), iA8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iA8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *pDataline, iA8, *(pScanline+2));
- *(pScanline+3) = 0xFF; /* filler byte */
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRX8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_bgrx8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGg16;
- mng_uint16 iBGg16;
- mng_uint8 iA8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRX8, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+2*iBps);
- *(pScanline+1) = *(pDataline+iBps);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = 0xFF; /* filler byte */
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha value */
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+4);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = 0xFF; /* filler byte */
- }
- else
- { /* get the proper values */
- int i;
- for (i=2; i >= 0; i--)
- {
- iFGg16 = mng_get_uint16 (pDataline+i+i);
- /* scale background up */
- iBGg16 = (mng_uint16)(*(pScanline+2-i));
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- /* now compose */
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- /* and return the composed values */
- *(pScanline+2-i) = (mng_uint8)(iFGg16 >> 8);
- }
- *(pScanline+3) = 0xFF; /* filler byte */
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = 0xFF; /* filler byte */
- }
- else
- { /* do alpha composing */
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+2-i), iA8, *(pScanline+i));
- }
- *(pScanline+3) = 0xFF; /* filler byte */
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRX8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_bgrx8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRX8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + (pData->iSourcel / pData->iColinc) * 4;
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = 0xFF; /* filler byte */
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = 0xFF; /* filler byte */
- }
- else
- { /* do alpha composing */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+2-i), iA8, *(pScanline+i));
- }
-#else
- MNG_COMPOSE8 (*pScanline, *(pDataline+2), iA8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iA8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *pDataline, iA8, *(pScanline+2));
-#endif
- *(pScanline+3) = 0xFF; /* filler byte */
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRX8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_BGRX8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGRA8
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_bgra8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+4);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = *(pDataline+6);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = *(pDataline+3);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*(pScanline+3));
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *pScanline = *(pDataline+4);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+2));
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*pScanline );
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iFGa16, iBGb16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iFGb16 >> 8);
- *(pScanline+1) = (mng_uint8)(iFGg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iFGr16 >> 8);
- /* alpha remains fully opaque !!! */
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+2));
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*pScanline );
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iCb16 >> 8);
- *(pScanline+1) = (mng_uint8)(iCg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iCr16 >> 8);
- *(pScanline+3) = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+3);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE8 (*pScanline, *(pDataline+2), iFGa8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iFGa8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *pDataline, iFGa8, *(pScanline+2));
- /* alpha remains fully opaque !!! */
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *(pScanline+2), *(pScanline+1), *pScanline, iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCb8;
- *(pScanline+1) = iCg8;
- *(pScanline+2) = iCr8;
- *(pScanline+3) = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_bgra8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGg16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+2*iBps);
- *(pScanline+1) = *(pDataline+iBps);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = *(pDataline+3*iBps);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*(pScanline+3));
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *pScanline = *(pDataline+4);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- int i;
- for (i=2; i >= 0; i--)
- {
- iFGg16 = mng_get_uint16 (pDataline+i+i);
- /* scale background up */
- iBGg16 = (mng_uint16)(*(pScanline+2-i));
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- /* now compose */
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- /* and return the composed values */
- *(pScanline+2-i) = (mng_uint8)(iFGg16 >> 8);
- /* alpha remains fully opaque !!! */
- }
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+2));
- iBGg16 = (mng_uint16)(*(pScanline+1));
- iBGb16 = (mng_uint16)(*pScanline );
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iCb16 >> 8);
- *(pScanline+1) = (mng_uint8)(iCg16 >> 8);
- *(pScanline+2) = (mng_uint8)(iCr16 >> 8);
- *(pScanline+3) = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+3);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+2-i), iFGa8, *(pScanline+i));
- }
- /* alpha remains fully opaque !!! */
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *(pScanline+2), *(pScanline+1), *pScanline, iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCb8;
- *(pScanline+1) = iCg8;
- *(pScanline+2) = iCr8;
- *(pScanline+3) = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_bgra8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = *(pDataline+3);
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+3);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *(pDataline+2);
- *(pScanline+1) = *(pDataline+1);
- *(pScanline+2) = *pDataline;
- *(pScanline+3) = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i), *(pDataline+2-i), iFGa8, *(pScanline+i));
- }
-#else
- MNG_COMPOSE8 (*pScanline, *(pDataline+2), iFGa8, *pScanline );
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+1), iFGa8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *pDataline, iFGa8, *(pScanline+2));
-#endif
- /* alpha remains fully opaque !!! */
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *(pScanline+2), *(pScanline+1), *pScanline, iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCb8;
- *(pScanline+1) = iCg8;
- *(pScanline+2) = iCr8;
- *(pScanline+3) = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_BGRA8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGRA8_PM
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_bgra8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8PM, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- if ((s = pDataline[6]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = pDataline[4];
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[0];
- pScanline[3] = 255;
- }
- else
- {
- pScanline[0] = DIV255B8(s * pDataline[4]);
- pScanline[1] = DIV255B8(s * pDataline[2]);
- pScanline[2] = DIV255B8(s * pDataline[0]);
- pScanline[3] = (mng_uint8)s;
- }
- }
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = pDataline[2];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[0];
- pScanline[3] = 255;
- }
- else
- {
- pScanline[0] = DIV255B8(s * pDataline[2]);
- pScanline[1] = DIV255B8(s * pDataline[1]);
- pScanline[2] = DIV255B8(s * pDataline[0]);
- pScanline[3] = (mng_uint8)s;
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- if ((s = pDataline[6]) != 0) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if (s == 255)
- { /* plain copy it */
- pScanline[0] = pDataline[4];
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[0];
- pScanline[3] = 255;
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i] = DIV255B8(s * pDataline[4-i-i] + t *
- pScanline[i]);
- }
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[4] + t * pScanline[0]);
- pScanline[1] = DIV255B8(s * pDataline[2] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[0] + t * pScanline[2]);
-#endif
- pScanline[3] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[3])));
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
- pScanline[0] = pDataline[2];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[0];
- pScanline[3] = 255;
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[i]);
- }
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[2] + t * pScanline[0]);
- pScanline[1] = DIV255B8(s * pDataline[1] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[0] + t * pScanline[2]);
-#endif
- pScanline[3] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[3])));
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_bgra8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8PM, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- if ((s = pDataline[6]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = pDataline[4];
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[0];
- pScanline[3] = 255;
- }
- else
- {
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i] = DIV255B8(s * pDataline[4-i-i]);
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[4]);
- pScanline[1] = DIV255B8(s * pDataline[2]);
- pScanline[2] = DIV255B8(s * pDataline[0]);
-#endif
- pScanline[3] = (mng_uint8)s;
- }
- }
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = pDataline[2];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[0];
- pScanline[3] = 255;
- }
- else
- {
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i] = DIV255B8(s * pDataline[2-i]);
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[2]);
- pScanline[1] = DIV255B8(s * pDataline[1]);
- pScanline[2] = DIV255B8(s * pDataline[0]);
-#endif
- pScanline[3] = (mng_uint8)s;
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- if ((s = pDataline[6]) != 0) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if (s == 255)
- { /* plain copy it */
- pScanline[0] = pDataline[4];
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[0];
- pScanline[3] = 255;
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i] = DIV255B8(s * pDataline[4-i-i] + t *
- pScanline[i]);
- }
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[4] + t * pScanline[0]);
- pScanline[1] = DIV255B8(s * pDataline[2] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[0] + t * pScanline[2]);
-#endif
- pScanline[3] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[3])));
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
- pScanline[0] = pDataline[2];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[0];
- pScanline[3] = 255;
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[i]);
- }
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[2] + t * pScanline[0]);
- pScanline[1] = DIV255B8(s * pDataline[1] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[0] + t * pScanline[2]);
-#endif
- pScanline[3] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[3])));
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_bgra8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8PM, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = pDataline[2];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[0];
- pScanline[3] = 255;
- }
- else
- {
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i] = DIV255B8(s * pDataline[2-i]);
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[2]);
- pScanline[1] = DIV255B8(s * pDataline[1]);
- pScanline[2] = DIV255B8(s * pDataline[0]);
-#endif
- pScanline[3] = (mng_uint8)s;
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
- pScanline[0] = pDataline[2];
- pScanline[1] = pDataline[1];
- pScanline[2] = pDataline[0];
- pScanline[3] = 255;
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[i]);
- }
- }
-#else
- pScanline[0] = DIV255B8(s * pDataline[2] + t * pScanline[0]);
- pScanline[1] = DIV255B8(s * pDataline[1] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[0] + t * pScanline[2]);
-#endif
- pScanline[3] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[3])));
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA8PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_BGRA8_PM */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_ABGR8
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_abgr8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+6);
- *(pScanline+1) = *(pDataline+4);
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *pDataline;
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *(pDataline+3);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+1);
- *(pScanline+3) = *pDataline;
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*pScanline);
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *pScanline = *(pDataline+6);
- *(pScanline+1) = *(pDataline+4);
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *pDataline;
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+3));
- iBGg16 = (mng_uint16)(*(pScanline+2));
- iBGb16 = (mng_uint16)(*(pScanline+1));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iFGa16, iBGb16);
- /* and return the composed values */
- /* alpha itself remains fully opaque !!! */
- *(pScanline+1) = (mng_uint8)(iFGb16 >> 8);
- *(pScanline+2) = (mng_uint8)(iFGg16 >> 8);
- *(pScanline+3) = (mng_uint8)(iFGr16 >> 8);
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+3));
- iBGg16 = (mng_uint16)(*(pScanline+2));
- iBGb16 = (mng_uint16)(*(pScanline+1));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iCa16 >> 8);
- *(pScanline+1) = (mng_uint8)(iCb16 >> 8);
- *(pScanline+2) = (mng_uint8)(iCg16 >> 8);
- *(pScanline+3) = (mng_uint8)(iCr16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *pScanline;
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *(pDataline+3);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+1);
- *(pScanline+3) = *pDataline;
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do simple alpha composing */
- /* alpha itself remains fully opaque !!! */
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+2), iFGa8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *(pDataline+1), iFGa8, *(pScanline+2));
- MNG_COMPOSE8 (*(pScanline+3), *pDataline, iFGa8, *(pScanline+3));
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *(pScanline+3), *(pScanline+2), *(pScanline+1), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCa8;
- *(pScanline+1) = iCb8;
- *(pScanline+2) = iCg8;
- *(pScanline+3) = iCr8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_abgr8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGg16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *pScanline = *(pDataline+3*iBps);
- *(pScanline+1) = *(pDataline+2*iBps);
- *(pScanline+2) = *(pDataline+iBps);
- *(pScanline+3) = *pDataline;
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*pScanline);
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *pScanline = *(pDataline+6);
- *(pScanline+1) = *(pDataline+4);
- *(pScanline+2) = *(pDataline+2);
- *(pScanline+3) = *pDataline;
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- int i;
- for (i=2; i >= 0; i--)
- {
- iFGg16 = mng_get_uint16 (pDataline+i+i);
- /* scale background up */
- iBGg16 = (mng_uint16)(*(pScanline+3-i));
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- /* now compose */
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- /* and return the composed values */
- /* alpha itself remains fully opaque !!! */
- *(pScanline+3-i) = (mng_uint8)(iFGg16 >> 8);
- }
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)(*(pScanline+3));
- iBGg16 = (mng_uint16)(*(pScanline+2));
- iBGb16 = (mng_uint16)(*(pScanline+1));
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *pScanline = (mng_uint8)(iCa16 >> 8);
- *(pScanline+1) = (mng_uint8)(iCb16 >> 8);
- *(pScanline+2) = (mng_uint8)(iCg16 >> 8);
- *(pScanline+3) = (mng_uint8)(iCr16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *pScanline;
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *(pDataline+3);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+1);
- *(pScanline+3) = *pDataline;
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do simple alpha composing */
- /* alpha itself remains fully opaque !!! */
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i+1), *(pDataline+2-i), iFGa8, *(pScanline+i+1));
- }
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *(pScanline+3), *(pScanline+2), *(pScanline+1), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCa8;
- *(pScanline+1) = iCb8;
- *(pScanline+2) = iCg8;
- *(pScanline+3) = iCr8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_abgr8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *pScanline = *(pDataline+3);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+1);
- *(pScanline+3) = *pDataline;
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *pScanline;
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pScanline = *(pDataline+3);
- *(pScanline+1) = *(pDataline+2);
- *(pScanline+2) = *(pDataline+1);
- *(pScanline+3) = *pDataline;
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do simple alpha composing */
- /* alpha itself remains fully opaque !!! */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pScanline+i+1), *(pDataline+2-i), iFGa8, *(pScanline+i+1));
- }
-#else
- MNG_COMPOSE8 (*(pScanline+1), *(pDataline+2), iFGa8, *(pScanline+1));
- MNG_COMPOSE8 (*(pScanline+2), *(pDataline+1), iFGa8, *(pScanline+2));
- MNG_COMPOSE8 (*(pScanline+3), *pDataline, iFGa8, *(pScanline+3));
-#endif
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- *(pScanline+3), *(pScanline+2), *(pScanline+1), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pScanline = iCa8;
- *(pScanline+1) = iCb8;
- *(pScanline+2) = iCg8;
- *(pScanline+3) = iCr8;
- }
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_ABGR8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_ABGR8_PM
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_abgr8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8_PM, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- if ((s = pDataline[6]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = 255;
- pScanline[1] = pDataline[4];
- pScanline[2] = pDataline[2];
- pScanline[3] = pDataline[0];
- }
- else
- {
- pScanline[0] = (mng_uint8)s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i+1] = DIV255B8(s * pDataline[4-i-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[4]);
- pScanline[2] = DIV255B8(s * pDataline[2]);
- pScanline[3] = DIV255B8(s * pDataline[0]);
-#endif
- }
- }
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = 255;
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[0];
- }
- else
- {
- pScanline[0] = (mng_uint8)s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i+1] = DIV255B8(s * pDataline[2-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[2]);
- pScanline[2] = DIV255B8(s * pDataline[1]);
- pScanline[3] = DIV255B8(s * pDataline[0]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- if ((s = pDataline[6]) != 0) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if (s == 255)
- { /* plain copy it */
- pScanline[0] = 255;
- pScanline[1] = pDataline[4];
- pScanline[2] = pDataline[2];
- pScanline[3] = pDataline[0];
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
- pScanline[0] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[0])));
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i+1] = DIV255B8(s * pDataline[4-i-i] + t *
- pScanline[i+1]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[4] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[2] + t * pScanline[2]);
- pScanline[3] = DIV255B8(s * pDataline[0] + t * pScanline[3]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
- pScanline[0] = 255;
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[0];
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
- pScanline[0] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[0])));
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i+1] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[i+1]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[2] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[1] + t * pScanline[2]);
- pScanline[3] = DIV255B8(s * pDataline[0] + t * pScanline[3]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8_PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_abgr8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8_PM, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- if ((s = pDataline[6]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = 255;
- pScanline[1] = pDataline[4];
- pScanline[2] = pDataline[2];
- pScanline[3] = pDataline[0];
- }
- else
- {
- pScanline[0] = (mng_uint8)s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i+1] = DIV255B8(s * pDataline[4-i-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[4]);
- pScanline[2] = DIV255B8(s * pDataline[2]);
- pScanline[3] = DIV255B8(s * pDataline[0]);
-#endif
- }
- }
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = 255;
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[0];
- }
- else
- {
- pScanline[0] = (mng_uint8)s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i+1] = DIV255B8(s * pDataline[2-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[2]);
- pScanline[2] = DIV255B8(s * pDataline[1]);
- pScanline[3] = DIV255B8(s * pDataline[0]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- if ((s = pDataline[6]) != 0) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if (s == 255)
- { /* plain copy it */
- pScanline[0] = 255;
- pScanline[1] = pDataline[4];
- pScanline[2] = pDataline[2];
- pScanline[3] = pDataline[0];
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
- pScanline[0] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[0])));
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i+1] = DIV255B8(s * pDataline[4-i-i] + t *
- pScanline[i+1]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[4] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[2] + t * pScanline[2]);
- pScanline[3] = DIV255B8(s * pDataline[0] + t * pScanline[3]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
- pScanline[0] = 255;
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[0];
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
- pScanline[0] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[0])));
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i+1] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[i+1]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[2] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[1] + t * pScanline[2]);
- pScanline[3] = DIV255B8(s * pDataline[0] + t * pScanline[3]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8_PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_abgr8_pm (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint32 s, t;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8_PM, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl << 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values and premultiply */
- if ((s = pDataline[3]) == 0)
- *(mng_uint32*) pScanline = 0; /* set all components = 0 */
- else
- {
- if (s == 255)
- {
- pScanline[0] = 255;
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[0];
- }
- else
- {
- pScanline[0] = (mng_uint8)s;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i+1] = DIV255B8(s * pDataline[2-i]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[2]);
- pScanline[2] = DIV255B8(s * pDataline[1]);
- pScanline[3] = DIV255B8(s * pDataline[0]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- if ((s = pDataline[3]) != 0) /* any opacity at all ? */
- { /* fully opaque ? */
- if (s == 255)
- { /* then simply copy the values */
- pScanline[0] = 255;
- pScanline[1] = pDataline[2];
- pScanline[2] = pDataline[1];
- pScanline[3] = pDataline[0];
- }
- else
- { /* now blend (premultiplied) */
- t = 255 - s;
- pScanline[0] = (mng_uint8)(255 - DIV255B8(t * (255 - pScanline[0])));
-#ifdef MNG_OPTIMIZE_FOOTPRINT_DIV
- {
- int i;
- for (i=2; i >= 0; i--)
- {
- pScanline[i+1] = DIV255B8(s * pDataline[2-i] + t *
- pScanline[i+1]);
- }
- }
-#else
- pScanline[1] = DIV255B8(s * pDataline[2] + t * pScanline[1]);
- pScanline[2] = DIV255B8(s * pDataline[1] + t * pScanline[2]);
- pScanline[3] = DIV255B8(s * pDataline[0] + t * pScanline[3]);
-#endif
- }
- }
-
- pScanline += (pData->iColinc << 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_ABGR8_PM, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_ABGR8_PM */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGR565
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_bgr565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) | ( (*(pDataline+2)>>5) ) );
- *pScanline = (mng_uint8)( ( (*(pDataline+4)) >>3) | ( (*(pDataline+2)&0xFC) << 3) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) | ( (*(pDataline+1)>>5 ) ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >>3 ) | ( (*(pDataline+1)&0xFC ) << 3) );
-
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
-
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( (*(pDataline))&0xF8 ) | (mng_uint8)( (*(pDataline+2)>>5 ) );
- *pScanline = (mng_uint8)( (*(pDataline+4)) >>3) | (mng_uint8)( (*(pDataline+2)&0xFC) << 3);
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
-
- iBGb16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGr16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iFGr16 >> 8)&0xF8 ) | ( (mng_uint8)(iFGg16>>8) >> 5) );
- *pScanline = (mng_uint8) ( ( (iFGb16>>11) ) | (((mng_uint8)(iFGg16>>8)&0xFC) << 3) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline+2))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0)>>3 ) );
- iBlue = (mng_uint8) ( (*pScanline << 3) );
-
- MNG_COMPOSE8 (iRed, *pDataline, iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8) ( ( iRed & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iBlue >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_bgr565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) |
- ( (*(pDataline+iBps)>>5) ) );
- *pScanline = (mng_uint8)( ( (*(pDataline+2*iBps)) >>3) |
- ( (*(pDataline+iBps)&0xFC) << 3) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
-
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( (*(pDataline))&0xF8 ) | (mng_uint8)( (*(pDataline+2)>>5 ) );
- *pScanline = (mng_uint8)( (*(pDataline+4)) >>3) | (mng_uint8)( (*(pDataline+2)&0xFC) << 3);
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
-
- iBGb16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGr16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iFGr16 >> 8)&0xF8 ) | ( (mng_uint8)(iFGg16>>8) >> 5) );
- *pScanline = (mng_uint8) ( ( (iFGb16>>11) ) | (((mng_uint8)(iFGg16>>8)&0xFC) << 3) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline+2))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0)>>3 ) );
- iBlue = (mng_uint8) ( (*pScanline << 3) );
-
- MNG_COMPOSE8 (iRed, *pDataline, iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8) ( ( iRed & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iBlue >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_bgr565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) | ( (*(pDataline+1)>>5 ) ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >>3 ) | ( (*(pDataline+1)&0xFC ) << 3) );
-
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline+2))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0)>>3 ) );
- iBlue = (mng_uint8) ( (*pScanline << 3) );
-
- MNG_COMPOSE8 (iRed, *pDataline, iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8) ( ( iRed & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iBlue >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_BGR565 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_RGB565
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_rgb565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB565, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( ( *(pDataline+4)) & 0xF8) | (*(pDataline+2) >> 5 ) );
- *pScanline = (mng_uint8)( ( ( *(pDataline )) >> 3 ) | ((*(pDataline+2) & 0xFC) << 3) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2)) & 0xF8) | (*(pDataline+1) >> 5 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+1) & 0xFC) << 3) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
-
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+4)) & 0xF8) | (*(pDataline+2)>>5) );
- *pScanline = (mng_uint8)( ( (*(pDataline )) >> 3 ) | ((*(pDataline+2)&0xFC) << 3) );
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
-
- /* scale background up */
- iBGr16 = (mng_uint8)( *(pScanline+1) & 0xF8 );
- iBGg16 = (mng_uint8)( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0) >> 3 ) );
- iBGb16 = (mng_uint8)( *(pScanline ) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8)( (mng_uint8)((iFGb16 >> 8) &0xF8) | ( (mng_uint8)(iFGg16 >> 8) >> 5 ) );
- *pScanline = (mng_uint8)( (mng_uint8) (iFGr16 >>11) | ( ( (mng_uint8)(iFGg16 >> 8) & 0xFC) << 3) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2)) & 0xF8) | ( *(pDataline+1) >> 5 ) );
- *pScanline = (mng_uint8)( ( (*(pDataline )) >> 3 ) | ( (*(pDataline+1) & 0xFC) << 3 ) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8)( *(pScanline+1) & 0xF8);
- iGreen = (mng_uint8)( ( *(pScanline+1) << 5 ) | ( ( (*pScanline)&0xE0)>>3 ) );
- iBlue = (mng_uint8)( *(pScanline ) << 3 );
-
- MNG_COMPOSE8 (iRed, *(pDataline+2), iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+0), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8)( ( iRed & 0xF8) | ( iGreen >> 5 ) );
- *pScanline = (mng_uint8)( (iBlue >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_rgb565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB565, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( ( *(pDataline+2*iBps)) & 0xF8) |
- (*(pDataline+iBps) >> 5 ) );
- *pScanline = (mng_uint8)( ( ( *(pDataline )) >> 3 ) |
- ((*(pDataline+iBps) & 0xFC) << 3) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
-
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+4)) & 0xF8) | (*(pDataline+2)>>5) );
- *pScanline = (mng_uint8)( ( (*(pDataline )) >> 3 ) | ((*(pDataline+2)&0xFC) << 3) );
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
-
- /* scale background up */
- iBGr16 = (mng_uint8)( *(pScanline+1) & 0xF8 );
- iBGg16 = (mng_uint8)( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0) >> 3 ) );
- iBGb16 = (mng_uint8)( *(pScanline ) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8)( (mng_uint8)((iFGb16 >> 8) &0xF8) | ( (mng_uint8)(iFGg16 >> 8) >> 5 ) );
- *pScanline = (mng_uint8)( (mng_uint8) (iFGr16 >>11) | ( ( (mng_uint8)(iFGg16 >> 8) & 0xFC) << 3) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2)) & 0xF8) | ( *(pDataline+1) >> 5 ) );
- *pScanline = (mng_uint8)( ( (*(pDataline )) >> 3 ) | ( (*(pDataline+1) & 0xFC) << 3 ) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8)( *(pScanline+1) & 0xF8);
- iGreen = (mng_uint8)( ( *(pScanline+1) << 5 ) | ( ( (*pScanline)&0xE0)>>3 ) );
- iBlue = (mng_uint8)( *(pScanline ) << 3 );
-
- MNG_COMPOSE8 (iRed, *(pDataline+2), iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+0), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8)( ( iRed & 0xF8) | ( iGreen >> 5 ) );
- *pScanline = (mng_uint8)( (iBlue >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_rgb565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB565, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2)) & 0xF8) | (*(pDataline+1) >> 5 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+1) & 0xFC) << 3) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2)) & 0xF8) | ( *(pDataline+1) >> 5 ) );
- *pScanline = (mng_uint8)( ( (*(pDataline )) >> 3 ) | ( (*(pDataline+1) & 0xFC) << 3 ) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8)( *(pScanline+1) & 0xF8);
- iGreen = (mng_uint8)( ( *(pScanline+1) << 5 ) | ( ( (*pScanline)&0xE0)>>3 ) );
- iBlue = (mng_uint8)( *(pScanline ) << 3 );
-
- MNG_COMPOSE8 (iRed, *(pDataline+2), iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+0), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8)( ( iRed & 0xF8) | ( iGreen >> 5 ) );
- *pScanline = (mng_uint8)( (iBlue >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_RGB565 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGRA565
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_bgra565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA565, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) | ( (*(pDataline+2)>>5) ) );
- *pScanline = (mng_uint8)( ( (*(pDataline+4)) >>3) | ( (*(pDataline+2)&0xFC) << 3) );
- *(pScanline+2) = *(pDataline+6);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) | ( (*(pDataline+1)>>5 ) ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >>3 ) | ( (*(pDataline+1)&0xFC ) << 3) );
- *(pScanline+2) = *(pDataline+3);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*(pScanline+2));
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *(pScanline+1) = (mng_uint8)( (*(pDataline))&0xF8 ) | (mng_uint8)( (*(pDataline+2)>>5 ) );
- *pScanline = (mng_uint8)( (*(pDataline+4)) >>3) | (mng_uint8)( (*(pDataline+2)&0xFC) << 3);
- *(pScanline+2) = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGb16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGr16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
-
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iFGa16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iFGr16 >> 8)&0xF8 ) | ( (mng_uint8)(iFGg16>>8) >> 5) );
- *pScanline = (mng_uint8) ( ( (iFGb16>>11) ) | (((mng_uint8)(iFGg16>>8)&0xFC) << 3) );
- }
- else
- { /* scale background up */
- iBGb16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGr16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iCr16 >> 8) & 0xF8 ) | ( (mng_uint8)(iCg16 >> 8) >> 5 ) );
- *pScanline = (mng_uint8) ( ( (iCb16 >> 11) ) | (((mng_uint8)(iCg16 >> 8) & 0xFC) << 3) );
- *(pScanline+2) = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+2);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline+2))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- *(pScanline+2) = *(pDataline+3);
- }
- else
- {
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0)>>3 ) );
- iBlue = (mng_uint8) ( (*pScanline << 3) );
-
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE8 (iRed, *pDataline, iFGa8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iFGa8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iFGa8, iBlue );
- /* alpha remains fully opaque !!! */
- *(pScanline+1) = (mng_uint8) ( ( iRed & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iBlue >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- iRed , iGreen , iBlue , iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
-
-
- *pScanline = (mng_uint8) ( ( iCb8 >> 3 ) | ( (iCg8 & 0xFC) << 3) );
- *(pScanline+1) = (mng_uint8) ( ( iCr8 & 0xF8 ) | (iCg8>>5) );
- *(pScanline+2) = (mng_uint8) iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc *3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_bgra565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA565, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) |
- ( (*(pDataline+iBps)>>5) ) );
- *pScanline = (mng_uint8)( ( (*(pDataline+2*iBps)) >>3) |
- ( (*(pDataline+iBps)&0xFC) << 3) );
- *(pScanline+2) = *(pDataline+3*iBps);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*(pScanline+2));
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *(pScanline+1) = (mng_uint8)( (*(pDataline))&0xF8 ) | (mng_uint8)( (*(pDataline+2)>>5 ) );
- *pScanline = (mng_uint8)( (*(pDataline+4)) >>3) | (mng_uint8)( (*(pDataline+2)&0xFC) << 3);
- *(pScanline+2) = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGb16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGr16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
-
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iFGa16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iFGr16 >> 8)&0xF8 ) | ( (mng_uint8)(iFGg16>>8) >> 5) );
- *pScanline = (mng_uint8) ( ( (iFGb16>>11) ) | (((mng_uint8)(iFGg16>>8)&0xFC) << 3) );
- }
- else
- { /* scale background up */
- iBGb16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGr16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iCr16 >> 8) & 0xF8 ) | ( (mng_uint8)(iCg16 >> 8) >> 5 ) );
- *pScanline = (mng_uint8) ( ( (iCb16 >> 11) ) | (((mng_uint8)(iCg16 >> 8) & 0xFC) << 3) );
- *(pScanline+2) = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+2);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline+2))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- *(pScanline+2) = *(pDataline+3);
- }
- else
- {
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0)>>3 ) );
- iBlue = (mng_uint8) ( (*pScanline << 3) );
-
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE8 (iRed, *pDataline, iFGa8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iFGa8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iFGa8, iBlue );
- /* alpha remains fully opaque !!! */
- *(pScanline+1) = (mng_uint8) ( ( iRed & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iBlue >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- iRed , iGreen , iBlue , iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
-
-
- *pScanline = (mng_uint8) ( ( iCb8 >> 3 ) | ( (iCg8 & 0xFC) << 3) );
- *(pScanline+1) = (mng_uint8) ( ( iCr8 & 0xF8 ) | (iCg8>>5) );
- *(pScanline+2) = (mng_uint8) iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc *3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_bgra565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA565, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) | ( (*(pDataline+1)>>5 ) ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >>3 ) | ( (*(pDataline+1)&0xFC ) << 3) );
- *(pScanline+2) = *(pDataline+3);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+2);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline+2))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- *(pScanline+2) = *(pDataline+3);
- }
- else
- {
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0)>>3 ) );
- iBlue = (mng_uint8) ( (*pScanline << 3) );
-
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE8 (iRed, *pDataline, iFGa8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iFGa8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iFGa8, iBlue );
- /* alpha remains fully opaque !!! */
- *(pScanline+1) = (mng_uint8) ( ( iRed & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iBlue >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- iRed , iGreen , iBlue , iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
-
-
- *pScanline = (mng_uint8) ( ( iCb8 >> 3 ) | ( (iCg8 & 0xFC) << 3) );
- *(pScanline+1) = (mng_uint8) ( ( iCr8 & 0xF8 ) | (iCg8>>5) );
- *(pScanline+2) = (mng_uint8) iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc *3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGRA565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_BGRA565 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_RGBA565
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_rgba565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA565, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+4))&0xF8 ) | ( (*(pDataline+2)>>5) ) );
- *pScanline = (mng_uint8)( ( (*(pDataline)) >>3) | ( (*(pDataline+2)&0xFC) << 3) );
- *(pScanline+2) = *(pDataline+6);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2))&0xF8 ) | ( (*(pDataline+1)>>5 ) ) );
- *pScanline = (mng_uint8)( ( *(pDataline) >>3 ) | ( (*(pDataline+1)&0xFC ) << 3) );
- *(pScanline+2) = *(pDataline+3);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*(pScanline+2));
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *(pScanline+1) = (mng_uint8)( (*(pDataline+4))&0xF8 ) | (mng_uint8)( (*(pDataline+2)>>5 ) );
- *pScanline = (mng_uint8)( (*(pDataline)) >>3) | (mng_uint8)( (*(pDataline+2)&0xFC) << 3);
- *(pScanline+2) = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGr16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGb16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
-
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iFGa16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iFGb16 >> 8)&0xF8 ) | ( (mng_uint8)(iFGg16>>8) >> 5) );
- *pScanline = (mng_uint8) ( ( (iFGr16>>11) ) | (((mng_uint8)(iFGg16>>8)&0xFC) << 3) );
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGb16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iCb16 >> 8) & 0xF8 ) | ( (mng_uint8)(iCg16 >> 8) >> 5 ) );
- *pScanline = (mng_uint8) ( ( (iCr16 >> 11) ) | (((mng_uint8)(iCg16 >> 8) & 0xFC) << 3) );
- *(pScanline+2) = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+2);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- *(pScanline+2) = *(pDataline+3);
- }
- else
- {
- mng_uint8 iRed, iGreen, iBlue;
-
- iBlue = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0)>>3 ) );
- iRed = (mng_uint8) ( (*pScanline << 3) );
-
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE8 (iRed, *pDataline, iFGa8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iFGa8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iFGa8, iBlue );
- /* alpha remains fully opaque !!! */
- *(pScanline+1) = (mng_uint8) ( ( iBlue & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iRed >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- iRed , iGreen , iBlue , iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
-
-
- *pScanline = (mng_uint8) ( ( iCr8 >> 3 ) | ( (iCg8 & 0xFC) << 3) );
- *(pScanline+1) = (mng_uint8) ( ( iCb8 & 0xF8 ) | (iCg8>>5) );
- *(pScanline+2) = (mng_uint8) iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc *3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_rgba565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint16 iFGa16, iBGa16, iCa16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16;
- mng_uint8 iCr8, iCg8, iCb8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA565, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2*iBps))&0xF8 ) |
- ( (*(pDataline+iBps)>>5) ) );
- *pScanline = (mng_uint8)( ( (*(pDataline)) >>3) |
- ( (*(pDataline+iBps)&0xFC) << 3) );
- *(pScanline+2) = *(pDataline+3*iBps);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* get alpha values */
- iFGa16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*(pScanline+2));
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* plain copy it */
- *(pScanline+1) = (mng_uint8)( (*(pDataline+4))&0xF8 ) | (mng_uint8)( (*(pDataline+2)>>5 ) );
- *pScanline = (mng_uint8)( (*(pDataline)) >>3) | (mng_uint8)( (*(pDataline+2)&0xFC) << 3);
- *(pScanline+2) = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
- iBGr16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGb16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
-
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iFGa16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iFGb16 >> 8)&0xF8 ) | ( (mng_uint8)(iFGg16>>8) >> 5) );
- *pScanline = (mng_uint8) ( ( (iFGr16>>11) ) | (((mng_uint8)(iFGg16>>8)&0xFC) << 3) );
- }
- else
- { /* scale background up */
- iBGr16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGb16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iCb16 >> 8) & 0xF8 ) | ( (mng_uint8)(iCg16 >> 8) >> 5 ) );
- *pScanline = (mng_uint8) ( ( (iCr16 >> 11) ) | (((mng_uint8)(iCg16 >> 8) & 0xFC) << 3) );
- *(pScanline+2) = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc * 3);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+2);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- *(pScanline+2) = *(pDataline+3);
- }
- else
- {
- mng_uint8 iRed, iGreen, iBlue;
-
- iBlue = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0)>>3 ) );
- iRed = (mng_uint8) ( (*pScanline << 3) );
-
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE8 (iRed, *pDataline, iFGa8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iFGa8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iFGa8, iBlue );
- /* alpha remains fully opaque !!! */
- *(pScanline+1) = (mng_uint8) ( ( iBlue & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iRed >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- iRed , iGreen , iBlue , iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
-
-
- *pScanline = (mng_uint8) ( ( iCr8 >> 3 ) | ( (iCg8 & 0xFC) << 3) );
- *(pScanline+1) = (mng_uint8) ( ( iCb8 & 0xF8 ) | (iCg8>>5) );
- *(pScanline+2) = (mng_uint8) iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc *3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_rgba565 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8, iCa8;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA565, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol << 2) + (pData->iDestl * 3);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2))&0xF8 ) | ( (*(pDataline+1)>>5 ) ) );
- *pScanline = (mng_uint8)( ( *(pDataline) >>3 ) | ( (*(pDataline+1)&0xFC ) << 3) );
- *(pScanline+2) = *(pDataline+3);
-
- pScanline += (pData->iColinc * 3);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iFGa8 = *(pDataline+3); /* get alpha values */
- iBGa8 = *(pScanline+2);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline+2)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- *(pScanline+2) = *(pDataline+3);
- }
- else
- {
- mng_uint8 iRed, iGreen, iBlue;
-
- iBlue = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | ( ((*pScanline) & 0xE0)>>3 ) );
- iRed = (mng_uint8) ( (*pScanline << 3) );
-
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE8 (iRed, *pDataline, iFGa8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iFGa8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iFGa8, iBlue );
- /* alpha remains fully opaque !!! */
- *(pScanline+1) = (mng_uint8) ( ( iBlue & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iRed >> 3 ) | ( (iGreen & 0xFC) << 3) );
- }
- else
- { /* now blend */
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iFGa8,
- iRed , iGreen , iBlue , iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
-
-
- *pScanline = (mng_uint8) ( ( iCr8 >> 3 ) | ( (iCg8 & 0xFC) << 3) );
- *(pScanline+1) = (mng_uint8) ( ( iCb8 & 0xF8 ) | (iCg8>>5) );
- *(pScanline+2) = (mng_uint8) iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc *3);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGBA565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_RGBA565 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGR565_A8
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_bgr565_a8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pAlphaline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16, iBGa16;
- mng_uint16 iCr16, iCg16, iCb16, iCa16;
- mng_uint8 iA8, iBGa8, iCa8;
- mng_uint8 iCr8, iCg8, iCb8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565_A8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- pAlphaline = (mng_uint8p)pData->fGetalphaline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row
-starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pAlphaline = pAlphaline + pData->iCol + pData->iDestl;
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) | ((*(pDataline+2)>>5) ) );
- *pScanline = (mng_uint8)( ( (*(pDataline+4)) >>3) | ((*(pDataline+2)&0xFC) << 3) );
- *pAlphaline = (mng_uint8)(*(pDataline+6));
-
- pScanline += (pData->iColinc * 2);
- pAlphaline += pData->iColinc;
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) | ((*(pDataline+1)>>5 ) ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >>3 ) | ((*(pDataline+1)&0xFC ) << 3) );
- *pAlphaline = (mng_uint8)(*(pDataline+3));
-
- pScanline += (pData->iColinc * 2);
- pAlphaline += pData->iColinc;
- pDataline += 4;
- }
- }
- }
- else /* Not fully opaque */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
-
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*pAlphaline);
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iA16) /* any opacity at all ? */
- {
- if ((iA16 == 0xFFFF) || (iBGa16 == 0)) /* fully opaque or background fully transparent ? */
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( (*(pDataline))&0xF8 ) | (mng_uint8)( (*(pDataline+2)>>5 ) );
- *pScanline = (mng_uint8)( (*(pDataline+4)) >>3) | (mng_uint8)( (*(pDataline+2)&0xFC) << 3);
- *pAlphaline = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- {
- /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
-
- iBGb16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGr16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iFGr16 >> 8)&0xF8 ) | ( (mng_uint8)(iFGg16>>8) >> 5) );
- *pScanline = (mng_uint8) ( ( (iFGb16>>11) ) | (((mng_uint8)(iFGg16>>8)&0xFC) << 3) );
- *pAlphaline = (mng_uint8)(iA16>>8);
- }
- else /* background is not fully opaque */
- { /* scale background up */
- iBGb16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGr16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iA16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iCr16 >> 8)&0xF8 ) | ( (mng_uint8)(iCg16>>8) >> 5) );
- *pScanline = (mng_uint8) ( ( (iCb16>>11) ) | (((mng_uint8)(iCg16>>8)&0xFC) << 3) );
- *pAlphaline = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pAlphaline += pData->iColinc;
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
-iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
- iBGa8 = *pAlphaline;
-
- if (iA8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iA8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline+2))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- *pAlphaline = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- {
- /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | (((*pScanline) & 0xE0)>>3 ) );
- iBlue = (mng_uint8) ( (*pScanline << 3) );
-
- MNG_COMPOSE8 (iRed, *pDataline, iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8) ( ( iRed & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iBlue >> 3 ) | ((iGreen & 0xFC) << 3) );
- *pAlphaline = iA8;
- }
- else /* background not fully opaque */
- {
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iA8,
- *pScanline, *(pScanline+1), *(pScanline+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( iCr8 & 0xF8 ) | (iCg8>>5) );
- *pScanline = (mng_uint8) ( ( iCb8 >> 3 ) | ((iCg8 & 0xFC) << 3) );
- *pAlphaline = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pAlphaline += pData->iColinc;
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565_A8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_bgr565_a8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pAlphaline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16, iBGa16;
- mng_uint16 iCr16, iCg16, iCb16, iCa16;
- mng_uint8 iA8, iBGa8, iCa8;
- mng_uint8 iCr8, iCg8, iCb8;
- mng_uint8 iBps;
-
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565_A8, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- pAlphaline = (mng_uint8p)pData->fGetalphaline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row
-starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pAlphaline = pAlphaline + pData->iCol + pData->iDestl;
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) |
- ((*(pDataline+iBps)>>5) ) );
- *pScanline = (mng_uint8)( ( (*(pDataline+2*iBps)) >>3) |
- ((*(pDataline+iBps)&0xFC) << 3) );
- *pAlphaline = (mng_uint8)(*(pDataline+6));
-
- pScanline += (pData->iColinc * 2);
- pAlphaline += pData->iColinc;
- pDataline += 8;
- }
- }
- else /* Not fully opaque */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
-
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
- iBGa16 = (mng_uint16)(*pAlphaline);
- iBGa16 = (mng_uint16)(iBGa16 << 8) | iBGa16;
-
- if (iA16) /* any opacity at all ? */
- {
- if ((iA16 == 0xFFFF) || (iBGa16 == 0)) /* fully opaque or background fully transparent ? */
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( (*(pDataline))&0xF8 ) | (mng_uint8)( (*(pDataline+2)>>5 ) );
- *pScanline = (mng_uint8)( (*(pDataline+4)) >>3) | (mng_uint8)( (*(pDataline+2)&0xFC) << 3);
- *pAlphaline = *(pDataline+6);
- }
- else
- {
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- {
- /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
- /* scale background up */
-
- iBGb16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGr16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iFGr16 >> 8)&0xF8 ) | ( (mng_uint8)(iFGg16>>8) >> 5) );
- *pScanline = (mng_uint8) ( ( (iFGb16>>11) ) | (((mng_uint8)(iFGg16>>8)&0xFC) << 3) );
- *pAlphaline = (mng_uint8)(iA16>>8);
- }
- else /* background is not fully opaque */
- { /* scale background up */
- iBGb16 = (mng_uint16)( (*(pScanline+1)) & 0xF8 );
- iBGg16 = (mng_uint16)( (*(pScanline+1) << 5) | (((*(pScanline )) & 0xE0) >>3 ) );
- iBGr16 = (mng_uint16)( (*(pScanline )) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* let's blend */
- MNG_BLEND16 (mng_get_uint16 (pDataline ),
- mng_get_uint16 (pDataline+2),
- mng_get_uint16 (pDataline+4), iA16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( (iCr16 >> 8)&0xF8 ) | ( (mng_uint8)(iCg16>>8) >> 5) );
- *pScanline = (mng_uint8) ( ( (iCb16>>11) ) | (((mng_uint8)(iCg16>>8)&0xFC) << 3) );
- *pAlphaline = (mng_uint8)(iCa16 >> 8);
- }
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pAlphaline += pData->iColinc;
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
-iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
- iBGa8 = *pAlphaline;
-
- if (iA8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iA8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline+2))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- *pAlphaline = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- {
- /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | (((*pScanline) & 0xE0)>>3 ) );
- iBlue = (mng_uint8) ( (*pScanline << 3) );
-
- MNG_COMPOSE8 (iRed, *pDataline, iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8) ( ( iRed & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iBlue >> 3 ) | ((iGreen & 0xFC) << 3) );
- *pAlphaline = iA8;
- }
- else /* background not fully opaque */
- {
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iA8,
- *pScanline, *(pScanline+1), *(pScanline+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( iCr8 & 0xF8 ) | (iCg8>>5) );
- *pScanline = (mng_uint8) ( ( iCb8 >> 3 ) | ((iCg8 & 0xFC) << 3) );
- *pAlphaline = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pAlphaline += pData->iColinc;
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565_A8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_bgr565_a8 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pAlphaline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iA8, iBGa8, iCa8;
- mng_uint8 iCr8, iCg8, iCb8;
-
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565_A8, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- pAlphaline = (mng_uint8p)pData->fGetalphaline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row
-starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pAlphaline = pAlphaline + pData->iCol + pData->iDestl;
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline))&0xF8 ) | ((*(pDataline+1)>>5 ) ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >>3 ) | ((*(pDataline+1)&0xFC ) << 3) );
- *pAlphaline = (mng_uint8)(*(pDataline+3));
-
- pScanline += (pData->iColinc * 2);
- pAlphaline += pData->iColinc;
- pDataline += 4;
- }
- }
- }
- else /* Not fully opaque */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
-iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
- iBGa8 = *pAlphaline;
-
- if (iA8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iA8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ( (*(pDataline)) &0xF8 ) | (*(pDataline+1) >>5 ) );
- *pScanline = (mng_uint8)( ( ((*(pDataline+2))>>3) ) | ((*(pDataline+1)&0xFC) << 3) );
- *pAlphaline = *(pDataline+3);
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- {
- /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8) ( *(pScanline+1) & 0xF8 );
- iGreen = (mng_uint8) ( (*(pScanline+1) << 5) | (((*pScanline) & 0xE0)>>3 ) );
- iBlue = (mng_uint8) ( (*pScanline << 3) );
-
- MNG_COMPOSE8 (iRed, *pDataline, iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8) ( ( iRed & 0xF8 ) | (iGreen>>5) );
- *pScanline = (mng_uint8) ( ( iBlue >> 3 ) | ((iGreen & 0xFC) << 3) );
- *pAlphaline = iA8;
- }
- else /* background not fully opaque */
- {
- MNG_BLEND8 (*pDataline, *(pDataline+1), *(pDataline+2), iA8,
- *pScanline, *(pScanline+1), *(pScanline+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8) ( ( iCr8 & 0xF8 ) | (iCg8>>5) );
- *pScanline = (mng_uint8) ( ( iCb8 >> 3 ) | ((iCg8 & 0xFC) << 3) );
- *pAlphaline = iCa8;
- }
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pAlphaline += pData->iColinc;
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR565_A8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_BGR565_A8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_RGB555
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_rgb555 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB555, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline+4) & 0xF8) >> 1 ) | (*(pDataline+2) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+2) & 0xF8) << 2 ) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline+2) & 0xF8) >> 1 ) | (*(pDataline+1) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+1) & 0xF8) << 2 ) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
-
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline+4) & 0xF8) >> 1 ) | (*(pDataline+2) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+2) & 0xF8) << 2 ) );
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
-
- /* scale background up */
- iBGr16 = (mng_uint8)( (*(pScanline+1) & 0xF8) << 1 );
- iBGg16 = (mng_uint8)( (*(pScanline+1) << 6 ) | ( ((*pScanline) & 0xE0) >> 2 ) );
- iBGb16 = (mng_uint8)( *(pScanline ) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8)( (mng_uint8)(((iFGb16 >> 8) & 0xF8) >> 1 ) | ( (mng_uint8)(iFGg16 >> 8) >> 6 ) );
- *pScanline = (mng_uint8)( (mng_uint8) ((iFGr16 >>11) >> 3 ) | ( ( (mng_uint8)(iFGg16 >> 8) & 0xF8) << 2 ) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline+2) & 0xF8) >> 1 ) | (*(pDataline+1) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+1) & 0xF8) << 2 ) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8)( (*(pScanline+1) & 0xF8) << 1 );
- iGreen = (mng_uint8)( (*(pScanline+1) << 6 ) | ( ((*pScanline) & 0xE0) >> 2 ) );
- iBlue = (mng_uint8)( *(pScanline ) << 3 );
-
- MNG_COMPOSE8 (iRed, *(pDataline+2), iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+0), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8)( ( (iRed & 0xF8) >> 1 ) | ( iGreen >> 6 ) );
- *pScanline = (mng_uint8)( (iBlue >> 3 ) | ( (iGreen & 0xF8) << 2 ) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB555, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_rgb555 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB555, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline+2*iBps) & 0xF8) >> 1 ) | (*(pDataline+iBps) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+iBps) & 0xF8) << 2 ) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
-
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline+4) & 0xF8) >> 1 ) | (*(pDataline+2) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+2) & 0xF8) << 2 ) );
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
-
- /* scale background up */
- iBGr16 = (mng_uint8)( (*(pScanline+1) & 0xF8) << 1 );
- iBGg16 = (mng_uint8)( (*(pScanline+1) << 6 ) | ( ((*pScanline) & 0xE0) >> 2 ) );
- iBGb16 = (mng_uint8)( *(pScanline ) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8)( (mng_uint8)(((iFGb16 >> 8) & 0xF8) >> 1 ) | ( (mng_uint8)(iFGg16 >> 8) >> 6 ) );
- *pScanline = (mng_uint8)( (mng_uint8) ((iFGr16 >>11) >> 3 ) | ( ( (mng_uint8)(iFGg16 >> 8) & 0xF8) << 2 ) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline+2) & 0xF8) >> 1 ) | (*(pDataline+1) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+1) & 0xF8) << 2 ) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8)( (*(pScanline+1) & 0xF8) << 1 );
- iGreen = (mng_uint8)( (*(pScanline+1) << 6 ) | ( ((*pScanline) & 0xE0) >> 2 ) );
- iBlue = (mng_uint8)( *(pScanline ) << 3 );
-
- MNG_COMPOSE8 (iRed, *(pDataline+2), iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+0), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8)( ( (iRed & 0xF8) >> 1 ) | ( iGreen >> 6 ) );
- *pScanline = (mng_uint8)( (iBlue >> 3 ) | ( (iGreen & 0xF8) << 2 ) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB555, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_rgb555 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB555, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline+2) & 0xF8) >> 1 ) | (*(pDataline+1) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+1) & 0xF8) << 2 ) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline+2) & 0xF8) >> 1 ) | (*(pDataline+1) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline ) >> 3 ) | ((*(pDataline+1) & 0xF8) << 2 ) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8)( (*(pScanline+1) & 0xF8) << 1 );
- iGreen = (mng_uint8)( (*(pScanline+1) << 6 ) | ( ((*pScanline) & 0xE0) >> 2 ) );
- iBlue = (mng_uint8)( *(pScanline ) << 3 );
-
- MNG_COMPOSE8 (iRed, *(pDataline+2), iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+0), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8)( ( (iRed & 0xF8) >> 1 ) | ( iGreen >> 6 ) );
- *pScanline = (mng_uint8)( (iBlue >> 3 ) | ( (iGreen & 0xF8) << 2 ) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_RGB555, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_RGB555 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGR555
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
-mng_retcode mng_display_bgr555 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR555, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- if (pData->bIsRGBA16) /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 3);
- else
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline ) & 0xF8) >> 1 ) | (*(pDataline+2) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline+4) >> 3 ) | ((*(pDataline+2) & 0xF8) << 2 ) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline ) & 0xF8) >> 1 ) | (*(pDataline+1) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >> 3 ) | ((*(pDataline+1) & 0xF8) << 2 ) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
-
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline ) & 0xF8) >> 1 ) | (*(pDataline+2) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline+4) >> 3 ) | ((*(pDataline+2) & 0xF8) << 2 ) );
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
-
- /* scale background up */
- iBGb16 = (mng_uint8)( (*(pScanline+1) & 0xF8) << 1 );
- iBGg16 = (mng_uint8)( (*(pScanline+1) << 6 ) | ( ((*pScanline) & 0xE0) >> 2 ) );
- iBGr16 = (mng_uint8)( *(pScanline ) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8)( (mng_uint8)(((iFGr16 >> 8) & 0xF8) >> 1 ) | ( (mng_uint8)(iFGg16 >> 8) >> 6 ) );
- *pScanline = (mng_uint8)( (mng_uint8) ((iFGb16 >>11) >> 3 ) | ( ( (mng_uint8)(iFGg16 >> 8) & 0xF8) << 2 ) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline ) & 0xF8) >> 1 ) | (*(pDataline+1) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >> 3 ) | ((*(pDataline+1) & 0xF8) << 2 ) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8)( (*(pScanline+1) & 0xF8) << 1 );
- iGreen = (mng_uint8)( (*(pScanline+1) << 6 ) | ( ((*pScanline) & 0xE0) >> 2 ) );
- iBlue = (mng_uint8)( *(pScanline ) << 3 );
-
- MNG_COMPOSE8 (iRed, *(pDataline+0), iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8)( ( (iRed & 0xF8) >> 1 ) | ( iGreen >> 6 ) );
- *pScanline = (mng_uint8)( (iBlue >> 3 ) | ( (iGreen & 0xF8) << 2 ) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR555, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#else /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-mng_retcode mng_display_bgr555 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint16 iA16;
- mng_uint16 iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGr16, iBGg16, iBGb16;
- mng_uint8 iA8;
- mng_uint8 iBps;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR555, MNG_LC_START);
-#endif
-
- iBps=(mng_uint8)(pData->bIsRGBA16 ? 2:1);
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- /* adjust source row starting-point */
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << (iBps+1));
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline ) & 0xF8) >> 1 ) | (*(pDataline+iBps) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2*iBps) >> 3 ) | ((*(pDataline+iBps) & 0xF8) << 2 ) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4*iBps;
- }
- }
- else
- {
- if (pData->bIsRGBA16) /* 16-bit input row ? */
- {
-
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA16 = mng_get_uint16 (pDataline+6);
-
- if (iA16) /* any opacity at all ? */
- {
- if (iA16 == 0xFFFF) /* fully opaque ? */
- { /* scale down by dropping the LSB */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline ) & 0xF8) >> 1 ) | (*(pDataline+2) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline+4) >> 3 ) | ((*(pDataline+2) & 0xF8) << 2 ) );
- }
- else
- { /* get the proper values */
- iFGr16 = mng_get_uint16 (pDataline );
- iFGg16 = mng_get_uint16 (pDataline+2);
- iFGb16 = mng_get_uint16 (pDataline+4);
-
- /* scale background up */
- iBGb16 = (mng_uint8)( (*(pScanline+1) & 0xF8) << 1 );
- iBGg16 = (mng_uint8)( (*(pScanline+1) << 6 ) | ( ((*pScanline) & 0xE0) >> 2 ) );
- iBGr16 = (mng_uint8)( *(pScanline ) << 3 );
-
- iBGr16 = (mng_uint16)((mng_uint32)iBGr16 << 8) | iBGr16;
- iBGg16 = (mng_uint16)((mng_uint32)iBGg16 << 8) | iBGg16;
- iBGb16 = (mng_uint16)((mng_uint32)iBGb16 << 8) | iBGb16;
- /* now compose */
- MNG_COMPOSE16(iFGr16, iFGr16, iA16, iBGr16);
- MNG_COMPOSE16(iFGg16, iFGg16, iA16, iBGg16);
- MNG_COMPOSE16(iFGb16, iFGb16, iA16, iBGb16);
- /* and return the composed values */
- *(pScanline+1) = (mng_uint8)( (mng_uint8)(((iFGr16 >> 8) & 0xF8) >> 1 ) | ( (mng_uint8)(iFGg16 >> 8) >> 6 ) );
- *pScanline = (mng_uint8)( (mng_uint8) ((iFGb16 >>11) >> 3 ) | ( ( (mng_uint8)(iFGg16 >> 8) & 0xF8) << 2 ) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 8;
- }
- }
- else
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline ) & 0xF8) >> 1 ) | (*(pDataline+1) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >> 3 ) | ((*(pDataline+1) & 0xF8) << 2 ) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8)( (*(pScanline+1) & 0xF8) << 1 );
- iGreen = (mng_uint8)( (*(pScanline+1) << 6 ) | ( ((*pScanline) & 0xE0) >> 2 ) );
- iBlue = (mng_uint8)( *(pScanline ) << 3 );
-
- MNG_COMPOSE8 (iRed, *(pDataline+0), iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8)( ( (iRed & 0xF8) >> 1 ) | ( iGreen >> 6 ) );
- *pScanline = (mng_uint8)( (iBlue >> 3 ) | ( (iGreen & 0xF8) << 2 ) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR555, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_OPTIMIZE_FOOTPRINT_COMPOSE */
-#else /* MNG_NO_16BIT_SUPPORT */
-mng_retcode mng_display_bgr555 (mng_datap pData)
-{
- mng_uint8p pScanline;
- mng_uint8p pDataline;
- mng_int32 iX;
- mng_uint8 iA8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR555, MNG_LC_START);
-#endif
- /* viewable row ? */
- if ((pData->iRow >= pData->iSourcet) && (pData->iRow < pData->iSourceb))
- { /* address destination row */
- pScanline = (mng_uint8p)pData->fGetcanvasline (((mng_handle)pData),
- pData->iRow + pData->iDestt -
- pData->iSourcet);
- /* adjust destination row starting-point */
- pScanline = pScanline + (pData->iCol * 2) + (pData->iDestl * 2);
- pDataline = pData->pRGBArow; /* address source row */
-
- pDataline = pDataline + ((pData->iSourcel / pData->iColinc) << 2);
-
- if (pData->bIsOpaque) /* forget about transparency ? */
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- { /* copy the values */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline ) & 0xF8) >> 1 ) | (*(pDataline+1) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >> 3 ) | ((*(pDataline+1) & 0xF8) << 2 ) );
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- else
- {
- {
- for (iX = pData->iSourcel + pData->iCol; iX < pData->iSourcer;
- iX += pData->iColinc)
- {
- iA8 = *(pDataline+3); /* get alpha value */
-
- if (iA8) /* any opacity at all ? */
- {
- if (iA8 == 0xFF) /* fully opaque ? */
- { /* then simply copy the values */
- *(pScanline+1) = (mng_uint8)( ((*(pDataline ) & 0xF8) >> 1 ) | (*(pDataline+1) >> 6 ) );
- *pScanline = (mng_uint8)( ( *(pDataline+2) >> 3 ) | ((*(pDataline+1) & 0xF8) << 2 ) );
- }
- else
- { /* do alpha composing */
- mng_uint8 iRed, iGreen, iBlue;
-
- iRed = (mng_uint8)( (*(pScanline+1) & 0xF8) << 1 );
- iGreen = (mng_uint8)( (*(pScanline+1) << 6 ) | ( ((*pScanline) & 0xE0) >> 2 ) );
- iBlue = (mng_uint8)( *(pScanline ) << 3 );
-
- MNG_COMPOSE8 (iRed, *(pDataline+0), iA8, iRed );
- MNG_COMPOSE8 (iGreen, *(pDataline+1), iA8, iGreen );
- MNG_COMPOSE8 (iBlue, *(pDataline+2), iA8, iBlue );
-
- *(pScanline+1) = (mng_uint8)( ( (iRed & 0xF8) >> 1 ) | ( iGreen >> 6 ) );
- *pScanline = (mng_uint8)( (iBlue >> 3 ) | ( (iGreen & 0xF8) << 2 ) );
- }
- }
-
- pScanline += (pData->iColinc * 2);
- pDataline += 4;
- }
- }
- }
- }
-
- check_update_region (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_BGR555, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_SKIPCANVAS_BGR555 */
-
-
-#ifndef MNG_SKIPCHUNK_BACK
-/* ************************************************************************** */
-/* * * */
-/* * Background restore routines - restore the background with info from * */
-/* * the BACK and/or bKGD chunk or the app's background canvas * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_restore_bkgd_backimage (mng_datap pData)
-{
- /* save some stuff */
- mng_uint8p pRGBArow = pData->pRGBArow;
- mng_int32 iRow = pData->iRow;
- mng_int32 iRowsamples = pData->iRowsamples;
-
- mng_retcode iRetcode; /* work variables */
- mng_uint8p pTemp;
- mng_uint8p pWork = pRGBArow;
- mng_uint32 iX;
- mng_int32 iZ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BACKIMAGE, MNG_LC_START);
-#endif
- /* determine row to retrieve */
- pData->iRow = pData->iDestt + iRow + pData->iBackimgoffsy;
-
- while (pData->iRow >= (mng_int32)pData->iBackimgheight)
- pData->iRow -= (mng_int32)pData->iBackimgheight;
- /* set width to that of background image */
- pData->iRowsamples = pData->iBackimgwidth;
- /* retrieve into alternate buffer ! */
- pData->pRGBArow = pData->pPrevrow;
- /* get it then */
- iRetcode = ((mng_retrieverow)pData->fRetrieverow) (pData);
-
- if (iRetcode) /* on error; bail out */
- return iRetcode;
- /* we got the full row; but now need to
- paste it into the proper location */
- iX = pData->iDestl - pData->iBackimgoffsx;
-
- while (iX >= pData->iBackimgwidth)
- iX -= pData->iBackimgwidth;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pData->bIsRGBA16) /* 16-bit buffer ? */
- {
- pTemp = pData->pPrevrow + (iX << 3);
-
- for (iZ = (pData->iDestr - pData->iDestl); iZ > 0; iZ--)
- {
- MNG_COPY (pWork, pTemp, 8);
-
- pWork += 8;
- pTemp += 8;
- iX++;
- /* reached end of bkgd-image line ? */
- if (iX >= pData->iBackimgwidth)
- {
- iX = 0;
- pTemp = pData->pPrevrow;
- }
- }
- }
- else
-#endif
- {
- pTemp = pData->pPrevrow + (iX << 2);
-
- for (iZ = (pData->iDestr - pData->iDestl); iZ > 0; iZ--)
- {
- MNG_COPY (pWork, pTemp, 4);
-
- pWork += 4;
- pTemp += 4;
- iX++;
- /* reached end of bkgd-image line ? */
- if (iX >= pData->iBackimgwidth)
- {
- iX = 0;
- pTemp = pData->pPrevrow;
- }
- }
- }
-
- pData->pRGBArow = pRGBArow; /* restore original values */
- pData->iRow = iRow;
- pData->iRowsamples = iRowsamples;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BACKIMAGE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_restore_bkgd_backcolor (mng_datap pData)
-{
- mng_int32 iX;
- mng_uint32p pWork32 = (mng_uint32p)pData->pRGBArow;
- mng_uint32 iWrite;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BACKCOLOR, MNG_LC_START);
-#endif
-
-#ifdef MNG_BIGENDIAN_SUPPORTED
- /* fast way for big endian */
- iWrite = (((mng_uint8)(pData->iBACKred >> 8)) << 24) |
- (((mng_uint8)(pData->iBACKgreen >> 8)) << 16) |
- (((mng_uint8)(pData->iBACKblue >> 8)) << 8) |
- ( 0xFF );
-#elif defined(MNG_LITTLEENDIAN_SUPPORTED)
- /* fast way for little endian */
- iWrite = ( 0xFF << 24) |
- (((mng_uint8)(pData->iBACKblue >> 8)) << 16) |
- (((mng_uint8)(pData->iBACKgreen >> 8)) << 8) |
- (((mng_uint8)(pData->iBACKred >> 8)) );
-#else
- /* generic way, works on all platforms */
- /* put the data in memory in the correct order */
- {
- mng_uint8 aBytes[4];
- aBytes[0] = (mng_uint8)(pData->iBACKred >> 8);
- aBytes[1] = (mng_uint8)(pData->iBACKgreen >> 8);
- aBytes[2] = (mng_uint8)(pData->iBACKblue >> 8);
- aBytes[3] = 0xFF;
- /* load that data into a register */
- iWrite = *(mng_uint32*) aBytes;
- }
-#endif
- /* ok; drop the background-color in there */
- for (iX = (pData->iSourcer - pData->iSourcel); iX > 0; iX--)
- *pWork32++ = iWrite;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BACKCOLOR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_bKGD
-mng_retcode mng_restore_bkgd_bkgd (mng_datap pData)
-{
- mng_int32 iX;
- mng_uint8p pWork = pData->pRGBArow;
- mng_imagep pImage = (mng_imagep)pData->pCurrentobj;
- mng_imagedatap pBuf = pImage->pImgbuf;
- mng_uint8 iRed = 0;
- mng_uint8 iGreen = 0;
- mng_uint8 iBlue = 0;
- mng_uint32p pWork32 = (mng_uint32p)pWork;
- mng_uint32 iWrite;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BKGD, MNG_LC_START);
-#endif
-
- switch (pBuf->iColortype)
- {
- case 0 : ; /* gray types */
- case 4 : {
- mng_uint8 iGray;
-
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuf->iBitdepth > 8)
- iGray = (mng_uint8)(pBuf->iBKGDgray >> 8);
- else
-#endif
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- /* LBR scaling */
- mng_uint8 multiplier[]={0,255,85,0,17,0,0,0,1};
- iGray = (mng_uint8)(multiplier[pBuf->iBitdepth] * pBuf->iBKGDgray);
-#else
- iGray = (mng_uint8)pBuf->iBKGDgray;
-#endif
- }
-
- iRed = iGray;
- iGreen = iGray;
- iBlue = iGray;
-
- break;
- }
-
- case 3 : { /* indexed type */
- iRed = pBuf->aPLTEentries [pBuf->iBKGDindex].iRed;
- iGreen = pBuf->aPLTEentries [pBuf->iBKGDindex].iGreen;
- iBlue = pBuf->aPLTEentries [pBuf->iBKGDindex].iBlue;
-
- break;
- }
-
- case 2 : ; /* rgb types */
- case 6 : {
-#ifndef MNG_NO_16BIT_SUPPORT
- if (pBuf->iBitdepth > 8)
- {
- iRed = (mng_uint8)(pBuf->iBKGDred >> 8);
- iGreen = (mng_uint8)(pBuf->iBKGDgreen >> 8);
- iBlue = (mng_uint8)(pBuf->iBKGDblue >> 8);
- }
- else
-#endif
- {
- iRed = (mng_uint8)(pBuf->iBKGDred );
- iGreen = (mng_uint8)(pBuf->iBKGDgreen);
- iBlue = (mng_uint8)(pBuf->iBKGDblue );
- }
-
- break;
- }
- }
-
-#ifdef MNG_BIGENDIAN_SUPPORTED
- /* fast way for big endian */
- iWrite = (iRed << 24) |
- (iGreen << 16) |
- (iBlue << 8);
-#elif defined(MNG_LITTLEENDIAN_SUPPORTED)
- /* fast way for little endian */
- iWrite = (iBlue << 16) |
- (iGreen << 8) |
- (iRed );
-#else
- /* generic way, works on all platforms */
- /* put the data in memory in the correct order */
- {
- mng_uint8 aBytes[4];
- aBytes[0] = (mng_uint8)(iRed);
- aBytes[1] = (mng_uint8)(iGreen);
- aBytes[2] = (mng_uint8)(iBlue);
- aBytes[3] = 0x00;
- /* load that data into a register */
- iWrite = *(mng_uint32*) aBytes;
- }
-#endif
- /* ok; drop it in there */
- for (iX = (pData->iSourcer - pData->iSourcel); iX > 0; iX--)
- *pWork32++ = iWrite;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_restore_bkgd_bgcolor (mng_datap pData)
-{
- mng_int32 iX;
- mng_uint32p pWork32 = (mng_uint32p)pData->pRGBArow;
- mng_uint32 iWrite;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BGCOLOR, MNG_LC_START);
-#endif
-
-#ifdef MNG_BIGENDIAN_SUPPORTED
- /* fast way for big endian */
- iWrite = (((mng_uint8)(pData->iBGred >> 8)) << 24) |
- (((mng_uint8)(pData->iBGgreen >> 8)) << 16) |
- (((mng_uint8)(pData->iBGblue >> 8)) << 8);
-#elif defined(MNG_LITTLEENDIAN_SUPPORTED)
- /* fast way for little endian */
- iWrite = (((mng_uint8)(pData->iBGblue >> 8)) << 16) |
- (((mng_uint8)(pData->iBGgreen >> 8)) << 8) |
- (((mng_uint8)(pData->iBGred >> 8)) );
-#else
- /* generic way, works on all platforms */
- /* put the data in memory in the correct order */
- {
- mng_uint8 aBytes[4];
- aBytes[0] = (mng_uint8)(pData->iBGred >> 8);
- aBytes[1] = (mng_uint8)(pData->iBGgreen >> 8);
- aBytes[2] = (mng_uint8)(pData->iBGblue >> 8);
- aBytes[3] = 0x00;
- /* load that data into a register */
- iWrite = *(mng_uint32*) aBytes;
- }
-#endif
- /* ok; drop the background-color in there */
- for (iX = (pData->iSourcer - pData->iSourcel); iX > 0; iX--)
- *pWork32++ = iWrite;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BGCOLOR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_RGB8
-mng_retcode mng_restore_bkgd_rgb8 (mng_datap pData)
-{
- mng_int32 iX;
- mng_uint8p pBkgd;
- mng_uint8p pWork = pData->pRGBArow;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_RGB8, MNG_LC_START);
-#endif
-
- if (pData->fGetbkgdline) /* can we access the background ? */
- { /* point to the right pixel then */
- pBkgd = (mng_uint8p)pData->fGetbkgdline ((mng_handle)pData,
- pData->iRow + pData->iDestt) +
- (3 * pData->iDestl);
-
- for (iX = (pData->iSourcer - pData->iSourcel); iX > 0; iX--)
- {
- *pWork = *pBkgd; /* ok; copy the pixel */
- *(pWork+1) = *(pBkgd+1);
- *(pWork+2) = *(pBkgd+2);
- *(pWork+3) = 0x00; /* transparant for alpha-canvasses */
-
- pWork += 4;
- pBkgd += 3;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SKIPCANVAS_RGB8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGR8
-mng_retcode mng_restore_bkgd_bgr8 (mng_datap pData)
-{
- mng_int32 iX;
- mng_uint8p pBkgd;
- mng_uint8p pWork = pData->pRGBArow;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BGR8, MNG_LC_START);
-#endif
-
- if (pData->fGetbkgdline) /* can we access the background ? */
- { /* point to the right pixel then */
- pBkgd = (mng_uint8p)pData->fGetbkgdline ((mng_handle)pData,
- pData->iRow + pData->iDestt) +
- (3 * pData->iDestl);
-
- for (iX = (pData->iSourcer - pData->iSourcel); iX > 0; iX--)
- {
- *pWork = *(pBkgd+2); /* ok; copy the pixel */
- *(pWork+1) = *(pBkgd+1);
- *(pWork+2) = *pBkgd;
- *(pWork+3) = 0x00; /* transparant for alpha-canvasses */
-
- pWork += 4;
- pBkgd += 3;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BGR8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SKIPCANVAS_BGR8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGRX8
-mng_retcode mng_restore_bkgd_bgrx8 (mng_datap pData)
-{
- mng_int32 iX;
- mng_uint8p pBkgd;
- mng_uint8p pWork = pData->pRGBArow;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BGRX8, MNG_LC_START);
-#endif
-
- if (pData->fGetbkgdline) /* can we access the background ? */
- { /* point to the right pixel then */
- pBkgd = (mng_uint8p)pData->fGetbkgdline ((mng_handle)pData,
- pData->iRow + pData->iDestt) +
- (3 * pData->iDestl);
-
- for (iX = (pData->iSourcer - pData->iSourcel); iX > 0; iX--)
- {
- *pWork = *(pBkgd+2); /* ok; copy the pixel */
- *(pWork+1) = *(pBkgd+1);
- *(pWork+2) = *pBkgd;
- *(pWork+3) = 0x00; /* transparant for alpha-canvasses */
-
- pWork += 4;
- pBkgd += 4;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BGRX8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SKIPCANVAS_BGRX8 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_BGR565
-mng_retcode mng_restore_bkgd_bgr565 (mng_datap pData)
-{
- mng_int32 iX;
- mng_uint8p pBkgd;
- mng_uint8p pWork = pData->pRGBArow;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BGR565, MNG_LC_START);
-#endif
-
- if (pData->fGetbkgdline) /* can we access the background ? */
- { /* point to the right pixel then */
- pBkgd = (mng_uint8p)pData->fGetbkgdline ((mng_handle)pData,
- pData->iRow + pData->iDestt) +
- (3 * pData->iDestl);
-
- for (iX = (pData->iSourcer - pData->iSourcel); iX > 0; iX--)
- {
- *pWork = (mng_uint8)( *(pBkgd+1) & 0xF8); /* ok; copy the pixel */
- *(pWork+1) = (mng_uint8)( (*(pBkgd+1) << 5 ) | ( ((*pBkgd)&0xE0)>>3 ) );
- *(pWork+2) = (mng_uint8)( *(pBkgd) << 3 );
- *(pWork+3) = 0x00; /* transparant for alpha-canvasses */
-
- pWork += 4;
- pBkgd += 2;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_BGR565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SKIPCANVAS_BGR565 */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_RGB565
-mng_retcode mng_restore_bkgd_rgb565 (mng_datap pData)
-{
- mng_int32 iX;
- mng_uint8p pBkgd;
- mng_uint8p pWork = pData->pRGBArow;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_RGB565, MNG_LC_START);
-#endif
-
- if (pData->fGetbkgdline) /* can we access the background ? */
- { /* point to the right pixel then */
- pBkgd = (mng_uint8p)pData->fGetbkgdline ((mng_handle)pData,
- pData->iRow + pData->iDestt) +
- (3 * pData->iDestl);
-
- for (iX = (pData->iSourcer - pData->iSourcel); iX > 0; iX--)
- {
- *pWork = (mng_uint8)( *(pBkgd)&0xF8); /* ok; copy the pixel */
- *(pWork+1) = (mng_uint8)( (*(pBkgd+1) << 5) | ( ((*pBkgd)&0xE0)>>3 ) );
- *(pWork+2) = (mng_uint8)( *(pBkgd+1) << 3);
- *(pWork+3) = 0x00; /* transparant for alpha-canvasses */
-
- pWork += 4;
- pBkgd += 2;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RESTORE_RGB565, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SKIPCANVAS_RBB565 */
-
-
-/* ************************************************************************** */
-/* * * */
-/* * Row retrieval routines - retrieve processed & uncompressed row-data * */
-/* * from the current "object" * */
-/* * * */
-/* ************************************************************************** */
-
-/* TODO: a serious optimization is to retrieve only those pixels that will
- actually be displayed; this would require changes in
- the "display_image" routine (in mng_display.c) &
- all the "retrieve_xxx" routines below &
- the "display_xxx" routines above !!!!!
- NOTE that "correct_xxx" routines would not require modification */
-
-mng_retcode mng_retrieve_g8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pRetrieveobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iG;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_G8, MNG_LC_START);
-#endif
-
- pRGBArow = pData->pRGBArow; /* temporary work pointers */
- pWorkrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize);
-
- if (pBuf->bHasTRNS) /* tRNS in buffer ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iG = *pWorkrow; /* get the gray-value */
- /* is it transparent ? */
- if ((mng_uint16)iG == pBuf->iTRNSgray)
- {
- *pRGBArow = 0x00; /* nuttin to display */
- *(pRGBArow+1) = 0x00;
- *(pRGBArow+2) = 0x00;
- *(pRGBArow+3) = 0x00;
- }
- else
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- mng_uint8 multiplier[]={0,255,85,0,17,0,0,0,1};
- iG = (mng_uint8)(iG * multiplier[pBuf->iBitdepth]);
-#endif
-
- *pRGBArow = iG; /* put in intermediate row */
- *(pRGBArow+1) = iG;
- *(pRGBArow+2) = iG;
- *(pRGBArow+3) = 0xFF;
- }
-
- pWorkrow++; /* next pixel */
- pRGBArow += 4;
- }
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- mng_uint8 multiplier[]={0,255,85,0,17,0,0,0,1}; /* LBR scaling */
- iG = (mng_uint8)(multiplier[pBuf->iBitdepth] * *pWorkrow);
-#else
- iG = *pWorkrow; /* get the gray-value */
-#endif
-
- *pRGBArow = iG; /* put in intermediate row */
- *(pRGBArow+1) = iG;
- *(pRGBArow+2) = iG;
- *(pRGBArow+3) = 0xFF;
-
- pWorkrow++; /* next pixel */
- pRGBArow += 4;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_retrieve_g16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pRetrieveobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint16 iG;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_G16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pRGBArow = pData->pRGBArow;
- pWorkrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize);
-
- if (pBuf->bHasTRNS) /* tRNS in buffer ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iG = mng_get_uint16 (pWorkrow); /* get the gray-value */
- /* is it transparent ? */
- if (iG == pBuf->iTRNSgray)
- { /* nuttin to display */
- mng_put_uint16 (pRGBArow, 0x0000);
- mng_put_uint16 (pRGBArow+2, 0x0000);
- mng_put_uint16 (pRGBArow+4, 0x0000);
- mng_put_uint16 (pRGBArow+6, 0x0000);
- }
- else
- { /* put in intermediate row */
- mng_put_uint16 (pRGBArow, iG);
- mng_put_uint16 (pRGBArow+2, iG);
- mng_put_uint16 (pRGBArow+4, iG);
- mng_put_uint16 (pRGBArow+6, 0xFFFF);
- }
-
- pWorkrow += 2; /* next pixel */
- pRGBArow += 8;
- }
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iG = mng_get_uint16 (pWorkrow); /* get the gray-value */
-
- mng_put_uint16 (pRGBArow, iG); /* and put in intermediate row */
- mng_put_uint16 (pRGBArow+2, iG);
- mng_put_uint16 (pRGBArow+4, iG);
- mng_put_uint16 (pRGBArow+6, 0xFFFF);
-
- pWorkrow += 2; /* next pixel */
- pRGBArow += 8;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_retrieve_rgb8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pRetrieveobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iR, iG, iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_RGB8, MNG_LC_START);
-#endif
-
- pRGBArow = pData->pRGBArow; /* temporary work pointers */
- pWorkrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize);
-
- if (pBuf->bHasTRNS) /* tRNS in buffer ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iR = *pWorkrow; /* get the rgb-values */
- iG = *(pWorkrow+1);
- iB = *(pWorkrow+2);
- /* is it transparent ? */
- if (((mng_uint16)iR == pBuf->iTRNSred ) &&
- ((mng_uint16)iG == pBuf->iTRNSgreen) &&
- ((mng_uint16)iB == pBuf->iTRNSblue ) )
- {
- *pRGBArow = 0x00; /* nothing to display */
- *(pRGBArow+1) = 0x00;
- *(pRGBArow+2) = 0x00;
- *(pRGBArow+3) = 0x00;
- }
- else
- {
- *pRGBArow = iR; /* put in intermediate row */
- *(pRGBArow+1) = iG;
- *(pRGBArow+2) = iB;
- *(pRGBArow+3) = 0xFF;
- }
-
- pWorkrow += 3; /* next pixel */
- pRGBArow += 4;
- }
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pRGBArow = *pWorkrow; /* just copy the pixel */
- *(pRGBArow+1) = *(pWorkrow+1);
- *(pRGBArow+2) = *(pWorkrow+2);
- *(pRGBArow+3) = 0xFF;
-
- pWorkrow += 3; /* next pixel */
- pRGBArow += 4;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_retrieve_rgb16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pRetrieveobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint16 iR, iG, iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_RGB16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pRGBArow = pData->pRGBArow;
- pWorkrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize);
-
- if (pBuf->bHasTRNS) /* tRNS in buffer ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iR = mng_get_uint16 (pWorkrow); /* get the rgb-values */
- iG = mng_get_uint16 (pWorkrow+2);
- iB = mng_get_uint16 (pWorkrow+4);
- /* is it transparent ? */
- if ((iR == pBuf->iTRNSred ) &&
- (iG == pBuf->iTRNSgreen) &&
- (iB == pBuf->iTRNSblue ) )
- { /* nothing to display */
- mng_put_uint16 (pRGBArow, 0x0000);
- mng_put_uint16 (pRGBArow+2, 0x0000);
- mng_put_uint16 (pRGBArow+4, 0x0000);
- mng_put_uint16 (pRGBArow+6, 0x0000);
- }
- else
- { /* put in intermediate row */
- mng_put_uint16 (pRGBArow, iR);
- mng_put_uint16 (pRGBArow+2, iG);
- mng_put_uint16 (pRGBArow+4, iB);
- mng_put_uint16 (pRGBArow+6, 0xFFFF);
- }
-
- pWorkrow += 6; /* next pixel */
- pRGBArow += 8;
- }
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* just copy the pixel */
- mng_put_uint16 (pRGBArow, mng_get_uint16 (pWorkrow ));
- mng_put_uint16 (pRGBArow+2, mng_get_uint16 (pWorkrow+2));
- mng_put_uint16 (pRGBArow+4, mng_get_uint16 (pWorkrow+4));
- mng_put_uint16 (pRGBArow+6, 0xFFFF);
-
- pWorkrow += 6; /* next pixel */
- pRGBArow += 8;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_retrieve_idx8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pRetrieveobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_IDX8, MNG_LC_START);
-#endif
-
- pRGBArow = pData->pRGBArow; /* temporary work pointers */
- pWorkrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize);
-
- if (pBuf->bHasTRNS) /* tRNS in buffer ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iQ = *pWorkrow; /* get the index */
- /* is it valid ? */
- if ((mng_uint32)iQ < pBuf->iPLTEcount)
- { /* put in intermediate row */
- *pRGBArow = pBuf->aPLTEentries [iQ].iRed;
- *(pRGBArow+1) = pBuf->aPLTEentries [iQ].iGreen;
- *(pRGBArow+2) = pBuf->aPLTEentries [iQ].iBlue;
- /* transparency for this index ? */
- if ((mng_uint32)iQ < pBuf->iTRNScount)
- *(pRGBArow+3) = pBuf->aTRNSentries [iQ];
- else
- *(pRGBArow+3) = 0xFF;
- }
- else
- MNG_ERROR (pData, MNG_PLTEINDEXERROR);
-
- pWorkrow++; /* next pixel */
- pRGBArow += 4;
- }
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iQ = *pWorkrow; /* get the index */
- /* is it valid ? */
- if ((mng_uint32)iQ < pBuf->iPLTEcount)
- { /* put in intermediate row */
- *pRGBArow = pBuf->aPLTEentries [iQ].iRed;
- *(pRGBArow+1) = pBuf->aPLTEentries [iQ].iGreen;
- *(pRGBArow+2) = pBuf->aPLTEentries [iQ].iBlue;
- *(pRGBArow+3) = 0xFF;
- }
- else
- MNG_ERROR (pData, MNG_PLTEINDEXERROR);
-
- pWorkrow++; /* next pixel */
- pRGBArow += 4;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_IDX8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_retrieve_ga8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pRetrieveobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iG;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_GA8, MNG_LC_START);
-#endif
-
- pRGBArow = pData->pRGBArow; /* temporary work pointers */
- pWorkrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iG = *pWorkrow; /* get the gray-value */
- *pRGBArow = iG; /* put in intermediate row */
- *(pRGBArow+1) = iG;
- *(pRGBArow+2) = iG;
- *(pRGBArow+3) = *(pWorkrow+1);
-
- pWorkrow += 2; /* next pixel */
- pRGBArow += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_GA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_retrieve_ga16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pRetrieveobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint16 iG;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_GA16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pRGBArow = pData->pRGBArow;
- pWorkrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iG = mng_get_uint16 (pWorkrow); /* get the gray-value */
-
- mng_put_uint16 (pRGBArow, iG); /* and put in intermediate row */
- mng_put_uint16 (pRGBArow+2, iG);
- mng_put_uint16 (pRGBArow+4, iG);
- mng_put_uint16 (pRGBArow+6, mng_get_uint16 (pWorkrow+2));
-
- pWorkrow += 4; /* next pixel */
- pRGBArow += 8;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_GA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_retrieve_rgba8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pRetrieveobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_RGBA8, MNG_LC_START);
-#endif
-
- pRGBArow = pData->pRGBArow; /* temporary work pointers */
- pWorkrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize);
- /* can't be easier than this ! */
- MNG_COPY (pRGBArow, pWorkrow, pBuf->iRowsize);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_retrieve_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pRetrieveobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_RGBA16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pRGBArow = pData->pRGBArow;
- pWorkrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize);
- /* can't be easier than this ! */
- MNG_COPY (pRGBArow, pWorkrow, pBuf->iRowsize);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RETRIEVE_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Row storage routines - store processed & uncompressed row-data * */
-/* * into the current "object" * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_store_g1 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_G1, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* is it white ? */
- *pOutrow = 0x01; /* white */
- else
- *pOutrow = 0x00; /* black */
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 1;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_G1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_g2 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint8 iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_G2, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
-
- iQ = (mng_uint8)((iB & iM) >> iS); /* get the gray level */
- *pOutrow = iQ; /* put in object buffer */
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_G2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_g4 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint8 iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_G4, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
-
- iQ = (mng_uint8)((iB & iM) >> iS); /* get the gray level */
- *pOutrow = iQ; /* put in object buffer */
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_G4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_g8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_G8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
-
- pOutrow += pData->iColinc; /* next pixel */
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_g16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_G16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* copy into object buffer */
- mng_put_uint16 (pOutrow, mng_get_uint16 (pWorkrow));
-
- pOutrow += (pData->iColinc << 1); /* next pixel */
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_rgb8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_RGB8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* copy the RGB bytes */
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
-
- pWorkrow += 3; /* next pixel */
- pOutrow += (pData->iColinc * 3);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_rgb16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_RGB16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- MNG_COPY (pOutrow, pWorkrow, 6); /* copy the RGB bytes */
-
- pWorkrow += 6; /* next pixel */
- pOutrow += (pData->iColinc * 6);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_store_idx1 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_IDX1, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* store the index */
- *pOutrow = 0x01;
- else
- *pOutrow = 0x00;
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 1;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_IDX1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_idx2 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_IDX2, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
- /* store the index */
- *pOutrow = (mng_uint8)((iB & iM) >> iS);
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_IDX2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_idx4 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_IDX4, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* store the index */
- *pOutrow = (mng_uint8)((iB & iM) >> iS);
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_IDX4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_idx8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_IDX8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
-
- pOutrow += pData->iColinc; /* next pixel */
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_IDX8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_ga8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_GA8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* copy the GA bytes */
- *(pOutrow+1) = *(pWorkrow+1);
-
- pWorkrow += 2; /* next pixel */
- pOutrow += (pData->iColinc << 1);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_GA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_ga16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_GA16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- MNG_COPY (pOutrow, pWorkrow, 4); /* copy the GA bytes */
-
- pWorkrow += 4; /* next pixel */
- pOutrow += (pData->iColinc << 2);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_GA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_rgba8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_RGBA8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* copy the RGBA bytes */
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
- *(pOutrow+3) = *(pWorkrow+3);
-
- pWorkrow += 4; /* next pixel */
- pOutrow += (pData->iColinc << 2);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_RGBA16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- MNG_COPY (pOutrow, pWorkrow, 8); /* copy the RGBA bytes */
-
- pWorkrow += 8; /* next pixel */
- pOutrow += (pData->iColinc << 3);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Row storage routines (JPEG) - store processed & uncompressed row-data * */
-/* * into the current "object" * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_g8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pJPEGrow; /* temporary work pointers */
- pOutrow = pBuf->pImgdata + (pData->iJPEGrow * pBuf->iRowsize);
- /* easy as pie ... */
- MNG_COPY (pOutrow, pWorkrow, pData->iRowsamples);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8, MNG_LC_END);
-#endif
-
- return mng_next_jpeg_row (pData); /* we've got one more row of gray-samples */
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_rgb8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
-#if RGB_PIXELSIZE != 3
- mng_int32 iX;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pJPEGrow; /* temporary work pointers */
- pOutrow = pBuf->pImgdata + (pData->iJPEGrow * pBuf->iRowsize);
-
-#if RGB_PIXELSIZE == 3
- /* easy as pie ... */
- MNG_COPY (pOutrow, pWorkrow, pData->iRowsamples * 3);
-#else
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* copy pixel into object buffer */
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
-
- pOutrow += 3; /* next pixel */
- pWorkrow += RGB_PIXELSIZE;
- }
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8, MNG_LC_END);
-#endif
-
- return mng_next_jpeg_row (pData); /* we've got one more row of rgb-samples */
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_ga8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_GA8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pJPEGrow; /* temporary work pointers */
- pOutrow = pBuf->pImgdata + (pData->iJPEGrow * pBuf->iRowsize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* copy into object buffer */
-
- pOutrow += 2; /* next pixel */
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_GA8, MNG_LC_END);
-#endif
-
- return mng_next_jpeg_row (pData); /* we've got one more row of gray-samples */
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_rgba8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGBA8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pJPEGrow; /* temporary work pointers */
- pOutrow = pBuf->pImgdata + (pData->iJPEGrow * pBuf->iRowsize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* copy pixel into object buffer */
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
-
- pOutrow += 4; /* next pixel */
- pWorkrow += RGB_PIXELSIZE;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGBA8, MNG_LC_END);
-#endif
-
- return mng_next_jpeg_row (pData); /* we've got one more row of rgb-samples */
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_g8_alpha (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_ALPHA, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pJPEGrow2;
- pOutrow = pBuf->pImgdata + (pData->iJPEGalpharow * pBuf->iRowsize) + 1;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
-
- pOutrow += 2; /* next pixel */
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_ALPHA, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_rgb8_alpha (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_ALPHA, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pJPEGrow2;
- pOutrow = pBuf->pImgdata + (pData->iJPEGalpharow * pBuf->iRowsize) + 3;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
-
- pOutrow += 4; /* next pixel */
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_ALPHA, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_store_jpeg_g8_a1 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_A1, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 1;
- iM = 0; /* start at pixel 0 */
- iB = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* is it opaque ? */
- *pOutrow = 0xFF; /* opaque */
- else
- *pOutrow = 0x00; /* transparent */
-
- pOutrow += 2; /* next pixel */
- iM >>= 1;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_A1, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_g8_a2 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_A2, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 1;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_SWITCH
- {
- const mng_uint8 alpha_level[4] = { 0x00, 0x55, 0xAA, 0xFF};
- *pOutrow = alpha_level[((iB & iM) >> iS)] ;
- }
-#else
- switch ((iB & iM) >> iS) /* determine the alpha level */
- {
- case 0x03 : { *pOutrow = 0xFF; break; }
- case 0x02 : { *pOutrow = 0xAA; break; }
- case 0x01 : { *pOutrow = 0x55; break; }
- default : { *pOutrow = 0x00; }
- }
-#endif
-
- pOutrow += 2; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_A2, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_g8_a4 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint8 iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_A4, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 1;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* get the alpha level */
- iQ = (mng_uint8)((iB & iM) >> iS);
- iQ = (mng_uint8)(iQ + (iQ << 4)); /* expand to 8-bit by replication */
-
- *pOutrow = iQ; /* put in object buffer */
-
- pOutrow += 2; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_A4, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_g8_a8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_A8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 1;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
-
- pOutrow += 2; /* next pixel */
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_A8, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_jpeg_g8_a16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_A16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 1;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* only high-order byte! */
-
- pOutrow += 2; /* next pixel */
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G8_A16, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_store_jpeg_rgb8_a1 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_A1, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 3;
- iM = 0; /* start at pixel 0 */
- iB = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* is it opaque ? */
- *pOutrow = 0xFF; /* opaque */
- else
- *pOutrow = 0x00; /* transparent */
-
- pOutrow += 4; /* next pixel */
- iM >>= 1;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_A1, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_rgb8_a2 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_A2, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 3;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_SWITCH
- {
- const mng_uint8 alpha_level[4] = { 0x00, 0x55, 0xAA, 0xFF};
- *pOutrow = alpha_level[((iB & iM) >> iS)] ;
- }
-#else
- switch ((iB & iM) >> iS) /* determine the alpha level */
- {
- case 0x03 : { *pOutrow = 0xFF; break; }
- case 0x02 : { *pOutrow = 0xAA; break; }
- case 0x01 : { *pOutrow = 0x55; break; }
- default : { *pOutrow = 0x00; }
- }
-#endif
-
- pOutrow += 4; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_A2, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_rgb8_a4 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint8 iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_A4, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 3;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* get the alpha level */
- iQ = (mng_uint8)((iB & iM) >> iS);
- iQ = (mng_uint8)(iQ + (iQ << 4)); /* expand to 8-bit by replication */
-
- *pOutrow = iQ; /* put in object buffer */
-
- pOutrow += 4; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_A4, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_store_jpeg_rgb8_a8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_A8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 3;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in buffer */
-
- pOutrow += 4; /* next pixel */
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_A8, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_jpeg_rgb8_a16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_A16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 3;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* only high-order byte */
-
- pOutrow += 4; /* next pixel */
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_RGB8_A16, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_JPEG12
-mng_retcode mng_store_jpeg_g12_a1 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G12_A1, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 2;
- iM = 0; /* start at pixel 0 */
- iB = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* opaque ? */
- mng_put_uint16 (pOutrow, 0xFFFF);/* opaque */
- else
- mng_put_uint16 (pOutrow, 0x0000);/* transparent */
-
- pOutrow += 4; /* next pixel */
- iM >>= 1;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G12_A1, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-#endif /* MNG_SUPPORT_JPEG12 */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_JPEG12
-mng_retcode mng_store_jpeg_g12_a2 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G12_A2, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 2;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_SWITCH
- {
- const mng_uint16 gray_level[4] = { 0x0000, 0x5555, 0xAAAA, 0xFFFF};
- mng_put_uint16 (pOutrow, gray_level[((iB & iM) >> iS)]) ;
- }
-#else
- switch ((iB & iM) >> iS) /* determine the gray level */
- {
- case 0x03 : { mng_put_uint16 (pOutrow, 0xFFFF); break; }
- case 0x02 : { mng_put_uint16 (pOutrow, 0xAAAA); break; }
- case 0x01 : { mng_put_uint16 (pOutrow, 0x5555); break; }
- default : { mng_put_uint16 (pOutrow, 0x0000); }
- }
-#endif
-
- pOutrow += 4; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G12_A2, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-#endif /* MNG_SUPPORT_JPEG12 */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_JPEG12
-mng_retcode mng_store_jpeg_g12_a4 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint16 iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G12_A4, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 2;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* get the gray level */
- iQ = (mng_uint16)((iB & iM) >> iS);
- iQ = (mng_uint16)(iQ + (iQ << 4)); /* expand to 16-bit by replication */
- iQ = (mng_uint16)(iQ + (iQ << 8));
- /* put in object buffer */
- mng_put_uint16 (pOutrow, iQ);
-
- pOutrow += 4; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G12_A4, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-#endif /* MNG_SUPPORT_JPEG12 */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_JPEG12
-mng_retcode mng_store_jpeg_g12_a8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint16 iW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G12_A8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 2;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iW = (mng_uint16)(*pWorkrow); /* get input byte */
- iW = (mng_uint16)(iW + (iW << 8)); /* expand to 16-bit by replication */
-
- mng_put_uint16 (pOutrow, iW); /* put in object buffer */
-
- pOutrow += 4; /* next pixel */
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G12_A8, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-#endif /* MNG_SUPPORT_JPEG12 */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_JPEG12
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_jpeg_g12_a16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G12_A16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 2;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* copy it */
- mng_put_uint16 (pOutrow, mng_get_uint16 (pWorkrow));
-
- pOutrow += 4; /* next pixel */
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_STORE_JPEG_G12_A16, MNG_LC_END);
-#endif
- /* we've got one more row of alpha-samples */
- return mng_next_jpeg_alpharow (pData);
-}
-#endif
-#endif /* MNG_SUPPORT_JPEG12 */
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_JNG */
-
-#ifndef MNG_NO_DELTA_PNG
-/* ************************************************************************** */
-/* * * */
-/* * Delta-image row routines - apply the processed & uncompressed row-data * */
-/* * onto the target "object" * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_delta_g1 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G1, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* is it white ? */
- *pOutrow = 0xFF; /* white */
- else
- *pOutrow = 0x00; /* black */
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 1;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* invert if it is white ? */
- *pOutrow = (mng_uint8)(*pOutrow ^ 0xFF);
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 1;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G1, MNG_LC_END);
-#endif
-
- return mng_store_g1 (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_g2 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_SWITCH
- const mng_uint8 level[4] = { 0x00, 0x55, 0xAA, 0xFF};
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G2, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_SWITCH
- *pOutrow = level[((iB & iM) >> iS)] ;
-#else
- switch ((iB & iM) >> iS) /* determine the alpha level */
- {
- case 0x03 : { *pOutrow = 0xFF; break; }
- case 0x02 : { *pOutrow = 0xAA; break; }
- case 0x01 : { *pOutrow = 0x55; break; }
- default : { *pOutrow = 0x00; }
- }
-#endif
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_SWITCH
- *pOutrow = level[((*pOutrow >> 6) + ((iB & iM) >> iS)) & 0x03] ;
-#else
- switch (((*pOutrow >> 6) + ((iB & iM) >> iS)) & 0x03)
- {
- case 0x03 : { *pOutrow = 0xFF; break; }
- case 0x02 : { *pOutrow = 0xAA; break; }
- case 0x01 : { *pOutrow = 0x55; break; }
- default : { *pOutrow = 0x00; }
- }
-#endif
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G2, MNG_LC_END);
-#endif
-
- return mng_store_g2 (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_g4 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint8 iQ;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G4, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* get the gray level */
- iQ = (mng_uint8)((iB & iM) >> iS);
- /* expand to 8-bit by replication */
- iQ = (mng_uint8)(iQ + (iQ << 4));
-
- *pOutrow = iQ; /* put in object buffer */
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* get the gray level */
- iQ = (mng_uint8)(((*pOutrow >> 4) + ((iB & iM) >> iS)) & 0x0F);
- /* expand to 8-bit by replication */
- iQ = (mng_uint8)(iQ + (iQ << 4));
-
- *pOutrow = iQ; /* put in object buffer */
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G4, MNG_LC_END);
-#endif
-
- return mng_store_g4 (pData);
-}
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_g8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
-
- pOutrow += pData->iColinc; /* next pixel */
- pWorkrow++;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* add to object buffer */
- *pOutrow = (mng_uint8)(*pOutrow + *pWorkrow);
-
- pOutrow += pData->iColinc; /* next pixel */
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G8, MNG_LC_END);
-#endif
-
- return mng_store_g8 (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_g16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
- *(pOutrow+1) = *(pWorkrow+1);
- /* next pixel */
- pOutrow += (pData->iColinc << 1);
- pWorkrow += 2;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* add to object buffer */
- mng_put_uint16 (pOutrow, (mng_uint16)(mng_get_uint16 (pOutrow ) +
- mng_get_uint16 (pWorkrow) ));
- /* next pixel */
- pOutrow += (pData->iColinc << 1);
- pWorkrow += 2;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G16, MNG_LC_END);
-#endif
-
- return mng_store_g16 (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_rgb8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGB8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
- /* next pixel */
- pOutrow += (pData->iColinc * 3);
- pWorkrow += 3;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* add to object buffer */
- *pOutrow = (mng_uint8)(*pOutrow + *pWorkrow );
- *(pOutrow+1) = (mng_uint8)(*(pOutrow+1) + *(pWorkrow+1));
- *(pOutrow+2) = (mng_uint8)(*(pOutrow+2) + *(pWorkrow+2));
- /* next pixel */
- pOutrow += (pData->iColinc * 3);
- pWorkrow += 3;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGB8, MNG_LC_END);
-#endif
-
- return mng_store_rgb8 (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_rgb16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGB16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
- *(pOutrow+3) = *(pWorkrow+3);
- *(pOutrow+4) = *(pWorkrow+4);
- *(pOutrow+5) = *(pWorkrow+5);
- /* next pixel */
- pOutrow += (pData->iColinc * 6);
- pWorkrow += 6;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* add to object buffer */
- mng_put_uint16 (pOutrow, (mng_uint16)(mng_get_uint16 (pOutrow ) +
- mng_get_uint16 (pWorkrow ) ));
- mng_put_uint16 (pOutrow+2, (mng_uint16)(mng_get_uint16 (pOutrow+2 ) +
- mng_get_uint16 (pWorkrow+2) ));
- mng_put_uint16 (pOutrow+4, (mng_uint16)(mng_get_uint16 (pOutrow+4 ) +
- mng_get_uint16 (pWorkrow+4) ));
- /* next pixel */
- pOutrow += (pData->iColinc * 6);
- pWorkrow += 6;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGB16, MNG_LC_END);
-#endif
-
- return mng_store_rgb16 (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_delta_idx1 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_IDX1, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* put the right index value */
- *pOutrow = 1;
- else
- *pOutrow = 0;
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 1;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* invert if it is non-zero index */
- *pOutrow = (mng_uint8)(*pOutrow ^ 0x01);
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 1;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_IDX1, MNG_LC_END);
-#endif
-
- return mng_store_idx1 (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_idx2 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_IDX2, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
- /* put the index */
- *pOutrow = (mng_uint8)((iB & iM) >> iS);
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
- /* calculate the index */
- *pOutrow = (mng_uint8)((*pOutrow + ((iB & iM) >> iS)) & 0x03);
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_IDX2, MNG_LC_END);
-#endif
-
- return mng_store_idx2 (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_idx4 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_IDX4, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* put the index */
- *pOutrow = (mng_uint8)((iB & iM) >> iS);
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* calculate the index */
- *pOutrow = (mng_uint8)((*pOutrow + ((iB & iM) >> iS)) & 0x0F);
-
- pOutrow += pData->iColinc; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_IDX4, MNG_LC_END);
-#endif
-
- return mng_store_idx4 (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_idx8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_IDX8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
-
- pOutrow += pData->iColinc; /* next pixel */
- pWorkrow++;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* add to object buffer */
- *pOutrow = (mng_uint8)(*pOutrow + *pWorkrow);
-
- pOutrow += pData->iColinc; /* next pixel */
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_IDX8, MNG_LC_END);
-#endif
-
- return mng_store_idx8 (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_ga8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
- *(pOutrow+1) = *(pWorkrow+1);
- /* next pixel */
- pOutrow += (pData->iColinc << 1);
- pWorkrow += 2;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* add to object buffer */
- *pOutrow = (mng_uint8)(*pOutrow + *pWorkrow );
- *(pOutrow+1) = (mng_uint8)(*(pOutrow+1) + *(pWorkrow+1));
- /* next pixel */
- pOutrow += (pData->iColinc << 1);
- pWorkrow += 2;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA8, MNG_LC_END);
-#endif
-
- return mng_store_ga8 (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_ga16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
- *(pOutrow+3) = *(pWorkrow+3);
- /* next pixel */
- pOutrow += (pData->iColinc << 2);
- pWorkrow += 4;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* add to object buffer */
- mng_put_uint16 (pOutrow, (mng_uint16)(mng_get_uint16 (pOutrow ) +
- mng_get_uint16 (pWorkrow ) ));
- mng_put_uint16 (pOutrow+2, (mng_uint16)(mng_get_uint16 (pOutrow+2 ) +
- mng_get_uint16 (pWorkrow+2) ));
- /* next pixel */
- pOutrow += (pData->iColinc << 2);
- pWorkrow += 4;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA16, MNG_LC_END);
-#endif
-
- return mng_store_ga16 (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_rgba8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow; /* put in object buffer */
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
- *(pOutrow+3) = *(pWorkrow+3);
- /* next pixel */
- pOutrow += (pData->iColinc << 2);
- pWorkrow += 4;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* add to object buffer */
- *pOutrow = (mng_uint8)(*pOutrow + *pWorkrow );
- *(pOutrow+1) = (mng_uint8)(*(pOutrow+1) + *(pWorkrow+1));
- *(pOutrow+2) = (mng_uint8)(*(pOutrow+2) + *(pWorkrow+2));
- *(pOutrow+3) = (mng_uint8)(*(pOutrow+3) + *(pWorkrow+3));
- /* next pixel */
- pOutrow += (pData->iColinc << 2);
- pWorkrow += 4;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA8, MNG_LC_END);
-#endif
-
- return mng_store_rgba8 (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pDeltaImage)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iDeltaBlocky * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) +
- (pData->iDeltaBlockx * pBuf->iSamplesize);
- /* pixel replace ? */
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- MNG_COPY (pOutrow, pWorkrow, 8); /* put in object buffer */
- /* next pixel */
- pOutrow += (pData->iColinc << 3);
- pWorkrow += 8;
- }
- }
- else
- { /* pixel add ! */
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* add to object buffer */
- mng_put_uint16 (pOutrow, (mng_uint16)(mng_get_uint16 (pOutrow ) +
- mng_get_uint16 (pWorkrow ) ));
- mng_put_uint16 (pOutrow+2, (mng_uint16)(mng_get_uint16 (pOutrow+2 ) +
- mng_get_uint16 (pWorkrow+2) ));
- mng_put_uint16 (pOutrow+4, (mng_uint16)(mng_get_uint16 (pOutrow+4 ) +
- mng_get_uint16 (pWorkrow+4) ));
- mng_put_uint16 (pOutrow+6, (mng_uint16)(mng_get_uint16 (pOutrow+6 ) +
- mng_get_uint16 (pWorkrow+6) ));
- /* next pixel */
- pOutrow += (pData->iColinc << 3);
- pWorkrow += 8;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA16, MNG_LC_END);
-#endif
-
- return mng_store_rgba16 (pData);
-}
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Delta-image row routines - apply the source row onto the target * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_delta_g1_g1 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G1_G1, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, pData->iRowsamples);
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow) & 0x01);
-
- pOutrow++;
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G1_G1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_g2_g2 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G2_G2, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, pData->iRowsamples);
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow) & 0x03);
-
- pOutrow++;
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G2_G2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_g4_g4 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G4_G4, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, pData->iRowsamples);
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow) & 0x0F);
-
- pOutrow++;
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G4_G4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_g8_g8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G8_G8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, pData->iRowsamples);
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow) & 0xFF);
-
- pOutrow++;
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G8_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_g16_g16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G16_G16, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, (pData->iRowsamples << 1));
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow, (mng_uint16)((mng_get_uint16 (pOutrow) +
- mng_get_uint16 (pWorkrow)) & 0xFFFF));
-
- pOutrow += 2;
- pWorkrow += 2;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_G16_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_NO_DELTA_PNG */
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_rgb8_rgb8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGB8_RGB8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, pData->iRowsamples * 3);
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples*3; iX > 0; iX--)
-#else
- for (iX = 0; iX < (pData->iRowsamples * 3); iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow) & 0xFF);
-
- pOutrow++;
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGB8_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_rgb16_rgb16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGB16_RGB16, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, (pData->iRowsamples * 6));
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow, (mng_uint16)((mng_get_uint16 (pOutrow ) +
- mng_get_uint16 (pWorkrow )) & 0xFFFF));
- mng_put_uint16 (pOutrow+2, (mng_uint16)((mng_get_uint16 (pOutrow+2) +
- mng_get_uint16 (pWorkrow+2)) & 0xFFFF));
- mng_put_uint16 (pOutrow+4, (mng_uint16)((mng_get_uint16 (pOutrow+4) +
- mng_get_uint16 (pWorkrow+4)) & 0xFFFF));
-
- pOutrow += 6;
- pWorkrow += 6;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGB16_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_delta_ga8_ga8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA8_GA8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, pData->iRowsamples << 1);
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = (pData->iRowsamples<<1); iX > 0; iX--)
-#else
- for (iX = 0; iX < (pData->iRowsamples << 1); iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow) & 0xFF);
-
- pOutrow++;
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA8_GA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_ga8_g8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA8_G8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow;
-
- pOutrow += 2;
- pWorkrow++;
- }
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow) & 0xFF);
-
- pOutrow += 2;
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA8_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_ga8_a8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA8_A8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 1;
-
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow;
-
- pOutrow += 2;
- pWorkrow++;
- }
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow) & 0xFF);
-
- pOutrow += 2;
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA8_A8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_ga16_ga16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA16_GA16, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, (pData->iRowsamples << 2));
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow, (mng_uint16)((mng_get_uint16 (pOutrow ) +
- mng_get_uint16 (pWorkrow )) & 0xFFFF));
- mng_put_uint16 (pOutrow+2, (mng_uint16)((mng_get_uint16 (pOutrow+2) +
- mng_get_uint16 (pWorkrow+2)) & 0xFFFF));
-
- pOutrow += 4;
- pWorkrow += 4;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA16_GA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_ga16_g16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA16_G16, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow, mng_get_uint16 (pWorkrow));
-
- pOutrow += 4;
- pWorkrow += 2;
- }
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow, (mng_uint16)((mng_get_uint16 (pOutrow) +
- mng_get_uint16 (pWorkrow)) & 0xFFFF));
-
- pOutrow += 4;
- pWorkrow += 2;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA16_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_ga16_a16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA16_A16, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow+2, mng_get_uint16 (pWorkrow));
-
- pOutrow += 4;
- pWorkrow += 2;
- }
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow+2, (mng_uint16)((mng_get_uint16 (pOutrow+2) +
- mng_get_uint16 (pWorkrow)) & 0xFFFF));
-
- pOutrow += 4;
- pWorkrow += 2;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_GA16_A16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_NO_DELTA_PNG */
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_rgba8_rgba8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA8_RGBA8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, pData->iRowsamples << 2);
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = (pData->iRowsamples << 2); iX > 0; iX--)
-#else
- for (iX = 0; iX < (pData->iRowsamples << 2); iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow) & 0xFF);
-
- pOutrow++;
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA8_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_retcode mng_delta_rgba8_rgb8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA8_RGB8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow;
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
-
- pOutrow += 4;
- pWorkrow += 3;
- }
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow ) & 0xFF);
- *(pOutrow+1) = (mng_uint8)(((mng_uint16)*(pOutrow+1) +
- (mng_uint16)*(pWorkrow+1)) & 0xFF);
- *(pOutrow+2) = (mng_uint8)(((mng_uint16)*(pOutrow+2) +
- (mng_uint16)*(pWorkrow+2)) & 0xFF);
-
- pOutrow += 4;
- pWorkrow += 3;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA8_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_delta_rgba8_a8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA8_A8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize) + 3;
-
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = *pWorkrow;
-
- pOutrow += 4;
- pWorkrow++;
- }
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(((mng_uint16)*pOutrow +
- (mng_uint16)*pWorkrow) & 0xFF);
-
- pOutrow += 4;
- pWorkrow++;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA8_A8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_DELTA_PNG */
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_rgba16_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA16_RGBA16, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if ((pData->iDeltatype == MNG_DELTATYPE_REPLACE ) ||
- (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) )
- {
- MNG_COPY (pOutrow, pWorkrow, (pData->iRowsamples << 3));
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow, (mng_uint16)((mng_get_uint16 (pOutrow ) +
- mng_get_uint16 (pWorkrow )) & 0xFFFF));
- mng_put_uint16 (pOutrow+2, (mng_uint16)((mng_get_uint16 (pOutrow+2) +
- mng_get_uint16 (pWorkrow+2)) & 0xFFFF));
- mng_put_uint16 (pOutrow+4, (mng_uint16)((mng_get_uint16 (pOutrow+4) +
- mng_get_uint16 (pWorkrow+4)) & 0xFFFF));
- mng_put_uint16 (pOutrow+6, (mng_uint16)((mng_get_uint16 (pOutrow+6) +
- mng_get_uint16 (pWorkrow+6)) & 0xFFFF));
-
- pOutrow += 8;
- pWorkrow += 8;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA16_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_rgba16_rgb16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA16_RGB16, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow, mng_get_uint16 (pWorkrow ));
- mng_put_uint16 (pOutrow+2, mng_get_uint16 (pWorkrow+2));
- mng_put_uint16 (pOutrow+4, mng_get_uint16 (pWorkrow+4));
-
- pOutrow += 8;
- pWorkrow += 6;
- }
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKCOLORADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow, (mng_uint16)((mng_get_uint16 (pOutrow ) +
- mng_get_uint16 (pWorkrow )) & 0xFFFF));
- mng_put_uint16 (pOutrow+2, (mng_uint16)((mng_get_uint16 (pOutrow+2) +
- mng_get_uint16 (pWorkrow+2)) & 0xFFFF));
- mng_put_uint16 (pOutrow+4, (mng_uint16)((mng_get_uint16 (pOutrow+4) +
- mng_get_uint16 (pWorkrow+4)) & 0xFFFF));
-
- pOutrow += 8;
- pWorkrow += 6;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA16_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_rgba16_a16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA16_A16, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAREPLACE)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow+6, mng_get_uint16 (pWorkrow));
-
- pOutrow += 8;
- pWorkrow += 2;
- }
- }
- else
- if (pData->iDeltatype == MNG_DELTATYPE_BLOCKALPHAADD)
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- mng_put_uint16 (pOutrow+6, (mng_uint16)((mng_get_uint16 (pOutrow+6) +
- mng_get_uint16 (pWorkrow)) & 0xFFFF));
-
- pOutrow += 8;
- pWorkrow += 2;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DELTA_RGBA16_A16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_NO_DELTA_PNG */
-
-/* ************************************************************************** */
-/* * * */
-/* * Delta-image row routines - scale the delta to bitdepth of target * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_scale_g1_g2 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G1_G2, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow << 1);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G1_G2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g1_g4 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G1_G4, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow << 3);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G1_G4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g1_g8 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G1_G8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow << 7);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G1_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_scale_g1_g16 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G1_G16, MNG_LC_START);
-#endif
-
- pWorkrow = pWorkrow + (pData->iRowsamples - 1);
- pOutrow = pOutrow + ((pData->iRowsamples - 1) << 1);
-/* pWorkrow = (mng_uint8p)((mng_uint32)pWorkrow + pData->iRowsamples - 1); */
-/* pOutrow = (mng_uint8p)((mng_uint32)pOutrow + ((pData->iRowsamples - 1) << 1)); */
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pOutrow+1) = 0;
- *pOutrow = (mng_uint8)(*pWorkrow << 7);
-
- pWorkrow--;
- pOutrow -= 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G1_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g2_g4 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G2_G4, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow << 2);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G2_G4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g2_g8 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G2_G8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow << 6);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G2_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_scale_g2_g16 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G2_G16, MNG_LC_START);
-#endif
-
- pWorkrow = pWorkrow + (pData->iRowsamples - 1);
- pOutrow = pOutrow + ((pData->iRowsamples - 1) << 1);
-/* pWorkrow = (mng_uint8p)((mng_uint32)pWorkrow + pData->iRowsamples - 1); */
-/* pOutrow = (mng_uint8p)((mng_uint32)pOutrow + ((pData->iRowsamples - 1) << 1)); */
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pOutrow+1) = 0;
- *pOutrow = (mng_uint8)(*pWorkrow << 6);
-
- pWorkrow--;
- pOutrow -= 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G2_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g4_g8 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G4_G8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow << 4);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G4_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_scale_g4_g16 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G4_G16, MNG_LC_START);
-#endif
-
- pWorkrow = pWorkrow + (pData->iRowsamples - 1);
- pOutrow = pOutrow + ((pData->iRowsamples - 1) << 1);
-/* pWorkrow = (mng_uint8p)((mng_uint32)pWorkrow + pData->iRowsamples - 1); */
-/* pOutrow = (mng_uint8p)((mng_uint32)pOutrow + ((pData->iRowsamples - 1) << 1)); */
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pOutrow+1) = 0;
- *pOutrow = (mng_uint8)(*pWorkrow << 4);
-
- pWorkrow--;
- pOutrow -= 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G4_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_scale_g8_g16 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G8_G16, MNG_LC_START);
-#endif
-
- pWorkrow = pWorkrow + (pData->iRowsamples - 1);
- pOutrow = pOutrow + ((pData->iRowsamples - 1) << 1);
-/* pWorkrow = (mng_uint8p)((mng_uint32)pWorkrow + pData->iRowsamples - 1); */
-/* pOutrow = (mng_uint8p)((mng_uint32)pOutrow + ((pData->iRowsamples - 1) << 1)); */
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pOutrow+1) = 0;
- *pOutrow = *pWorkrow;
-
- pWorkrow--;
- pOutrow -= 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G8_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_scale_ga8_ga16 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_GA8_GA16, MNG_LC_START);
-#endif
-
- pWorkrow = pWorkrow + ((pData->iRowsamples - 1) << 1);
- pOutrow = pOutrow + ((pData->iRowsamples - 1) << 2);
-/* pWorkrow = (mng_uint8p)((mng_uint32)pWorkrow + ((pData->iRowsamples - 1) << 1)); */
-/* pOutrow = (mng_uint8p)((mng_uint32)pOutrow + ((pData->iRowsamples - 1) << 2)); */
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pOutrow+3) = 0;
- *(pOutrow+2) = *(pWorkrow+1);
- *(pOutrow+1) = 0;
- *pOutrow = *pWorkrow;
-
- pWorkrow -= 2;
- pOutrow -= 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_GA8_GA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_scale_rgb8_rgb16 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_RGB8_RGB16, MNG_LC_START);
-#endif
-
- pWorkrow = pWorkrow + (3 * (pData->iRowsamples - 1));
- pOutrow = pOutrow + (6 * (pData->iRowsamples - 1));
-/* pWorkrow = (mng_uint8p)((mng_uint32)pWorkrow + 3 * (pData->iRowsamples - 1)); */
-/* pOutrow = (mng_uint8p)((mng_uint32)pOutrow + 6 * (pData->iRowsamples - 1)); */
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pOutrow+5) = 0;
- *(pOutrow+4) = *(pWorkrow+2);
- *(pOutrow+3) = 0;
- *(pOutrow+2) = *(pWorkrow+1);
- *(pOutrow+1) = 0;
- *pOutrow = *pWorkrow;
-
- pWorkrow -= 3;
- pOutrow -= 6;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_RGB8_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_scale_rgba8_rgba16 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_RGBA8_RGBA16, MNG_LC_START);
-#endif
-
- pWorkrow = pWorkrow + ((pData->iRowsamples - 1) << 2);
- pOutrow = pOutrow + ((pData->iRowsamples - 1) << 3);
-/* pWorkrow = (mng_uint8p)((mng_uint32)pWorkrow + ((pData->iRowsamples - 1) << 2)); */
-/* pOutrow = (mng_uint8p)((mng_uint32)pOutrow + ((pData->iRowsamples - 1) << 3)); */
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *(pOutrow+7) = 0;
- *(pOutrow+6) = *(pWorkrow+3);
- *(pOutrow+5) = 0;
- *(pOutrow+4) = *(pWorkrow+2);
- *(pOutrow+3) = 0;
- *(pOutrow+2) = *(pWorkrow+1);
- *(pOutrow+1) = 0;
- *pOutrow = *pWorkrow;
-
- pWorkrow -= 4;
- pOutrow -= 8;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_RGBA8_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_scale_g2_g1 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G2_G1, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow >> 1);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G2_G1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g4_g1 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G4_G1, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow >> 3);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G4_G1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g8_g1 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G8_G1, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow >> 7);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G8_G1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_scale_g16_g1 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G16_G1, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 15);
- pOutrow++;
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G16_G1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g4_g2 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G4_G2, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow >> 2);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G4_G2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g8_g2 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G8_G2, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow >> 6);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G8_G2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_scale_g16_g2 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G16_G2, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 14);
- pOutrow++;
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G16_G2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g8_g4 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G8_G4, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pWorkrow = (mng_uint8)(*pWorkrow >> 4);
- pWorkrow++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G8_G4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_scale_g16_g4 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G16_G4, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 12);
- pOutrow++;
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G16_G4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* NO_1_2_4BIT_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_g16_g8 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G16_G8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 8);
- pOutrow++;
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_G16_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_ga16_ga8 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_GA16_GA8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 8);
- pOutrow++;
- pWorkrow += 2;
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 8);
- pOutrow++;
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_GA16_GA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_rgb16_rgb8 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_RGB16_RGB8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 8);
- pOutrow++;
- pWorkrow += 2;
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 8);
- pOutrow++;
- pWorkrow += 2;
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 8);
- pOutrow++;
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_RGB16_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_scale_rgba16_rgba8 (mng_datap pData)
-{
- mng_uint8p pWorkrow = pData->pRGBArow;
- mng_uint8p pOutrow = pData->pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_RGBA16_RGBA8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 8);
- pOutrow++;
- pWorkrow += 2;
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 8);
- pOutrow++;
- pWorkrow += 2;
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 8);
- pOutrow++;
- pWorkrow += 2;
- *pOutrow = (mng_uint8)(mng_get_uint16 (pWorkrow) >> 8);
- pOutrow++;
- pWorkrow += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_SCALE_RGBA16_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Delta-image bit routines - promote bit_depth * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_uint8 mng_promote_replicate_1_2 (mng_uint8 iB)
-{
- return (mng_uint8)((iB << 1) | iB);
-}
-
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_replicate_1_4 (mng_uint8 iB)
-{
- iB = (mng_uint8)((iB << 1) + iB);
- return (mng_uint8)((iB << 2) + iB);
-}
-
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_replicate_1_8 (mng_uint8 iB)
-{
- iB = (mng_uint8)((iB << 1) + iB);
- iB = (mng_uint8)((iB << 2) + iB);
- return (mng_uint8)((iB << 4) + iB);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_uint16 mng_promote_replicate_1_16 (mng_uint8 iB)
-{
- iB = (mng_uint8)((iB << 1) + iB);
- iB = (mng_uint8)((iB << 2) + iB);
- iB = (mng_uint8)((iB << 4) + iB);
- return (mng_uint16)(((mng_uint16)iB << 8) + (mng_uint16)iB);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_replicate_2_4 (mng_uint8 iB)
-{
- return (mng_uint8)((iB << 2) + iB);
-}
-
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_replicate_2_8 (mng_uint8 iB)
-{
- iB = (mng_uint8)((iB << 2) + iB);
- return (mng_uint8)((iB << 4) + iB);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_uint16 mng_promote_replicate_2_16 (mng_uint8 iB)
-{
- iB = (mng_uint8)((iB << 2) + iB);
- iB = (mng_uint8)((iB << 4) + iB);
- return (mng_uint16)(((mng_uint16)iB << 8) + (mng_uint16)iB);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_replicate_4_8 (mng_uint8 iB)
-{
- return (mng_uint8)((iB << 4) + iB);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_uint16 mng_promote_replicate_4_16 (mng_uint8 iB)
-{
- iB = (mng_uint8)((iB << 4) + iB);
- return (mng_uint16)(((mng_uint16)iB << 8) + (mng_uint16)iB);
-}
-#endif
-#endif /* NO_1_2_4BIT_SUPPORT */
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_uint16 mng_promote_replicate_8_16 (mng_uint8 iB)
-{
- return (mng_uint16)(((mng_uint16)iB << 8) + (mng_uint16)iB);
-}
-#endif
-
-/* ************************************************************************** */
-
-#if !defined(MNG_NO_DELTA_PNG)
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_uint8 mng_promote_zerofill_1_2 (mng_uint8 iB)
-{
- return (mng_uint8)(iB << 1);
-}
-
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_zerofill_1_4 (mng_uint8 iB)
-{
- return (mng_uint8)(iB << 3);
-}
-
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_zerofill_1_8 (mng_uint8 iB)
-{
- return (mng_uint8)(iB << 7);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_uint16 mng_promote_zerofill_1_16 (mng_uint8 iB)
-{
- return (mng_uint16)((mng_uint16)iB << 15);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_zerofill_2_4 (mng_uint8 iB)
-{
- return (mng_uint8)(iB << 2);
-}
-
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_zerofill_2_8 (mng_uint8 iB)
-{
- return (mng_uint8)(iB << 6);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_uint16 mng_promote_zerofill_2_16 (mng_uint8 iB)
-{
- return (mng_uint16)((mng_uint16)iB << 14);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_zerofill_4_8 (mng_uint8 iB)
-{
- return (mng_uint8)(iB << 4);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_uint16 mng_promote_zerofill_4_16 (mng_uint8 iB)
-{
- return (mng_uint16)((mng_uint16)iB << 12);
-}
-#endif
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_uint16 mng_promote_zerofill_8_16 (mng_uint8 iB)
-{
- return (mng_uint16)((mng_uint16)iB << 8);
-}
-#endif
-#endif /* MNG_NO_DELTA_PNG */
-
-/* ************************************************************************** */
-/* * * */
-/* * Delta-image row routines - promote color_type * */
-/* * * */
-/* ************************************************************************** */
-
-#if !defined(MNG_NO_DELTA_PNG) || !defined(MNG_SKIPCHUNK_PAST) || !defined(MNG_SKIPCHUNK_MAGN)
-mng_retcode mng_promote_g8_g8 (mng_datap pData)
-{
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_G8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iB = *pSrcline;
- if (pData->fPromBitdepth) /* bitdepth promoted ? */
- iB = ((mng_bitdepth_8)pData->fPromBitdepth) (iB);
- *pDstline = iB;
-
- pSrcline++;
- pDstline++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g8_g16 (mng_datap pData)
-{
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint16 iW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_G16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iW = ((mng_bitdepth_16)pData->fPromBitdepth) (*pSrcline);
-
- *pDstline = (mng_uint8)(iW >> 8);
- *(pDstline+1) = (mng_uint8)(iW && 0xFF);
-
- pSrcline++;
- pDstline += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_promote_g16_g16 (mng_datap pData)
-{
- mng_uint16p pSrcline = (mng_uint16p)pData->pPromSrc;
- mng_uint16p pDstline = (mng_uint16p)pData->pPromDst;
- mng_uint32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G16_G16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- *pDstline = *pSrcline;
- pSrcline++;
- pDstline++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G16_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_promote_g8_ga8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_GA8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iB = *pSrcline;
- /* no cheap transparency ? */
- if ((!pBuf->bHasTRNS) || ((mng_uint16)iB != pBuf->iTRNSgray))
- *(pDstline+1) = 0xFF;
-
- if (pData->fPromBitdepth) /* bitdepth promoted ? */
- iB = ((mng_bitdepth_8)pData->fPromBitdepth) (iB);
-
- *pDstline = iB;
-
- pSrcline++;
- pDstline += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_GA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g8_ga16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
- mng_uint16 iW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_GA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iB = *pSrcline;
- /* no cheap transparency ? */
- if ((!pBuf->bHasTRNS) || ((mng_uint16)iB != pBuf->iTRNSgray))
- {
- *(pDstline+2) = 0xFF;
- *(pDstline+3) = 0xFF;
- }
-
- iW = ((mng_bitdepth_16)pData->fPromBitdepth) (iB);
-
- *pDstline = (mng_uint8)(iW >> 8);
- *(pDstline+1) = (mng_uint8)(iW && 0xFF);
-
- pSrcline++;
- pDstline += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_GA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g16_ga16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint16p pSrcline = (mng_uint16p)pData->pPromSrc;
- mng_uint16p pDstline = (mng_uint16p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint16 iW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G16_GA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iW = *pSrcline;
- /* no cheap transparency ? */
- if ((!pBuf->bHasTRNS) || ((mng_uint16)iW != pBuf->iTRNSgray))
- *(pDstline+1) = 0xFFFF;
-
- *pDstline = iW;
-
- pSrcline++;
- pDstline += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G16_GA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_promote_g8_rgb8 (mng_datap pData)
-{
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_RGB8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iB = *pSrcline;
-
- if (pData->fPromBitdepth) /* bitdepth promoted ? */
- iB = ((mng_bitdepth_8)pData->fPromBitdepth) (iB);
-
- *pDstline = iB;
- *(pDstline+1) = iB;
- *(pDstline+2) = iB;
-
- pSrcline++;
- pDstline += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g8_rgb16 (mng_datap pData)
-{
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
- mng_uint16 iW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_RGB16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iB = *pSrcline;
- iW = ((mng_bitdepth_16)pData->fPromBitdepth) (iB);
-
- iB = (mng_uint8)(iW >> 8);
- *pDstline = iB;
- *(pDstline+2) = iB;
- *(pDstline+4) = iB;
- iB = (mng_uint8)(iW && 0xFF);
- *(pDstline+1) = iB;
- *(pDstline+3) = iB;
- *(pDstline+5) = iB;
-
- pSrcline++;
- pDstline += 6;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g16_rgb16 (mng_datap pData)
-{
- mng_uint16p pSrcline = (mng_uint16p)pData->pPromSrc;
- mng_uint16p pDstline = (mng_uint16p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint16 iW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G16_RGB16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iW = *pSrcline;
-
- *pDstline = iW;
- *(pDstline+1) = iW;
- *(pDstline+2) = iW;
-
- pSrcline++;
- pDstline += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G16_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_promote_g8_rgba8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_RGBA8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iB = *pSrcline;
- /* no cheap transparency ? */
- if ((!pBuf->bHasTRNS) || ((mng_uint16)iB != pBuf->iTRNSgray))
- *(pDstline+3) = 0xFF;
-
- if (pData->fPromBitdepth) /* bitdepth promoted ? */
- iB = ((mng_bitdepth_8)pData->fPromBitdepth) (iB);
-
- *pDstline = iB;
- *(pDstline+1) = iB;
- *(pDstline+2) = iB;
-
- pSrcline++;
- pDstline += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g8_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
- mng_uint16 iW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_RGBA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iB = *pSrcline;
- /* no cheap transparency ? */
- if ((!pBuf->bHasTRNS) || ((mng_uint16)iB != pBuf->iTRNSgray))
- {
- *(pDstline+6) = 0xFF;
- *(pDstline+7) = 0xFF;
- }
-
- iW = ((mng_bitdepth_16)pData->fPromBitdepth) (iB);
-
- iB = (mng_uint8)(iW >> 8);
- *pDstline = iB;
- *(pDstline+2) = iB;
- *(pDstline+4) = iB;
- iB = (mng_uint8)(iW && 0xFF);
- *(pDstline+1) = iB;
- *(pDstline+3) = iB;
- *(pDstline+5) = iB;;
-
- pSrcline++;
- pDstline += 8;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G8_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g16_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint16p pSrcline = (mng_uint16p)pData->pPromSrc;
- mng_uint16p pDstline = (mng_uint16p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint16 iW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G16_RGBA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iW = *pSrcline;
- /* no cheap transparency ? */
- if ((!pBuf->bHasTRNS) || (iW != pBuf->iTRNSgray))
- *(pDstline+3) = 0xFFFF;
-
- *pDstline = iW;
- *(pDstline+1) = iW;
- *(pDstline+2) = iW;
-
- pSrcline++;
- pDstline += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_G16_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_ga8_ga16 (mng_datap pData)
-{
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint16 iW;
- mng_uint16 iA;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_GA8_GA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iW = ((mng_bitdepth_16)pData->fPromBitdepth) (*pSrcline);
- iA = ((mng_bitdepth_16)pData->fPromBitdepth) (*(pSrcline+1));
-
- *pDstline = (mng_uint8)(iW >> 8);
- *(pDstline+1) = (mng_uint8)(iW && 0xFF);
- *(pDstline+2) = (mng_uint8)(iA >> 8);
- *(pDstline+3) = (mng_uint8)(iA && 0xFF);
-
- pSrcline += 2;
- pDstline += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_GA8_GA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_promote_ga8_rgba8 (mng_datap pData)
-{
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
- mng_uint8 iA;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_GA8_RGBA8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iB = *pSrcline;
- iA = *(pSrcline+1);
-
- *pDstline = iB;
- *(pDstline+1) = iB;
- *(pDstline+2) = iB;
- *(pDstline+3) = iA;
-
- pSrcline += 2;
- pDstline += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_GA8_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_ga8_rgba16 (mng_datap pData)
-{
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
- mng_uint16 iW;
- mng_uint16 iA;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_GA8_RGBA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iW = ((mng_bitdepth_16)pData->fPromBitdepth) (*pSrcline);
- iA = ((mng_bitdepth_16)pData->fPromBitdepth) (*(pSrcline+1));
-
- iB = (mng_uint8)(iW >> 8);
- *pDstline = iB;
- *(pDstline+2) = iB;
- *(pDstline+4) = iB;
- iB = (mng_uint8)(iW && 0xFF);
- *(pDstline+1) = iB;
- *(pDstline+3) = iB;
- *(pDstline+5) = iB;
- *(pDstline+6) = (mng_uint8)(iA >> 8);
- *(pDstline+7) = (mng_uint8)(iA && 0xFF);
-
- pSrcline += 2;
- pDstline += 8;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_GA8_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_ga16_rgba16 (mng_datap pData)
-{
- mng_uint16p pSrcline = (mng_uint16p)pData->pPromSrc;
- mng_uint16p pDstline = (mng_uint16p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint16 iW;
- mng_uint16 iA;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_GA16_RGBA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iW = *pSrcline;
- iA = *(pSrcline+1);
-
- *pDstline = iW;
- *(pDstline+1) = iW;
- *(pDstline+2) = iW;
- *(pDstline+3) = iA;
-
- pSrcline += 2;
- pDstline += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_GA16_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_rgb8_rgb16 (mng_datap pData)
-{
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint16 iR;
- mng_uint16 iG;
- mng_uint16 iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_RGB8_RGB16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iR = ((mng_bitdepth_16)pData->fPromBitdepth) (*pSrcline);
- iG = ((mng_bitdepth_16)pData->fPromBitdepth) (*(pSrcline+1));
- iB = ((mng_bitdepth_16)pData->fPromBitdepth) (*(pSrcline+2));
-
- *pDstline = (mng_uint8)(iR >> 8);
- *(pDstline+1) = (mng_uint8)(iR && 0xFF);
- *(pDstline+2) = (mng_uint8)(iG >> 8);
- *(pDstline+3) = (mng_uint8)(iG && 0xFF);
- *(pDstline+4) = (mng_uint8)(iB >> 8);
- *(pDstline+5) = (mng_uint8)(iB && 0xFF);
-
- pSrcline += 3;
- pDstline += 6;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_RGB8_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_promote_rgb8_rgba8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iR;
- mng_uint8 iG;
- mng_uint8 iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_RGB8_RGBA8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iR = *pSrcline;
- iG = *(pSrcline+1);
- iB = *(pSrcline+2);
- /* no cheap transparency ? */
- if ((!pBuf->bHasTRNS) || ((mng_uint16)iR != pBuf->iTRNSred) ||
- ((mng_uint16)iG != pBuf->iTRNSgreen) || ((mng_uint16)iB != pBuf->iTRNSblue))
- *(pDstline+3) = 0xFF;
-
- *pDstline = iR;
- *(pDstline+1) = iG;
- *(pDstline+2) = iB;
-
- pSrcline += 3;
- pDstline += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_RGB8_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_rgb8_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iR;
- mng_uint8 iG;
- mng_uint8 iB;
- mng_uint16 iRw;
- mng_uint16 iGw;
- mng_uint16 iBw;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_RGB8_RGBA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iR = *pSrcline;
- iG = *(pSrcline+1);
- iB = *(pSrcline+2);
- /* no cheap transparency ? */
- if ((!pBuf->bHasTRNS) || ((mng_uint16)iR != pBuf->iTRNSred) ||
- ((mng_uint16)iG != pBuf->iTRNSgreen) || ((mng_uint16)iB != pBuf->iTRNSblue))
- {
- *(pDstline+6) = 0xFF;
- *(pDstline+7) = 0xFF;
- }
-
- iRw = ((mng_bitdepth_16)pData->fPromBitdepth) (iR);
- iGw = ((mng_bitdepth_16)pData->fPromBitdepth) (iG);
- iBw = ((mng_bitdepth_16)pData->fPromBitdepth) (iB);
-
- *pDstline = (mng_uint8)(iRw >> 8);
- *(pDstline+1) = (mng_uint8)(iRw && 0xFF);
- *(pDstline+2) = (mng_uint8)(iGw >> 8);
- *(pDstline+3) = (mng_uint8)(iGw && 0xFF);
- *(pDstline+4) = (mng_uint8)(iBw >> 8);
- *(pDstline+5) = (mng_uint8)(iBw && 0xFF);
-
- pSrcline += 3;
- pDstline += 8;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_RGB8_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_rgb16_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint16p pSrcline = (mng_uint16p)pData->pPromSrc;
- mng_uint16p pDstline = (mng_uint16p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint16 iR;
- mng_uint16 iG;
- mng_uint16 iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_RGB16_RGBA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iR = *pSrcline;
- iG = *(pSrcline+1);
- iB = *(pSrcline+2);
- /* no cheap transparency ? */
- if ((!pBuf->bHasTRNS) || (iR != pBuf->iTRNSred) ||
- (iG != pBuf->iTRNSgreen) || (iB != pBuf->iTRNSblue))
- *(pDstline+3) = 0xFFFF;
-
- *pDstline = iR;
- *(pDstline+1) = iG;
- *(pDstline+2) = iB;
-
- pSrcline += 3;
- pDstline += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_RGB16_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_promote_idx8_rgb8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_IDX8_RGB8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iB = *pSrcline;
-
- if ((mng_uint32)iB < pBuf->iPLTEcount)
- {
- *pDstline = pBuf->aPLTEentries [iB].iRed;
- *(pDstline+1) = pBuf->aPLTEentries [iB].iGreen;
- *(pDstline+2) = pBuf->aPLTEentries [iB].iBlue;
- }
-
- pSrcline++;
- pDstline += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_IDX8_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_idx8_rgb16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iN;
- mng_uint16 iR;
- mng_uint16 iG;
- mng_uint16 iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_IDX8_RGB16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iN = *pSrcline;
-
- if ((mng_uint32)iN < pBuf->iPLTEcount)
- {
- iR = ((mng_bitdepth_16)pData->fPromBitdepth) (pBuf->aPLTEentries [iN].iRed);
- iG = ((mng_bitdepth_16)pData->fPromBitdepth) (pBuf->aPLTEentries [iN].iGreen);
- iB = ((mng_bitdepth_16)pData->fPromBitdepth) (pBuf->aPLTEentries [iN].iBlue);
- *pDstline = (mng_uint8)(iR >> 8);
- *(pDstline+1) = (mng_uint8)(iR && 0xFF);
- *(pDstline+2) = (mng_uint8)(iG >> 8);
- *(pDstline+3) = (mng_uint8)(iG && 0xFF);
- *(pDstline+4) = (mng_uint8)(iB >> 8);
- *(pDstline+5) = (mng_uint8)(iB && 0xFF);
- }
-
- pSrcline++;
- pDstline += 6;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_IDX8_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_promote_idx8_rgba8 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_IDX8_RGBA8, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iB = *pSrcline;
-
- if ((mng_uint32)iB < pBuf->iPLTEcount)
- {
- *pDstline = pBuf->aPLTEentries [iB].iRed;
- *(pDstline+1) = pBuf->aPLTEentries [iB].iGreen;
- *(pDstline+2) = pBuf->aPLTEentries [iB].iBlue;
-
- if ((pBuf->bHasTRNS) && ((mng_uint32)iB < pBuf->iTRNScount))
- *(pDstline+3) = pBuf->aTRNSentries [iB];
- else
- *(pDstline+3) = 0xFF;
- }
-
- pSrcline++;
- pDstline += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_IDX8_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_idx8_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = (mng_imagedatap)pData->pPromBuf;
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint8 iN;
- mng_uint16 iR;
- mng_uint16 iG;
- mng_uint16 iB;
- mng_uint16 iA;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_IDX8_RGBA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iN = *pSrcline;
-
- if ((mng_uint32)iN < pBuf->iPLTEcount)
- {
- iR = ((mng_bitdepth_16)pData->fPromBitdepth) (pBuf->aPLTEentries [iN].iRed);
- iG = ((mng_bitdepth_16)pData->fPromBitdepth) (pBuf->aPLTEentries [iN].iGreen);
- iB = ((mng_bitdepth_16)pData->fPromBitdepth) (pBuf->aPLTEentries [iN].iBlue);
-
- if ((pBuf->bHasTRNS) && ((mng_uint32)iN < pBuf->iTRNScount))
- iA = ((mng_bitdepth_16)pData->fPromBitdepth) (pBuf->aTRNSentries [iN]);
- else
- iA = 0xFFFF;
-
- *pDstline = (mng_uint8)(iR >> 8);
- *(pDstline+1) = (mng_uint8)(iR && 0xFF);
- *(pDstline+2) = (mng_uint8)(iG >> 8);
- *(pDstline+3) = (mng_uint8)(iG && 0xFF);
- *(pDstline+4) = (mng_uint8)(iB >> 8);
- *(pDstline+5) = (mng_uint8)(iB && 0xFF);
- *(pDstline+6) = (mng_uint8)(iA >> 8);
- *(pDstline+7) = (mng_uint8)(iA && 0xFF);
- }
-
- pSrcline++;
- pDstline += 8;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_IDX8_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_promote_rgba8_rgba16 (mng_datap pData)
-{
- mng_uint8p pSrcline = (mng_uint8p)pData->pPromSrc;
- mng_uint8p pDstline = (mng_uint8p)pData->pPromDst;
- mng_uint32 iX;
- mng_uint16 iR;
- mng_uint16 iG;
- mng_uint16 iB;
- mng_uint16 iA;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_RGBA8_RGBA16, MNG_LC_START);
-#endif
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPromWidth; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPromWidth; iX++)
-#endif
- {
- iR = ((mng_bitdepth_16)pData->fPromBitdepth) (*pSrcline);
- iG = ((mng_bitdepth_16)pData->fPromBitdepth) (*(pSrcline+1));
- iB = ((mng_bitdepth_16)pData->fPromBitdepth) (*(pSrcline+2));
- iA = ((mng_bitdepth_16)pData->fPromBitdepth) (*(pSrcline+3));
-
- *pDstline = (mng_uint8)(iR >> 8);
- *(pDstline+1) = (mng_uint8)(iR && 0xFF);
- *(pDstline+2) = (mng_uint8)(iG >> 8);
- *(pDstline+3) = (mng_uint8)(iG && 0xFF);
- *(pDstline+4) = (mng_uint8)(iB >> 8);
- *(pDstline+5) = (mng_uint8)(iB && 0xFF);
- *(pDstline+6) = (mng_uint8)(iA >> 8);
- *(pDstline+7) = (mng_uint8)(iA && 0xFF);
-
- pSrcline += 4;
- pDstline += 8;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROMOTE_RGBA8_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* !defined(MNG_NO_DELTA_PNG) || !defined(MNG_SKIPCHUNK_PAST) || !defined(MNG_SKIPCHUNK_MAGN) */
-
-/* ************************************************************************** */
-/* * * */
-/* * Row processing routines - convert uncompressed data from zlib to * */
-/* * managable row-data which serves as input to the color-management * */
-/* * routines * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_process_g1 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_G1, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
- iM = 0; /* start at pixel 0 */
- iB = 0;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
- if (pBuf->iTRNSgray) /* white transparent ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* is it white ? */
- /* transparent ! */
- mng_put_uint32 (pRGBArow, 0x00000000);
- else /* opaque black */
- mng_put_uint32 (pRGBArow, 0x000000FF);
-
- pRGBArow += 4; /* next pixel */
- iM >>= 1;
- }
- }
- else /* black transparent */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* is it white ? */
- /* opaque white */
- mng_put_uint32 (pRGBArow, 0xFFFFFFFF);
- else /* transparent */
- mng_put_uint32 (pRGBArow, 0x00000000);
-
- pRGBArow += 4; /* next pixel */
- iM >>= 1;
- }
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else /* no transparency */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- }
-
- if (iB & iM) /* is it white ? */
- /* opaque white */
- mng_put_uint32 (pRGBArow, 0xFFFFFFFF);
- else /* opaque black */
- mng_put_uint32 (pRGBArow, 0x000000FF);
-
- pRGBArow += 4; /* next pixel */
- iM >>= 1;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_G1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_g2 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint8 iQ;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-#ifdef MNG_OPTIMIZE_FOOTPRINT_SWITCH
- const mng_uint32 level[4] = { 0x000000FF, 0x555555FF,
- 0xAAAAAAFF, 0xFFFFFFFF};
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_G2, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
- /* determine gray level */
- iQ = (mng_uint8)((iB & iM) >> iS);
-
- if (iQ == pBuf->iTRNSgray) /* transparent ? */
- mng_put_uint32 (pRGBArow, 0x00000000);
- else
- {
-#ifdef MNG_OPTIMIZE_FOOTPRINT_SWITCH
- mng_put_uint32 (pRGBArow, level[iQ]);
-#else
- switch (iQ) /* determine the gray level */
- {
- case 0x03 : { mng_put_uint32 (pRGBArow, 0xFFFFFFFF); break; }
- case 0x02 : { mng_put_uint32 (pRGBArow, 0xAAAAAAFF); break; }
- case 0x01 : { mng_put_uint32 (pRGBArow, 0x555555FF); break; }
- default : { mng_put_uint32 (pRGBArow, 0x000000FF); }
- }
-#endif
- }
-
- pRGBArow += 4; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_SWITCH
- mng_put_uint32 (pRGBArow, level[((iB & iM) >> iS)] );
-#else
- switch ((iB & iM) >> iS) /* determine the gray level */
- {
- case 0x03 : { mng_put_uint32 (pRGBArow, 0xFFFFFFFF); break; }
- case 0x02 : { mng_put_uint32 (pRGBArow, 0xAAAAAAFF); break; }
- case 0x01 : { mng_put_uint32 (pRGBArow, 0x555555FF); break; }
- default : { mng_put_uint32 (pRGBArow, 0x000000FF); }
- }
-#endif
-
- pRGBArow += 4; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_G2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_g4 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint8 iQ;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_G4, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* get the gray level */
- iQ = (mng_uint8)((iB & iM) >> iS);
-
- if (iQ == pBuf->iTRNSgray) /* transparent ? */
- {
- *pRGBArow = 0; /* put in intermediate row */
- *(pRGBArow+1) = 0;
- *(pRGBArow+2) = 0;
- *(pRGBArow+3) = 0;
- }
- else
- { /* expand to 8-bit by replication */
- iQ = (mng_uint8)(iQ + (iQ << 4));
-
- *pRGBArow = iQ; /* put in intermediate row */
- *(pRGBArow+1) = iQ;
- *(pRGBArow+2) = iQ;
- *(pRGBArow+3) = 0xFF;
- }
-
- pRGBArow += 4; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* get the gray level */
- iQ = (mng_uint8)((iB & iM) >> iS);
- iQ = (mng_uint8)(iQ + (iQ << 4));/* expand to 8-bit by replication */
-
- *pRGBArow = iQ; /* put in intermediate row */
- *(pRGBArow+1) = iQ;
- *(pRGBArow+2) = iQ;
- *(pRGBArow+3) = 0xFF;
-
- pRGBArow += 4; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_G4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_g8 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_G8, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iB = *pWorkrow; /* get next input-byte */
-
- if (iB == pBuf->iTRNSgray) /* transparent ? */
- {
- *pRGBArow = 0; /* put in intermediate row */
- *(pRGBArow+1) = 0;
- *(pRGBArow+2) = 0;
- *(pRGBArow+3) = 0;
- }
- else
- {
- *pRGBArow = iB; /* put in intermediate row */
- *(pRGBArow+1) = iB;
- *(pRGBArow+2) = iB;
- *(pRGBArow+3) = 0xFF;
- }
-
- pRGBArow += 4; /* next pixel */
- pWorkrow++;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iB = *pWorkrow; /* get next input-byte */
-
- *pRGBArow = iB; /* put in intermediate row */
- *(pRGBArow+1) = iB;
- *(pRGBArow+2) = iB;
- *(pRGBArow+3) = 0xFF;
-
- pRGBArow += 4; /* next pixel */
- pWorkrow++;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_G8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_process_g16 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint16 iW;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_G16, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iW = mng_get_uint16 (pWorkrow); /* get input */
-
- if (iW == pBuf->iTRNSgray) /* transparent ? */
- { /* put in intermediate row */
- mng_put_uint16 (pRGBArow, 0);
- mng_put_uint16 (pRGBArow+2, 0);
- mng_put_uint16 (pRGBArow+4, 0);
- mng_put_uint16 (pRGBArow+6, 0);
- }
- else
- { /* put in intermediate row */
- mng_put_uint16 (pRGBArow, iW);
- mng_put_uint16 (pRGBArow+2, iW);
- mng_put_uint16 (pRGBArow+4, iW);
- mng_put_uint16 (pRGBArow+6, 0xFFFF);
- }
-
- pRGBArow += 8; /* next pixel */
- pWorkrow += 2;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iW = mng_get_uint16 (pWorkrow); /* get input */
-
- mng_put_uint16 (pRGBArow, iW); /* and put in intermediate row */
- mng_put_uint16 (pRGBArow+2, iW);
- mng_put_uint16 (pRGBArow+4, iW);
- mng_put_uint16 (pRGBArow+6, 0xFFFF);
-
- pRGBArow += 8; /* next pixel */
- pWorkrow += 2;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_G16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_rgb8 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iR, iG, iB;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_RGB8, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iR = *pWorkrow; /* get the RGB values */
- iG = *(pWorkrow+1);
- iB = *(pWorkrow+2);
- /* transparent ? */
- if ((iR == pBuf->iTRNSred) && (iG == pBuf->iTRNSgreen) &&
- (iB == pBuf->iTRNSblue))
- {
- *pRGBArow = 0; /* this pixel is transparent ! */
- *(pRGBArow+1) = 0;
- *(pRGBArow+2) = 0;
- *(pRGBArow+3) = 0;
- }
- else
- {
- *pRGBArow = iR; /* copy the RGB values */
- *(pRGBArow+1) = iG;
- *(pRGBArow+2) = iB;
- *(pRGBArow+3) = 0xFF; /* this one isn't transparent */
- }
-
- pWorkrow += 3; /* next pixel */
- pRGBArow += 4;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pRGBArow = *pWorkrow; /* copy the RGB bytes */
- *(pRGBArow+1) = *(pWorkrow+1);
- *(pRGBArow+2) = *(pWorkrow+2);
- *(pRGBArow+3) = 0xFF; /* no alpha; so always fully opaque */
-
- pWorkrow += 3; /* next pixel */
- pRGBArow += 4;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_RGB8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_process_rgb16 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint16 iR, iG, iB;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_RGB16, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iR = mng_get_uint16 (pWorkrow); /* get the RGB values */
- iG = mng_get_uint16 (pWorkrow+2);
- iB = mng_get_uint16 (pWorkrow+4);
- /* transparent ? */
- if ((iR == pBuf->iTRNSred) && (iG == pBuf->iTRNSgreen) &&
- (iB == pBuf->iTRNSblue))
- { /* transparent then */
- mng_put_uint16 (pRGBArow, 0);
- mng_put_uint16 (pRGBArow+2, 0);
- mng_put_uint16 (pRGBArow+4, 0);
- mng_put_uint16 (pRGBArow+6, 0);
- }
- else
- { /* put in intermediate row */
- mng_put_uint16 (pRGBArow, iR);
- mng_put_uint16 (pRGBArow+2, iG);
- mng_put_uint16 (pRGBArow+4, iB);
- mng_put_uint16 (pRGBArow+6, 0xFFFF);
- }
-
- pWorkrow += 6; /* next pixel */
- pRGBArow += 8;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* copy the RGB values */
- mng_put_uint16 (pRGBArow, mng_get_uint16 (pWorkrow ));
- mng_put_uint16 (pRGBArow+2, mng_get_uint16 (pWorkrow+2));
- mng_put_uint16 (pRGBArow+4, mng_get_uint16 (pWorkrow+4));
- mng_put_uint16 (pRGBArow+6, 0xFFFF);
-
- pWorkrow += 6; /* next pixel */
- pRGBArow += 8;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_RGB16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_process_idx1 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint8 iQ;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_IDX1, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- iS = 7;
- }
- /* get the index */
- iQ = (mng_uint8)((iB & iM) >> iS);
- /* index valid ? */
- if ((mng_uint32)iQ < pBuf->iPLTEcount)
- { /* put in intermediate row */
- *pRGBArow = pBuf->aPLTEentries [iQ].iRed;
- *(pRGBArow+1) = pBuf->aPLTEentries [iQ].iGreen;
- *(pRGBArow+2) = pBuf->aPLTEentries [iQ].iBlue;
- /* transparency for this index ? */
- if ((mng_uint32)iQ < pBuf->iTRNScount)
- *(pRGBArow+3) = pBuf->aTRNSentries [iQ];
- else
- *(pRGBArow+3) = 0xFF;
- }
- else
- MNG_ERROR (pData, MNG_PLTEINDEXERROR);
-
- pRGBArow += 4; /* next pixel */
- iM >>= 1;
- iS -= 1;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0x80;
- iS = 7;
- }
- /* get the index */
- iQ = (mng_uint8)((iB & iM) >> iS);
- /* index valid ? */
- if ((mng_uint32)iQ < pBuf->iPLTEcount)
- { /* put in intermediate row */
- *pRGBArow = pBuf->aPLTEentries [iQ].iRed;
- *(pRGBArow+1) = pBuf->aPLTEentries [iQ].iGreen;
- *(pRGBArow+2) = pBuf->aPLTEentries [iQ].iBlue;
- *(pRGBArow+3) = 0xFF;
- }
- else
- MNG_ERROR (pData, MNG_PLTEINDEXERROR);
-
- pRGBArow += 4; /* next pixel */
- iM >>= 1;
- iS -= 1;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_IDX1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_idx2 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint8 iQ;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_IDX2, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
- /* get the index */
- iQ = (mng_uint8)((iB & iM) >> iS);
- /* index valid ? */
- if ((mng_uint32)iQ < pBuf->iPLTEcount)
- { /* put in intermediate row */
- *pRGBArow = pBuf->aPLTEentries [iQ].iRed;
- *(pRGBArow+1) = pBuf->aPLTEentries [iQ].iGreen;
- *(pRGBArow+2) = pBuf->aPLTEentries [iQ].iBlue;
- /* transparency for this index ? */
- if ((mng_uint32)iQ < pBuf->iTRNScount)
- *(pRGBArow+3) = pBuf->aTRNSentries [iQ];
- else
- *(pRGBArow+3) = 0xFF;
- }
- else
- MNG_ERROR (pData, MNG_PLTEINDEXERROR);
-
- pRGBArow += 4; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = *pWorkrow; /* get next input-byte */
- pWorkrow++;
- iM = 0xC0;
- iS = 6;
- }
- /* get the index */
- iQ = (mng_uint8)((iB & iM) >> iS);
- /* index valid ? */
- if ((mng_uint32)iQ < pBuf->iPLTEcount)
- { /* put in intermediate row */
- *pRGBArow = pBuf->aPLTEentries [iQ].iRed;
- *(pRGBArow+1) = pBuf->aPLTEentries [iQ].iGreen;
- *(pRGBArow+2) = pBuf->aPLTEentries [iQ].iBlue;
- *(pRGBArow+3) = 0xFF;
- }
- else
- MNG_ERROR (pData, MNG_PLTEINDEXERROR);
-
- pRGBArow += 4; /* next pixel */
- iM >>= 2;
- iS -= 2;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_IDX2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_idx4 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iB;
- mng_uint8 iM;
- mng_uint32 iS;
- mng_uint8 iQ;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_IDX4, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
- iM = 0; /* start at pixel 0 */
- iB = 0;
- iS = 0;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = pWorkrow [0]; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* get the index */
- iQ = (mng_uint8)((iB & iM) >> iS);
- /* index valid ? */
- if ((mng_uint32)iQ < pBuf->iPLTEcount)
- { /* put in intermediate row */
- pRGBArow [0] = pBuf->aPLTEentries [iQ].iRed;
- pRGBArow [1] = pBuf->aPLTEentries [iQ].iGreen;
- pRGBArow [2] = pBuf->aPLTEentries [iQ].iBlue;
- /* transparency for this index ? */
- if ((mng_uint32)iQ < pBuf->iTRNScount)
- pRGBArow [3] = pBuf->aTRNSentries [iQ];
- else
- pRGBArow [3] = 0xFF;
- }
- else
- MNG_ERROR (pData, MNG_PLTEINDEXERROR);
-
- pRGBArow += 4; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- if (!iM) /* mask underflow ? */
- {
- iB = pWorkrow [0]; /* get next input-byte */
- pWorkrow++;
- iM = 0xF0;
- iS = 4;
- }
- /* get the index */
- iQ = (mng_uint8)((iB & iM) >> iS);
- /* index valid ? */
- if ((mng_uint32)iQ < pBuf->iPLTEcount)
- { /* put in intermediate row */
- pRGBArow [0] = pBuf->aPLTEentries [iQ].iRed;
- pRGBArow [1] = pBuf->aPLTEentries [iQ].iGreen;
- pRGBArow [2] = pBuf->aPLTEentries [iQ].iBlue;
- pRGBArow [3] = 0xFF;
- }
- else
- MNG_ERROR (pData, MNG_PLTEINDEXERROR);
-
- pRGBArow += 4; /* next pixel */
- iM >>= 4;
- iS -= 4;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_IDX4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_idx8 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint8 iQ;
- mng_imagedatap pBuf = (mng_imagedatap)pData->pStorebuf;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_IDX8, MNG_LC_START);
-#endif
-
- if (!pBuf) /* no object? then use obj 0 */
- pBuf = ((mng_imagep)pData->pObjzero)->pImgbuf;
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
-
- if (pBuf->bHasTRNS) /* tRNS encountered ? */
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iQ = *pWorkrow; /* get input byte */
- /* index valid ? */
- if ((mng_uint32)iQ < pBuf->iPLTEcount)
- { /* put in intermediate row */
- pRGBArow [0] = pBuf->aPLTEentries [iQ].iRed;
- pRGBArow [1] = pBuf->aPLTEentries [iQ].iGreen;
- pRGBArow [2] = pBuf->aPLTEentries [iQ].iBlue;
- /* transparency for this index ? */
- if ((mng_uint32)iQ < pBuf->iTRNScount)
- pRGBArow [3] = pBuf->aTRNSentries [iQ];
- else
- pRGBArow [3] = 0xFF;
- }
- else
- MNG_ERROR (pData, MNG_PLTEINDEXERROR);
-
- pRGBArow += 4; /* next pixel */
- pWorkrow++;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's not fully opaque */
- }
- else
- {
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iQ = *pWorkrow; /* get input byte */
- /* index valid ? */
- if ((mng_uint32)iQ < pBuf->iPLTEcount)
- { /* put in intermediate row */
- pRGBArow [0] = pBuf->aPLTEentries [iQ].iRed;
- pRGBArow [1] = pBuf->aPLTEentries [iQ].iGreen;
- pRGBArow [2] = pBuf->aPLTEentries [iQ].iBlue;
- pRGBArow [3] = 0xFF;
- }
- else
- MNG_ERROR (pData, MNG_PLTEINDEXERROR);
-
- pRGBArow += 4; /* next pixel */
- pWorkrow++;
- }
-
- pData->bIsOpaque = MNG_TRUE; /* it's fully opaque */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_IDX8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_ga8 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_GA8, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- *pRGBArow = *pWorkrow; /* copy the gray value */
- *(pRGBArow+1) = *pWorkrow;
- *(pRGBArow+2) = *pWorkrow;
- *(pRGBArow+3) = *(pWorkrow+1); /* copy the alpha value */
-
- pWorkrow += 2; /* next pixel */
- pRGBArow += 4;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's definitely not fully opaque */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_GA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_process_ga16 (mng_datap pData)
-{
- mng_uint8p pWorkrow;
- mng_uint8p pRGBArow;
- mng_int32 iX;
- mng_uint16 iW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_GA16, MNG_LC_START);
-#endif
- /* temporary work pointers */
- pWorkrow = pData->pWorkrow + pData->iPixelofs;
- pRGBArow = pData->pRGBArow;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iW = mng_get_uint16 (pWorkrow); /* copy the gray value */
- mng_put_uint16 (pRGBArow, iW);
- mng_put_uint16 (pRGBArow+2, iW);
- mng_put_uint16 (pRGBArow+4, iW);
- /* copy the alpha value */
- mng_put_uint16 (pRGBArow+6, mng_get_uint16 (pWorkrow+2));
-
- pWorkrow += 4; /* next pixel */
- pRGBArow += 8;
- }
-
- pData->bIsOpaque = MNG_FALSE; /* it's definitely not fully opaque */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_GA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_rgba8 (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_RGBA8, MNG_LC_START);
-#endif
- /* this is the easiest transform */
- MNG_COPY (pData->pRGBArow, pData->pWorkrow + pData->iPixelofs, pData->iRowsize);
-
- pData->bIsOpaque = MNG_FALSE; /* it's definitely not fully opaque */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_process_rgba16 (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_RGBA16, MNG_LC_START);
-#endif
- /* this is the easiest transform */
- MNG_COPY (pData->pRGBArow, pData->pWorkrow + pData->iPixelofs, pData->iRowsize);
-
- pData->bIsOpaque = MNG_FALSE; /* it's definitely not fully opaque */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Row processing initialization routines - set up the variables needed * */
-/* * to process uncompressed row-data * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_FOOTPRINT_INIT
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_init_g1_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G1_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_g1;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_g1;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_g1;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g1;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 7;
- pData->iSamplediv = 3;
- pData->iRowsize = (pData->iRowsamples + 7) >> 3;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G1_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_g1_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G1_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_g1;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_g1;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_g1;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g1;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 1;
- pData->iSampleofs = 7;
- pData->iSamplediv = 3;
- pData->iRowsize = ((pData->iRowsamples + 7) >> 3);
- pData->iRowmax = ((pData->iDatawidth + 7) >> 3) + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G1_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_g2_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G2_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_g2;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_g2;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_g2;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g2;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 3;
- pData->iSamplediv = 2;
- pData->iRowsize = (pData->iRowsamples + 3) >> 2;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G2_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_g2_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G2_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_g2;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_g2;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_g2;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g2;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 1;
- pData->iSampleofs = 3;
- pData->iSamplediv = 2;
- pData->iRowsize = ((pData->iRowsamples + 3) >> 2);
- pData->iRowmax = ((pData->iDatawidth + 3) >> 2) + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G2_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_g4_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G4_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_g4;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_g4;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_g4;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g4;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 1;
- pData->iSamplediv = 1;
- pData->iRowsize = (pData->iRowsamples + 1) >> 1;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G4_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_g4_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G4_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_g4;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_g4;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_g4;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g4;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 1;
- pData->iSampleofs = 1;
- pData->iSamplediv = 1;
- pData->iRowsize = ((pData->iRowsamples + 1) >> 1);
- pData->iRowmax = ((pData->iDatawidth + 1) >> 1) + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G4_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_g8_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G8_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_g8;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_g8;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_g8;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g8;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G8_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_g8_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G8_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_g8;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_g8;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_g8;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g8;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 1;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples;
- pData->iRowmax = pData->iDatawidth + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G8_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_g16_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G16_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_g16;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_g16;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_g16;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g16;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 2;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 1;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 2;
- pData->bIsRGBA16 = MNG_TRUE; /* intermediate row is 16-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G16_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_g16_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G16_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_g16;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_g16;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_g16;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g16;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 2;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 1;
- pData->iRowmax = (pData->iDatawidth << 1) + pData->iPixelofs;
- pData->iFilterbpp = 2;
- pData->bIsRGBA16 = MNG_TRUE; /* intermediate row is 16-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_G16_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_rgb8_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGB8_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_rgb8;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_rgb8;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_rgb8;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_rgb8;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 3;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples * 3;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 3;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGB8_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_rgb8_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGB8_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_rgb8;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_rgb8;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_rgb8;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_rgb8;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 3;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples * 3;
- pData->iRowmax = (pData->iDatawidth * 3) + pData->iPixelofs;
- pData->iFilterbpp = 3;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGB8_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_rgb16_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGB16_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_rgb16;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_rgb16;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_rgb16;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_rgb16;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 6;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples * 6;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 6;
- pData->bIsRGBA16 = MNG_TRUE; /* intermediate row is 16-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGB16_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_rgb16_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGB16_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_rgb16;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_rgb16;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_rgb16;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_rgb16;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 6;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples * 6;
- pData->iRowmax = (pData->iDatawidth * 6) + pData->iPixelofs;
- pData->iFilterbpp = 6;
- pData->bIsRGBA16 = MNG_TRUE; /* intermediate row is 16-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGB16_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_init_idx1_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX1_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_idx1;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_idx1;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_idx1;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_idx1;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 7;
- pData->iSamplediv = 3;
- pData->iRowsize = (pData->iRowsamples + 7) >> 3;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX1_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_idx1_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX1_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_idx1;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_idx1;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_idx1;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_idx1;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 1;
- pData->iSampleofs = 7;
- pData->iSamplediv = 3;
- pData->iRowsize = (pData->iRowsamples + 7) >> 3;
- pData->iRowmax = ((pData->iDatawidth + 7) >> 3) + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX1_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_idx2_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX2_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_idx2;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_idx2;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_idx2;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_idx2;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 3;
- pData->iSamplediv = 2;
- pData->iRowsize = (pData->iRowsamples + 3) >> 2;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX2_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_idx2_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX2_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_idx2;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_idx2;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_idx2;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_idx2;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 1;
- pData->iSampleofs = 3;
- pData->iSamplediv = 2;
- pData->iRowsize = (pData->iRowsamples + 3) >> 2;
- pData->iRowmax = ((pData->iDatawidth + 3) >> 2) + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX2_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_idx4_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX4_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_idx4;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_idx4;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_idx4;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_idx4;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 1;
- pData->iSamplediv = 1;
- pData->iRowsize = (pData->iRowsamples + 1) >> 1;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX4_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_idx4_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX4_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_idx4;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_idx4;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_idx4;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_idx4;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 1;
- pData->iSampleofs = 1;
- pData->iSamplediv = 1;
- pData->iRowsize = (pData->iRowsamples + 1) >> 1;
- pData->iRowmax = ((pData->iDatawidth + 1) >> 1) + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX4_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_idx8_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX8_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_idx8;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_idx8;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_idx8;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_idx8;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX8_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_idx8_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX8_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_idx8;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_idx8;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_idx8;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_idx8;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 1;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples;
- pData->iRowmax = pData->iDatawidth + pData->iPixelofs;
- pData->iFilterbpp = 1;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_IDX8_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_ga8_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GA8_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_ga8;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_ga8;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_ga8;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_ga8;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 2;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 1;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 2;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GA8_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_ga8_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GA8_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_ga8;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_ga8;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_ga8;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_ga8;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 2;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 1;
- pData->iRowmax = (pData->iDatawidth << 1) + pData->iPixelofs;
- pData->iFilterbpp = 2;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GA8_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_ga16_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GA16_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_ga16;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_ga16;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_ga16;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_ga16;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 4;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 2;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 4;
- pData->bIsRGBA16 = MNG_TRUE; /* intermediate row is 16-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GA16_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_ga16_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GA16_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_ga16;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_ga16;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_ga16;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_ga16;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 4;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 2;
- pData->iRowmax = (pData->iDatawidth << 2) + pData->iPixelofs;
- pData->iFilterbpp = 4;
- pData->bIsRGBA16 = MNG_TRUE; /* intermediate row is 16-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_GA16_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_rgba8_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGBA8_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_rgba8;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_rgba8;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_rgba8;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_rgba8;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 4;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 2;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 4;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGBA8_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-/* ************************************************************************** */
-
-mng_retcode mng_init_rgba8_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGBA8_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_rgba8;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_rgba8;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_rgba8;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_rgba8;
-#endif
-
- pData->iPass = 0; /* from 0..6; is 1..7 in specifications */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 4;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 2;
- pData->iRowmax = (pData->iDatawidth << 2) + pData->iPixelofs;
- pData->iFilterbpp = 4;
- pData->bIsRGBA16 = MNG_FALSE; /* intermediate row is 8-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGBA8_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_rgba16_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGBA16_NI, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_rgba16;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_rgba16;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_rgba16;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_rgba16;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 8;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 3;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 8;
- pData->bIsRGBA16 = MNG_TRUE; /* intermediate row is 16-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGBA16_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_rgba16_i (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGBA16_I, MNG_LC_START);
-#endif
-
- if (pData->fDisplayrow)
- pData->fProcessrow = (mng_fptr)mng_process_rgba16;
-
- if (pData->pStoreobj) /* store in object too ? */
- { /* immediate delta ? */
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- pData->fStorerow = (mng_fptr)mng_delta_rgba16;
- else
-#endif
- pData->fStorerow = (mng_fptr)mng_store_rgba16;
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_rgba16;
-#endif
-
- pData->iPass = 0; /* from 0..6; (1..7 in specification) */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >> interlace_divider [0];
- pData->iSamplemul = 8;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 3;
- pData->iRowmax = (pData->iDatawidth << 3) + pData->iPixelofs;
- pData->iFilterbpp = 8;
- pData->bIsRGBA16 = MNG_TRUE; /* intermediate row is 16-bit deep */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_RGBA16_I, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Row processing initialization routines (JPEG) - set up the variables * */
-/* * needed to process uncompressed row-data * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_init_jpeg_a1_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JPEG_A1_NI, MNG_LC_START);
-#endif
-
- if (pData->pStoreobj) /* store in object too ? */
- {
- if (pData->iJHDRimgbitdepth == 8)
- {
- switch (pData->iJHDRcolortype)
- {
- case 12 : { pData->fStorerow = (mng_fptr)mng_store_jpeg_g8_a1; break; }
- case 14 : { pData->fStorerow = (mng_fptr)mng_store_jpeg_rgb8_a1; break; }
- }
- }
-
- /* TODO: bitdepth 12 & 20 */
-
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g1;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 7;
- pData->iSamplediv = 3;
- pData->iRowsize = (pData->iRowsamples + 7) >> 3;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JPEG_A1_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_jpeg_a2_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JPEG_A2_NI, MNG_LC_START);
-#endif
-
- if (pData->pStoreobj) /* store in object too ? */
- {
- if (pData->iJHDRimgbitdepth == 8)
- {
- switch (pData->iJHDRcolortype)
- {
- case 12 : { pData->fStorerow = (mng_fptr)mng_store_jpeg_g8_a2; break; }
- case 14 : { pData->fStorerow = (mng_fptr)mng_store_jpeg_rgb8_a2; break; }
- }
- }
-
- /* TODO: bitdepth 12 & 20 */
-
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g2;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 3;
- pData->iSamplediv = 2;
- pData->iRowsize = (pData->iRowsamples + 3) >> 2;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JPEG_A2_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_jpeg_a4_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JPEG_A4_NI, MNG_LC_START);
-#endif
-
- if (pData->pStoreobj) /* store in object too ? */
- {
- if (pData->iJHDRimgbitdepth == 8)
- {
- switch (pData->iJHDRcolortype)
- {
- case 12 : { pData->fStorerow = (mng_fptr)mng_store_jpeg_g8_a4; break; }
- case 14 : { pData->fStorerow = (mng_fptr)mng_store_jpeg_rgb8_a4; break; }
- }
- }
-
- /* TODO: bitdepth 12 & 20 */
-
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g4;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 1;
- pData->iSamplediv = 1;
- pData->iRowsize = (pData->iRowsamples + 1) >> 1;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JPEG_A4_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_init_jpeg_a8_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JPEG_A8_NI, MNG_LC_START);
-#endif
-
- if (pData->pStoreobj) /* store in object too ? */
- {
- if (pData->iJHDRimgbitdepth == 8)
- {
- switch (pData->iJHDRcolortype)
- {
- case 12 : { pData->fStorerow = (mng_fptr)mng_store_jpeg_g8_a8; break; }
- case 14 : { pData->fStorerow = (mng_fptr)mng_store_jpeg_rgb8_a8; break; }
- }
- }
-
- /* TODO: bitdepth 12 & 20 */
-
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g8;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 1;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 1;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JPEG_A8_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_jpeg_a16_ni (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JPEG_A16_NI, MNG_LC_START);
-#endif
-
- if (pData->pStoreobj) /* store in object too ? */
- {
- if (pData->iJHDRimgbitdepth == 8)
- {
- switch (pData->iJHDRcolortype)
- {
- case 12 : { pData->fStorerow = (mng_fptr)mng_store_jpeg_g8_a16; break; }
- case 14 : { pData->fStorerow = (mng_fptr)mng_store_jpeg_rgb8_a16; break; }
- }
- }
-
- /* TODO: bitdepth 12 & 20 */
-
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- pData->fDifferrow = (mng_fptr)mng_differ_g16;
-#endif
-
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- pData->iSamplemul = 2;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iRowsize = pData->iRowsamples << 1;
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
- pData->iFilterbpp = 2;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_JPEG_A16_NI, MNG_LC_END);
-#endif
-
- return mng_init_rowproc (pData);
-}
-#endif
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_JNG */
-#endif /* MNG_OPTIMIZE_FOOTPRINT_INIT */
-
-
-/* ************************************************************************** */
-/* * * */
-/* * Generic row processing initialization & cleanup routines * */
-/* * - initialize the buffers used by the row processing routines * */
-/* * - cleanup the buffers used by the row processing routines * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_init_rowproc (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ROWPROC, MNG_LC_START);
-#endif
-
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
- if (pData->ePng_imgtype != png_none)
- {
- if (pData->fDisplayrow)
- switch (pData->ePng_imgtype)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case png_g1:
- pData->fProcessrow = (mng_fptr)mng_process_g1;
- break;
- case png_g2:
- pData->fProcessrow = (mng_fptr)mng_process_g2;
- break;
- case png_g4:
- pData->fProcessrow = (mng_fptr)mng_process_g4;
- break;
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case png_g8:
- pData->fProcessrow = (mng_fptr)mng_process_g8;
- break;
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case png_idx1:
- pData->fProcessrow = (mng_fptr)mng_process_idx1;
- break;
- case png_idx2:
- pData->fProcessrow = (mng_fptr)mng_process_idx2;
- break;
- case png_idx4:
- pData->fProcessrow = (mng_fptr)mng_process_idx4;
- break;
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case png_idx8:
- pData->fProcessrow = (mng_fptr)mng_process_idx8;
- break;
- case png_ga8:
- pData->fProcessrow = (mng_fptr)mng_process_ga8;
- break;
- case png_rgb8:
- pData->fProcessrow = (mng_fptr)mng_process_rgb8;
- break;
- case png_rgba8:
- pData->fProcessrow = (mng_fptr)mng_process_rgba8;
- break;
-#ifndef MNG_NO_16BIT_SUPPORT
- case png_g16:
- pData->fProcessrow = (mng_fptr)mng_process_g16;
- break;
- case png_ga16:
- pData->fProcessrow = (mng_fptr)mng_process_ga16;
- break;
- case png_rgb16:
- pData->fProcessrow = (mng_fptr)mng_process_rgb16;
- break;
- case png_rgba16:
- pData->fProcessrow = (mng_fptr)mng_process_rgba16;
- break;
-#endif
- default:
- break;
- }
-
- if (pData->pStoreobj) /* store in object too ? */
- {
-#ifndef MNG_NO_DELTA_PNG
- if ((pData->bHasDHDR) && (pData->bDeltaimmediate))
- switch (pData->ePng_imgtype)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case png_g1:
- pData->fStorerow = (mng_fptr)mng_delta_g1;
- break;
- case png_g2:
- pData->fStorerow = (mng_fptr)mng_delta_g2;
- break;
- case png_g4:
- pData->fStorerow = (mng_fptr)mng_delta_g4;
- break;
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case png_g8:
- pData->fStorerow = (mng_fptr)mng_delta_g8;
- break;
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case png_idx1:
- pData->fStorerow = (mng_fptr)mng_delta_idx1;
- break;
- case png_idx2:
- pData->fStorerow = (mng_fptr)mng_delta_idx2;
- break;
- case png_idx4:
- pData->fStorerow = (mng_fptr)mng_delta_idx4;
- break;
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case png_idx8:
- pData->fStorerow = (mng_fptr)mng_delta_idx8;
- break;
- case png_ga8:
- pData->fStorerow = (mng_fptr)mng_delta_ga8;
- break;
- case png_rgb8:
- pData->fStorerow = (mng_fptr)mng_delta_rgb8;
- break;
- case png_rgba8:
- pData->fStorerow = (mng_fptr)mng_delta_rgba8;
- break;
-#ifndef MNG_NO_16BIT_SUPPORT
- case png_g16:
- pData->fStorerow = (mng_fptr)mng_delta_g16;
- break;
- case png_ga16:
- pData->fStorerow = (mng_fptr)mng_delta_ga16;
- break;
- case png_rgb16:
- pData->fStorerow = (mng_fptr)mng_delta_rgb16;
- break;
- case png_rgba16:
- pData->fStorerow = (mng_fptr)mng_delta_rgba16;
- break;
-#endif
- default:
- break;
- }
- else
-#endif /* MNG_NO_DELTA_PNG */
- switch (pData->ePng_imgtype)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case png_g1:
- pData->fStorerow = (mng_fptr)mng_store_g1;
- break;
- case png_g2:
- pData->fStorerow = (mng_fptr)mng_store_g2;
- break;
- case png_g4:
- pData->fStorerow = (mng_fptr)mng_store_g4;
- break;
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case png_g8:
- pData->fStorerow = (mng_fptr)mng_store_g8;
- break;
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case png_idx1:
- pData->fStorerow = (mng_fptr)mng_store_idx1;
- break;
- case png_idx2:
- pData->fStorerow = (mng_fptr)mng_store_idx2;
- break;
- case png_idx4:
- pData->fStorerow = (mng_fptr)mng_store_idx4;
- break;
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case png_idx8:
- pData->fStorerow = (mng_fptr)mng_store_idx8;
- break;
- case png_ga8:
- pData->fStorerow = (mng_fptr)mng_store_ga8;
- break;
- case png_rgb8:
- pData->fStorerow = (mng_fptr)mng_store_rgb8;
- break;
- case png_rgba8:
- pData->fStorerow = (mng_fptr)mng_store_rgba8;
- break;
-#ifndef MNG_NO_16BIT_SUPPORT
- case png_g16:
- pData->fStorerow = (mng_fptr)mng_store_g16;
- break;
- case png_ga16:
- pData->fStorerow = (mng_fptr)mng_store_ga16;
- break;
- case png_rgb16:
- pData->fStorerow = (mng_fptr)mng_store_rgb16;
- break;
- case png_rgba16:
- pData->fStorerow = (mng_fptr)mng_store_rgba16;
- break;
-#endif
-
-#ifdef MNG_INCLUDE_JNG
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case png_jpeg_a1:
-/* if (pData->iJHDRimgbitdepth == 8) */
- {
- switch (pData->iJHDRcolortype)
- {
- case 12 :
- { pData->fStorerow = (mng_fptr)mng_store_jpeg_g8_a1; break; }
- case 14 :
- { pData->fStorerow = (mng_fptr)mng_store_jpeg_rgb8_a1; break; }
- }
- }
- /* TODO: bitdepth 12 & 20 */
- break;
- case png_jpeg_a2:
-/* if (pData->iJHDRimgbitdepth == 8) */
- {
- switch (pData->iJHDRcolortype)
- {
- case 12 :
- { pData->fStorerow = (mng_fptr)mng_store_jpeg_g8_a2; break; }
- case 14 :
- { pData->fStorerow = (mng_fptr)mng_store_jpeg_rgb8_a2; break; }
- }
- }
- break;
- /* TODO: bitdepth 12 & 20 */
- case png_jpeg_a4:
-/* if (pData->iJHDRimgbitdepth == 8) */
- {
- switch (pData->iJHDRcolortype)
- {
- case 12 :
- { pData->fStorerow = (mng_fptr)mng_store_jpeg_g8_a4; break; }
- case 14 :
- { pData->fStorerow = (mng_fptr)mng_store_jpeg_rgb8_a4; break; }
- }
- }
- break;
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- /* TODO: bitdepth 12 & 20 */
- case png_jpeg_a8:
-/* if (pData->iJHDRimgbitdepth == 8) */
- {
- switch (pData->iJHDRcolortype)
- {
- case 12 :
- { pData->fStorerow = (mng_fptr)mng_store_jpeg_g8_a8; break; }
- case 14 :
- { pData->fStorerow = (mng_fptr)mng_store_jpeg_rgb8_a8; break; }
- }
- }
- break;
- /* TODO: bitdepth 12 & 20 */
-#ifndef MNG_NO_16BIT_SUPPORT
- case png_jpeg_a16:
-/* if (pData->iJHDRimgbitdepth == 8) */
- {
- switch (pData->iJHDRcolortype)
- {
- case 12 :
- { pData->fStorerow = (mng_fptr)mng_store_jpeg_g8_a16; break; }
- case 14 :
- { pData->fStorerow = (mng_fptr)mng_store_jpeg_rgb8_a16; break; }
- }
- }
- break;
- /* TODO: bitdepth 12 & 20 */
-#endif
-#endif /* MNG_INCLUDE_JNG */
- default:
- break;
- }
- }
-
-#ifdef FILTER192 /* leveling & differing ? */
- if (pData->iFilter == MNG_FILTER_DIFFERING)
- switch (pData->ePng_imgtype)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case png_g1:
-#ifdef MNG_INCLUDE_JNG
- case png_jpeg_a1:
-#endif
- pData->fDifferrow = (mng_fptr)mng_differ_g1;
- break;
- case png_g2:
-#ifdef MNG_INCLUDE_JNG
- case png_jpeg_a2:
-#endif
- pData->fDifferrow = (mng_fptr)mng_differ_g2;
- break;
- case png_g4:
-#ifdef MNG_INCLUDE_JNG
- case png_jpeg_a4:
-#endif
- pData->fDifferrow = (mng_fptr)mng_differ_g4;
- break;
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case png_g8:
-#ifdef MNG_INCLUDE_JNG
- case png_jpeg_a8:
-#endif
- pData->fDifferrow = (mng_fptr)mng_differ_g8;
- break;
- case png_rgb8:
- pData->fDifferrow = (mng_fptr)mng_differ_rgb8;
- break;
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case png_idx1:
- pData->fDifferrow = (mng_fptr)mng_differ_idx1;
- break;
- case png_idx2:
- pData->fDifferrow = (mng_fptr)mng_differ_idx2;
- break;
- case png_idx4:
- pData->fDifferrow = (mng_fptr)mng_differ_idx4;
- break;
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case png_idx8:
- pData->fDifferrow = (mng_fptr)mng_differ_idx8;
- break;
- case png_ga8:
- pData->fDifferrow = (mng_fptr)mng_differ_ga8;
- break;
- case png_rgb8:
- pData->fDifferrow = (mng_fptr)mng_differ_rgb8;
- break;
- case png_rgba8:
- pData->fDifferrow = (mng_fptr)mng_differ_rgba8;
- break;
-#ifndef MNG_NO_16BIT_SUPPORT
- case png_g16:
-#ifdef MNG_INCLUDE_JNG
- case png_jpeg_a16:
-#endif
- pData->fDifferrow = (mng_fptr)mng_differ_g16;
- break;
- case png_ga16:
- pData->fDifferrow = (mng_fptr)mng_differ_ga16;
- break;
- case png_rgb16:
- pData->fDifferrow = (mng_fptr)mng_differ_rgb16;
- break;
- case png_rgba16:
- pData->fDifferrow = (mng_fptr)mng_differ_rgba16;
- break;
-#endif
- default:
- break;
- }
-#endif
-
- switch (pData->ePng_imgtype)
- {
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
- case png_g1:
- case png_idx1:
-#ifdef MNG_INCLUDE_JNG
- case png_jpeg_a1:
-#endif
- pData->iSamplemul = 1;
- pData->iSampleofs = 7;
- pData->iSamplediv = 3;
- pData->iFilterbpp = 1;
- break;
- case png_g2:
- case png_idx2:
-#ifdef MNG_INCLUDE_JNG
- case png_jpeg_a2:
-#endif
- pData->iSamplemul = 1;
- pData->iSampleofs = 3;
- pData->iSamplediv = 2;
- pData->iFilterbpp = 1;
- break;
- case png_g4:
- case png_idx4:
-#ifdef MNG_INCLUDE_JNG
- case png_jpeg_a4:
-#endif
- pData->iSamplemul = 1;
- pData->iSampleofs = 1;
- pData->iSamplediv = 1;
- pData->iFilterbpp = 1;
- break;
-#endif /* MNG_NO_1_2_4BIT_SUPPORT */
- case png_g8:
- case png_idx8:
-#ifdef MNG_INCLUDE_JNG
- case png_jpeg_a8:
-#endif
- pData->iSamplemul = 1;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iFilterbpp = 1;
- break;
- case png_ga8:
-#ifndef MNG_NO_16BIT_SUPPORT
- case png_g16:
-#ifdef MNG_INCLUDE_JNG
- case png_jpeg_a16:
-#endif
-#endif
- pData->iSamplemul = 2;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iFilterbpp = 2;
- break;
- case png_rgb8:
- pData->iSamplemul = 3;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iFilterbpp = 3;
- break;
-#ifndef MNG_NO_16BIT_SUPPORT
- case png_ga16:
-#endif
- case png_rgba8:
- pData->iSamplemul = 4;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iFilterbpp = 4;
- break;
-#ifndef MNG_NO_16BIT_SUPPORT
- case png_rgb16:
- pData->iSamplemul = 6;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iFilterbpp = 6;
- break;
- case png_rgba16:
- pData->iSamplemul = 8;
- pData->iSampleofs = 0;
- pData->iSamplediv = 0;
- pData->iFilterbpp = 8;
- break;
-#endif
- default:
- break;
- }
-
- if (pData->iInterlace) /* noninterlaced */
- {
- pData->iPass = 0; /* from 0..6; (1..7 in specification) */
- pData->iRow = interlace_row [0];
- pData->iRowinc = interlace_rowskip [0];
- pData->iCol = interlace_col [0];
- pData->iColinc = interlace_colskip [0];
- pData->iRowsamples = (pData->iDatawidth + interlace_roundoff [0]) >>
- interlace_divider [0];
- pData->iRowmax = ((pData->iDatawidth * pData->iSamplemul +
- pData->iSampleofs) >> pData->iSamplediv) + pData->iPixelofs;
- }
- else /* interlaced */
- {
- pData->iPass = -1;
- pData->iRow = 0;
- pData->iRowinc = 1;
- pData->iCol = 0;
- pData->iColinc = 1;
- pData->iRowsamples = pData->iDatawidth;
- }
- if (pData->iSamplediv > 0)
- pData->iRowsize = (pData->iRowsamples + pData->iSampleofs) >>
- pData->iSamplediv;
- else
- pData->iRowsize = (pData->iRowsamples * pData->iSamplemul);
-
- if (!pData->iInterlace) /* noninterlaced */
- pData->iRowmax = pData->iRowsize + pData->iPixelofs;
-
-#ifdef MNG_NO_16BIT_SUPPORT
- pData->bIsRGBA16 = MNG_FALSE;
-#else
- switch (pData->ePng_imgtype)
- {
- case png_g16:
- case png_ga16:
- case png_rgb16:
- case png_rgba16:
- pData->bIsRGBA16 = MNG_TRUE;
- break;
- default:
- pData->bIsRGBA16 = MNG_FALSE;
- break;
- }
-#endif
-
- }
-#endif /* MNG_OPTIMIZE_FOOTPRINT_INIT */
-
- if (pData->pStoreobj) /* storage object selected ? */
- {
- pData->pStorebuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- /* and so it becomes viewable ! */
- ((mng_imagep)pData->pStoreobj)->bViewable = MNG_TRUE;
- ((mng_imagedatap)pData->pStorebuf)->bViewable = MNG_TRUE;
- }
-
- /* allocate the buffers; the individual init routines have already
- calculated the required maximum size; except in the case of a JNG
- without alpha!!! */
- if (pData->iRowmax)
- {
-#if defined(MNG_NO_16BIT_SUPPORT) || defined (MNG_NO_1_2_4BIT_SUPPORT)
- mng_uint8 iRowadd = 0;
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iPNGdepth < 8)
- iRowadd=(pData->iPNGdepth*pData->iRowmax+7)/8;
-#endif
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iPNGdepth > 8)
- iRowadd=pData->iRowmax;
-#endif
- MNG_ALLOC (pData, pData->pWorkrow, pData->iRowmax+iRowadd);
- MNG_ALLOC (pData, pData->pPrevrow, pData->iRowmax+iRowadd);
-#else
- MNG_ALLOC (pData, pData->pWorkrow, pData->iRowmax);
- MNG_ALLOC (pData, pData->pPrevrow, pData->iRowmax);
-#endif
- }
-
- /* allocate an RGBA16 row for intermediate processing */
- MNG_ALLOC (pData, pData->pRGBArow, (pData->iDatawidth << 3));
-
-#ifndef MNG_NO_CMS
- if (pData->fDisplayrow) /* display "on-the-fly" ? */
- {
-#if defined(MNG_FULL_CMS) /* determine color-management initialization */
- mng_retcode iRetcode = mng_init_full_cms (pData, MNG_TRUE, MNG_TRUE, MNG_FALSE);
-#elif defined(MNG_GAMMA_ONLY)
- mng_retcode iRetcode = mng_init_gamma_only (pData, MNG_TRUE, MNG_TRUE, MNG_FALSE);
-#elif defined(MNG_APP_CMS)
- mng_retcode iRetcode = mng_init_app_cms (pData, MNG_TRUE, MNG_TRUE, MNG_FALSE);
-#endif
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* !MNG_NO_CMS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_INIT_ROWPROC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_next_row (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_NEXT_ROW, MNG_LC_START);
-#endif
-
- pData->iRow += pData->iRowinc; /* increase the row counter */
-
- if (pData->iPass >= 0) /* interlaced ? */
- {
- while ((pData->iPass < 7) && /* went 'outside' the image ? */
- ((pData->iRow >= (mng_int32)pData->iDataheight) ||
- (pData->iCol >= (mng_int32)pData->iDatawidth ) ))
- {
- pData->iPass++; /* next pass ! */
-
- if (pData->iPass < 7) /* there's only 7 passes ! */
- {
- pData->iRow = interlace_row [pData->iPass];
- pData->iRowinc = interlace_rowskip [pData->iPass];
- pData->iCol = interlace_col [pData->iPass];
- pData->iColinc = interlace_colskip [pData->iPass];
- pData->iRowsamples = (pData->iDatawidth - pData->iCol + interlace_roundoff [pData->iPass])
- >> interlace_divider [pData->iPass];
-
- if (pData->iSamplemul > 1) /* recalculate row dimension */
- pData->iRowsize = pData->iRowsamples * pData->iSamplemul;
- else
- if (pData->iSamplediv > 0)
- pData->iRowsize = (pData->iRowsamples + pData->iSampleofs) >> pData->iSamplediv;
- else
- pData->iRowsize = pData->iRowsamples;
-
- }
-
- if ((pData->iPass < 7) && /* reset previous row to zeroes ? */
- (pData->iRow < (mng_int32)pData->iDataheight) &&
- (pData->iCol < (mng_int32)pData->iDatawidth ) )
- { /* making sure the filters will work properly! */
- mng_int32 iX;
- mng_uint8p pTemp = pData->pPrevrow;
-
-#ifdef MNG_NO_16BIT_SUPPORT
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iPNGmult*pData->iRowsize; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iPNGmult*pData->iRowsize; iX++)
-#endif
-#else
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsize; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsize; iX++)
-#endif
-#endif
- {
- *pTemp = 0;
- pTemp++;
- }
- }
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_NEXT_ROW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_cleanup_rowproc (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CLEANUP_ROWPROC, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_LCMS /* cleanup cms profile/transform */
- {
- mng_retcode iRetcode = mng_clear_cms (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif /* MNG_INCLUDE_LCMS */
-
- if (pData->pRGBArow) /* cleanup buffer for intermediate row */
- MNG_FREEX (pData, pData->pRGBArow, (pData->iDatawidth << 3));
- if (pData->pPrevrow) /* cleanup buffer for previous row */
- MNG_FREEX (pData, pData->pPrevrow, pData->iRowmax);
- if (pData->pWorkrow) /* cleanup buffer for working row */
- MNG_FREEX (pData, pData->pWorkrow, pData->iRowmax);
-
- pData->pWorkrow = MNG_NULL; /* propogate uninitialized buffers */
- pData->pPrevrow = MNG_NULL;
- pData->pRGBArow = MNG_NULL;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_CLEANUP_ROWPROC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* woohiii */
-}
-
-/* ************************************************************************** */
-/* * * */
-/* * Generic row processing routines for JNG * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-/* ************************************************************************** */
-
-mng_retcode mng_display_jpeg_rows (mng_datap pData)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_JPEG_ROWS, MNG_LC_START);
-#endif
- /* any completed rows ? */
- if ((pData->iJPEGrow > pData->iJPEGdisprow) &&
- (pData->iJPEGalpharow > pData->iJPEGdisprow) )
- {
- mng_uint32 iX, iMax;
- mng_uint32 iSaverow = pData->iRow; /* save alpha decompression row-count */
- /* determine the highest complete(!) row */
- if (pData->iJPEGrow > pData->iJPEGalpharow)
- iMax = pData->iJPEGalpharow;
- else
- iMax = pData->iJPEGrow;
- /* display the rows */
- for (iX = pData->iJPEGdisprow; iX < iMax; iX++)
- {
- pData->iRow = iX; /* make sure we all know which row to handle */
- /* makeup an intermediate row from the buffer */
- iRetcode = ((mng_retrieverow)pData->fRetrieverow) (pData);
- /* color-correct it if necessary */
- if ((!iRetcode) && (pData->fCorrectrow))
- iRetcode = ((mng_correctrow)pData->fCorrectrow) (pData);
-
- if (!iRetcode) /* and display it */
- {
- iRetcode = ((mng_displayrow)pData->fDisplayrow) (pData);
-
- if (!iRetcode) /* check progressive display refresh */
- iRetcode = mng_display_progressive_check (pData);
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
- pData->iJPEGdisprow = iMax; /* keep track of the last displayed row */
- pData->iRow = iSaverow; /* restore alpha decompression row-count */
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DISPLAY_JPEG_ROWS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_next_jpeg_alpharow (mng_datap pData)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_NEXT_JPEG_ALPHAROW, MNG_LC_START);
-#endif
-
- pData->iJPEGalpharow++; /* count the row */
-
- if (pData->fDisplayrow) /* display "on-the-fly" ? */
- { /* try to display what you can */
- iRetcode = mng_display_jpeg_rows (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_NEXT_JPEG_ALPHAROW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_next_jpeg_row (mng_datap pData)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_NEXT_JPEG_ROW, MNG_LC_START);
-#endif
-
- pData->iJPEGrow++; /* increase the row-counter */
-
- if (pData->fDisplayrow) /* display "on-the-fly" ? */
- { /* has alpha channel ? */
- if ((pData->iJHDRcolortype == MNG_COLORTYPE_JPEGGRAYA ) ||
- (pData->iJHDRcolortype == MNG_COLORTYPE_JPEGCOLORA) )
- { /* try to display what you can */
- iRetcode = mng_display_jpeg_rows (pData);
- }
- else
- { /* make sure we all know which row to handle */
- pData->iRow = pData->iJPEGrow - 1;
- /* makeup an intermediate row from the buffer */
- iRetcode = ((mng_retrieverow)pData->fRetrieverow) (pData);
- /* color-correct it if necessary */
- if ((!iRetcode) && (pData->fCorrectrow))
- iRetcode = ((mng_correctrow)pData->fCorrectrow) (pData);
-
- if (!iRetcode) /* and display it */
- {
- iRetcode = ((mng_displayrow)pData->fDisplayrow) (pData);
-
- if (!iRetcode) /* check progressive display refresh */
- iRetcode = mng_display_progressive_check (pData);
- }
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-
- /* surpassed last filled row ? */
- if (pData->iJPEGrow > pData->iJPEGrgbrow)
- pData->iJPEGrgbrow = pData->iJPEGrow;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_NEXT_JPEG_ROW, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_MAGN
-#ifndef MNG_OPTIMIZE_FOOTPRINT_MAGN
-#ifndef MNG_NO_GRAY_SUPPORT
-mng_retcode mng_magnify_g8_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX, iS, iM;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_X1, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- iM = iML;
- else
- if (iX == (iWidth - 1)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
-
- for (iS = 1; iS < iM; iS++) /* fill interval */
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- }
-
- pTempsrc1++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_X1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_g8_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_X2, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 1;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- { /* is it same as first ? */
- if (*pTempsrc1 == *pTempsrc2)
- {
- for (iS = 1; iS < iM; iS++) /* then just repeat the first */
- {
- *pTempdst = *pTempsrc1;
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++) /* calculate the distances */
- {
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2)) + (mng_int32)(*pTempsrc1) );
- pTempdst++;
- }
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- }
- }
- }
-
- pTempsrc1++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_X2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_g8_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_X3, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 1;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- { /* is it same as first ? */
- if (*pTempsrc1 == *pTempsrc2)
- {
- for (iS = 1; iS < iM; iS++) /* then just repeat the first */
- {
- *pTempdst = *pTempsrc1;
- pTempdst++;
- }
- }
- else
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* replicate first half */
- {
- *pTempdst = *pTempsrc1;
- pTempdst++;
- }
-
- for (iS = iH; iS < iM; iS++) /* replicate second half */
- {
- *pTempdst = *pTempsrc2;
- pTempdst++;
- }
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- }
- }
- }
-
- pTempsrc1++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_X3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_GRAY_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb8_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX, iS, iM;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_X1, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- iM = iML;
- else
- if (iX == (iWidth - 1)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
-
- for (iS = 1; iS < iM; iS++) /* fill interval */
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- }
-
- pTempsrc1 += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_X1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb8_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_X2, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 3;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- for (iS = 1; iS < iM; iS++)
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2)) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);
- else
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+1)) -
- (mng_int32)(*(pTempsrc1+1)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+1)) );
-
- pTempdst++;
-
- if (*(pTempsrc1+2) == *(pTempsrc2+2))
- *pTempdst = *(pTempsrc1+2);
- else
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+2)) -
- (mng_int32)(*(pTempsrc1+2)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+2)) );
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_X2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb8_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_X3, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 3;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* replicate first half */
- {
- *pTempdst = *pTempsrc1;
- *(pTempdst+1) = *(pTempsrc1+1);
- *(pTempdst+2) = *(pTempsrc1+2);
-
- pTempdst += 3;
- }
-
- for (iS = iH; iS < iM; iS++) /* replicate second half */
- {
- *pTempdst = *pTempsrc2;
- *(pTempdst+1) = *(pTempsrc2+1);
- *(pTempdst+2) = *(pTempsrc2+2);
-
- pTempdst += 3;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_X3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_GRAY_SUPPORT
-mng_retcode mng_magnify_ga8_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX, iS, iM;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_X1, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- iM = iML;
- else
- if (iX == (iWidth - 1)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
-
- for (iS = 1; iS < iM; iS++) /* fill interval */
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- }
-
- pTempsrc1 += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_X1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga8_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_X2, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 2;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- for (iS = 1; iS < iM; iS++)
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2)) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);
- else
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+1)) -
- (mng_int32)(*(pTempsrc1+1)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+1)) );
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_X2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga8_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_X3, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 2;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* replicate first half */
- {
- *pTempdst = *pTempsrc1;
- *(pTempdst+1) = *(pTempsrc1+1);
-
- pTempdst += 2;
- }
-
- for (iS = iH; iS < iM; iS++) /* replicate second half */
- {
- *pTempdst = *pTempsrc2;
- *(pTempdst+1) = *(pTempsrc2+1);
-
- pTempdst += 2;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_X3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga8_x4 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_X4, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 2;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* first half */
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2)) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
-
- *pTempdst = *(pTempsrc1+1); /* replicate alpha from left */
-
- pTempdst++;
- }
-
- for (iS = iH; iS < iM; iS++) /* second half */
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2)) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
-
- *pTempdst = *(pTempsrc2+1); /* replicate alpha from right */
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_X4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga8_x5 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_X5, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 2;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* first half */
- {
- *pTempdst = *pTempsrc1; /* replicate gray from left */
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);/* just repeat the first */
- else /* calculate the distance */
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+1)) -
- (mng_int32)(*(pTempsrc1+1)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+1)) );
-
- pTempdst++;
- }
-
- for (iS = iH; iS < iM; iS++) /* second half */
- {
- *pTempdst = *pTempsrc2; /* replicate gray from right */
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);/* just repeat the first */
- else /* calculate the distance */
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+1)) -
- (mng_int32)(*(pTempsrc1+1)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+1)) );
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_X5, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_GRAY_SUPPORT */
-#endif /* MNG_OPTIMIZE_FOOTPRINT_MAGN */
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba8_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX, iS, iM;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_X1, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- iM = iML;
- else
- if (iX == (iWidth - 1)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
-
- for (iS = 1; iS < iM; iS++) /* fill interval */
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
- }
-
- pTempsrc1 += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_X1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba8_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_X2, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 4;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- for (iS = 1; iS < iM; iS++)
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2)) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);
- else
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+1)) -
- (mng_int32)(*(pTempsrc1+1)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+1)) );
-
- pTempdst++;
-
- if (*(pTempsrc1+2) == *(pTempsrc2+2))
- *pTempdst = *(pTempsrc1+2);
- else
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+2)) -
- (mng_int32)(*(pTempsrc1+2)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+2)) );
-
- pTempdst++;
-
- if (*(pTempsrc1+3) == *(pTempsrc2+3))
- *pTempdst = *(pTempsrc1+3);
- else
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+3)) -
- (mng_int32)(*(pTempsrc1+3)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+3)) );
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_X2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba8_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_X3, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 4;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* replicate first half */
- {
- *pTempdst = *pTempsrc1;
- *(pTempdst+1) = *(pTempsrc1+1);
- *(pTempdst+2) = *(pTempsrc1+2);
- *(pTempdst+3) = *(pTempsrc1+3);
-
- pTempdst += 4;
- }
-
- for (iS = iH; iS < iM; iS++) /* replicate second half */
- {
- *pTempdst = *pTempsrc2;
- *(pTempdst+1) = *(pTempsrc2+1);
- *(pTempdst+2) = *(pTempsrc2+2);
- *(pTempdst+3) = *(pTempsrc2+3);
-
- pTempdst += 4;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_X3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba8_x4 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_X4, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 4;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* first half */
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2)) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);
- else
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+1)) -
- (mng_int32)(*(pTempsrc1+1)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+1)) );
-
- pTempdst++;
-
- if (*(pTempsrc1+2) == *(pTempsrc2+2))
- *pTempdst = *(pTempsrc1+2);
- else
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+2)) -
- (mng_int32)(*(pTempsrc1+2)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+2)) );
-
- pTempdst++;
- /* replicate alpha from left */
- *pTempdst = *(pTempsrc1+3);
-
- pTempdst++;
- }
-
- for (iS = iH; iS < iM; iS++) /* second half */
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2)) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);
- else
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+1)) -
- (mng_int32)(*(pTempsrc1+1)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+1)) );
-
- pTempdst++;
-
- if (*(pTempsrc1+2) == *(pTempsrc2+2))
- *pTempdst = *(pTempsrc1+2);
- else
- *pTempdst = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+2)) -
- (mng_int32)(*(pTempsrc1+2)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+2)) );
-
- pTempdst++;
- /* replicate alpha from right */
- *pTempdst = *(pTempsrc2+3);
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_X4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba8_x5 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_X5, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline; /* initialize pixel-loop */
- pTempdst = pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 4;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* first half */
- {
- *pTempdst = *pTempsrc1; /* replicate color from left */
- *(pTempdst+1) = *(pTempsrc1+1);
- *(pTempdst+2) = *(pTempsrc1+2);
-
- if (*(pTempsrc1+3) == *(pTempsrc2+3))
- *(pTempdst+3) = *(pTempsrc1+3);
- else
- *(pTempdst+3) = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+3)) -
- (mng_int32)(*(pTempsrc1+3)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+3)) );
-
- pTempdst += 4;
- }
-
- for (iS = iH; iS < iM; iS++) /* second half */
- {
- *pTempdst = *pTempsrc2; /* replicate color from right */
- *(pTempdst+1) = *(pTempsrc2+1);
- *(pTempdst+2) = *(pTempsrc2+2);
-
- if (*(pTempsrc1+3) == *(pTempsrc2+3))
- *(pTempdst+3) = *(pTempsrc1+3);
- else
- *(pTempdst+3) = (mng_uint8)(((2 * iS * ( (mng_int32)(*(pTempsrc2+3)) -
- (mng_int32)(*(pTempsrc1+3)) ) + iM) /
- (iM * 2)) + (mng_int32)(*(pTempsrc1+3)) );
-
- pTempdst += 4;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_X4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_FOOTPRINT_MAGN
-#ifndef MNG_NO_GRAY_SUPPORT
-mng_retcode mng_magnify_g8_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_Y1, MNG_LC_START);
-#endif
-
- MNG_COPY (pDstline, pSrcline1, iWidth);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_Y1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-mng_retcode mng_magnify_g8_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_Y2, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = pSrcline2;
- pTempdst = pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, iWidth);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_g8_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_Y3, MNG_LC_START);
-#endif
-
- if (pSrcline2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- MNG_COPY (pDstline, pSrcline1, iWidth)
- else
- MNG_COPY (pDstline, pSrcline2, iWidth);
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pDstline, pSrcline1, iWidth);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G8_Y3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_GRAY_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb8_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_Y1, MNG_LC_START);
-#endif
-
- MNG_COPY (pDstline, pSrcline1, iWidth * 3);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_Y1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb8_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_Y2, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = pSrcline2;
- pTempdst = pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, iWidth * 3);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb8_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_Y3, MNG_LC_START);
-#endif
-
- if (pSrcline2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- MNG_COPY (pDstline, pSrcline1, iWidth * 3)
- else
- MNG_COPY (pDstline, pSrcline2, iWidth * 3);
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pDstline, pSrcline1, iWidth * 3);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB8_Y3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_GRAY_SUPPORT
-mng_retcode mng_magnify_ga8_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_Y1, MNG_LC_START);
-#endif
-
- MNG_COPY (pDstline, pSrcline1, iWidth << 1);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_Y1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga8_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_Y2, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = pSrcline2;
- pTempdst = pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, iWidth << 1);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga8_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_Y3, MNG_LC_START);
-#endif
-
- if (pSrcline2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- MNG_COPY (pDstline, pSrcline1, iWidth << 1)
- else
- MNG_COPY (pDstline, pSrcline2, iWidth << 1);
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pDstline, pSrcline1, iWidth << 1);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga8_y4 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_Y4, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = pSrcline2;
- pTempdst = pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2 += 2;
-
- *pTempdst++ = *pTempsrc1++; /* replicate alpha from top */
- }
- }
- else
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1 += 2;
- pTempsrc2++;
-
- *pTempdst++ = *pTempsrc2++; /* replicate alpha from bottom */
- }
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, iWidth << 1);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_Y4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga8_y5 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_Y5, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = pSrcline2;
- pTempdst = pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc1; /* replicate gray from top */
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2) /* calculate the distances */
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- {
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc2; /* replicate gray from bottom */
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2) /* calculate the distances */
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, iWidth << 1);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA8_Y5, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_GRAY_SUPPORT */
-#endif /* MNG_OPTIMIZE_FOOTPRINT_MAGN */
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba8_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_Y1, MNG_LC_START);
-#endif
-
- MNG_COPY (pDstline, pSrcline1, iWidth << 2);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_Y1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba8_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_Y2, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = pSrcline2;
- pTempdst = pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, iWidth << 2);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba8_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_Y3, MNG_LC_START);
-#endif
-
- if (pSrcline2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- MNG_COPY (pDstline, pSrcline1, iWidth << 2)
- else
- MNG_COPY (pDstline, pSrcline2, iWidth << 2);
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pDstline, pSrcline1, iWidth << 2);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba8_y4 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_Y4, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = pSrcline2;
- pTempdst = pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2 += 2;
-
- *pTempdst++ = *pTempsrc1++; /* replicate alpha from top */
- }
- }
- else
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1 += 2;
- pTempsrc2++;
-
- *pTempdst++ = *pTempsrc2++; /* replicate alpha from bottom */
- }
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, iWidth << 2);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_Y4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba8_y5 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint8p pTempsrc1;
- mng_uint8p pTempsrc2;
- mng_uint8p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_Y5, MNG_LC_START);
-#endif
-
- pTempsrc1 = pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = pSrcline2;
- pTempdst = pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst++ = *pTempsrc1++; /* replicate color from top */
- *pTempdst++ = *pTempsrc1++;
- *pTempdst++ = *pTempsrc1++;
-
- pTempsrc2 += 3;
-
- if (*pTempsrc1 == *pTempsrc2) /* calculate the distances */
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- {
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst++ = *pTempsrc2++; /* replicate color from bottom */
- *pTempdst++ = *pTempsrc2++;
- *pTempdst++ = *pTempsrc2++;
-
- pTempsrc1 += 3;
-
- if (*pTempsrc1 == *pTempsrc2) /* calculate the distances */
- *pTempdst = *pTempsrc1;
- else
- *pTempdst = (mng_uint8)( ( (2 * iS * ( (mng_int32)(*pTempsrc2) -
- (mng_int32)(*pTempsrc1) ) + iM) /
- (iM * 2) ) + (mng_int32)(*pTempsrc1) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, iWidth << 2);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA8_Y5, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_FOOTPRINT_MAGN
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_NO_GRAY_SUPPORT
-mng_retcode mng_magnify_g16_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX, iS, iM;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_X1, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- iM = iML;
- else
- if (iX == (iWidth - 1)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
-
- for (iS = 1; iS < iM; iS++) /* fill interval */
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- }
-
- pTempsrc1++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_X1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_g16_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_X2, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 1;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- { /* is it same as first ? */
- if (*pTempsrc1 == *pTempsrc2)
- {
- for (iS = 1; iS < iM; iS++) /* then just repeat the first */
- {
- *pTempdst = *pTempsrc1;
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++) /* calculate the distances */
- {
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ));
- pTempdst++;
- }
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- }
- }
- }
-
- pTempsrc1++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_X2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_g16_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_X3, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 1;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- { /* is it same as first ? */
- if (*pTempsrc1 == *pTempsrc2)
- {
- for (iS = 1; iS < iM; iS++) /* then just repeat the first */
- {
- *pTempdst = *pTempsrc1;
- pTempdst++;
- }
- }
- else
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* replicate first half */
- {
- *pTempdst = *pTempsrc1;
- pTempdst++;
- }
-
- for (iS = iH; iS < iM; iS++) /* replicate second half */
- {
- *pTempdst = *pTempsrc2;
- pTempdst++;
- }
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- }
- }
- }
-
- pTempsrc1++;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_X3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_GRAY_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb16_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX, iS, iM;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_X1, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- iM = iML;
- else
- if (iX == (iWidth - 1)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
-
- for (iS = 1; iS < iM; iS++) /* fill interval */
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- }
-
- pTempsrc1 += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_X1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb16_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_X2, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 3;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- for (iS = 1; iS < iM; iS++)
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+1))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) );
-
- pTempdst++;
-
- if (*(pTempsrc1+2) == *(pTempsrc2+2))
- *pTempdst = *(pTempsrc1+2);
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+2))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+2))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+2))) ) );
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_X2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb16_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_X3, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 3;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* replicate first half */
- {
- *pTempdst = *pTempsrc1;
- *(pTempdst+1) = *(pTempsrc1+1);
- *(pTempdst+2) = *(pTempsrc1+2);
-
- pTempdst += 3;
- }
-
- for (iS = iH; iS < iM; iS++) /* replicate second half */
- {
- *pTempdst = *pTempsrc2;
- *(pTempdst+1) = *(pTempsrc2+1);
- *(pTempdst+2) = *(pTempsrc2+2);
-
- pTempdst += 3;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 3;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_X3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_GRAY_SUPPORT
-mng_retcode mng_magnify_ga16_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX, iS, iM;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_X1, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p) pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- iM = iML;
- else
- if (iX == (iWidth - 1)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
-
- for (iS = 1; iS < iM; iS++) /* fill interval */
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- }
-
- pTempsrc1 += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_X1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga16_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_X2, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 2;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- for (iS = 1; iS < iM; iS++)
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+1))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) );
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_X2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga16_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_X3, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 2;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* replicate first half */
- {
- *pTempdst = *pTempsrc1;
- *(pTempdst+1) = *(pTempsrc1+1);
-
- pTempdst += 2;
- }
-
- for (iS = iH; iS < iM; iS++) /* replicate second half */
- {
- *pTempdst = *pTempsrc2;
- *(pTempdst+1) = *(pTempsrc2+1);
-
- pTempdst += 2;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_X3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga16_x4 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_X4, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 2;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* first half */
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
-
- *pTempdst = *(pTempsrc1+1); /* replicate alpha from left */
-
- pTempdst++;
- }
-
- for (iS = iH; iS < iM; iS++) /* second half */
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
-
- *pTempdst = *(pTempsrc2+1); /* replicate alpha from right */
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_X4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga16_x5 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_X5, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 2;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* first half */
- {
- *pTempdst = *pTempsrc1; /* replicate gray from left */
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);/* just repeat the first */
- else /* calculate the distance */
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+1))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) );
-
- pTempdst++;
- }
-
- for (iS = iH; iS < iM; iS++) /* second half */
- {
- *pTempdst = *pTempsrc2; /* replicate gray from right */
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);/* just repeat the first */
- else /* calculate the distance */
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+1))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) );
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_X5, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_GRAY_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba16_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX, iS, iM;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_X1, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- iM = iML;
- else
- if (iX == (iWidth - 1)) /* last interval ? */
- iM = iMR;
- else
- iM = iMX;
-
- for (iS = 1; iS < iM; iS++) /* fill interval */
- {
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
- }
-
- pTempsrc1 += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_X1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba16_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_X2, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 4;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- for (iS = 1; iS < iM; iS++)
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+1))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) );
-
- pTempdst++;
-
- if (*(pTempsrc1+2) == *(pTempsrc2+2))
- *pTempdst = *(pTempsrc1+2);
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+2))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+2))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+2))) ) );
-
- pTempdst++;
-
- if (*(pTempsrc1+3) == *(pTempsrc2+3))
- *pTempdst = *(pTempsrc1+3);
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+3))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+3))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+3))) ) );
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_X2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba16_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_X3, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 4;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* replicate first half */
- {
- *pTempdst = *pTempsrc1;
- *(pTempdst+1) = *(pTempsrc1+1);
- *(pTempdst+2) = *(pTempsrc1+2);
- *(pTempdst+3) = *(pTempsrc1+3);
-
- pTempdst += 4;
- }
-
- for (iS = iH; iS < iM; iS++) /* replicate second half */
- {
- *pTempdst = *pTempsrc2;
- *(pTempdst+1) = *(pTempsrc2+1);
- *(pTempdst+2) = *(pTempsrc2+2);
- *(pTempdst+3) = *(pTempsrc2+3);
-
- pTempdst += 4;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_X3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba16_x4 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_X4, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 4;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* first half */
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+1))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) );
-
- pTempdst++;
-
- if (*(pTempsrc1+2) == *(pTempsrc2+2))
- *pTempdst = *(pTempsrc1+2);
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+2))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+2))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+2))) ) );
-
- pTempdst++;
- /* replicate alpha from left */
- *pTempdst = *(pTempsrc1+3);
-
- pTempdst++;
- }
-
- for (iS = iH; iS < iM; iS++) /* second half */
- {
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1; /* just repeat the first */
- else /* calculate the distance */
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
-
- if (*(pTempsrc1+1) == *(pTempsrc2+1))
- *pTempdst = *(pTempsrc1+1);
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+1))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+1))) ) );
-
- pTempdst++;
-
- if (*(pTempsrc1+2) == *(pTempsrc2+2))
- *pTempdst = *(pTempsrc1+2);
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+2))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+2))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+2))) ) );
-
- pTempdst++;
- /* replicate alpha from right */
- *pTempdst = *(pTempsrc2+3);
-
- pTempdst++;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_X4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba16_x5 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_int32 iS, iM, iH;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_X5, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline; /* initialize pixel-loop */
- pTempdst = (mng_uint16p)pDstline;
-
- for (iX = 0; iX < iWidth; iX++)
- {
- pTempsrc2 = pTempsrc1 + 4;
-
- *pTempdst = *pTempsrc1; /* copy original source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
-
- if (iX == 0) /* first interval ? */
- {
- if (iWidth == 1) /* single pixel ? */
- pTempsrc2 = MNG_NULL;
-
- iM = (mng_int32)iML;
- }
- else
- if (iX == (iWidth - 2)) /* last interval ? */
- iM = (mng_int32)iMR;
- else
- iM = (mng_int32)iMX;
- /* fill interval ? */
- if ((iX < iWidth - 1) || (iWidth == 1))
- {
- if (pTempsrc2) /* do we have the second pixel ? */
- {
- iH = (iM+1) / 2; /* calculate halfway point */
-
- for (iS = 1; iS < iH; iS++) /* first half */
- {
- *pTempdst = *pTempsrc1; /* replicate color from left */
- *(pTempdst+1) = *(pTempsrc1+1);
- *(pTempdst+2) = *(pTempsrc1+2);
-
- if (*(pTempsrc1+3) == *(pTempsrc2+3))
- *(pTempdst+3) = *(pTempsrc1+3);
- else
- mng_put_uint16 ((mng_uint8p)(pTempdst+3),
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+3))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+3))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+3))) ) );
-
- pTempdst += 4;
- }
-
- for (iS = iH; iS < iM; iS++) /* second half */
- {
- *pTempdst = *pTempsrc2; /* replicate color from right */
- *(pTempdst+1) = *(pTempsrc2+1);
- *(pTempdst+2) = *(pTempsrc2+2);
-
- if (*(pTempsrc1+3) == *(pTempsrc2+3))
- *(pTempdst+3) = *(pTempsrc1+3);
- else
- mng_put_uint16 ((mng_uint8p)(pTempdst+3),
- (mng_uint16)(((2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc2+3))) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+3))) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)(pTempsrc1+3))) ) );
-
- pTempdst += 4;
- }
- }
- else
- {
- for (iS = 1; iS < iM; iS++)
- {
- *pTempdst = *pTempsrc1; /* repeat first source pixel */
- pTempdst++;
- *pTempdst = *(pTempsrc1+1);
- pTempdst++;
- *pTempdst = *(pTempsrc1+2);
- pTempdst++;
- *pTempdst = *(pTempsrc1+3);
- pTempdst++;
- }
- }
- }
-
- pTempsrc1 += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_X4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_GRAY_SUPPORT
-mng_retcode mng_magnify_g16_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_Y1, MNG_LC_START);
-#endif
-
- MNG_COPY (pDstline, pSrcline1, (iWidth << 1));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_Y1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_g16_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_Y2, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = (mng_uint16p)pSrcline2;
- pTempdst = (mng_uint16p)pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, (iWidth << 1));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_g16_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_Y3, MNG_LC_START);
-#endif
-
- if (pSrcline2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- MNG_COPY (pDstline, pSrcline1, (iWidth << 1))
- else
- MNG_COPY (pDstline, pSrcline2, (iWidth << 1));
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pDstline, pSrcline1, (iWidth << 1));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_G16_Y3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_GRAY_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb16_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_Y1, MNG_LC_START);
-#endif
-
- MNG_COPY (pDstline, pSrcline1, iWidth * 6);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_Y1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb16_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_Y2, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = (mng_uint16p)pSrcline2;
- pTempdst = (mng_uint16p)pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, iWidth * 6);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgb16_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_Y3, MNG_LC_START);
-#endif
-
- if (pSrcline2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- MNG_COPY (pDstline, pSrcline1, iWidth * 6)
- else
- MNG_COPY (pDstline, pSrcline2, iWidth * 6);
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pDstline, pSrcline1, iWidth * 6);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGB16_Y3, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_GRAY_SUPPORT
-mng_retcode mng_magnify_ga16_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_Y1, MNG_LC_START);
-#endif
-
- MNG_COPY (pDstline, pSrcline1, (iWidth << 2));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_Y1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga16_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_Y2, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = (mng_uint16p)pSrcline2;
- pTempdst = (mng_uint16p)pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, (iWidth << 2));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga16_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_Y3, MNG_LC_START);
-#endif
-
- if (pSrcline2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- MNG_COPY (pDstline, pSrcline1, (iWidth << 2))
- else
- MNG_COPY (pDstline, pSrcline2, (iWidth << 2));
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pDstline, pSrcline1, (iWidth << 2));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga16_y4 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_Y4, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = (mng_uint16p)pSrcline2;
- pTempdst = (mng_uint16p)pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2 += 2;
-
- *pTempdst++ = *pTempsrc1++; /* replicate alpha from top */
- }
- }
- else
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1 += 2;
- pTempsrc2++;
-
- *pTempdst++ = *pTempsrc2++; /* replicate alpha from bottom */
- }
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, (iWidth << 2));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_Y4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_ga16_y5 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_Y5, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = (mng_uint16p)pSrcline2;
- pTempdst = (mng_uint16p)pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc1; /* replicate gray from top */
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2) /* calculate the distances */
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- {
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst = *pTempsrc2; /* replicate gray from bottom */
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2) /* calculate the distances */
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, (iWidth << 2));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_GA16_Y5, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_GRAY_SUPPORT */
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba16_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_Y1, MNG_LC_START);
-#endif
-
- MNG_COPY (pDstline, pSrcline1, (iWidth << 3));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_Y1, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba16_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_Y2, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = (mng_uint16p)pSrcline2;
- pTempdst = (mng_uint16p)pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, (iWidth << 3));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba16_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_Y3, MNG_LC_START);
-#endif
-
- if (pSrcline2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- MNG_COPY (pDstline, pSrcline1, (iWidth << 3))
- else
- MNG_COPY (pDstline, pSrcline2, (iWidth << 3));
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pDstline, pSrcline1, (iWidth << 3));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_Y2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba16_y4 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_Y4, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = (mng_uint16p)pSrcline2;
- pTempdst = (mng_uint16p)pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2 += 2;
-
- *pTempdst++ = *pTempsrc1++; /* replicate alpha from top */
- }
- }
- else
- {
- for (iX = 0; iX < iWidth; iX++)
- { /* calculate the distances */
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
-
- if (*pTempsrc1 == *pTempsrc2)
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1 += 2;
- pTempsrc2++;
-
- *pTempdst++ = *pTempsrc2++; /* replicate alpha from bottom */
- }
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, (iWidth << 3));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_Y4, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_magnify_rgba16_y5 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline)
-{
- mng_uint32 iX;
- mng_uint16p pTempsrc1;
- mng_uint16p pTempsrc2;
- mng_uint16p pTempdst;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_Y5, MNG_LC_START);
-#endif
-
- pTempsrc1 = (mng_uint16p)pSrcline1; /* initialize pixel-loop */
- pTempsrc2 = (mng_uint16p)pSrcline2;
- pTempdst = (mng_uint16p)pDstline;
-
- if (pTempsrc2) /* do we have a second line ? */
- {
- if (iS < (iM+1) / 2) /* top half ? */
- {
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst++ = *pTempsrc1++; /* replicate color from top */
- *pTempdst++ = *pTempsrc1++;
- *pTempdst++ = *pTempsrc1++;
-
- pTempsrc2 += 3;
-
- if (*pTempsrc1 == *pTempsrc2) /* calculate the distances */
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- else
- {
- for (iX = 0; iX < iWidth; iX++)
- {
- *pTempdst++ = *pTempsrc2++; /* replicate color from bottom */
- *pTempdst++ = *pTempsrc2++;
- *pTempdst++ = *pTempsrc2++;
-
- pTempsrc1 += 3;
-
- if (*pTempsrc1 == *pTempsrc2) /* calculate the distances */
- *pTempdst = *pTempsrc1;
- else
- mng_put_uint16 ((mng_uint8p)pTempdst,
- (mng_uint16)( ( (2 * iS * ( (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc2)) -
- (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) + iM) /
- (iM * 2)) + (mng_int32)(mng_get_uint16 ((mng_uint8p)pTempsrc1)) ) );
-
- pTempdst++;
- pTempsrc1++;
- pTempsrc2++;
- }
- }
- }
- else
- { /* just repeat the entire line */
- MNG_COPY (pTempdst, pTempsrc1, (iWidth << 3));
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_MAGNIFY_RGBA16_Y5, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_NO_16BIT_SUPPORT */
-#endif /* MNG_OPTIMIZE_FOOTPRINT_MAGN */
-#endif /* MNG_SKIPCHUNK_MAGN */
-
-/* ************************************************************************** */
-/* * * */
-/* * PAST composition routines - compose over/under with a target object * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_composeover_rgba8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8;
- mng_uint8 iCr8, iCg8, iCb8, iCa8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_COMPOSEOVER_RGBA8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iFGa8 = *(pWorkrow+3); /* get alpha values */
- iBGa8 = *(pOutrow+3);
-
- if (iFGa8) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa8 == 0xFF) || (iBGa8 == 0))
- { /* then simply copy the values */
- *pOutrow = *pWorkrow;
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
- *(pOutrow+3) = iFGa8;
- }
- else
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pOutrow+i), *(pWorkrow+i), iFGa8, *(pOutrow+i));
- }
-#else
- MNG_COMPOSE8 (*pOutrow, *pWorkrow, iFGa8, *pOutrow );
- MNG_COMPOSE8 (*(pOutrow+1), *(pWorkrow+1), iFGa8, *(pOutrow+1));
- MNG_COMPOSE8 (*(pOutrow+2), *(pWorkrow+2), iFGa8, *(pOutrow+2));
-#endif
- /* alpha remains fully opaque !!! */
- }
- else
- { /* here we'll have to blend */
- MNG_BLEND8 (*pWorkrow, *(pWorkrow+1), *(pWorkrow+2), iFGa8,
- *pOutrow, *(pOutrow+1), *(pOutrow+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pOutrow = iCr8;
- *(pOutrow+1) = iCg8;
- *(pOutrow+2) = iCb8;
- *(pOutrow+3) = iCa8;
- }
- }
- }
-
- pOutrow += 4;
- pWorkrow += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_COMPOSEOVER_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_composeover_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint16p pWorkrow;
- mng_uint16p pOutrow;
- mng_int32 iX;
- mng_uint16 iFGa16, iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGa16, iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16, iCa16;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_COMPOSEOVER_RGBA16, MNG_LC_START);
-#endif
-
- pWorkrow = (mng_uint16p)pData->pRGBArow;
- pOutrow = (mng_uint16p)(pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize));
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* get alpha values */
- iFGa16 = mng_get_uint16 ((mng_uint8p)(pWorkrow+3));
- iBGa16 = mng_get_uint16 ((mng_uint8p)(pOutrow+3));
-
- if (iFGa16) /* any opacity at all ? */
- { /* fully opaque or background fully transparent ? */
- if ((iFGa16 == 0xFFFF) || (iBGa16 == 0))
- { /* then simply copy the values */
- *pOutrow = *pWorkrow;
- *(pOutrow+1) = *(pWorkrow+1);
- *(pOutrow+2) = *(pWorkrow+2);
- *(pOutrow+3) = *(pWorkrow+3);
- }
- else
- { /* get color values */
- iFGr16 = mng_get_uint16 ((mng_uint8p)pWorkrow);
- iFGg16 = mng_get_uint16 ((mng_uint8p)(pWorkrow+1));
- iFGb16 = mng_get_uint16 ((mng_uint8p)(pWorkrow+2));
- iBGr16 = mng_get_uint16 ((mng_uint8p)pOutrow);
- iBGg16 = mng_get_uint16 ((mng_uint8p)(pOutrow+1));
- iBGb16 = mng_get_uint16 ((mng_uint8p)(pOutrow+2));
-
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE16 (iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16 (iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16 (iFGb16, iFGb16, iFGa16, iBGb16);
-
- mng_put_uint16 ((mng_uint8p)pOutrow, iFGr16);
- mng_put_uint16 ((mng_uint8p)(pOutrow+1), iFGg16);
- mng_put_uint16 ((mng_uint8p)(pOutrow+2), iFGb16);
- /* alpha remains fully opaque !!! */
- }
- else
- { /* here we'll have to blend */
- MNG_BLEND16 (iFGr16, iFGg16, iFGb16, iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- mng_put_uint16 ((mng_uint8p)pOutrow, iCr16);
- mng_put_uint16 ((mng_uint8p)(pOutrow+1), iCg16);
- mng_put_uint16 ((mng_uint8p)(pOutrow+2), iCb16);
- mng_put_uint16 ((mng_uint8p)(pOutrow+3), iCa16);
- }
- }
- }
-
- pOutrow += 4;
- pWorkrow += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_COMPOSEOVER_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_composeunder_rgba8 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint8p pWorkrow;
- mng_uint8p pOutrow;
- mng_int32 iX;
- mng_uint8 iFGa8, iBGa8;
- mng_uint8 iCr8, iCg8, iCb8, iCa8;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_COMPOSEUNDER_RGBA8, MNG_LC_START);
-#endif
-
- pWorkrow = pData->pRGBArow;
- pOutrow = pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize);
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- {
- iFGa8 = *(pOutrow+3); /* get alpha values */
- iBGa8 = *(pWorkrow+3);
- /* anything to do at all ? */
- if ((iBGa8) && (iFGa8 != 0xFF))
- {
- if (iBGa8 == 0xFF) /* background fully opaque ? */
- { /* do alpha composing */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_COMPOSE
- int i;
- for (i=2; i >= 0; i--)
- {
- MNG_COMPOSE8 (*(pOutrow+i), *(pOutrow+i), iFGa8, *(pWorkrow+i));
- }
-#else
- MNG_COMPOSE8 (*pOutrow, *pOutrow, iFGa8, *pWorkrow );
- MNG_COMPOSE8 (*(pOutrow+1), *(pOutrow+1), iFGa8, *(pWorkrow+1));
- MNG_COMPOSE8 (*(pOutrow+2), *(pOutrow+2), iFGa8, *(pWorkrow+2));
-#endif
- *(pOutrow+3) = 0xFF; /* alpha becomes fully opaque !!! */
- }
- else
- { /* here we'll have to blend */
- MNG_BLEND8 (*pOutrow, *(pOutrow+1), *(pOutrow+2), iFGa8,
- *pWorkrow, *(pWorkrow+1), *(pWorkrow+2), iBGa8,
- iCr8, iCg8, iCb8, iCa8);
- /* and return the composed values */
- *pOutrow = iCr8;
- *(pOutrow+1) = iCg8;
- *(pOutrow+2) = iCb8;
- *(pOutrow+3) = iCa8;
- }
- }
-
- pOutrow += 4;
- pWorkrow += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_COMPOSEUNDER_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_composeunder_rgba16 (mng_datap pData)
-{
- mng_imagedatap pBuf = ((mng_imagep)pData->pStoreobj)->pImgbuf;
- mng_uint16p pWorkrow;
- mng_uint16p pOutrow;
- mng_int32 iX;
- mng_uint16 iFGa16, iFGr16, iFGg16, iFGb16;
- mng_uint16 iBGa16, iBGr16, iBGg16, iBGb16;
- mng_uint16 iCr16, iCg16, iCb16, iCa16;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_COMPOSEUNDER_RGBA16, MNG_LC_START);
-#endif
-
- pWorkrow = (mng_uint16p)pData->pRGBArow;
- pOutrow = (mng_uint16p)(pBuf->pImgdata + (pData->iRow * pBuf->iRowsize ) +
- (pData->iCol * pBuf->iSamplesize));
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* get alpha values */
- iFGa16 = mng_get_uint16 ((mng_uint8p)(pOutrow+3));
- iBGa16 = mng_get_uint16 ((mng_uint8p)(pWorkrow+3));
- /* anything to do at all ? */
- if ((iBGa16) && (iFGa16 != 0xFFFF))
- {
- iFGr16 = mng_get_uint16 ((mng_uint8p)pOutrow);
- iFGg16 = mng_get_uint16 ((mng_uint8p)(pOutrow+1));
- iFGb16 = mng_get_uint16 ((mng_uint8p)(pOutrow+2));
- iBGr16 = mng_get_uint16 ((mng_uint8p)pWorkrow);
- iBGg16 = mng_get_uint16 ((mng_uint8p)(pWorkrow+1));
- iBGb16 = mng_get_uint16 ((mng_uint8p)(pWorkrow+2));
-
- if (iBGa16 == 0xFFFF) /* background fully opaque ? */
- { /* do alpha composing */
- MNG_COMPOSE16 (iFGr16, iFGr16, iFGa16, iBGr16);
- MNG_COMPOSE16 (iFGg16, iFGg16, iFGa16, iBGg16);
- MNG_COMPOSE16 (iFGb16, iFGb16, iFGa16, iBGb16);
-
- mng_put_uint16 ((mng_uint8p)pOutrow, iFGr16);
- mng_put_uint16 ((mng_uint8p)(pOutrow+1), iFGg16);
- mng_put_uint16 ((mng_uint8p)(pOutrow+2), iFGb16);
- *(pOutrow+3) = 0xFFFF; /* alpha becomes fully opaque !!! */
- }
- else
- { /* here we'll have to blend */
- MNG_BLEND16 (iFGr16, iFGg16, iFGb16, iFGa16,
- iBGr16, iBGg16, iBGb16, iBGa16,
- iCr16, iCg16, iCb16, iCa16);
- /* and return the composed values */
- mng_put_uint16 ((mng_uint8p)pOutrow, iCr16);
- mng_put_uint16 ((mng_uint8p)(pOutrow+1), iCg16);
- mng_put_uint16 ((mng_uint8p)(pOutrow+2), iCb16);
- mng_put_uint16 ((mng_uint8p)(pOutrow+3), iCa16);
- }
- }
-
- pOutrow += 4;
- pWorkrow += 4;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_COMPOSEUNDER_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * PAST flip & tile routines - flip or tile a row of pixels * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_flip_rgba8 (mng_datap pData)
-{
- mng_uint32p pWorkrow;
- mng_uint32p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FLIP_RGBA8, MNG_LC_START);
-#endif
- /* setup temp pointers */
- pWorkrow = (mng_uint32p)pData->pRGBArow + pData->iRowsamples - 1;
- pOutrow = (mng_uint32p)pData->pWorkrow;
- /* swap original buffers */
- pData->pWorkrow = pData->pRGBArow;
- pData->pRGBArow = (mng_uint8p)pOutrow;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* let's flip */
- *pOutrow = *pWorkrow;
- pOutrow++;
- pWorkrow--;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FLIP_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_flip_rgba16 (mng_datap pData)
-{
- mng_uint32p pWorkrow;
- mng_uint32p pOutrow;
- mng_int32 iX;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FLIP_RGBA16, MNG_LC_START);
-#endif
- /* setup temp pointers */
- pWorkrow = (mng_uint32p)pData->pRGBArow + ((pData->iRowsamples - 1) << 1);
- pOutrow = (mng_uint32p)pData->pWorkrow;
- /* swap original buffers */
- pData->pWorkrow = pData->pRGBArow;
- pData->pRGBArow = (mng_uint8p)pOutrow;
-
-#ifdef MNG_DECREMENT_LOOPS
- for (iX = pData->iRowsamples; iX > 0; iX--)
-#else
- for (iX = 0; iX < pData->iRowsamples; iX++)
-#endif
- { /* let's flip */
- *pOutrow = *pWorkrow;
- *(pOutrow + 1) = *(pWorkrow + 1);
-
- pOutrow += 2;
- pWorkrow -= 2;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_FLIP_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode mng_tile_rgba8 (mng_datap pData)
-{
- mng_uint32p pWorkrow;
- mng_uint32p pOutrow;
- mng_int32 iX;
- mng_uint32 iZ, iMax;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_TILE_RGBA8, MNG_LC_START);
-#endif
-
- iZ = pData->iSourcel; /* indent ? */
- /* what's our source-length */
- iMax = ((mng_imagep)pData->pRetrieveobj)->pImgbuf->iWidth;
- /* setup temp pointers */
- pWorkrow = (mng_uint32p)pData->pRGBArow + iZ;
- pOutrow = (mng_uint32p)pData->pWorkrow;
- /* swap original buffers */
- pData->pWorkrow = pData->pRGBArow;
- pData->pRGBArow = (mng_uint8p)pOutrow;
-
- for (iX = pData->iDestl; iX < pData->iDestr; iX++)
- { /* tiiiile */
- *pOutrow = *pWorkrow;
-
- pWorkrow++;
- pOutrow++;
- iZ++;
-
- if (iZ >= iMax) /* end of source ? */
- {
- iZ = 0;
- pWorkrow = (mng_uint32p)pData->pWorkrow;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_TILE_RGBA8, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_tile_rgba16 (mng_datap pData)
-{
- mng_uint32p pWorkrow;
- mng_uint32p pOutrow;
- mng_int32 iX;
- mng_uint32 iZ, iMax;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_TILE_RGBA16, MNG_LC_START);
-#endif
-
- iZ = pData->iSourcel; /* indent ? */
- /* what's our source-length */
- iMax = ((mng_imagep)pData->pRetrieveobj)->pImgbuf->iWidth;
- /* setup temp pointers */
- pWorkrow = (mng_uint32p)pData->pRGBArow + (iZ << 1);
- pOutrow = (mng_uint32p)pData->pWorkrow;
- /* swap original buffers */
- pData->pWorkrow = pData->pRGBArow;
- pData->pRGBArow = (mng_uint8p)pOutrow;
-
- for (iX = pData->iDestl; iX < pData->iDestr; iX++)
- { /* tiiiile */
- *pOutrow = *pWorkrow;
- *(pOutrow + 1) = *(pWorkrow + 1);
-
- pWorkrow += 2;
- pOutrow += 2;
- iZ++;
-
- if (iZ >= iMax) /* end of source ? */
- {
- iZ = 0;
- pWorkrow = (mng_uint32p)pData->pWorkrow;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_TILE_RGBA16, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SKIPCHUNK_PAST */
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_DISPLAY_PROCS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_pixels.h b/src/3rdparty/libmng/libmng_pixels.h
deleted file mode 100644
index 5a0281e89d..0000000000
--- a/src/3rdparty/libmng/libmng_pixels.h
+++ /dev/null
@@ -1,1147 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_pixels.h copyright (c) 2000-2006 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Pixel-row management routines (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the pixel-row management routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.5.2 - 05/22/2000 - G.Juyn * */
-/* * - added some JNG definitions * */
-/* * - added delta-image row-processing routines * */
-/* * 0.5.2 - 06/05/2000 - G.Juyn * */
-/* * - added support for RGB8_A8 canvasstyle * */
-/* * * */
-/* * 0.5.3 - 06/16/2000 - G.Juyn * */
-/* * - changed progressive-display processing * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN support * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added optional support for bKGD for PNG images * */
-/* * - added support for JDAA * */
-/* * 0.9.3 - 10/19/2000 - G.Juyn * */
-/* * - implemented delayed delta-processing * */
-/* * * */
-/* * 0.9.4 - 1/18/2001 - G.Juyn * */
-/* * - added "new" MAGN methods 3, 4 & 5 * */
-/* * * */
-/* * 1.0.1 - 04/21/2001 - G.Juyn (code by G.Kelly) * */
-/* * - added BGRA8 canvas with premultiplied alpha * */
-/* * * */
-/* * 1.0.5 - 08/15/2002 - G.Juyn * */
-/* * - completed PROM support * */
-/* * - completed delta-image support * */
-/* * 1.0.5 - 08/16/2002 - G.Juyn * */
-/* * - completed MAGN support (16-bit functions) * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/22/2002 - G.Juyn * */
-/* * - added bgrx8 canvas (filler byte) * */
-/* * 1.0.5 - 09/23/2002 - G.Juyn * */
-/* * - added compose over/under routines for PAST processing * */
-/* * - added flip & tile routines for PAST processing * */
-/* * * */
-/* * 1.0.6 - 03/09/2003 - G.Juyn * */
-/* * - hiding 12-bit JPEG stuff * */
-/* * 1.0.6 - 05/11/2003 - G. Juyn * */
-/* * - added conditionals around canvas update routines * */
-/* * 1.0.6 - 06/09/2003 - G. R-P * */
-/* * - added conditionals around 8-bit magn routines * */
-/* * 1.0.6 - 07/07/2003 - G. R-P * */
-/* * - removed conditionals around 8-bit magn routines * */
-/* * - added conditionals around 16-bit and delta-PNG * */
-/* * supporting code * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added SKIPCHUNK conditionals around PAST chunk support * */
-/* * 1.0.6 - 08/18/2003 - G.R-P * */
-/* * - added conditionals around 1, 2, and 4-bit prototypes * */
-/* * * */
-/* * 1.0.7 - 11/27/2003 - R.A * */
-/* * - added CANVAS_RGB565 and CANVAS_BGR565 * */
-/* * 1.0.7 - 12/06/2003 - R.A * */
-/* * - added CANVAS_RGBA565 and CANVAS_BGRA565 * */
-/* * 1.0.7 - 01/25/2004 - J.S * */
-/* * - added premultiplied alpha canvas' for RGBA, ARGB, ABGR * */
-/* * * */
-/* * 1.0.9 - 10/10/2004 - G.R-P. * */
-/* * - added MNG_NO_1_2_4BIT_SUPPORT * */
-/* * 1.0.9 - 10/14/2004 - G.Juyn * */
-/* * - added bgr565_a8 canvas-style (thanks to J. Elvander) * */
-/* * * */
-/* * 1.0.10 - 03/07/2006 - (thanks to W. Manthey) * */
-/* * - added CANVAS_RGB555 and CANVAS_BGR555 * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_pixels_h_
-#define _libmng_pixels_h_
-
-/* ************************************************************************** */
-/* * * */
-/* * Progressive display check - checks to see if progressive display is * */
-/* * in order & indicates so * */
-/* * * */
-/* * The routine is called after a call to one of the display_xxx routines * */
-/* * if appropriate * */
-/* * * */
-/* * The refresh is warrented in the read_chunk routine (mng_read.c) * */
-/* * and only during read&display processing, since there's not much point * */
-/* * doing it from memory! * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_display_progressive_check (mng_datap pData);
-
-/* ************************************************************************** */
-/* * * */
-/* * Display routines - convert rowdata (which is already color-corrected) * */
-/* * to the output canvas, respecting any transparency information * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCANVAS_RGB8
-mng_retcode mng_display_rgb8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_RGBA8
-mng_retcode mng_display_rgba8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_RGBA8_PM
-mng_retcode mng_display_rgba8_pm (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_ARGB8
-mng_retcode mng_display_argb8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_ARGB8_PM
-mng_retcode mng_display_argb8_pm (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_RGB8_A8
-mng_retcode mng_display_rgb8_a8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGR8
-mng_retcode mng_display_bgr8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGRX8
-mng_retcode mng_display_bgrx8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGRA8
-mng_retcode mng_display_bgra8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGRA8_PM
-mng_retcode mng_display_bgra8_pm (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_ABGR8
-mng_retcode mng_display_abgr8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_ABGR8_PM
-mng_retcode mng_display_abgr8_pm (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_RGB565
-mng_retcode mng_display_rgb565 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_RGBA565
-mng_retcode mng_display_rgba565 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGR565
-mng_retcode mng_display_bgr565 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGRA565
-mng_retcode mng_display_bgra565 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGR565_A8
-mng_retcode mng_display_bgr565_a8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_RGB555
-mng_retcode mng_display_rgb555 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGR555
-mng_retcode mng_display_bgr555 (mng_datap pData);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Background restore routines - restore the background with info from * */
-/* * the BACK and/or bKGD chunk and/or the app's background canvas * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_restore_bkgd_backimage (mng_datap pData);
-mng_retcode mng_restore_bkgd_backcolor (mng_datap pData);
-mng_retcode mng_restore_bkgd_bkgd (mng_datap pData);
-mng_retcode mng_restore_bkgd_bgcolor (mng_datap pData);
-#ifndef MNG_SKIPCANVAS_RGB8
-mng_retcode mng_restore_bkgd_rgb8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGR8
-mng_retcode mng_restore_bkgd_bgr8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGRX8
-mng_retcode mng_restore_bkgd_bgrx8 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_RGB565
-mng_retcode mng_restore_bkgd_rgb565 (mng_datap pData);
-#endif
-#ifndef MNG_SKIPCANVAS_BGR565
-mng_retcode mng_restore_bkgd_bgr565 (mng_datap pData);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Row retrieval routines - retrieve processed & uncompressed row-data * */
-/* * from the current "object" * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_retrieve_g8 (mng_datap pData);
-mng_retcode mng_retrieve_rgb8 (mng_datap pData);
-mng_retcode mng_retrieve_idx8 (mng_datap pData);
-mng_retcode mng_retrieve_ga8 (mng_datap pData);
-mng_retcode mng_retrieve_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_retrieve_g16 (mng_datap pData);
-mng_retcode mng_retrieve_ga16 (mng_datap pData);
-mng_retcode mng_retrieve_rgb16 (mng_datap pData);
-mng_retcode mng_retrieve_rgba16 (mng_datap pData);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Row storage routines - store processed & uncompressed row-data * */
-/* * into the current "object" * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_store_g1 (mng_datap pData);
-mng_retcode mng_store_g2 (mng_datap pData);
-mng_retcode mng_store_g4 (mng_datap pData);
-mng_retcode mng_store_idx1 (mng_datap pData);
-mng_retcode mng_store_idx2 (mng_datap pData);
-mng_retcode mng_store_idx4 (mng_datap pData);
-#endif
-mng_retcode mng_store_idx8 (mng_datap pData);
-mng_retcode mng_store_rgb8 (mng_datap pData);
-mng_retcode mng_store_g8 (mng_datap pData);
-mng_retcode mng_store_ga8 (mng_datap pData);
-mng_retcode mng_store_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_g16 (mng_datap pData);
-mng_retcode mng_store_ga16 (mng_datap pData);
-mng_retcode mng_store_rgb16 (mng_datap pData);
-mng_retcode mng_store_rgba16 (mng_datap pData);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Row storage routines (JPEG) - store processed & uncompressed row-data * */
-/* * into the current "object" * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-mng_retcode mng_store_jpeg_g8 (mng_datap pData);
-mng_retcode mng_store_jpeg_rgb8 (mng_datap pData);
-mng_retcode mng_store_jpeg_ga8 (mng_datap pData);
-mng_retcode mng_store_jpeg_rgba8 (mng_datap pData);
-
-#ifdef MNG_SUPPORT_JPEG12
-mng_retcode mng_store_jpeg_g12 (mng_datap pData);
-mng_retcode mng_store_jpeg_rgb12 (mng_datap pData);
-mng_retcode mng_store_jpeg_ga12 (mng_datap pData);
-mng_retcode mng_store_jpeg_rgba12 (mng_datap pData);
-#endif
-
-mng_retcode mng_store_jpeg_g8_alpha (mng_datap pData);
-mng_retcode mng_store_jpeg_rgb8_alpha (mng_datap pData);
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_store_jpeg_g8_a1 (mng_datap pData);
-mng_retcode mng_store_jpeg_g8_a2 (mng_datap pData);
-mng_retcode mng_store_jpeg_g8_a4 (mng_datap pData);
-#endif
-mng_retcode mng_store_jpeg_g8_a8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_jpeg_g8_a16 (mng_datap pData);
-#endif
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_store_jpeg_rgb8_a1 (mng_datap pData);
-mng_retcode mng_store_jpeg_rgb8_a2 (mng_datap pData);
-mng_retcode mng_store_jpeg_rgb8_a4 (mng_datap pData);
-#endif
-mng_retcode mng_store_jpeg_rgb8_a8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_jpeg_rgb8_a16 (mng_datap pData);
-#endif
-
-#ifdef MNG_SUPPORT_JPEG12
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_store_jpeg_g12_a1 (mng_datap pData);
-mng_retcode mng_store_jpeg_g12_a2 (mng_datap pData);
-mng_retcode mng_store_jpeg_g12_a4 (mng_datap pData);
-#endif
-mng_retcode mng_store_jpeg_g12_a8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_jpeg_g12_a16 (mng_datap pData);
-#endif
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_store_jpeg_rgb12_a1 (mng_datap pData);
-mng_retcode mng_store_jpeg_rgb12_a2 (mng_datap pData);
-mng_retcode mng_store_jpeg_rgb12_a4 (mng_datap pData);
-#endif
-mng_retcode mng_store_jpeg_rgb12_a8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_store_jpeg_rgb12_a16 (mng_datap pData);
-#endif
-#endif
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Delta-image row routines - apply the processed & uncompressed row-data * */
-/* * onto the target "object" * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_delta_g1 (mng_datap pData);
-mng_retcode mng_delta_g2 (mng_datap pData);
-mng_retcode mng_delta_g4 (mng_datap pData);
-#endif
-mng_retcode mng_delta_g8 (mng_datap pData);
-mng_retcode mng_delta_g16 (mng_datap pData);
-mng_retcode mng_delta_rgb8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_rgb16 (mng_datap pData);
-#endif
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_delta_idx1 (mng_datap pData);
-mng_retcode mng_delta_idx2 (mng_datap pData);
-mng_retcode mng_delta_idx4 (mng_datap pData);
-#endif
-mng_retcode mng_delta_idx8 (mng_datap pData);
-mng_retcode mng_delta_ga8 (mng_datap pData);
-mng_retcode mng_delta_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_ga16 (mng_datap pData);
-mng_retcode mng_delta_rgba16 (mng_datap pData);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Delta-image row routines - apply the source row onto the target * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_delta_g1_g1 (mng_datap pData);
-mng_retcode mng_delta_g2_g2 (mng_datap pData);
-mng_retcode mng_delta_g4_g4 (mng_datap pData);
-#endif
-mng_retcode mng_delta_g8_g8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_g16_g16 (mng_datap pData);
-#endif
-mng_retcode mng_delta_ga8_ga8 (mng_datap pData);
-mng_retcode mng_delta_ga8_g8 (mng_datap pData);
-mng_retcode mng_delta_ga8_a8 (mng_datap pData);
-mng_retcode mng_delta_rgba8_rgb8 (mng_datap pData);
-mng_retcode mng_delta_rgba8_a8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_ga16_ga16 (mng_datap pData);
-mng_retcode mng_delta_ga16_g16 (mng_datap pData);
-mng_retcode mng_delta_ga16_a16 (mng_datap pData);
-mng_retcode mng_delta_rgba16_a16 (mng_datap pData);
-mng_retcode mng_delta_rgba16_rgb16 (mng_datap pData);
-#endif
-#endif /* MNG_NO_DELTA_PNG */
-mng_retcode mng_delta_rgb8_rgb8 (mng_datap pData); /* Used for PAST */
-mng_retcode mng_delta_rgba8_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_delta_rgb16_rgb16 (mng_datap pData);
-mng_retcode mng_delta_rgba16_rgba16 (mng_datap pData);
-#endif
-
-#ifndef MNG_NO_DELTA_PNG
-/* ************************************************************************** */
-/* * * */
-/* * Delta-image row routines - scale the delta to bitdepth of target * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_scale_g1_g2 (mng_datap pData);
-mng_retcode mng_scale_g1_g4 (mng_datap pData);
-mng_retcode mng_scale_g1_g8 (mng_datap pData);
-mng_retcode mng_scale_g2_g4 (mng_datap pData);
-mng_retcode mng_scale_g2_g8 (mng_datap pData);
-mng_retcode mng_scale_g4_g8 (mng_datap pData);
-#endif
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_scale_g1_g16 (mng_datap pData);
-mng_retcode mng_scale_g2_g16 (mng_datap pData);
-mng_retcode mng_scale_g4_g16 (mng_datap pData);
-#endif
-mng_retcode mng_scale_g8_g16 (mng_datap pData);
-mng_retcode mng_scale_ga8_ga16 (mng_datap pData);
-mng_retcode mng_scale_rgb8_rgb16 (mng_datap pData);
-mng_retcode mng_scale_rgba8_rgba16 (mng_datap pData);
-#endif
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_scale_g2_g1 (mng_datap pData);
-mng_retcode mng_scale_g4_g1 (mng_datap pData);
-mng_retcode mng_scale_g8_g1 (mng_datap pData);
-mng_retcode mng_scale_g4_g2 (mng_datap pData);
-mng_retcode mng_scale_g8_g2 (mng_datap pData);
-mng_retcode mng_scale_g8_g4 (mng_datap pData);
-#endif
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_scale_g16_g1 (mng_datap pData);
-mng_retcode mng_scale_g16_g2 (mng_datap pData);
-mng_retcode mng_scale_g16_g4 (mng_datap pData);
-#endif
-mng_retcode mng_scale_g16_g8 (mng_datap pData);
-mng_retcode mng_scale_ga16_ga8 (mng_datap pData);
-mng_retcode mng_scale_rgb16_rgb8 (mng_datap pData);
-mng_retcode mng_scale_rgba16_rgba8 (mng_datap pData);
-#endif
-#endif /* MNG_NO_DELTA_PNG */
-
-/* ************************************************************************** */
-/* * * */
-/* * Delta-image bit routines - promote bit_depth * */
-/* * * */
-/* ************************************************************************** */
-
-mng_uint8 mng_promote_replicate_1_2 (mng_uint8 iB);
-mng_uint8 mng_promote_replicate_1_4 (mng_uint8 iB);
-mng_uint8 mng_promote_replicate_1_8 (mng_uint8 iB);
-mng_uint8 mng_promote_replicate_2_4 (mng_uint8 iB);
-mng_uint8 mng_promote_replicate_2_8 (mng_uint8 iB);
-mng_uint8 mng_promote_replicate_4_8 (mng_uint8 iB);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_uint16 mng_promote_replicate_1_16 (mng_uint8 iB);
-mng_uint16 mng_promote_replicate_2_16 (mng_uint8 iB);
-mng_uint16 mng_promote_replicate_4_16 (mng_uint8 iB);
-mng_uint16 mng_promote_replicate_8_16 (mng_uint8 iB);
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DELTA_PNG
-mng_uint8 mng_promote_zerofill_1_2 (mng_uint8 iB);
-mng_uint8 mng_promote_zerofill_1_4 (mng_uint8 iB);
-mng_uint8 mng_promote_zerofill_1_8 (mng_uint8 iB);
-mng_uint8 mng_promote_zerofill_2_4 (mng_uint8 iB);
-mng_uint8 mng_promote_zerofill_2_8 (mng_uint8 iB);
-mng_uint8 mng_promote_zerofill_4_8 (mng_uint8 iB);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_uint16 mng_promote_zerofill_1_16 (mng_uint8 iB);
-mng_uint16 mng_promote_zerofill_2_16 (mng_uint8 iB);
-mng_uint16 mng_promote_zerofill_4_16 (mng_uint8 iB);
-mng_uint16 mng_promote_zerofill_8_16 (mng_uint8 iB);
-#endif
-#endif /* MNG_NO_DELTA_PNG */
-
-/* ************************************************************************** */
-/* * * */
-/* * Delta-image row routines - promote color_type * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_promote_g8_g8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g8_g16 (mng_datap pData);
-mng_retcode mng_promote_g16_g16 (mng_datap pData);
-#endif
-
-mng_retcode mng_promote_g8_ga8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g8_ga16 (mng_datap pData);
-mng_retcode mng_promote_g16_ga16 (mng_datap pData);
-#endif
-
-mng_retcode mng_promote_g8_rgb8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g8_rgb16 (mng_datap pData);
-mng_retcode mng_promote_g16_rgb16 (mng_datap pData);
-#endif
-
-mng_retcode mng_promote_g8_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_g8_rgba16 (mng_datap pData);
-mng_retcode mng_promote_g16_rgba16 (mng_datap pData);
-
-mng_retcode mng_promote_ga8_ga16 (mng_datap pData);
-#endif
-
-mng_retcode mng_promote_ga8_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_ga8_rgba16 (mng_datap pData);
-mng_retcode mng_promote_ga16_rgba16 (mng_datap pData);
-#endif
-
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_rgb8_rgb16 (mng_datap pData);
-#endif
-
-mng_retcode mng_promote_rgb8_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_rgb8_rgba16 (mng_datap pData);
-mng_retcode mng_promote_rgb16_rgba16 (mng_datap pData);
-#endif
-
-mng_retcode mng_promote_idx8_rgb8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_idx8_rgb16 (mng_datap pData);
-#endif
-
-mng_retcode mng_promote_idx8_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_promote_idx8_rgba16 (mng_datap pData);
-
-mng_retcode mng_promote_rgba8_rgba16 (mng_datap pData);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Row processing routines - convert uncompressed data from zlib to * */
-/* * managable row-data which serves as input to the color-management * */
-/* * routines * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_process_g1 (mng_datap pData);
-mng_retcode mng_process_g2 (mng_datap pData);
-mng_retcode mng_process_g4 (mng_datap pData);
-#endif
-mng_retcode mng_process_g8 (mng_datap pData);
-mng_retcode mng_process_rgb8 (mng_datap pData);
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_process_idx1 (mng_datap pData);
-mng_retcode mng_process_idx2 (mng_datap pData);
-mng_retcode mng_process_idx4 (mng_datap pData);
-#endif
-mng_retcode mng_process_idx8 (mng_datap pData);
-mng_retcode mng_process_ga8 (mng_datap pData);
-mng_retcode mng_process_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_process_g16 (mng_datap pData);
-mng_retcode mng_process_ga16 (mng_datap pData);
-mng_retcode mng_process_rgb16 (mng_datap pData);
-mng_retcode mng_process_rgba16 (mng_datap pData);
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Row processing initialization routines - set up the variables needed * */
-/* * to process uncompressed row-data * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_FOOTPRINT_INIT
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_init_g1_i (mng_datap pData);
-mng_retcode mng_init_g2_i (mng_datap pData);
-mng_retcode mng_init_g4_i (mng_datap pData);
-#endif
-mng_retcode mng_init_g8_i (mng_datap pData);
-mng_retcode mng_init_rgb8_i (mng_datap pData);
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_init_idx1_i (mng_datap pData);
-mng_retcode mng_init_idx2_i (mng_datap pData);
-mng_retcode mng_init_idx4_i (mng_datap pData);
-#endif
-mng_retcode mng_init_idx8_i (mng_datap pData);
-mng_retcode mng_init_ga8_i (mng_datap pData);
-mng_retcode mng_init_rgba8_i (mng_datap pData);
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_init_g1_ni (mng_datap pData);
-mng_retcode mng_init_g2_ni (mng_datap pData);
-mng_retcode mng_init_g4_ni (mng_datap pData);
-#endif
-mng_retcode mng_init_g8_ni (mng_datap pData);
-mng_retcode mng_init_rgb8_ni (mng_datap pData);
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_init_idx1_ni (mng_datap pData);
-mng_retcode mng_init_idx2_ni (mng_datap pData);
-mng_retcode mng_init_idx4_ni (mng_datap pData);
-#endif
-mng_retcode mng_init_idx8_ni (mng_datap pData);
-mng_retcode mng_init_ga8_ni (mng_datap pData);
-mng_retcode mng_init_rgba8_ni (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_g16_i (mng_datap pData);
-mng_retcode mng_init_rgb16_i (mng_datap pData);
-mng_retcode mng_init_ga16_i (mng_datap pData);
-mng_retcode mng_init_rgba16_i (mng_datap pData);
-mng_retcode mng_init_g16_ni (mng_datap pData);
-mng_retcode mng_init_rgb16_ni (mng_datap pData);
-mng_retcode mng_init_ga16_ni (mng_datap pData);
-mng_retcode mng_init_rgba16_ni (mng_datap pData);
-#endif
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Row processing initialization routines (JPEG) - set up the variables * */
-/* * needed to process uncompressed row-data * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_FOOTPRINT_INIT
-#ifdef MNG_INCLUDE_JNG
-#ifndef MNG_NO_1_2_4BIT_SUPPORT
-mng_retcode mng_init_jpeg_a1_ni (mng_datap pData);
-mng_retcode mng_init_jpeg_a2_ni (mng_datap pData);
-mng_retcode mng_init_jpeg_a4_ni (mng_datap pData);
-#endif
-mng_retcode mng_init_jpeg_a8_ni (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_init_jpeg_a16_ni (mng_datap pData);
-#endif
-#endif
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * General row processing routines * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_init_rowproc (mng_datap pData);
-mng_retcode mng_next_row (mng_datap pData);
-#ifdef MNG_INCLUDE_JNG
-mng_retcode mng_next_jpeg_alpharow (mng_datap pData);
-mng_retcode mng_next_jpeg_row (mng_datap pData);
-#endif
-mng_retcode mng_cleanup_rowproc (mng_datap pData);
-
-/* ************************************************************************** */
-/* * * */
-/* * Magnification row routines - apply magnification transforms * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_OPTIMIZE_FOOTPRINT_MAGN
-mng_retcode mng_magnify_g8_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_g8_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_g8_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb8_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb8_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb8_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga8_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga8_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga8_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga8_x4 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga8_x5 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-#endif
-mng_retcode mng_magnify_rgba8_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba8_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba8_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba8_x4 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba8_x5 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-#ifndef MNG_OPTIMIZE_FOOTPRINT_MAGN
-mng_retcode mng_magnify_g8_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_g8_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_g8_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb8_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb8_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb8_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga8_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga8_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga8_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga8_y4 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga8_y5 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-#endif
-mng_retcode mng_magnify_rgba8_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba8_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba8_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba8_y4 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba8_y5 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-
-/* ************************************************************************** */
-#ifndef MNG_NO_16BIT_SUPPORT
-#ifndef MNG_OPTIMIZE_FOOTPRINT_MAGN
-mng_retcode mng_magnify_g16_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_g16_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_g16_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb16_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb16_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb16_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga16_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga16_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga16_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga16_x4 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga16_x5 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba16_x1 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba16_x2 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba16_x3 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba16_x4 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba16_x5 (mng_datap pData,
- mng_uint16 iMX,
- mng_uint16 iML,
- mng_uint16 iMR,
- mng_uint32 iWidth,
- mng_uint8p pSrcline,
- mng_uint8p pDstline);
-
-mng_retcode mng_magnify_g16_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_g16_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_g16_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb16_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb16_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgb16_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga16_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga16_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga16_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga16_y4 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_ga16_y5 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba16_y1 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba16_y2 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba16_y3 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba16_y4 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-mng_retcode mng_magnify_rgba16_y5 (mng_datap pData,
- mng_int32 iS,
- mng_int32 iM,
- mng_uint32 iWidth,
- mng_uint8p pSrcline1,
- mng_uint8p pSrcline2,
- mng_uint8p pDstline);
-#endif
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * PAST composition routines - compose over/under with a target object * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode mng_composeover_rgba8 (mng_datap pData);
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_composeunder_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_composeover_rgba16 (mng_datap pData);
-mng_retcode mng_composeunder_rgba16 (mng_datap pData);
-#endif
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * PAST flip & tile routines - flip or tile a row of pixels * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef MNG_SKIPCHUNK_PAST
-mng_retcode mng_flip_rgba8 (mng_datap pData);
-mng_retcode mng_tile_rgba8 (mng_datap pData);
-#ifndef MNG_NO_16BIT_SUPPORT
-mng_retcode mng_flip_rgba16 (mng_datap pData);
-mng_retcode mng_tile_rgba16 (mng_datap pData);
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#endif /* _libmng_pixels_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_prop_xs.c b/src/3rdparty/libmng/libmng_prop_xs.c
deleted file mode 100644
index 3849d51cc5..0000000000
--- a/src/3rdparty/libmng/libmng_prop_xs.c
+++ /dev/null
@@ -1,2799 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_prop_xs.c copyright (c) 2000-2006 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : property get/set interface (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the property get/set functions * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - fixed calling convention * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - added set_outputprofile2 & set_srgbprofile2 * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * * */
-/* * 0.5.2 - 05/23/2000 - G.Juyn * */
-/* * - changed inclusion of cms-routines * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - added support for get/set default zlib/IJG parms * */
-/* * 0.5.2 - 05/31/2000 - G.Juyn * */
-/* * - fixed up punctuation (contribution by Tim Rowley) * */
-/* * 0.5.2 - 06/05/2000 - G.Juyn * */
-/* * - added support for RGB8_A8 canvasstyle * */
-/* * * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - added get/set for speedtype to facilitate testing * */
-/* * - added get for imagelevel during processtext callback * */
-/* * 0.5.3 - 06/26/2000 - G.Juyn * */
-/* * - changed userdata variable to mng_ptr * */
-/* * 0.5.3 - 06/29/2000 - G.Juyn * */
-/* * - fixed incompatible return-types * */
-/* * * */
-/* * 0.9.1 - 07/08/2000 - G.Juyn * */
-/* * - added get routines for internal display variables * */
-/* * - added get/set routines for suspensionmode variable * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - added get/set routines for sectionbreak variable * */
-/* * * */
-/* * 0.9.2 - 07/31/2000 - G.Juyn * */
-/* * - added status_xxxx functions * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 10/10/2000 - G.Juyn * */
-/* * - added support for alpha-depth prediction * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added functions to retrieve PNG/JNG specific header-info * */
-/* * 0.9.3 - 10/20/2000 - G.Juyn * */
-/* * - added get/set for bKGD preference setting * */
-/* * 0.9.3 - 10/21/2000 - G.Juyn * */
-/* * - added get function for interlace/progressive display * */
-/* * * */
-/* * 1.0.1 - 04/21/2001 - G.Juyn (code by G.Kelly) * */
-/* * - added BGRA8 canvas with premultiplied alpha * */
-/* * 1.0.1 - 05/02/2001 - G.Juyn * */
-/* * - added "default" sRGB generation (Thanks Marti!) * */
-/* * * */
-/* * 1.0.2 - 06/23/2001 - G.Juyn * */
-/* * - added optimization option for MNG-video playback * */
-/* * 1.0.2 - 06/25/2001 - G.Juyn * */
-/* * - added option to turn off progressive refresh * */
-/* * * */
-/* * 1.0.3 - 08/06/2001 - G.Juyn * */
-/* * - added get function for last processed BACK chunk * */
-/* * * */
-/* * 1.0.4 - 06/22/2002 - G.Juyn * */
-/* * - B495442 - invalid returnvalue in mng_get_suspensionmode * */
-/* * * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 09/22/2002 - G.Juyn * */
-/* * - added bgrx8 canvas (filler byte) * */
-/* * 1.0.5 - 11/07/2002 - G.Juyn * */
-/* * - added support to get totals after mng_read() * */
-/* * * */
-/* * 1.0.6 - 05/11/2003 - G. Juyn * */
-/* * - added conditionals around canvas update routines * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added conditionals around some JNG-supporting code * */
-/* * 1.0.6 - 07/11/2003 - G.R-P * */
-/* * - added conditionals zlib and jpeg property accessors * */
-/* * 1.0.6 - 07/14/2003 - G.R-P * */
-/* * - added conditionals around various unused functions * */
-/* * * */
-/* * 1.0.7 - 11/27/2003 - R.A * */
-/* * - added CANVAS_RGB565 and CANVAS_BGR565 * */
-/* * 1.0.7 - 12/06/2003 - R.A * */
-/* * - added CANVAS_RGBA565 and CANVAS_BGRA565 * */
-/* * 1.0.7 - 01/25/2004 - J.S * */
-/* * - added premultiplied alpha canvas' for RGBA, ARGB, ABGR * */
-/* * 1.0.7 - 03/07/2004 - G.R-P. * */
-/* * - put gamma, cms-related functions inside #ifdef * */
-/* * * */
-/* * 1.0.8 - 04/02/2004 - G.Juyn * */
-/* * - added CRC existence & checking flags * */
-/* * * */
-/* * 1.0.9 - 09/18/2004 - G.R-P. * */
-/* * - added some MNG_SUPPORT_WRITE conditionals * */
-/* * 1.0.9 - 10/03/2004 - G.Juyn * */
-/* * - added function to retrieve current FRAM delay * */
-/* * 1.0.9 - 10/14/2004 - G.Juyn * */
-/* * - added bgr565_a8 canvas-style (thanks to J. Elvander) * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* * 1.0.10 - 03/07/2006 - (thanks to W. Manthey) * */
-/* * - added CANVAS_RGB555 and CANVAS_BGR555 * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_objects.h"
-#include "libmng_memory.h"
-#include "libmng_cms.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Property set functions * */
-/* * * */
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_userdata (mng_handle hHandle,
- mng_ptr pUserdata)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_USERDATA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->pUserdata = pUserdata;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_USERDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_canvasstyle (mng_handle hHandle,
- mng_uint32 iStyle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_CANVASSTYLE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
-
- switch (iStyle)
- {
-#ifndef MNG_SKIPCANVAS_RGB8
- case MNG_CANVAS_RGB8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_RGBA8
- case MNG_CANVAS_RGBA8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_RGBA8_PM
- case MNG_CANVAS_RGBA8_PM: break;
-#endif
-#ifndef MNG_SKIPCANVAS_ARGB8
- case MNG_CANVAS_ARGB8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_ARGB8_PM
- case MNG_CANVAS_ARGB8_PM: break;
-#endif
-#ifndef MNG_SKIPCANVAS_RGB8_A8
- case MNG_CANVAS_RGB8_A8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGR8
- case MNG_CANVAS_BGR8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGRX8
- case MNG_CANVAS_BGRX8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGRA8
- case MNG_CANVAS_BGRA8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGRA8_PM
- case MNG_CANVAS_BGRA8_PM: break;
-#endif
-#ifndef MNG_SKIPCANVAS_ABGR8
- case MNG_CANVAS_ABGR8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_ABGR8_PM
- case MNG_CANVAS_ABGR8_PM: break;
-#endif
-#ifndef MNG_SKIPCANVAS_RGB565
- case MNG_CANVAS_RGB565 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_RGBA565
- case MNG_CANVAS_RGBA565 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGR565
- case MNG_CANVAS_BGR565 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGRA565
- case MNG_CANVAS_BGRA565 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGR565_A8
- case MNG_CANVAS_BGR565_A8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_RGB555
- case MNG_CANVAS_RGB555 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGR555
- case MNG_CANVAS_BGR555 : break;
-#endif
-/* case MNG_CANVAS_RGB16 : break; */
-/* case MNG_CANVAS_RGBA16 : break; */
-/* case MNG_CANVAS_ARGB16 : break; */
-/* case MNG_CANVAS_BGR16 : break; */
-/* case MNG_CANVAS_BGRA16 : break; */
-/* case MNG_CANVAS_ABGR16 : break; */
-/* case MNG_CANVAS_INDEX8 : break; */
-/* case MNG_CANVAS_INDEXA8 : break; */
-/* case MNG_CANVAS_AINDEX8 : break; */
-/* case MNG_CANVAS_GRAY8 : break; */
-/* case MNG_CANVAS_GRAY16 : break; */
-/* case MNG_CANVAS_GRAYA8 : break; */
-/* case MNG_CANVAS_GRAYA16 : break; */
-/* case MNG_CANVAS_AGRAY8 : break; */
-/* case MNG_CANVAS_AGRAY16 : break; */
-/* case MNG_CANVAS_DX15 : break; */
-/* case MNG_CANVAS_DX16 : break; */
- default : { MNG_ERROR (((mng_datap)hHandle), MNG_INVALIDCNVSTYLE) };
- }
-
- ((mng_datap)hHandle)->iCanvasstyle = iStyle;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_CANVASSTYLE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_bkgdstyle (mng_handle hHandle,
- mng_uint32 iStyle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_BKGDSTYLE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
-
- switch (iStyle) /* alpha-modes not supported */
- {
-#ifndef MNG_SKIPCANVAS_RGB8
- case MNG_CANVAS_RGB8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGR8
- case MNG_CANVAS_BGR8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGRX8
- case MNG_CANVAS_BGRX8 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_RGB565
- case MNG_CANVAS_RGB565 : break;
-#endif
-#ifndef MNG_SKIPCANVAS_BGR565
- case MNG_CANVAS_BGR565 : break;
-#endif
-/* case MNG_CANVAS_RGB16 : break; */
-/* case MNG_CANVAS_BGR16 : break; */
-/* case MNG_CANVAS_INDEX8 : break; */
-/* case MNG_CANVAS_GRAY8 : break; */
-/* case MNG_CANVAS_GRAY16 : break; */
-/* case MNG_CANVAS_DX15 : break; */
-/* case MNG_CANVAS_DX16 : break; */
- default : MNG_ERROR (((mng_datap)hHandle), MNG_INVALIDCNVSTYLE);
- }
-
- ((mng_datap)hHandle)->iBkgdstyle = iStyle;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_BKGDSTYLE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_bgcolor (mng_handle hHandle,
- mng_uint16 iRed,
- mng_uint16 iGreen,
- mng_uint16 iBlue)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_BGCOLOR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iBGred = iRed;
- ((mng_datap)hHandle)->iBGgreen = iGreen;
- ((mng_datap)hHandle)->iBGblue = iBlue;
- ((mng_datap)hHandle)->bUseBKGD = MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_BGCOLOR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_usebkgd (mng_handle hHandle,
- mng_bool bUseBKGD)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_USEBKGD, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->bUseBKGD = bUseBKGD;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_USEBKGD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_storechunks (mng_handle hHandle,
- mng_bool bStorechunks)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_STORECHUNKS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->bStorechunks = bStorechunks;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_STORECHUNKS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_sectionbreaks (mng_handle hHandle,
- mng_bool bSectionbreaks)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SECTIONBREAKS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->bSectionbreaks = bSectionbreaks;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SECTIONBREAKS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_cacheplayback (mng_handle hHandle,
- mng_bool bCacheplayback)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_CACHEPLAYBACK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
-
- if (((mng_datap)hHandle)->bHasheader)
- MNG_ERROR (((mng_datap)hHandle), MNG_FUNCTIONINVALID);
-
- ((mng_datap)hHandle)->bCacheplayback = bCacheplayback;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_CACHEPLAYBACK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_doprogressive (mng_handle hHandle,
- mng_bool bDoProgressive)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_DOPROGRESSIVE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
-
- ((mng_datap)hHandle)->bDoProgressive = bDoProgressive;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_DOPROGRESSIVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_crcmode (mng_handle hHandle,
- mng_uint32 iCrcmode)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_CRCMODE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
-
- ((mng_datap)hHandle)->iCrcmode = iCrcmode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_CRCMODE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_set_srgb (mng_handle hHandle,
- mng_bool bIssRGB)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SRGB, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->bIssRGB = bIssRGB;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_SKIPCHUNK_iCCP
-mng_retcode MNG_DECL mng_set_outputprofile (mng_handle hHandle,
- mng_pchar zFilename)
-{
-#ifdef MNG_INCLUDE_LCMS
- mng_datap pData;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_OUTPUTPROFILE, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_LCMS
- MNG_VALIDHANDLE (hHandle)
-
- pData = (mng_datap)hHandle; /* address the structure */
-
- if (pData->hProf2) /* previously defined ? */
- mnglcms_freeprofile (pData->hProf2);
- /* allocate new CMS profile handle */
- pData->hProf2 = mnglcms_createfileprofile (zFilename);
-
- if (!pData->hProf2) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
-#endif /* MNG_INCLUDE_LCMS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_OUTPUTPROFILE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_SKIPCHUNK_iCCP
-mng_retcode MNG_DECL mng_set_outputprofile2 (mng_handle hHandle,
- mng_uint32 iProfilesize,
- mng_ptr pProfile)
-{
-#ifdef MNG_INCLUDE_LCMS
- mng_datap pData;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_OUTPUTPROFILE2, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_LCMS
- MNG_VALIDHANDLE (hHandle)
-
- pData = (mng_datap)hHandle; /* address the structure */
-
- if (pData->hProf2) /* previously defined ? */
- mnglcms_freeprofile (pData->hProf2);
- /* allocate new CMS profile handle */
- pData->hProf2 = mnglcms_creatememprofile (iProfilesize, pProfile);
-
- if (!pData->hProf2) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
-#endif /* MNG_INCLUDE_LCMS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_OUTPUTPROFILE2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_outputsrgb (mng_handle hHandle)
-{
-#ifdef MNG_INCLUDE_LCMS
- mng_datap pData;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_OUTPUTSRGB, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_LCMS
- MNG_VALIDHANDLE (hHandle)
-
- pData = (mng_datap)hHandle; /* address the structure */
-
- if (pData->hProf2) /* previously defined ? */
- mnglcms_freeprofile (pData->hProf2);
- /* allocate new CMS profile handle */
- pData->hProf2 = mnglcms_createsrgbprofile ();
-
- if (!pData->hProf2) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
-#endif /* MNG_INCLUDE_LCMS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_OUTPUTSRGB, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_set_srgbprofile (mng_handle hHandle,
- mng_pchar zFilename)
-{
-#ifdef MNG_INCLUDE_LCMS
- mng_datap pData;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SRGBPROFILE2, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_LCMS
- MNG_VALIDHANDLE (hHandle)
-
- pData = (mng_datap)hHandle; /* address the structure */
-
- if (pData->hProf3) /* previously defined ? */
- mnglcms_freeprofile (pData->hProf3);
- /* allocate new CMS profile handle */
- pData->hProf3 = mnglcms_createfileprofile (zFilename);
-
- if (!pData->hProf3) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
-#endif /* MNG_INCLUDE_LCMS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SRGBPROFILE2, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_set_srgbprofile2 (mng_handle hHandle,
- mng_uint32 iProfilesize,
- mng_ptr pProfile)
-{
-#ifdef MNG_INCLUDE_LCMS
- mng_datap pData;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SRGBPROFILE, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_LCMS
- MNG_VALIDHANDLE (hHandle)
-
- pData = (mng_datap)hHandle; /* address the structure */
-
- if (pData->hProf3) /* previously defined ? */
- mnglcms_freeprofile (pData->hProf3);
- /* allocate new CMS profile handle */
- pData->hProf3 = mnglcms_creatememprofile (iProfilesize, pProfile);
-
- if (!pData->hProf3) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
-#endif /* MNG_INCLUDE_LCMS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SRGBPROFILE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_srgbimplicit (mng_handle hHandle)
-{
-#ifdef MNG_INCLUDE_LCMS
- mng_datap pData;
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SRGBIMPLICIT, MNG_LC_START);
-#endif
-
-#ifdef MNG_INCLUDE_LCMS
- MNG_VALIDHANDLE (hHandle)
-
- pData = (mng_datap)hHandle; /* address the structure */
-
- if (pData->hProf3) /* previously defined ? */
- mnglcms_freeprofile (pData->hProf3);
- /* allocate new CMS profile handle */
- pData->hProf3 = mnglcms_createsrgbprofile ();
-
- if (!pData->hProf3) /* handle error ? */
- MNG_ERRORL (pData, MNG_LCMS_NOHANDLE);
-#endif /* MNG_INCLUDE_LCMS */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SRGBIMPLICIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-mng_retcode MNG_DECL mng_set_viewgamma (mng_handle hHandle,
- mng_float dGamma)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_VIEWGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->dViewgamma = dGamma;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_VIEWGAMMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_displaygamma (mng_handle hHandle,
- mng_float dGamma)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_DISPLAYGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->dDisplaygamma = dGamma;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_DISPLAYGAMMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_dfltimggamma (mng_handle hHandle,
- mng_float dGamma)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_DFLTIMGGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->dDfltimggamma = dGamma;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_DFLTIMGGAMMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-mng_retcode MNG_DECL mng_set_viewgammaint (mng_handle hHandle,
- mng_uint32 iGamma)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_VIEWGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->dViewgamma = (mng_float)iGamma / 100000;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_VIEWGAMMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_displaygammaint (mng_handle hHandle,
- mng_uint32 iGamma)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_DISPLAYGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->dDisplaygamma = (mng_float)iGamma / 100000;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_DISPLAYGAMMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DFLT_INFO
-mng_retcode MNG_DECL mng_set_dfltimggammaint (mng_handle hHandle,
- mng_uint32 iGamma)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_DFLTIMGGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->dDfltimggamma = (mng_float)iGamma / 100000;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_DFLTIMGGAMMA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIP_MAXCANVAS
-mng_retcode MNG_DECL mng_set_maxcanvaswidth (mng_handle hHandle,
- mng_uint32 iMaxwidth)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_MAXCANVASWIDTH, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iMaxwidth = iMaxwidth;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_MAXCANVASWIDTH, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_maxcanvasheight (mng_handle hHandle,
- mng_uint32 iMaxheight)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_MAXCANVASHEIGHT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iMaxheight = iMaxheight;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_MAXCANVASHEIGHT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_set_maxcanvassize (mng_handle hHandle,
- mng_uint32 iMaxwidth,
- mng_uint32 iMaxheight)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_MAXCANVASSIZE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iMaxwidth = iMaxwidth;
- ((mng_datap)hHandle)->iMaxheight = iMaxheight;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_MAXCANVASSIZE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_zlib_level (mng_handle hHandle,
- mng_int32 iZlevel)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_LEVEL, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iZlevel = iZlevel;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_LEVEL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_zlib_method (mng_handle hHandle,
- mng_int32 iZmethod)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_METHOD, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iZmethod = iZmethod;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_METHOD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_zlib_windowbits (mng_handle hHandle,
- mng_int32 iZwindowbits)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_WINDOWBITS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iZwindowbits = iZwindowbits;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_WINDOWBITS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_zlib_memlevel (mng_handle hHandle,
- mng_int32 iZmemlevel)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_MEMLEVEL, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iZmemlevel = iZmemlevel;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_MEMLEVEL, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_zlib_strategy (mng_handle hHandle,
- mng_int32 iZstrategy)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_STRATEGY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iZstrategy = iZstrategy;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_STRATEGY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_zlib_maxidat (mng_handle hHandle,
- mng_uint32 iMaxIDAT)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_MAXIDAT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iMaxIDAT = iMaxIDAT;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_ZLIB_MAXIDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_jpeg_dctmethod (mng_handle hHandle,
- mngjpeg_dctmethod eJPEGdctmethod)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_DCTMETHOD, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->eJPEGdctmethod = eJPEGdctmethod;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_DCTMETHOD, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_jpeg_quality (mng_handle hHandle,
- mng_int32 iJPEGquality)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_QUALITY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iJPEGquality = iJPEGquality;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_QUALITY, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_jpeg_smoothing (mng_handle hHandle,
- mng_int32 iJPEGsmoothing)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_SMOOTHING, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iJPEGsmoothing = iJPEGsmoothing;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_SMOOTHING, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_jpeg_progressive (mng_handle hHandle,
- mng_bool bJPEGprogressive)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_PROGRESSIVE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->bJPEGcompressprogr = bJPEGprogressive;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_PROGRESSIVE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_jpeg_optimized (mng_handle hHandle,
- mng_bool bJPEGoptimized)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_OPTIMIZED, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->bJPEGcompressopt = bJPEGoptimized;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_OPTIMIZED, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-#ifdef MNG_SUPPORT_WRITE
-mng_retcode MNG_DECL mng_set_jpeg_maxjdat (mng_handle hHandle,
- mng_uint32 iMaxJDAT)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_MAXJDAT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iMaxJDAT = iMaxJDAT;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_JPEG_MAXJDAT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_WRITE */
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_retcode MNG_DECL mng_set_suspensionmode (mng_handle hHandle,
- mng_bool bSuspensionmode)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SUSPENSIONMODE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
-
- if (((mng_datap)hHandle)->bReading) /* we must NOT be reading !!! */
- MNG_ERROR ((mng_datap)hHandle, MNG_FUNCTIONINVALID);
-
- ((mng_datap)hHandle)->bSuspensionmode = bSuspensionmode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SUSPENSIONMODE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_set_speed (mng_handle hHandle,
- mng_speedtype iSpeed)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SPEED, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- ((mng_datap)hHandle)->iSpeed = iSpeed;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_SET_SPEED, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-/* * * */
-/* * Property get functions * */
-/* * * */
-/* ************************************************************************** */
-
-mng_ptr MNG_DECL mng_get_userdata (mng_handle hHandle)
-{ /* no tracing in here to prevent recursive calls */
- MNG_VALIDHANDLEX (hHandle)
- return ((mng_datap)hHandle)->pUserdata;
-}
-
-/* ************************************************************************** */
-
-mng_imgtype MNG_DECL mng_get_sigtype (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_SIGTYPE, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_it_unknown;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_SIGTYPE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->eSigtype;
-}
-
-/* ************************************************************************** */
-
-mng_imgtype MNG_DECL mng_get_imagetype (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_IMAGETYPE, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_it_unknown;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_IMAGETYPE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->eImagetype;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_imagewidth (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_IMAGEWIDTH, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_IMAGEWIDTH, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iWidth;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_imageheight (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_IMAGEWIDTH, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_IMAGEHEIGHT, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iHeight;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_ticks (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_TICKS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_TICKS, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iTicks;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_framecount (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_FRAMECOUNT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_FRAMECOUNT, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iFramecount;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_layercount (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_LAYERCOUNT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_LAYERCOUNT, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iLayercount;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_playtime (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_PLAYTIME, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_PLAYTIME, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iPlaytime;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_simplicity (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_SIMPLICITY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_SIMPLICITY, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iSimplicity;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_get_bitdepth (mng_handle hHandle)
-{
- mng_uint8 iRslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_BITDEPTH, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
- if (((mng_datap)hHandle)->eImagetype == mng_it_png)
- iRslt = ((mng_datap)hHandle)->iBitdepth;
- else
-#ifdef MNG_INCLUDE_JNG
- if (((mng_datap)hHandle)->eImagetype == mng_it_jng)
- iRslt = ((mng_datap)hHandle)->iJHDRimgbitdepth;
- else
-#endif
- iRslt = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_BITDEPTH, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_get_colortype (mng_handle hHandle)
-{
- mng_uint8 iRslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_COLORTYPE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
- if (((mng_datap)hHandle)->eImagetype == mng_it_png)
- iRslt = ((mng_datap)hHandle)->iColortype;
- else
-#ifdef MNG_INCLUDE_JNG
- if (((mng_datap)hHandle)->eImagetype == mng_it_jng)
- iRslt = ((mng_datap)hHandle)->iJHDRcolortype;
- else
-#endif
- iRslt = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_COLORTYPE, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_get_compression (mng_handle hHandle)
-{
- mng_uint8 iRslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_COMPRESSION, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
- if (((mng_datap)hHandle)->eImagetype == mng_it_png)
- iRslt = ((mng_datap)hHandle)->iCompression;
- else
-#ifdef MNG_INCLUDE_JNG
- if (((mng_datap)hHandle)->eImagetype == mng_it_jng)
- iRslt = ((mng_datap)hHandle)->iJHDRimgcompression;
- else
-#endif
- iRslt = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_COMPRESSION, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_get_filter (mng_handle hHandle)
-{
- mng_uint8 iRslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_FILTER, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
- if (((mng_datap)hHandle)->eImagetype == mng_it_png)
- iRslt = ((mng_datap)hHandle)->iFilter;
- else
- iRslt = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_FILTER, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_get_interlace (mng_handle hHandle)
-{
- mng_uint8 iRslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_INTERLACE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
- if (((mng_datap)hHandle)->eImagetype == mng_it_png)
- iRslt = ((mng_datap)hHandle)->iInterlace;
- else
-#ifdef MNG_INCLUDE_JNG
- if (((mng_datap)hHandle)->eImagetype == mng_it_jng)
- iRslt = ((mng_datap)hHandle)->iJHDRimginterlace;
- else
-#endif
- iRslt = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_INTERLACE, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_get_alphabitdepth (mng_handle hHandle)
-{
- mng_uint8 iRslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ALPHABITDEPTH, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_INCLUDE_JNG
- if (((mng_datap)hHandle)->eImagetype == mng_it_jng)
- iRslt = ((mng_datap)hHandle)->iJHDRalphabitdepth;
- else
-#endif
- iRslt = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ALPHABITDEPTH, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_uint8 MNG_DECL mng_get_refreshpass (mng_handle hHandle)
-{
- mng_uint8 iRslt;
- mng_datap pData;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_REFRESHPASS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
- pData = (mng_datap)hHandle;
- /* for PNG we know the exact pass */
- if ((pData->eImagetype == mng_it_png) && (pData->iPass >= 0))
- iRslt = pData->iPass;
-#ifdef MNG_INCLUDE_JNG
- else /* for JNG we'll fake it... */
- if ((pData->eImagetype == mng_it_jng) &&
- (pData->bJPEGhasheader) && (pData->bJPEGdecostarted) &&
- (pData->bJPEGprogressive))
- {
- if (pData->pJPEGdinfo->input_scan_number <= 1)
- iRslt = 0; /* first pass (I think...) */
- else
- if (jpeg_input_complete (pData->pJPEGdinfo))
- iRslt = 7; /* input complete; aka final pass */
- else
- iRslt = 3; /* anything between 0 and 7 will do */
-
- }
-#endif
- else
- iRslt = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_REFRESHPASS, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-mng_uint8 MNG_DECL mng_get_alphacompression (mng_handle hHandle)
-{
- mng_uint8 iRslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ALPHACOMPRESSION, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_INCLUDE_JNG
- if (((mng_datap)hHandle)->eImagetype == mng_it_jng)
- iRslt = ((mng_datap)hHandle)->iJHDRalphacompression;
- else
-#endif
- iRslt = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ALPHACOMPRESSION, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_get_alphafilter (mng_handle hHandle)
-{
- mng_uint8 iRslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ALPHAFILTER, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_INCLUDE_JNG
- if (((mng_datap)hHandle)->eImagetype == mng_it_jng)
- iRslt = ((mng_datap)hHandle)->iJHDRalphafilter;
- else
-#endif
- iRslt = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ALPHAFILTER, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_get_alphainterlace (mng_handle hHandle)
-{
- mng_uint8 iRslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ALPHAINTERLACE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_INCLUDE_JNG
- if (((mng_datap)hHandle)->eImagetype == mng_it_jng)
- iRslt = ((mng_datap)hHandle)->iJHDRalphainterlace;
- else
-#endif
- iRslt = 0;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ALPHAINTERLACE, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-
-/* ************************************************************************** */
-
-mng_uint8 MNG_DECL mng_get_alphadepth (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ALPHADEPTH, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ALPHADEPTH, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iAlphadepth;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_canvasstyle (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_CANVASSTYLE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_CANVASSTYLE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iCanvasstyle;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_bkgdstyle (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_BKGDSTYLE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_BKGDSTYLE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iBkgdstyle;
-}
-
-/* ************************************************************************** */
-
-mng_retcode MNG_DECL mng_get_bgcolor (mng_handle hHandle,
- mng_uint16* iRed,
- mng_uint16* iGreen,
- mng_uint16* iBlue)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GET_BGCOLOR, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
- *iRed = ((mng_datap)hHandle)->iBGred;
- *iGreen = ((mng_datap)hHandle)->iBGgreen;
- *iBlue = ((mng_datap)hHandle)->iBGblue;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (((mng_datap)hHandle), MNG_FN_GET_BGCOLOR, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_bool MNG_DECL mng_get_usebkgd (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_USEBKGD, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_USEBKGD, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bUseBKGD;
-}
-
-/* ************************************************************************** */
-
-mng_bool MNG_DECL mng_get_storechunks (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_STORECHUNKS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_STORECHUNKS, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bStorechunks;
-}
-
-/* ************************************************************************** */
-
-mng_bool MNG_DECL mng_get_sectionbreaks (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_SECTIONBREAKS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_SECTIONBREAKS, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bSectionbreaks;
-}
-
-/* ************************************************************************** */
-
-mng_bool MNG_DECL mng_get_cacheplayback (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_CACHEPLAYBACK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_CACHEPLAYBACK, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bCacheplayback;
-}
-
-/* ************************************************************************** */
-
-mng_bool MNG_DECL mng_get_doprogressive (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_DOPROGRESSIVE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_DOPROGRESSIVE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bDoProgressive;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_crcmode (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_CRCMODE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_CRCMODE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iCrcmode;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_bool MNG_DECL mng_get_srgb (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_SRGB, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEB (((mng_datap)hHandle), MNG_FN_GET_SRGB, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bIssRGB;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-mng_float MNG_DECL mng_get_viewgamma (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_VIEWGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_VIEWGAMMA, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->dViewgamma;
-}
-#endif
-
-/* ************************************************************************** */
-
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-mng_float MNG_DECL mng_get_displaygamma (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_DISPLAYGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_DISPLAYGAMMA, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->dDisplaygamma;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DFLT_INFO
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-mng_float MNG_DECL mng_get_dfltimggamma (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_DFLTIMGGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_DFLTIMGGAMMA, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->dDfltimggamma;
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-mng_uint32 MNG_DECL mng_get_viewgammaint (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_VIEWGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_VIEWGAMMA, MNG_LC_END);
-#endif
-
- return (mng_uint32)(((mng_datap)hHandle)->dViewgamma * 100000);
-}
-#endif
-
-/* ************************************************************************** */
-
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-mng_uint32 MNG_DECL mng_get_displaygammaint (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_DISPLAYGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_DISPLAYGAMMA, MNG_LC_END);
-#endif
-
- return (mng_uint32)(((mng_datap)hHandle)->dDisplaygamma * 100000);
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_NO_DFLT_INFO
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-mng_uint32 MNG_DECL mng_get_dfltimggammaint (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_DFLTIMGGAMMA, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_DFLTIMGGAMMA, MNG_LC_END);
-#endif
-
- return (mng_uint32)(((mng_datap)hHandle)->dDfltimggamma * 100000);
-}
-#endif
-#endif
-
-/* ************************************************************************** */
-
-#ifndef MNG_SKIP_MAXCANVAS
-mng_uint32 MNG_DECL mng_get_maxcanvaswidth (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_MAXCANVASWIDTH, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_MAXCANVASWIDTH, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iMaxwidth;
-}
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_maxcanvasheight (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_MAXCANVASHEIGHT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_MAXCANVASHEIGHT, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iMaxheight;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-mng_int32 MNG_DECL mng_get_zlib_level (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_LEVEL, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_LEVEL, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iZlevel;
-}
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-mng_int32 MNG_DECL mng_get_zlib_method (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_METHOD, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_METHOD, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iZmethod;
-}
-
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-mng_int32 MNG_DECL mng_get_zlib_windowbits (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_WINDOWBITS, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_WINDOWBITS, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iZwindowbits;
-}
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-mng_int32 MNG_DECL mng_get_zlib_memlevel (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_MEMLEVEL, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_MEMLEVEL, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iZmemlevel;
-}
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-mng_int32 MNG_DECL mng_get_zlib_strategy (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_STRATEGY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_STRATEGY, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iZstrategy;
-}
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-#ifdef MNG_ACCESS_ZLIB
-mng_uint32 MNG_DECL mng_get_zlib_maxidat (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_MAXIDAT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_ZLIB_MAXIDAT, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iMaxIDAT;
-}
-#endif /* MNG_ACCESS_ZLIB */
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-mngjpeg_dctmethod MNG_DECL mng_get_jpeg_dctmethod (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_DCTMETHOD, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return JDCT_ISLOW;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_DCTMETHOD, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->eJPEGdctmethod;
-}
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-mng_int32 MNG_DECL mng_get_jpeg_quality (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_QUALITY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_QUALITY, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iJPEGquality;
-}
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-mng_int32 MNG_DECL mng_get_jpeg_smoothing (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_SMOOTHING, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_SMOOTHING, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iJPEGsmoothing;
-}
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-mng_bool MNG_DECL mng_get_jpeg_progressive (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_PROGRESSIVE, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_PROGRESSIVE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bJPEGcompressprogr;
-}
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-mng_bool MNG_DECL mng_get_jpeg_optimized (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_OPTIMIZED, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_OPTIMIZED, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bJPEGcompressopt;
-}
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-#ifdef MNG_ACCESS_JPEG
-mng_uint32 MNG_DECL mng_get_jpeg_maxjdat (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_MAXJDAT, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_JPEG_MAXJDAT, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iMaxJDAT;
-}
-#endif /* MNG_ACCESS_JPEG */
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_bool MNG_DECL mng_get_suspensionmode (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_SUSPENSIONMODE, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_SUSPENSIONMODE, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bSuspensionmode;
-}
-#endif /* MNG_SUPPORT_READ */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_speedtype MNG_DECL mng_get_speed (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_SPEED, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_st_normal;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_SPEED, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iSpeed;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-mng_uint32 MNG_DECL mng_get_imagelevel (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_IMAGELEVEL, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLEX (hHandle)
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_IMAGELEVEL, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iImagelevel;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_get_lastbackchunk (mng_handle hHandle,
- mng_uint16* iRed,
- mng_uint16* iGreen,
- mng_uint16* iBlue,
- mng_uint8* iMandatory)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_LASTBACKCHUNK, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
-
- if (((mng_datap)hHandle)->eImagetype != mng_it_mng)
- MNG_ERROR (((mng_datap)hHandle), MNG_FUNCTIONINVALID);
-
- *iRed = ((mng_datap)hHandle)->iBACKred;
- *iGreen = ((mng_datap)hHandle)->iBACKgreen;
- *iBlue = ((mng_datap)hHandle)->iBACKblue;
- *iMandatory = ((mng_datap)hHandle)->iBACKmandatory;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_LASTBACKCHUNK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode MNG_DECL mng_get_lastseekname (mng_handle hHandle,
- mng_pchar zSegmentname)
-{
- mng_datap pData;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_LASTSEEKNAME, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
-
- pData = (mng_datap)hHandle;
- /* only allowed for MNG ! */
- if (pData->eImagetype != mng_it_mng)
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- if (pData->pLastseek) /* is there a last SEEK ? */
- {
- mng_ani_seekp pSEEK = (mng_ani_seekp)pData->pLastseek;
-
- if (pSEEK->iSegmentnamesize) /* copy the name if there is one */
- MNG_COPY (zSegmentname, pSEEK->zSegmentname, pSEEK->iSegmentnamesize);
-
- *(((mng_uint8p)zSegmentname) + pSEEK->iSegmentnamesize) = 0;
- }
- else
- { /* return an empty string */
- *((mng_uint8p)zSegmentname) = 0;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_LASTSEEKNAME, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_uint32 MNG_DECL mng_get_currframdelay (mng_handle hHandle)
-{
- mng_datap pData;
- mng_uint32 iRslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_CURRFRAMDELAY, MNG_LC_START);
-#endif
-
- MNG_VALIDHANDLE (hHandle)
-
- pData = (mng_datap)hHandle;
- /* only allowed for MNG ! */
- if (pData->eImagetype != mng_it_mng)
- MNG_ERROR (pData, MNG_FUNCTIONINVALID);
-
- iRslt = pData->iFramedelay;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_CURRFRAMDELAY, MNG_LC_END);
-#endif
-
- return iRslt;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_uint32 MNG_DECL mng_get_starttime (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_STARTTIME, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_st_normal;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_STARTTIME, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iStarttime;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_uint32 MNG_DECL mng_get_runtime (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_RUNTIME, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_st_normal;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_RUNTIME, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iRuntime;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_CURRENT_INFO
-mng_uint32 MNG_DECL mng_get_currentframe (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_CURRENTFRAME, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_st_normal;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_CURRENTFRAME, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iFrameseq;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_CURRENT_INFO
-mng_uint32 MNG_DECL mng_get_currentlayer (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_CURRENTLAYER, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_st_normal;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_CURRENTLAYER, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iLayerseq;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_CURRENT_INFO
-mng_uint32 MNG_DECL mng_get_currentplaytime (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_CURRENTPLAYTIME, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_st_normal;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_CURRENTPLAYTIME, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iFrametime;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_CURRENT_INFO
-mng_uint32 MNG_DECL mng_get_totalframes (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_TOTALFRAMES, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_st_normal;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_TOTALFRAMES, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iTotalframes;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_CURRENT_INFO
-mng_uint32 MNG_DECL mng_get_totallayers (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_TOTALLAYERS, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_st_normal;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_TOTALLAYERS, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iTotallayers;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-#ifndef MNG_NO_CURRENT_INFO
-mng_uint32 MNG_DECL mng_get_totalplaytime (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_TOTALPLAYTIME, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return mng_st_normal;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_GET_TOTALPLAYTIME, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->iTotalplaytime;
-}
-#endif
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-mng_bool MNG_DECL mng_status_error (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_ERROR, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_ERROR, MNG_LC_END);
-#endif
-
- return (mng_bool)((mng_datap)hHandle)->iErrorcode;
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_bool MNG_DECL mng_status_reading (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_READING, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_READING, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bReading;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_READ
-mng_bool MNG_DECL mng_status_suspendbreak (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_SUSPENDBREAK, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_SUSPENDBREAK, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bSuspended;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_WRITE
-mng_bool MNG_DECL mng_status_creating (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_CREATING, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_CREATING, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bCreating;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_WRITE
-mng_bool MNG_DECL mng_status_writing (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_WRITING, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_WRITING, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bWriting;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_bool MNG_DECL mng_status_displaying (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_DISPLAYING, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_DISPLAYING, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bDisplaying;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_bool MNG_DECL mng_status_running (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_RUNNING, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_RUNNING, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bRunning;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_bool MNG_DECL mng_status_timerbreak (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_TIMERBREAK, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_TIMERBREAK, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bTimerset;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
-mng_bool MNG_DECL mng_status_dynamic (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_DYNAMIC, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_DYNAMIC, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bDynamic;
-}
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DYNAMICMNG
-mng_bool MNG_DECL mng_status_runningevent (mng_handle hHandle)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_RUNNINGEVENT, MNG_LC_START);
-#endif
-
- if ((hHandle == 0) || (((mng_datap)hHandle)->iMagic != MNG_MAGIC))
- return MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACEX (((mng_datap)hHandle), MNG_FN_STATUS_RUNNINGEVENT, MNG_LC_END);
-#endif
-
- return ((mng_datap)hHandle)->bRunningevent;
-}
-#endif
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_read.c b/src/3rdparty/libmng/libmng_read.c
deleted file mode 100644
index c922e19a5e..0000000000
--- a/src/3rdparty/libmng/libmng_read.c
+++ /dev/null
@@ -1,1369 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_read.c copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Read logic (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the high-level read logic * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - added callback error-reporting support * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * * */
-/* * 0.5.2 - 05/19/2000 - G.Juyn * */
-/* * - cleaned up some code regarding mixed support * */
-/* * 0.5.2 - 05/20/2000 - G.Juyn * */
-/* * - added support for JNG * */
-/* * 0.5.2 - 05/31/2000 - G.Juyn * */
-/* * - fixed up punctuation (contribution by Tim Rowley) * */
-/* * * */
-/* * 0.5.3 - 06/16/2000 - G.Juyn * */
-/* * - changed progressive-display processing * */
-/* * * */
-/* * 0.9.1 - 07/08/2000 - G.Juyn * */
-/* * - changed read-processing for improved I/O-suspension * */
-/* * 0.9.1 - 07/14/2000 - G.Juyn * */
-/* * - changed EOF processing behavior * */
-/* * 0.9.1 - 07/14/2000 - G.Juyn * */
-/* * - changed default readbuffer size from 1024 to 4200 * */
-/* * * */
-/* * 0.9.2 - 07/27/2000 - G.Juyn * */
-/* * - B110320 - fixed GCC warning about mix-sized pointer math * */
-/* * 0.9.2 - 07/31/2000 - G.Juyn * */
-/* * - B110546 - fixed for improperly returning UNEXPECTEDEOF * */
-/* * 0.9.2 - 08/04/2000 - G.Juyn * */
-/* * - B111096 - fixed large-buffer read-suspension * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - removed test-MaGN * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added support for JDAA * */
-/* * * */
-/* * 0.9.5 - 01/23/2001 - G.Juyn * */
-/* * - fixed timing-problem with switching framing_modes * */
-/* * * */
-/* * 1.0.4 - 06/22/2002 - G.Juyn * */
-/* * - B495443 - incorrect suspend check in read_databuffer * */
-/* * * */
-/* * 1.0.5 - 07/04/2002 - G.Juyn * */
-/* * - added errorcode for extreme chunk-sizes * */
-/* * 1.0.5 - 07/08/2002 - G.Juyn * */
-/* * - B578572 - removed eMNGma hack (thanks Dimitri!) * */
-/* * 1.0.5 - 07/16/2002 - G.Juyn * */
-/* * - B581625 - large chunks fail with suspension reads * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * - added HLAPI function to copy chunks * */
-/* * 1.0.5 - 09/16/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * * */
-/* * 1.0.6 - 05/25/2003 - G.R-P * */
-/* * - added MNG_SKIPCHUNK_cHNK footprint optimizations * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added MNG_NO_DELTA_PNG reduction * */
-/* * - skip additional code when MNG_INCLUDE_JNG is not enabled * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * 1.0.6 - 08/17/2003 - G.R-P * */
-/* * - added conditionals around non-VLC chunk support * */
-/* * * */
-/* * 1.0.7 - 03/10/2004 - G.R-P * */
-/* * - added conditionals around openstream/closestream * */
-/* * * */
-/* * 1.0.8 - 04/08/2004 - G.Juyn * */
-/* * - added CRC existence & checking flags * */
-/* * 1.0.8 - 04/11/2004 - G.Juyn * */
-/* * - added data-push mechanisms for specialized decoders * */
-/* * 1.0.8 - 07/06/2004 - G.R-P * */
-/* * - defend against using undefined closestream function * */
-/* * 1.0.8 - 07/28/2004 - G.R-P * */
-/* * - added check for extreme chunk-lengths * */
-/* * * */
-/* * 1.0.9 - 09/16/2004 - G.Juyn * */
-/* * - fixed chunk pushing mechanism * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKINITFREE * */
-/* * 1.0.9 - 12/06/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKASSIGN * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKREADER * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * 1.0.9 - 12/31/2004 - G.R-P * */
-/* * - removed stray characters from #ifdef directive * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_memory.h"
-#include "libmng_objects.h"
-#include "libmng_object_prc.h"
-#include "libmng_chunks.h"
-#ifdef MNG_OPTIMIZE_CHUNKREADER
-#include "libmng_chunk_descr.h"
-#endif
-#include "libmng_chunk_prc.h"
-#include "libmng_chunk_io.h"
-#include "libmng_display.h"
-#include "libmng_read.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_READ_PROCS
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_eof (mng_datap pData)
-{
- if (!pData->bEOF) /* haven't closed the stream yet ? */
- {
- pData->bEOF = MNG_TRUE; /* now we do! */
-
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- if (pData->fClosestream && !pData->fClosestream ((mng_handle)pData))
- {
- MNG_ERROR (pData, MNG_APPIOERROR);
- }
-#endif
- }
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_release_pushdata (mng_datap pData)
-{
- mng_pushdatap pFirst = pData->pFirstpushdata;
- mng_pushdatap pNext = pFirst->pNext;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RELEASE_PUSHDATA, MNG_LC_START);
-#endif
-
- pData->pFirstpushdata = pNext; /* next becomes the first */
-
- if (!pNext) /* no next? => no last! */
- pData->pLastpushdata = MNG_NULL;
- /* buffer owned and release callback defined? */
- if ((pFirst->bOwned) && (pData->fReleasedata))
- pData->fReleasedata ((mng_handle)pData, pFirst->pData, pFirst->iLength);
- else /* otherwise use internal free mechanism */
- MNG_FREEX (pData, pFirst->pData, pFirst->iLength);
- /* and free it */
- MNG_FREEX (pData, pFirst, sizeof(mng_pushdata));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RELEASE_PUSHDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_release_pushchunk (mng_datap pData)
-{
- mng_pushdatap pFirst = pData->pFirstpushchunk;
- mng_pushdatap pNext = pFirst->pNext;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RELEASE_PUSHCHUNK, MNG_LC_START);
-#endif
-
- pData->pFirstpushchunk = pNext; /* next becomes the first */
-
- if (!pNext) /* no next? => no last! */
- pData->pLastpushchunk = MNG_NULL;
- /* buffer owned and release callback defined? */
- if ((pFirst->bOwned) && (pData->fReleasedata))
- pData->fReleasedata ((mng_handle)pData, pFirst->pData, pFirst->iLength);
- else /* otherwise use internal free mechanism */
- MNG_FREEX (pData, pFirst->pData, pFirst->iLength);
- /* and free it */
- MNG_FREEX (pData, pFirst, sizeof(mng_pushdata));
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_RELEASE_PUSHCHUNK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode read_data (mng_datap pData,
- mng_uint8p pBuf,
- mng_uint32 iSize,
- mng_uint32 * iRead)
-{
- mng_retcode iRetcode;
- mng_uint32 iTempsize = iSize;
- mng_uint8p pTempbuf = pBuf;
- mng_pushdatap pPush = pData->pFirstpushdata;
- mng_uint32 iPushsize = 0;
- *iRead = 0; /* nothing yet */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DATA, MNG_LC_START);
-#endif
-
- while (pPush) /* calculate size of pushed data */
- {
- iPushsize += pPush->iRemaining;
- pPush = pPush->pNext;
- }
-
- if (iTempsize <= iPushsize) /* got enough push data? */
- {
- while (iTempsize)
- {
- pPush = pData->pFirstpushdata;
- /* enough data remaining in this buffer? */
- if (pPush->iRemaining <= iTempsize)
- { /* no: then copy what we've got */
- MNG_COPY (pTempbuf, pPush->pDatanext, pPush->iRemaining);
- /* move pointers & lengths */
- pTempbuf += pPush->iRemaining;
- *iRead += pPush->iRemaining;
- iTempsize -= pPush->iRemaining;
- /* release the depleted buffer */
- iRetcode = mng_release_pushdata (pData);
- if (iRetcode)
- return iRetcode;
- }
- else
- { /* copy the needed bytes */
- MNG_COPY (pTempbuf, pPush->pDatanext, iTempsize);
- /* move pointers & lengths */
- pPush->iRemaining -= iTempsize;
- pPush->pDatanext += iTempsize;
- pTempbuf += iTempsize;
- *iRead += iTempsize;
- iTempsize = 0; /* all done!!! */
- }
- }
- }
- else
- {
- mng_uint32 iTempread = 0;
- /* get it from the app then */
- if (!pData->fReaddata (((mng_handle)pData), pTempbuf, iTempsize, &iTempread))
- MNG_ERROR (pData, MNG_APPIOERROR);
-
- *iRead += iTempread;
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode read_databuffer (mng_datap pData,
- mng_uint8p pBuf,
- mng_uint8p * pBufnext,
- mng_uint32 iSize,
- mng_uint32 * iRead)
-{
- mng_retcode iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DATABUFFER, MNG_LC_START);
-#endif
-
- if (pData->bSuspensionmode)
- {
- mng_uint8p pTemp;
- mng_uint32 iTemp;
-
- *iRead = 0; /* let's be negative about the outcome */
-
- if (!pData->pSuspendbuf) /* need to create a suspension buffer ? */
- {
- pData->iSuspendbufsize = MNG_SUSPENDBUFFERSIZE;
- /* so, create it */
- MNG_ALLOC (pData, pData->pSuspendbuf, pData->iSuspendbufsize);
-
- pData->iSuspendbufleft = 0; /* make sure to fill it first time */
- pData->pSuspendbufnext = pData->pSuspendbuf;
- }
- /* more than our buffer can hold ? */
- if (iSize > pData->iSuspendbufsize)
- {
- mng_uint32 iRemain;
-
- if (!*pBufnext) /* first time ? */
- {
- if (pData->iSuspendbufleft) /* do we have some data left ? */
- { /* then copy it */
- MNG_COPY (pBuf, pData->pSuspendbufnext, pData->iSuspendbufleft);
- /* fixup variables */
- *pBufnext = pBuf + pData->iSuspendbufleft;
- pData->pSuspendbufnext = pData->pSuspendbuf;
- pData->iSuspendbufleft = 0;
- }
- else
- {
- *pBufnext = pBuf;
- }
- }
- /* calculate how much to get */
- iRemain = iSize - (mng_uint32)(*pBufnext - pBuf);
- /* let's go get it */
- iRetcode = read_data (pData, *pBufnext, iRemain, &iTemp);
- if (iRetcode)
- return iRetcode;
- /* first read after suspension return 0 means EOF */
- if ((pData->iSuspendpoint) && (iTemp == 0))
- { /* that makes it final */
- mng_retcode iRetcode = mng_process_eof (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* indicate the source is depleted */
- *iRead = iSize - iRemain + iTemp;
- }
- else
- {
- if (iTemp < iRemain) /* suspension required ? */
- {
- *pBufnext = *pBufnext + iTemp;
- pData->bSuspended = MNG_TRUE;
- }
- else
- {
- *iRead = iSize; /* got it all now ! */
- }
- }
- }
- else
- { /* need to read some more ? */
- while ((!pData->bSuspended) && (!pData->bEOF) && (iSize > pData->iSuspendbufleft))
- { /* not enough space left in buffer ? */
- if (pData->iSuspendbufsize - pData->iSuspendbufleft -
- (mng_uint32)(pData->pSuspendbufnext - pData->pSuspendbuf) <
- MNG_SUSPENDREQUESTSIZE)
- {
- if (pData->iSuspendbufleft) /* then lets shift (if there's anything left) */
- MNG_COPY (pData->pSuspendbuf, pData->pSuspendbufnext, pData->iSuspendbufleft);
- /* adjust running pointer */
- pData->pSuspendbufnext = pData->pSuspendbuf;
- }
- /* still not enough room ? */
- if (pData->iSuspendbufsize - pData->iSuspendbufleft < MNG_SUSPENDREQUESTSIZE)
- MNG_ERROR (pData, MNG_INTERNALERROR);
- /* now read some more data */
- pTemp = pData->pSuspendbufnext + pData->iSuspendbufleft;
-
- iRetcode = read_data (pData, pTemp, MNG_SUSPENDREQUESTSIZE, &iTemp);
- if (iRetcode)
- return iRetcode;
- /* adjust fill-counter */
- pData->iSuspendbufleft += iTemp;
- /* first read after suspension returning 0 means EOF */
- if ((pData->iSuspendpoint) && (iTemp == 0))
- { /* that makes it final */
- mng_retcode iRetcode = mng_process_eof (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if (pData->iSuspendbufleft) /* return the leftover scraps */
- MNG_COPY (pBuf, pData->pSuspendbufnext, pData->iSuspendbufleft);
- /* and indicate so */
- *iRead = pData->iSuspendbufleft;
- pData->pSuspendbufnext = pData->pSuspendbuf;
- pData->iSuspendbufleft = 0;
- }
- else
- { /* suspension required ? */
- if ((iSize > pData->iSuspendbufleft) && (iTemp < MNG_SUSPENDREQUESTSIZE))
- pData->bSuspended = MNG_TRUE;
-
- }
-
- pData->iSuspendpoint = 0; /* reset it here in case we loop back */
- }
-
- if ((!pData->bSuspended) && (!pData->bEOF))
- { /* return the data ! */
- MNG_COPY (pBuf, pData->pSuspendbufnext, iSize);
-
- *iRead = iSize; /* returned it all */
- /* adjust suspension-buffer variables */
- pData->pSuspendbufnext += iSize;
- pData->iSuspendbufleft -= iSize;
- }
- }
- }
- else
- {
- iRetcode = read_data (pData, (mng_ptr)pBuf, iSize, iRead);
- if (iRetcode)
- return iRetcode;
- if (*iRead == 0) /* suspension required ? */
- pData->bSuspended = MNG_TRUE;
- }
-
- pData->iSuspendpoint = 0; /* safely reset it here ! */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_DATABUFFER, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode process_raw_chunk (mng_datap pData,
- mng_uint8p pBuf,
- mng_uint32 iBuflen)
-{
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- /* the table-idea & binary search code was adapted from
- libpng 1.1.0 (pngread.c) */
- /* NOTE1: the table must remain sorted by chunkname, otherwise the binary
- search will break !!! (ps. watch upper-/lower-case chunknames !!) */
- /* NOTE2: the layout must remain equal to the header part of all the
- chunk-structures (yes, that means even the pNext and pPrev fields;
- it's wasting a bit of space, but hey, the code is a lot easier) */
-
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
- mng_chunk_header mng_chunk_unknown = {MNG_UINT_HUH, mng_init_general, mng_free_unknown,
- mng_read_unknown, mng_write_unknown, mng_assign_unknown, 0, 0, sizeof(mng_unknown_chunk)};
-#else
- mng_chunk_header mng_chunk_unknown = {MNG_UINT_HUH, mng_init_unknown, mng_free_unknown,
- mng_read_unknown, mng_write_unknown, mng_assign_unknown, 0, 0};
-#endif
-
-#ifdef MNG_OPTIMIZE_CHUNKINITFREE
-
- mng_chunk_header mng_chunk_table [] =
- {
-#ifndef MNG_SKIPCHUNK_BACK
- {MNG_UINT_BACK, mng_init_general, mng_free_general, mng_read_back, mng_write_back, mng_assign_general, 0, 0, sizeof(mng_back)},
-#endif
-#ifndef MNG_SKIPCHUNK_BASI
- {MNG_UINT_BASI, mng_init_general, mng_free_general, mng_read_basi, mng_write_basi, mng_assign_general, 0, 0, sizeof(mng_basi)},
-#endif
-#ifndef MNG_SKIPCHUNK_CLIP
- {MNG_UINT_CLIP, mng_init_general, mng_free_general, mng_read_clip, mng_write_clip, mng_assign_general, 0, 0, sizeof(mng_clip)},
-#endif
-#ifndef MNG_SKIPCHUNK_CLON
- {MNG_UINT_CLON, mng_init_general, mng_free_general, mng_read_clon, mng_write_clon, mng_assign_general, 0, 0, sizeof(mng_clon)},
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
- {MNG_UINT_DBYK, mng_init_general, mng_free_dbyk, mng_read_dbyk, mng_write_dbyk, mng_assign_dbyk, 0, 0, sizeof(mng_dbyk)},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_DEFI
- {MNG_UINT_DEFI, mng_init_general, mng_free_general, mng_read_defi, mng_write_defi, mng_assign_general, 0, 0, sizeof(mng_defi)},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_UINT_DHDR, mng_init_general, mng_free_general, mng_read_dhdr, mng_write_dhdr, mng_assign_general, 0, 0, sizeof(mng_dhdr)},
-#endif
-#ifndef MNG_SKIPCHUNK_DISC
- {MNG_UINT_DISC, mng_init_general, mng_free_disc, mng_read_disc, mng_write_disc, mng_assign_disc, 0, 0, sizeof(mng_disc)},
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DROP
- {MNG_UINT_DROP, mng_init_general, mng_free_drop, mng_read_drop, mng_write_drop, mng_assign_drop, 0, 0, sizeof(mng_drop)},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_LOOP
- {MNG_UINT_ENDL, mng_init_general, mng_free_general, mng_read_endl, mng_write_endl, mng_assign_general, 0, 0, sizeof(mng_endl)},
-#endif
-#ifndef MNG_SKIPCHUNK_FRAM
- {MNG_UINT_FRAM, mng_init_general, mng_free_fram, mng_read_fram, mng_write_fram, mng_assign_fram, 0, 0, sizeof(mng_fram)},
-#endif
- {MNG_UINT_IDAT, mng_init_general, mng_free_idat, mng_read_idat, mng_write_idat, mng_assign_idat, 0, 0, sizeof(mng_idat)}, /* 12-th element! */
- {MNG_UINT_IEND, mng_init_general, mng_free_general, mng_read_iend, mng_write_iend, mng_assign_general, 0, 0, sizeof(mng_iend)},
- {MNG_UINT_IHDR, mng_init_general, mng_free_general, mng_read_ihdr, mng_write_ihdr, mng_assign_general, 0, 0, sizeof(mng_ihdr)},
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
- {MNG_UINT_IJNG, mng_init_general, mng_free_general, mng_read_ijng, mng_write_ijng, mng_assign_general, 0, 0, sizeof(mng_ijng)},
-#endif
- {MNG_UINT_IPNG, mng_init_general, mng_free_general, mng_read_ipng, mng_write_ipng, mng_assign_general, 0, 0, sizeof(mng_ipng)},
-#endif
-#ifdef MNG_INCLUDE_JNG
- {MNG_UINT_JDAA, mng_init_general, mng_free_jdaa, mng_read_jdaa, mng_write_jdaa, mng_assign_jdaa, 0, 0, sizeof(mng_jdaa)},
- {MNG_UINT_JDAT, mng_init_general, mng_free_jdat, mng_read_jdat, mng_write_jdat, mng_assign_jdat, 0, 0, sizeof(mng_jdat)},
- {MNG_UINT_JHDR, mng_init_general, mng_free_general, mng_read_jhdr, mng_write_jhdr, mng_assign_general, 0, 0, sizeof(mng_jhdr)},
- {MNG_UINT_JSEP, mng_init_general, mng_free_general, mng_read_jsep, mng_write_jsep, mng_assign_general, 0, 0, sizeof(mng_jsep)},
- {MNG_UINT_JdAA, mng_init_general, mng_free_jdaa, mng_read_jdaa, mng_write_jdaa, mng_assign_jdaa, 0, 0, sizeof(mng_jdaa)},
-#endif
-#ifndef MNG_SKIPCHUNK_LOOP
- {MNG_UINT_LOOP, mng_init_general, mng_free_loop, mng_read_loop, mng_write_loop, mng_assign_loop, 0, 0, sizeof(mng_loop)},
-#endif
-#ifndef MNG_SKIPCHUNK_MAGN
- {MNG_UINT_MAGN, mng_init_general, mng_free_general, mng_read_magn, mng_write_magn, mng_assign_general, 0, 0, sizeof(mng_magn)},
-#endif
- {MNG_UINT_MEND, mng_init_general, mng_free_general, mng_read_mend, mng_write_mend, mng_assign_general, 0, 0, sizeof(mng_mend)},
- {MNG_UINT_MHDR, mng_init_general, mng_free_general, mng_read_mhdr, mng_write_mhdr, mng_assign_general, 0, 0, sizeof(mng_mhdr)},
-#ifndef MNG_SKIPCHUNK_MOVE
- {MNG_UINT_MOVE, mng_init_general, mng_free_general, mng_read_move, mng_write_move, mng_assign_general, 0, 0, sizeof(mng_move)},
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
- {MNG_UINT_ORDR, mng_init_general, mng_free_ordr, mng_read_ordr, mng_write_ordr, mng_assign_ordr, 0, 0, sizeof(mng_ordr)},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_UINT_PAST, mng_init_general, mng_free_past, mng_read_past, mng_write_past, mng_assign_past, 0, 0, sizeof(mng_past)},
-#endif
- {MNG_UINT_PLTE, mng_init_general, mng_free_general, mng_read_plte, mng_write_plte, mng_assign_general, 0, 0, sizeof(mng_plte)},
-#ifndef MNG_NO_DELTA_PNG
- {MNG_UINT_PPLT, mng_init_general, mng_free_general, mng_read_pplt, mng_write_pplt, mng_assign_general, 0, 0, sizeof(mng_pplt)},
- {MNG_UINT_PROM, mng_init_general, mng_free_general, mng_read_prom, mng_write_prom, mng_assign_general, 0, 0, sizeof(mng_prom)},
-#endif
-#ifndef MNG_SKIPCHUNK_SAVE
- {MNG_UINT_SAVE, mng_init_general, mng_free_save, mng_read_save, mng_write_save, mng_assign_save, 0, 0, sizeof(mng_save)},
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
- {MNG_UINT_SEEK, mng_init_general, mng_free_seek, mng_read_seek, mng_write_seek, mng_assign_seek, 0, 0, sizeof(mng_seek)},
-#endif
-#ifndef MNG_SKIPCHUNK_SHOW
- {MNG_UINT_SHOW, mng_init_general, mng_free_general, mng_read_show, mng_write_show, mng_assign_general, 0, 0, sizeof(mng_show)},
-#endif
-#ifndef MNG_SKIPCHUNK_TERM
- {MNG_UINT_TERM, mng_init_general, mng_free_general, mng_read_term, mng_write_term, mng_assign_general, 0, 0, sizeof(mng_term)},
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
- {MNG_UINT_bKGD, mng_init_general, mng_free_general, mng_read_bkgd, mng_write_bkgd, mng_assign_general, 0, 0, sizeof(mng_bkgd)},
-#endif
-#ifndef MNG_SKIPCHUNK_cHRM
- {MNG_UINT_cHRM, mng_init_general, mng_free_general, mng_read_chrm, mng_write_chrm, mng_assign_general, 0, 0, sizeof(mng_chrm)},
-#endif
-#ifndef MNG_SKIPCHUNK_eXPI
- {MNG_UINT_eXPI, mng_init_general, mng_free_expi, mng_read_expi, mng_write_expi, mng_assign_expi, 0, 0, sizeof(mng_expi)},
-#endif
-#ifndef MNG_SKIPCHUNK_evNT
- {MNG_UINT_evNT, mng_init_general, mng_free_evnt, mng_read_evnt, mng_write_evnt, mng_assign_evnt, 0, 0, sizeof(mng_evnt)},
-#endif
-#ifndef MNG_SKIPCHUNK_fPRI
- {MNG_UINT_fPRI, mng_init_general, mng_free_general, mng_read_fpri, mng_write_fpri, mng_assign_general, 0, 0, sizeof(mng_fpri)},
-#endif
-#ifndef MNG_SKIPCHUNK_gAMA
- {MNG_UINT_gAMA, mng_init_general, mng_free_general, mng_read_gama, mng_write_gama, mng_assign_general, 0, 0, sizeof(mng_gama)},
-#endif
-#ifndef MNG_SKIPCHUNK_hIST
- {MNG_UINT_hIST, mng_init_general, mng_free_general, mng_read_hist, mng_write_hist, mng_assign_general, 0, 0, sizeof(mng_hist)},
-#endif
-#ifndef MNG_SKIPCHUNK_iCCP
- {MNG_UINT_iCCP, mng_init_general, mng_free_iccp, mng_read_iccp, mng_write_iccp, mng_assign_iccp, 0, 0, sizeof(mng_iccp)},
-#endif
-#ifndef MNG_SKIPCHUNK_iTXt
- {MNG_UINT_iTXt, mng_init_general, mng_free_itxt, mng_read_itxt, mng_write_itxt, mng_assign_itxt, 0, 0, sizeof(mng_itxt)},
-#endif
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_UINT_mpNG, mng_init_general, mng_free_mpng, mng_read_mpng, mng_write_mpng, mng_assign_mpng, 0, 0, sizeof(mng_mpng)},
-#endif
-#ifndef MNG_SKIPCHUNK_nEED
- {MNG_UINT_nEED, mng_init_general, mng_free_need, mng_read_need, mng_write_need, mng_assign_need, 0, 0, sizeof(mng_need)},
-#endif
-/* TODO: {MNG_UINT_oFFs, 0, 0, 0, 0, 0, 0}, */
-/* TODO: {MNG_UINT_pCAL, 0, 0, 0, 0, 0, 0}, */
-#ifndef MNG_SKIPCHUNK_pHYg
- {MNG_UINT_pHYg, mng_init_general, mng_free_general, mng_read_phyg, mng_write_phyg, mng_assign_general, 0, 0, sizeof(mng_phyg)},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYs
- {MNG_UINT_pHYs, mng_init_general, mng_free_general, mng_read_phys, mng_write_phys, mng_assign_general, 0, 0, sizeof(mng_phys)},
-#endif
-#ifndef MNG_SKIPCHUNK_sBIT
- {MNG_UINT_sBIT, mng_init_general, mng_free_general, mng_read_sbit, mng_write_sbit, mng_assign_general, 0, 0, sizeof(mng_sbit)},
-#endif
-/* TODO: {MNG_UINT_sCAL, 0, 0, 0, 0, 0, 0}, */
-#ifndef MNG_SKIPCHUNK_sPLT
- {MNG_UINT_sPLT, mng_init_general, mng_free_splt, mng_read_splt, mng_write_splt, mng_assign_splt, 0, 0, sizeof(mng_splt)},
-#endif
- {MNG_UINT_sRGB, mng_init_general, mng_free_general, mng_read_srgb, mng_write_srgb, mng_assign_general, 0, 0, sizeof(mng_srgb)},
-#ifndef MNG_SKIPCHUNK_tEXt
- {MNG_UINT_tEXt, mng_init_general, mng_free_text, mng_read_text, mng_write_text, mng_assign_text, 0, 0, sizeof(mng_text)},
-#endif
-#ifndef MNG_SKIPCHUNK_tIME
- {MNG_UINT_tIME, mng_init_general, mng_free_general, mng_read_time, mng_write_time, mng_assign_general, 0, 0, sizeof(mng_time)},
-#endif
- {MNG_UINT_tRNS, mng_init_general, mng_free_general, mng_read_trns, mng_write_trns, mng_assign_general, 0, 0, sizeof(mng_trns)},
-#ifndef MNG_SKIPCHUNK_zTXt
- {MNG_UINT_zTXt, mng_init_general, mng_free_ztxt, mng_read_ztxt, mng_write_ztxt, mng_assign_ztxt, 0, 0, sizeof(mng_ztxt)},
-#endif
- };
-
-#else /* MNG_OPTIMIZE_CHUNKINITFREE */
-
- mng_chunk_header mng_chunk_table [] =
- {
-#ifndef MNG_SKIPCHUNK_BACK
- {MNG_UINT_BACK, mng_init_back, mng_free_back, mng_read_back, mng_write_back, mng_assign_back, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_BASI
- {MNG_UINT_BASI, mng_init_basi, mng_free_basi, mng_read_basi, mng_write_basi, mng_assign_basi, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_CLIP
- {MNG_UINT_CLIP, mng_init_clip, mng_free_clip, mng_read_clip, mng_write_clip, mng_assign_clip, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_CLON
- {MNG_UINT_CLON, mng_init_clon, mng_free_clon, mng_read_clon, mng_write_clon, mng_assign_clon, 0, 0},
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DBYK
- {MNG_UINT_DBYK, mng_init_dbyk, mng_free_dbyk, mng_read_dbyk, mng_write_dbyk, mng_assign_dbyk, 0, 0},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_DEFI
- {MNG_UINT_DEFI, mng_init_defi, mng_free_defi, mng_read_defi, mng_write_defi, mng_assign_defi, 0, 0},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_UINT_DHDR, mng_init_dhdr, mng_free_dhdr, mng_read_dhdr, mng_write_dhdr, mng_assign_dhdr, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_DISC
- {MNG_UINT_DISC, mng_init_disc, mng_free_disc, mng_read_disc, mng_write_disc, mng_assign_disc, 0, 0},
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_DROP
- {MNG_UINT_DROP, mng_init_drop, mng_free_drop, mng_read_drop, mng_write_drop, mng_assign_drop, 0, 0},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_LOOP
- {MNG_UINT_ENDL, mng_init_endl, mng_free_endl, mng_read_endl, mng_write_endl, mng_assign_endl, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_FRAM
- {MNG_UINT_FRAM, mng_init_fram, mng_free_fram, mng_read_fram, mng_write_fram, mng_assign_fram, 0, 0},
-#endif
- {MNG_UINT_IDAT, mng_init_idat, mng_free_idat, mng_read_idat, mng_write_idat, mng_assign_idat, 0, 0}, /* 12-th element! */
- {MNG_UINT_IEND, mng_init_iend, mng_free_iend, mng_read_iend, mng_write_iend, mng_assign_iend, 0, 0},
- {MNG_UINT_IHDR, mng_init_ihdr, mng_free_ihdr, mng_read_ihdr, mng_write_ihdr, mng_assign_ihdr, 0, 0},
-#ifndef MNG_NO_DELTA_PNG
-#ifdef MNG_INCLUDE_JNG
- {MNG_UINT_IJNG, mng_init_ijng, mng_free_ijng, mng_read_ijng, mng_write_ijng, mng_assign_ijng, 0, 0},
-#endif
- {MNG_UINT_IPNG, mng_init_ipng, mng_free_ipng, mng_read_ipng, mng_write_ipng, mng_assign_ipng, 0, 0},
-#endif
-#ifdef MNG_INCLUDE_JNG
- {MNG_UINT_JDAA, mng_init_jdaa, mng_free_jdaa, mng_read_jdaa, mng_write_jdaa, mng_assign_jdaa, 0, 0},
- {MNG_UINT_JDAT, mng_init_jdat, mng_free_jdat, mng_read_jdat, mng_write_jdat, mng_assign_jdat, 0, 0},
- {MNG_UINT_JHDR, mng_init_jhdr, mng_free_jhdr, mng_read_jhdr, mng_write_jhdr, mng_assign_jhdr, 0, 0},
- {MNG_UINT_JSEP, mng_init_jsep, mng_free_jsep, mng_read_jsep, mng_write_jsep, mng_assign_jsep, 0, 0},
- {MNG_UINT_JdAA, mng_init_jdaa, mng_free_jdaa, mng_read_jdaa, mng_write_jdaa, mng_assign_jdaa, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_LOOP
- {MNG_UINT_LOOP, mng_init_loop, mng_free_loop, mng_read_loop, mng_write_loop, mng_assign_loop, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_MAGN
- {MNG_UINT_MAGN, mng_init_magn, mng_free_magn, mng_read_magn, mng_write_magn, mng_assign_magn, 0, 0},
-#endif
- {MNG_UINT_MEND, mng_init_mend, mng_free_mend, mng_read_mend, mng_write_mend, mng_assign_mend, 0, 0},
- {MNG_UINT_MHDR, mng_init_mhdr, mng_free_mhdr, mng_read_mhdr, mng_write_mhdr, mng_assign_mhdr, 0, 0},
-#ifndef MNG_SKIPCHUNK_MOVE
- {MNG_UINT_MOVE, mng_init_move, mng_free_move, mng_read_move, mng_write_move, mng_assign_move, 0, 0},
-#endif
-#ifndef MNG_NO_DELTA_PNG
-#ifndef MNG_SKIPCHUNK_ORDR
- {MNG_UINT_ORDR, mng_init_ordr, mng_free_ordr, mng_read_ordr, mng_write_ordr, mng_assign_ordr, 0, 0},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_UINT_PAST, mng_init_past, mng_free_past, mng_read_past, mng_write_past, mng_assign_past, 0, 0},
-#endif
- {MNG_UINT_PLTE, mng_init_plte, mng_free_plte, mng_read_plte, mng_write_plte, mng_assign_plte, 0, 0},
-#ifndef MNG_NO_DELTA_PNG
- {MNG_UINT_PPLT, mng_init_pplt, mng_free_pplt, mng_read_pplt, mng_write_pplt, mng_assign_pplt, 0, 0},
- {MNG_UINT_PROM, mng_init_prom, mng_free_prom, mng_read_prom, mng_write_prom, mng_assign_prom, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_SAVE
- {MNG_UINT_SAVE, mng_init_save, mng_free_save, mng_read_save, mng_write_save, mng_assign_save, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
- {MNG_UINT_SEEK, mng_init_seek, mng_free_seek, mng_read_seek, mng_write_seek, mng_assign_seek, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_SHOW
- {MNG_UINT_SHOW, mng_init_show, mng_free_show, mng_read_show, mng_write_show, mng_assign_show, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_TERM
- {MNG_UINT_TERM, mng_init_term, mng_free_term, mng_read_term, mng_write_term, mng_assign_term, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
- {MNG_UINT_bKGD, mng_init_bkgd, mng_free_bkgd, mng_read_bkgd, mng_write_bkgd, mng_assign_bkgd, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_cHRM
- {MNG_UINT_cHRM, mng_init_chrm, mng_free_chrm, mng_read_chrm, mng_write_chrm, mng_assign_chrm, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_eXPI
- {MNG_UINT_eXPI, mng_init_expi, mng_free_expi, mng_read_expi, mng_write_expi, mng_assign_expi, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_evNT
- {MNG_UINT_evNT, mng_init_evnt, mng_free_evnt, mng_read_evnt, mng_write_evnt, mng_assign_evnt, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_fPRI
- {MNG_UINT_fPRI, mng_init_fpri, mng_free_fpri, mng_read_fpri, mng_write_fpri, mng_assign_fpri, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_gAMA
- {MNG_UINT_gAMA, mng_init_gama, mng_free_gama, mng_read_gama, mng_write_gama, mng_assign_gama, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_hIST
- {MNG_UINT_hIST, mng_init_hist, mng_free_hist, mng_read_hist, mng_write_hist, mng_assign_hist, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_iCCP
- {MNG_UINT_iCCP, mng_init_iccp, mng_free_iccp, mng_read_iccp, mng_write_iccp, mng_assign_iccp, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_iTXt
- {MNG_UINT_iTXt, mng_init_itxt, mng_free_itxt, mng_read_itxt, mng_write_itxt, mng_assign_itxt, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_nEED
- {MNG_UINT_nEED, mng_init_need, mng_free_need, mng_read_need, mng_write_need, mng_assign_need, 0, 0},
-#endif
-/* TODO: {MNG_UINT_oFFs, 0, 0, 0, 0, 0, 0}, */
-/* TODO: {MNG_UINT_pCAL, 0, 0, 0, 0, 0, 0}, */
-#ifndef MNG_SKIPCHUNK_pHYg
- {MNG_UINT_pHYg, mng_init_phyg, mng_free_phyg, mng_read_phyg, mng_write_phyg, mng_assign_phyg, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYs
- {MNG_UINT_pHYs, mng_init_phys, mng_free_phys, mng_read_phys, mng_write_phys, mng_assign_phys, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_sBIT
- {MNG_UINT_sBIT, mng_init_sbit, mng_free_sbit, mng_read_sbit, mng_write_sbit, mng_assign_sbit, 0, 0},
-#endif
-/* TODO: {MNG_UINT_sCAL, 0, 0, 0, 0, 0, 0}, */
-#ifndef MNG_SKIPCHUNK_sPLT
- {MNG_UINT_sPLT, mng_init_splt, mng_free_splt, mng_read_splt, mng_write_splt, mng_assign_splt, 0, 0},
-#endif
- {MNG_UINT_sRGB, mng_init_srgb, mng_free_srgb, mng_read_srgb, mng_write_srgb, mng_assign_srgb, 0, 0},
-#ifndef MNG_SKIPCHUNK_tEXt
- {MNG_UINT_tEXt, mng_init_text, mng_free_text, mng_read_text, mng_write_text, mng_assign_text, 0, 0},
-#endif
-#ifndef MNG_SKIPCHUNK_tIME
- {MNG_UINT_tIME, mng_init_time, mng_free_time, mng_read_time, mng_write_time, mng_assign_time, 0, 0},
-#endif
- {MNG_UINT_tRNS, mng_init_trns, mng_free_trns, mng_read_trns, mng_write_trns, mng_assign_trns, 0, 0},
-#ifndef MNG_SKIPCHUNK_zTXt
- {MNG_UINT_zTXt, mng_init_ztxt, mng_free_ztxt, mng_read_ztxt, mng_write_ztxt, mng_assign_ztxt, 0, 0},
-#endif
- };
-
-#endif /* MNG_OPTIMIZE_CHUNKINITFREE */
-
- /* binary search variables */
- mng_int32 iTop, iLower, iUpper, iMiddle;
- mng_chunk_headerp pEntry; /* pointer to found entry */
-#else
- mng_chunk_header sEntry; /* temp chunk-header */
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
-
- mng_chunkid iChunkname; /* the chunk's tag */
- mng_chunkp pChunk; /* chunk structure (if #define MNG_STORE_CHUNKS) */
- mng_retcode iRetcode; /* temporary error-code */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_RAW_CHUNK, MNG_LC_START);
-#endif
- /* reset timer indicator on read-cycle */
- if ((pData->bReading) && (!pData->bDisplaying))
- pData->bTimerset = MNG_FALSE;
- /* get the chunkname */
- iChunkname = (mng_chunkid)(mng_get_uint32 (pBuf));
-
- pBuf += sizeof (mng_chunkid); /* adjust the buffer */
- iBuflen -= sizeof (mng_chunkid);
- pChunk = 0;
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- /* determine max index of table */
- iTop = (sizeof (mng_chunk_table) / sizeof (mng_chunk_table [0])) - 1;
-
- /* binary search; with 54 chunks, worst-case is 7 comparisons */
- iLower = 0;
-#ifndef MNG_NO_DELTA_PNG
- iMiddle = 11; /* start with the IDAT entry */
-#else
- iMiddle = 8;
-#endif
- iUpper = iTop;
- pEntry = 0; /* no goods yet! */
-
- do /* the binary search itself */
- {
- if (mng_chunk_table [iMiddle].iChunkname < iChunkname)
- iLower = iMiddle + 1;
- else if (mng_chunk_table [iMiddle].iChunkname > iChunkname)
- iUpper = iMiddle - 1;
- else
- {
- pEntry = &mng_chunk_table [iMiddle];
- break;
- }
-
- iMiddle = (iLower + iUpper) >> 1;
- }
- while (iLower <= iUpper);
-
- if (!pEntry) /* unknown chunk ? */
- pEntry = &mng_chunk_unknown; /* make it so! */
-
-#else /* MNG_OPTIMIZE_CHUNKREADER */
-
- mng_get_chunkheader (iChunkname, &sEntry);
-
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
-
- pData->iChunkname = iChunkname; /* keep track of where we are */
- pData->iChunkseq++;
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- if (pEntry->fRead) /* read-callback available ? */
- {
- iRetcode = pEntry->fRead (pData, pEntry, iBuflen, (mng_ptr)pBuf, &pChunk);
-
- if (!iRetcode) /* everything oke ? */
- { /* remember unknown chunk's id */
- if ((pChunk) && (pEntry->iChunkname == MNG_UINT_HUH))
- ((mng_chunk_headerp)pChunk)->iChunkname = iChunkname;
- }
- }
-#else /* MNG_OPTIMIZE_CHUNKREADER */
- if (sEntry.fRead) /* read-callback available ? */
- {
- iRetcode = sEntry.fRead (pData, &sEntry, iBuflen, (mng_ptr)pBuf, &pChunk);
-
-#ifndef MNG_OPTIMIZE_CHUNKREADER
- if (!iRetcode) /* everything oke ? */
- { /* remember unknown chunk's id */
- if ((pChunk) && (sEntry.iChunkname == MNG_UINT_HUH))
- ((mng_chunk_headerp)pChunk)->iChunkname = iChunkname;
- }
-#endif
- }
-#endif /* MNG_OPTIMIZE_CHUNKREADER */
- else
- iRetcode = MNG_NOERROR;
-
- if (pChunk) /* store this chunk ? */
- mng_add_chunk (pData, pChunk); /* do it */
-
-#ifdef MNG_INCLUDE_JNG /* implicit EOF ? */
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasJHDR))
-#else
- if ((!pData->bHasMHDR) && (!pData->bHasIHDR))
-#endif
- iRetcode = mng_process_eof (pData);/* then do some EOF processing */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_PROCESS_RAW_CHUNK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode check_chunk_crc (mng_datap pData,
- mng_uint8p pBuf,
- mng_uint32 iBuflen)
-{
- mng_uint32 iCrc; /* calculated CRC */
- mng_bool bDiscard = MNG_FALSE;
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_CHUNK_CRC, MNG_LC_START);
-#endif
-
- if (pData->iCrcmode & MNG_CRC_INPUT) /* crc included ? */
- {
- mng_bool bCritical = (mng_bool)((*pBuf & 0x20) == 0);
- mng_uint32 iL = iBuflen - (mng_uint32)(sizeof (iCrc));
-
- if (((bCritical ) && (pData->iCrcmode & MNG_CRC_CRITICAL )) ||
- ((!bCritical) && (pData->iCrcmode & MNG_CRC_ANCILLARY)))
- { /* calculate the crc */
- iCrc = mng_crc (pData, pBuf, iL);
- /* and check it */
- if (!(iCrc == mng_get_uint32 (pBuf + iL)))
- {
- mng_bool bWarning = MNG_FALSE;
- mng_bool bError = MNG_FALSE;
-
- if (bCritical)
- {
- switch (pData->iCrcmode & MNG_CRC_CRITICAL)
- {
- case MNG_CRC_CRITICAL_WARNING : { bWarning = MNG_TRUE; break; }
- case MNG_CRC_CRITICAL_ERROR : { bError = MNG_TRUE; break; }
- }
- }
- else
- {
- switch (pData->iCrcmode & MNG_CRC_ANCILLARY)
- {
- case MNG_CRC_ANCILLARY_DISCARD : { bDiscard = MNG_TRUE; break; }
- case MNG_CRC_ANCILLARY_WARNING : { bWarning = MNG_TRUE; break; }
- case MNG_CRC_ANCILLARY_ERROR : { bError = MNG_TRUE; break; }
- }
- }
-
- if (bWarning)
- MNG_WARNING (pData, MNG_INVALIDCRC);
- if (bError)
- MNG_ERROR (pData, MNG_INVALIDCRC);
- }
- }
-
- if (!bDiscard) /* still processing ? */
- iRetcode = process_raw_chunk (pData, pBuf, iL);
- }
- else
- { /* no crc => straight onto processing */
- iRetcode = process_raw_chunk (pData, pBuf, iBuflen);
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_CHUNK_CRC, MNG_LC_END);
-#endif
-
- return iRetcode;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode read_chunk (mng_datap pData)
-{
- mng_uint32 iBufmax = pData->iReadbufsize;
- mng_uint8p pBuf = pData->pReadbuf;
- mng_uint32 iBuflen = 0; /* number of bytes requested */
- mng_uint32 iRead = 0; /* number of bytes read */
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_CHUNK, MNG_LC_START);
-#endif
-
-#ifdef MNG_SUPPORT_DISPLAY
- if (pData->pCurraniobj) /* processing an animation object ? */
- {
- do /* process it then */
- {
- iRetcode = ((mng_object_headerp)pData->pCurraniobj)->fProcess (pData, pData->pCurraniobj);
- /* refresh needed ? */
-/* if ((!iRetcode) && (!pData->bTimerset) && (pData->bNeedrefresh))
- iRetcode = display_progressive_refresh (pData, 1); */
- /* can we advance to next object ? */
- if ((!iRetcode) && (pData->pCurraniobj) &&
- (!pData->bTimerset) && (!pData->bSectionwait))
- { /* reset timer indicator on read-cycle */
- if ((pData->bReading) && (!pData->bDisplaying))
- pData->bTimerset = MNG_FALSE;
-
- pData->pCurraniobj = ((mng_object_headerp)pData->pCurraniobj)->pNext;
- /* TERM processing to be done ? */
- if ((!pData->pCurraniobj) && (pData->bHasTERM) && (!pData->bHasMHDR))
- iRetcode = mng_process_display_mend (pData);
- }
- } /* until error or a break or no more objects */
- while ((!iRetcode) && (pData->pCurraniobj) &&
- (!pData->bTimerset) && (!pData->bSectionwait) && (!pData->bFreezing));
- }
- else
- {
- if (pData->iBreakpoint) /* do we need to finish something first ? */
- {
- switch (pData->iBreakpoint) /* return to broken display routine */
- {
-#ifndef MNG_SKIPCHUNK_FRAM
- case 1 : { iRetcode = mng_process_display_fram2 (pData); break; }
-#endif
- case 2 : { iRetcode = mng_process_display_ihdr (pData); break; }
-#ifndef MNG_SKIPCHUNK_SHOW
- case 3 : ; /* same as 4 !!! */
- case 4 : { iRetcode = mng_process_display_show (pData); break; }
-#endif
-#ifndef MNG_SKIPCHUNK_CLON
- case 5 : { iRetcode = mng_process_display_clon2 (pData); break; }
-#endif
-#ifdef MNG_INCLUDE_JNG
- case 7 : { iRetcode = mng_process_display_jhdr (pData); break; }
-#endif
- case 6 : ; /* same as 8 !!! */
- case 8 : { iRetcode = mng_process_display_iend (pData); break; }
-#ifndef MNG_SKIPCHUNK_MAGN
- case 9 : { iRetcode = mng_process_display_magn2 (pData); break; }
-#endif
- case 10 : { iRetcode = mng_process_display_mend2 (pData); break; }
-#ifndef MNG_SKIPCHUNK_PAST
- case 11 : { iRetcode = mng_process_display_past2 (pData); break; }
-#endif
- }
- }
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#endif /* MNG_SUPPORT_DISPLAY */
- /* can we continue processing now, or do we */
- /* need to wait for the timer to finish (again) ? */
-#ifdef MNG_SUPPORT_DISPLAY
- if ((!pData->bTimerset) && (!pData->bSectionwait) && (!pData->bEOF))
-#else
- if (!pData->bEOF)
-#endif
- {
-#ifdef MNG_SUPPORT_DISPLAY
- /* freezing in progress ? */
- if ((pData->bFreezing) && (pData->iSuspendpoint == 0))
- pData->bRunning = MNG_FALSE; /* then this is the right moment to do it */
-#endif
-
- if (pData->iSuspendpoint <= 2)
- {
- iBuflen = sizeof (mng_uint32); /* read length */
- iRetcode = read_databuffer (pData, pBuf, &pData->pReadbufnext, iBuflen, &iRead);
-
- if (iRetcode) /* bail on errors */
- return iRetcode;
-
- if (pData->bSuspended) /* suspended ? */
- pData->iSuspendpoint = 2;
- else /* save the length */
- {
- pData->iChunklen = mng_get_uint32 (pBuf);
- if (pData->iChunklen > 0x7ffffff)
- return MNG_INVALIDLENGTH;
- }
-
- }
-
- if (!pData->bSuspended) /* still going ? */
- { /* previously suspended or not eof ? */
- if ((pData->iSuspendpoint > 2) || (iRead == iBuflen))
- { /* determine length chunkname + data (+ crc) */
- if (pData->iCrcmode & MNG_CRC_INPUT)
- iBuflen = pData->iChunklen + (mng_uint32)(sizeof (mng_chunkid) + sizeof (mng_uint32));
- else
- iBuflen = pData->iChunklen + (mng_uint32)(sizeof (mng_chunkid));
-
- /* do we have enough data in the current push buffer ? */
- if ((pData->pFirstpushdata) && (iBuflen <= pData->pFirstpushdata->iRemaining))
- {
- mng_pushdatap pPush = pData->pFirstpushdata;
- pBuf = pPush->pDatanext;
- pPush->pDatanext += iBuflen;
- pPush->iRemaining -= iBuflen;
- pData->iSuspendpoint = 0; /* safely reset this here ! */
-
- iRetcode = check_chunk_crc (pData, pBuf, iBuflen);
- if (iRetcode)
- return iRetcode;
-
- if (!pPush->iRemaining) /* buffer depleted? then release it */
- iRetcode = mng_release_pushdata (pData);
- }
- else
- {
- if (iBuflen < iBufmax) /* does it fit in default buffer ? */
- { /* note that we don't use the full size
- so there's always a zero-byte at the
- very end !!! */
- iRetcode = read_databuffer (pData, pBuf, &pData->pReadbufnext, iBuflen, &iRead);
- if (iRetcode) /* bail on errors */
- return iRetcode;
-
- if (pData->bSuspended) /* suspended ? */
- pData->iSuspendpoint = 3;
- else
- {
- if (iRead != iBuflen) /* did we get all the data ? */
- MNG_ERROR (pData, MNG_UNEXPECTEDEOF);
- iRetcode = check_chunk_crc (pData, pBuf, iBuflen);
- }
- }
- else
- {
- if (iBuflen > 16777216) /* is the length incredible? */
- MNG_ERROR (pData, MNG_IMPROBABLELENGTH);
-
- if (!pData->iSuspendpoint) /* create additional large buffer ? */
- { /* again reserve space for the last zero-byte */
- pData->iLargebufsize = iBuflen + 1;
- pData->pLargebufnext = MNG_NULL;
- MNG_ALLOC (pData, pData->pLargebuf, pData->iLargebufsize);
- }
-
- iRetcode = read_databuffer (pData, pData->pLargebuf, &pData->pLargebufnext, iBuflen, &iRead);
- if (iRetcode)
- return iRetcode;
-
- if (pData->bSuspended) /* suspended ? */
- pData->iSuspendpoint = 4;
- else
- {
- if (iRead != iBuflen) /* did we get all the data ? */
- MNG_ERROR (pData, MNG_UNEXPECTEDEOF);
- iRetcode = check_chunk_crc (pData, pData->pLargebuf, iBuflen);
- /* cleanup additional large buffer */
- MNG_FREE (pData, pData->pLargebuf, pData->iLargebufsize);
- }
- }
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- }
- else
- { /* that's final */
- iRetcode = mng_process_eof (pData);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
- if ((iRead != 0) || /* did we get an unexpected eof ? */
-#ifdef MNG_INCLUDE_JNG
- (pData->bHasIHDR || pData->bHasMHDR || pData->bHasJHDR))
-#else
- (pData->bHasIHDR || pData->bHasMHDR))
-#endif
- MNG_ERROR (pData, MNG_UNEXPECTEDEOF);
- }
- }
- }
-
-#ifdef MNG_SUPPORT_DISPLAY /* refresh needed ? */
- if ((!pData->bTimerset) && (!pData->bSuspended) && (pData->bNeedrefresh))
- {
- iRetcode = mng_display_progressive_refresh (pData, 1);
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_CHUNK, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-MNG_LOCAL mng_retcode process_pushedchunk (mng_datap pData)
-{
- mng_pushdatap pPush;
- mng_retcode iRetcode = MNG_NOERROR;
-
-#ifdef MNG_SUPPORT_DISPLAY
- if (pData->pCurraniobj) /* processing an animation object ? */
- {
- do /* process it then */
- {
- iRetcode = ((mng_object_headerp)pData->pCurraniobj)->fProcess (pData, pData->pCurraniobj);
- /* refresh needed ? */
-/* if ((!iRetcode) && (!pData->bTimerset) && (pData->bNeedrefresh))
- iRetcode = display_progressive_refresh (pData, 1); */
- /* can we advance to next object ? */
- if ((!iRetcode) && (pData->pCurraniobj) &&
- (!pData->bTimerset) && (!pData->bSectionwait))
- { /* reset timer indicator on read-cycle */
- if ((pData->bReading) && (!pData->bDisplaying))
- pData->bTimerset = MNG_FALSE;
-
- pData->pCurraniobj = ((mng_object_headerp)pData->pCurraniobj)->pNext;
- /* TERM processing to be done ? */
- if ((!pData->pCurraniobj) && (pData->bHasTERM) && (!pData->bHasMHDR))
- iRetcode = mng_process_display_mend (pData);
- }
- } /* until error or a break or no more objects */
- while ((!iRetcode) && (pData->pCurraniobj) &&
- (!pData->bTimerset) && (!pData->bSectionwait) && (!pData->bFreezing));
- }
- else
- {
- if (pData->iBreakpoint) /* do we need to finish something first ? */
- {
- switch (pData->iBreakpoint) /* return to broken display routine */
- {
-#ifndef MNG_SKIPCHUNK_FRAM
- case 1 : { iRetcode = mng_process_display_fram2 (pData); break; }
-#endif
- case 2 : { iRetcode = mng_process_display_ihdr (pData); break; }
-#ifndef MNG_SKIPCHUNK_SHOW
- case 3 : ; /* same as 4 !!! */
- case 4 : { iRetcode = mng_process_display_show (pData); break; }
-#endif
-#ifndef MNG_SKIPCHUNK_CLON
- case 5 : { iRetcode = mng_process_display_clon2 (pData); break; }
-#endif
-#ifdef MNG_INCLUDE_JNG
- case 7 : { iRetcode = mng_process_display_jhdr (pData); break; }
-#endif
- case 6 : ; /* same as 8 !!! */
- case 8 : { iRetcode = mng_process_display_iend (pData); break; }
-#ifndef MNG_SKIPCHUNK_MAGN
- case 9 : { iRetcode = mng_process_display_magn2 (pData); break; }
-#endif
- case 10 : { iRetcode = mng_process_display_mend2 (pData); break; }
-#ifndef MNG_SKIPCHUNK_PAST
- case 11 : { iRetcode = mng_process_display_past2 (pData); break; }
-#endif
- }
- }
- }
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
-
-#endif /* MNG_SUPPORT_DISPLAY */
- /* can we continue processing now, or do we */
- /* need to wait for the timer to finish (again) ? */
-#ifdef MNG_SUPPORT_DISPLAY
- if ((!pData->bTimerset) && (!pData->bSectionwait) && (!pData->bEOF))
-#else
- if (!pData->bEOF)
-#endif
- {
- pData->iSuspendpoint = 0; /* safely reset it here ! */
- pPush = pData->pFirstpushchunk;
-
- iRetcode = process_raw_chunk (pData, pPush->pData, pPush->iLength);
- if (iRetcode)
- return iRetcode;
-
-#ifdef MNG_SUPPORT_DISPLAY /* refresh needed ? */
- if ((!pData->bTimerset) && (!pData->bSuspended) && (pData->bNeedrefresh))
- {
- iRetcode = mng_display_progressive_refresh (pData, 1);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#endif
- }
-
- return mng_release_pushchunk (pData);
-}
-
-/* ************************************************************************** */
-
-mng_retcode mng_read_graphic (mng_datap pData)
-{
- mng_uint32 iBuflen; /* number of bytes requested */
- mng_uint32 iRead; /* number of bytes read */
- mng_retcode iRetcode; /* temporary error-code */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_GRAPHIC, MNG_LC_START);
-#endif
-
- if (!pData->pReadbuf) /* buffer allocated ? */
- {
- pData->iReadbufsize = 4200; /* allocate a default read buffer */
- MNG_ALLOC (pData, pData->pReadbuf, pData->iReadbufsize);
- }
- /* haven't processed the signature ? */
- if ((!pData->bHavesig) || (pData->iSuspendpoint == 1))
- {
- iBuflen = 2 * sizeof (mng_uint32); /* read signature */
-
- iRetcode = read_databuffer (pData, pData->pReadbuf, &pData->pReadbufnext, iBuflen, &iRead);
-
- if (iRetcode)
- return iRetcode;
-
- if (pData->bSuspended) /* input suspension ? */
- pData->iSuspendpoint = 1;
- else
- {
- if (iRead != iBuflen) /* full signature received ? */
- MNG_ERROR (pData, MNG_UNEXPECTEDEOF);
- /* is it a valid signature ? */
- if (mng_get_uint32 (pData->pReadbuf) == PNG_SIG)
- pData->eSigtype = mng_it_png;
- else
-#ifdef MNG_INCLUDE_JNG
- if (mng_get_uint32 (pData->pReadbuf) == JNG_SIG)
- pData->eSigtype = mng_it_jng;
- else
-#endif
- if (mng_get_uint32 (pData->pReadbuf) == MNG_SIG)
- pData->eSigtype = mng_it_mng;
- else
- MNG_ERROR (pData, MNG_INVALIDSIG);
- /* all of it ? */
- if (mng_get_uint32 (pData->pReadbuf+4) != POST_SIG)
- MNG_ERROR (pData, MNG_INVALIDSIG);
-
- pData->bHavesig = MNG_TRUE;
- }
- }
-
- if (!pData->bSuspended) /* still going ? */
- {
- do
- { /* reset timer during mng_read() ? */
- if ((pData->bReading) && (!pData->bDisplaying))
- pData->bTimerset = MNG_FALSE;
-
- if (pData->pFirstpushchunk) /* chunks pushed ? */
- iRetcode = process_pushedchunk (pData); /* process the pushed chunk */
- else
- iRetcode = read_chunk (pData); /* read & process a chunk */
-
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
-#ifdef MNG_SUPPORT_DISPLAY /* until EOF or a break-request */
- while (((!pData->bEOF) || (pData->pCurraniobj)) &&
- (!pData->bSuspended) && (!pData->bSectionwait) &&
- ((!pData->bTimerset) || ((pData->bReading) && (!pData->bDisplaying))));
-#else
- while ((!pData->bEOF) && (!pData->bSuspended));
-#endif
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_READ_GRAPHIC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_READ_PROCS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_read.h b/src/3rdparty/libmng/libmng_read.h
deleted file mode 100644
index 119cc3e60e..0000000000
--- a/src/3rdparty/libmng/libmng_read.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_read.h copyright (c) 2000-2004 G.Juyn * */
-/* * version : 1.0.8 * */
-/* * * */
-/* * purpose : Read management (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the read management routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 10/18/2000 - G.Juyn * */
-/* * - added closestream() processing for mng_cleanup() * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * * */
-/* * 1.0.8 - 04/12/2004 - G.Juyn * */
-/* * - added data-push mechanisms for specialized decoders * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_read_h_
-#define _libmng_read_h_
-
-/* ************************************************************************** */
-
-mng_retcode mng_process_eof (mng_datap pData);
-
-mng_retcode mng_release_pushdata (mng_datap pData);
-
-mng_retcode mng_release_pushchunk (mng_datap pData);
-
-mng_retcode mng_read_graphic (mng_datap pData);
-
-/* ************************************************************************** */
-
-#endif /* _libmng_read_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_trace.c b/src/3rdparty/libmng/libmng_trace.c
deleted file mode 100644
index a6a2cab2b6..0000000000
--- a/src/3rdparty/libmng/libmng_trace.c
+++ /dev/null
@@ -1,1683 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_trace.c copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Trace functions (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the trace functions * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - added callback error-reporting support * */
-/* * * */
-/* * 0.5.2 - 05/23/2000 - G.Juyn * */
-/* * - added trace telltale reporting * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - added tracestrings for global animation color-chunks * */
-/* * - added tracestrings for get/set of default ZLIB/IJG parms * */
-/* * - added tracestrings for global PLTE,tRNS,bKGD * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - added tracestrings for image-object promotion * */
-/* * - added tracestrings for delta-image processing * */
-/* * 0.5.2 - 06/02/2000 - G.Juyn * */
-/* * - added tracestrings for getalphaline callback * */
-/* * 0.5.2 - 06/05/2000 - G.Juyn * */
-/* * - added tracestring for RGB8_A8 canvasstyle * */
-/* * 0.5.2 - 06/06/2000 - G.Juyn * */
-/* * - added tracestring for mng_read_resume HLAPI function * */
-/* * * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - added tracestrings for get/set speedtype * */
-/* * - added tracestring for get imagelevel * */
-/* * 0.5.3 - 06/22/2000 - G.Juyn * */
-/* * - added tracestring for delta-image processing * */
-/* * - added tracestrings for PPLT chunk processing * */
-/* * * */
-/* * 0.9.1 - 07/07/2000 - G.Juyn * */
-/* * - added tracecodes for special display processing * */
-/* * 0.9.1 - 07/08/2000 - G.Juyn * */
-/* * - added tracestring for get/set suspensionmode * */
-/* * - added tracestrings for get/set display variables * */
-/* * - added tracecode for read_databuffer (I/O-suspension) * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - added tracestrings for SAVE/SEEK callbacks * */
-/* * - added tracestrings for get/set sectionbreaks * */
-/* * - added tracestring for special error routine * */
-/* * 0.9.1 - 07/19/2000 - G.Juyn * */
-/* * - added tracestring for updatemngheader * */
-/* * * */
-/* * 0.9.2 - 07/31/2000 - G.Juyn * */
-/* * - added tracestrings for status_xxxxx functions * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * - added tracestring for updatemngsimplicity * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * 0.9.3 - 10/10/2000 - G.Juyn * */
-/* * - added support for alpha-depth prediction * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - added JDAA chunk * */
-/* * - added support for nEED * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added functions to retrieve PNG/JNG specific header-info * */
-/* * - added optional support for bKGD for PNG images * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - added callback to process non-critical unknown chunks * */
-/* * - added routine to discard "invalid" objects * */
-/* * 0.9.3 - 10/19/2000 - G.Juyn * */
-/* * - implemented delayed delta-processing * */
-/* * 0.9.3 - 10/20/2000 - G.Juyn * */
-/* * - added get/set for bKGD preference setting * */
-/* * 0.9.3 - 10/21/2000 - G.Juyn * */
-/* * - added get function for interlace/progressive display * */
-/* * * */
-/* * 0.9.4 - 1/18/2001 - G.Juyn * */
-/* * - added "new" MAGN methods 3, 4 & 5 * */
-/* * * */
-/* * 1.0.1 - 02/08/2001 - G.Juyn * */
-/* * - added MEND processing callback * */
-/* * 1.0.1 - 04/21/2001 - G.Juyn (code by G.Kelly) * */
-/* * - added BGRA8 canvas with premultiplied alpha * */
-/* * 1.0.1 - 05/02/2001 - G.Juyn * */
-/* * - added "default" sRGB generation (Thanks Marti!) * */
-/* * * */
-/* * 1.0.2 - 06/23/2001 - G.Juyn * */
-/* * - added optimization option for MNG-video playback * */
-/* * - added processterm callback * */
-/* * 1.0.2 - 06/25/2001 - G.Juyn * */
-/* * - added option to turn off progressive refresh * */
-/* * * */
-/* * 1.0.3 - 08/06/2001 - G.Juyn * */
-/* * - added get function for last processed BACK chunk * */
-/* * * */
-/* * 1.0.5 - 08/15/2002 - G.Juyn * */
-/* * - completed PROM support * */
-/* * - completed delta-image support * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * - added HLAPI function to copy chunks * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - added support for PAST * */
-/* * 1.0.5 - 09/22/2002 - G.Juyn * */
-/* * - added bgrx8 canvas (filler byte) * */
-/* * 1.0.5 - 09/23/2002 - G.Juyn * */
-/* * - added in-memory color-correction of abstract images * */
-/* * - added compose over/under routines for PAST processing * */
-/* * - added flip & tile routines for PAST processing * */
-/* * 1.0.5 - 10/09/2002 - G.Juyn * */
-/* * - fixed trace-constants for PAST chunk * */
-/* * 1.0.5 - 11/07/2002 - G.Juyn * */
-/* * - added support to get totals after mng_read() * */
-/* * * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added conditionals around JNG and Delta-PNG code * */
-/* * 1.0.6 - 07/14/2003 - G.R-P * */
-/* * - added conditionals around various unused functions * */
-/* * 1.0.6 - 07/29/2003 - G.R-P * */
-/* * - added conditionals around PAST chunk support * */
-/* * * */
-/* * 1.0.7 - 11/27/2003 - R.A * */
-/* * - added CANVAS_RGB565 and CANVAS_BGR565 * */
-/* * 1.0.7 - 01/25/2004 - J.S * */
-/* * - added premultiplied alpha canvas' for RGBA, ARGB, ABGR * */
-/* * 1.0.7 - 03/07/2004 - G. Randers-Pehrson * */
-/* * - put gamma, cms-related declarations inside #ifdef * */
-/* * 1.0.7 - 03/10/2004 - G.R-P * */
-/* * - added conditionals around openstream/closestream * */
-/* * * */
-/* * 1.0.8 - 04/02/2004 - G.Juyn * */
-/* * - added CRC existence & checking flags * */
-/* * 1.0.8 - 04/11/2004 - G.Juyn * */
-/* * - added data-push mechanisms for specialized decoders * */
-/* * * */
-/* * 1.0.9 - 10/03/2004 - G.Juyn * */
-/* * - added function to retrieve current FRAM delay * */
-/* * 1.0.9 - 10/14/2004 - G.Juyn * */
-/* * - added bgr565_a8 canvas-style (thanks to J. Elvander) * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 07/06/2007 - G.R-P bugfix by Lucas Quintana * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_TRACE_PROCS
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_TRACE_STRINGS
-MNG_LOCAL mng_trace_entry const trace_table [] =
- {
- {MNG_FN_INITIALIZE, "initialize"},
- {MNG_FN_RESET, "reset"},
- {MNG_FN_CLEANUP, "cleanup"},
- {MNG_FN_READ, "read"},
- {MNG_FN_WRITE, "write"},
- {MNG_FN_CREATE, "create"},
- {MNG_FN_READDISPLAY, "readdisplay"},
- {MNG_FN_DISPLAY, "display"},
- {MNG_FN_DISPLAY_RESUME, "display_resume"},
- {MNG_FN_DISPLAY_FREEZE, "display_freeze"},
- {MNG_FN_DISPLAY_RESET, "display_reset"},
-#ifndef MNG_NO_DISPLAY_GO_SUPPORTED
- {MNG_FN_DISPLAY_GOFRAME, "display_goframe"},
- {MNG_FN_DISPLAY_GOLAYER, "display_golayer"},
- {MNG_FN_DISPLAY_GOTIME, "display_gotime"},
-#endif
- {MNG_FN_GETLASTERROR, "getlasterror"},
- {MNG_FN_READ_RESUME, "read_resume"},
- {MNG_FN_TRAPEVENT, "trapevent"},
- {MNG_FN_READ_PUSHDATA, "read_pushdata"},
- {MNG_FN_READ_PUSHSIG, "read_pushsig"},
- {MNG_FN_READ_PUSHCHUNK, "read_pushchunk"},
-
- {MNG_FN_SETCB_MEMALLOC, "setcb_memalloc"},
- {MNG_FN_SETCB_MEMFREE, "setcb_memfree"},
- {MNG_FN_SETCB_READDATA, "setcb_readdata"},
- {MNG_FN_SETCB_WRITEDATA, "setcb_writedata"},
- {MNG_FN_SETCB_ERRORPROC, "setcb_errorproc"},
- {MNG_FN_SETCB_TRACEPROC, "setcb_traceproc"},
- {MNG_FN_SETCB_PROCESSHEADER, "setcb_processheader"},
- {MNG_FN_SETCB_PROCESSTEXT, "setcb_processtext"},
- {MNG_FN_SETCB_GETCANVASLINE, "setcb_getcanvasline"},
- {MNG_FN_SETCB_GETBKGDLINE, "setcb_getbkgdline"},
- {MNG_FN_SETCB_REFRESH, "setcb_refresh"},
- {MNG_FN_SETCB_GETTICKCOUNT, "setcb_gettickcount"},
- {MNG_FN_SETCB_SETTIMER, "setcb_settimer"},
- {MNG_FN_SETCB_PROCESSGAMMA, "setcb_processgamma"},
- {MNG_FN_SETCB_PROCESSCHROMA, "setcb_processchroma"},
- {MNG_FN_SETCB_PROCESSSRGB, "setcb_processsrgb"},
- {MNG_FN_SETCB_PROCESSICCP, "setcb_processiccp"},
- {MNG_FN_SETCB_PROCESSAROW, "setcb_processarow"},
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- {MNG_FN_SETCB_OPENSTREAM, "setcb_openstream"},
- {MNG_FN_SETCB_CLOSESTREAM, "setcb_closestream"},
-#endif
- {MNG_FN_SETCB_GETALPHALINE, "setcb_getalphaline"},
- {MNG_FN_SETCB_PROCESSSAVE, "setcb_processsave"},
- {MNG_FN_SETCB_PROCESSSEEK, "setcb_processseek"},
- {MNG_FN_SETCB_PROCESSNEED, "setcb_processneed"},
- {MNG_FN_SETCB_PROCESSUNKNOWN, "setcb_processunknown"},
- {MNG_FN_SETCB_PROCESSMEND, "setcb_processmend"},
- {MNG_FN_SETCB_PROCESSTERM, "setcb_processterm"},
- {MNG_FN_SETCB_RELEASEDATA, "setcb_releasedata"},
-
- {MNG_FN_GETCB_MEMALLOC, "getcb_memalloc"},
- {MNG_FN_GETCB_MEMFREE, "getcb_memfree"},
- {MNG_FN_GETCB_READDATA, "getcb_readdata,"},
- {MNG_FN_GETCB_WRITEDATA, "getcb_writedata"},
- {MNG_FN_GETCB_ERRORPROC, "getcb_errorproc"},
- {MNG_FN_GETCB_TRACEPROC, "getcb_traceproc"},
- {MNG_FN_GETCB_PROCESSHEADER, "getcb_processheader"},
- {MNG_FN_GETCB_PROCESSTEXT, "getcb_processtext"},
- {MNG_FN_GETCB_GETCANVASLINE, "getcb_getcanvasline"},
- {MNG_FN_GETCB_GETBKGDLINE, "getcb_getbkgdline"},
- {MNG_FN_GETCB_REFRESH, "getcb_refresh"},
- {MNG_FN_GETCB_GETTICKCOUNT, "getcb_gettickcount"},
- {MNG_FN_GETCB_SETTIMER, "getcb_settimer"},
- {MNG_FN_GETCB_PROCESSGAMMA, "getcb_processgamma"},
- {MNG_FN_GETCB_PROCESSCHROMA, "getcb_processchroma"},
- {MNG_FN_GETCB_PROCESSSRGB, "getcb_processsrgb"},
- {MNG_FN_GETCB_PROCESSICCP, "getcb_processiccp"},
- {MNG_FN_GETCB_PROCESSAROW, "getcb_processarow"},
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- {MNG_FN_GETCB_OPENSTREAM, "getcb_openstream"},
- {MNG_FN_GETCB_CLOSESTREAM, "getcb_closestream"},
-#endif
- {MNG_FN_GETCB_GETALPHALINE, "getcb_getalphaline"},
- {MNG_FN_GETCB_PROCESSSAVE, "getcb_processsave"},
- {MNG_FN_GETCB_PROCESSSEEK, "getcb_processseek"},
- {MNG_FN_GETCB_PROCESSNEED, "getcb_processneed"},
- {MNG_FN_GETCB_PROCESSUNKNOWN, "getcb_processunknown"},
- {MNG_FN_GETCB_PROCESSMEND, "getcb_processmend"},
- {MNG_FN_GETCB_PROCESSTERM, "getcb_processterm"},
- {MNG_FN_GETCB_RELEASEDATA, "getcb_releasedata"},
-
- {MNG_FN_SET_USERDATA, "set_userdata"},
- {MNG_FN_SET_CANVASSTYLE, "set_canvasstyle"},
- {MNG_FN_SET_BKGDSTYLE, "set_bkgdstyle"},
- {MNG_FN_SET_BGCOLOR, "set_bgcolor"},
- {MNG_FN_SET_STORECHUNKS, "set_storechunks"},
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
- {MNG_FN_SET_VIEWGAMMA, "set_viewgamma"},
-#ifndef MNG_NO_DFLT_INFO
- {MNG_FN_SET_DISPLAYGAMMA, "set_displaygamma"},
-#endif
- {MNG_FN_SET_DFLTIMGGAMMA, "set_dfltimggamma"},
-#endif
- {MNG_FN_SET_SRGB, "set_srgb"},
- {MNG_FN_SET_OUTPUTPROFILE, "set_outputprofile"},
- {MNG_FN_SET_SRGBPROFILE, "set_srgbprofile"},
-#ifndef MNG_SKIP_MAXCANVAS
- {MNG_FN_SET_MAXCANVASWIDTH, "set_maxcanvaswidth"},
- {MNG_FN_SET_MAXCANVASHEIGHT, "set_maxcanvasheight"},
- {MNG_FN_SET_MAXCANVASSIZE, "set_maxcanvassize"},
-#endif
-#ifndef MNG_NO_ACCESS_ZLIB
- {MNG_FN_SET_ZLIB_LEVEL, "set_zlib_level"},
- {MNG_FN_SET_ZLIB_METHOD, "set_zlib_method"},
- {MNG_FN_SET_ZLIB_WINDOWBITS, "set_zlib_windowbits"},
- {MNG_FN_SET_ZLIB_MEMLEVEL, "set_zlib_memlevel"},
- {MNG_FN_SET_ZLIB_STRATEGY, "set_zlib_strategy"},
- {MNG_FN_SET_ZLIB_MAXIDAT, "set_zlib_maxidat"},
-#endif
-#ifndef MNG_NO_ACCESS_JPEG
- {MNG_FN_SET_JPEG_DCTMETHOD, "set_jpeg_dctmethod"},
- {MNG_FN_SET_JPEG_QUALITY, "set_jpeg_quality"},
- {MNG_FN_SET_JPEG_SMOOTHING, "set_jpeg_smoothing"},
- {MNG_FN_SET_JPEG_PROGRESSIVE, "set_jpeg_progressive"},
- {MNG_FN_SET_JPEG_OPTIMIZED, "set_jpeg_optimized"},
- {MNG_FN_SET_JPEG_MAXJDAT, "set_jpeg_maxjdat"},
-#endif
- {MNG_FN_SET_SPEED, "set_speed"},
- {MNG_FN_SET_SUSPENSIONMODE, "set_suspensionmode"},
- {MNG_FN_SET_SECTIONBREAKS, "set_sectionbreaks"},
- {MNG_FN_SET_USEBKGD, "set_usebkgd"},
- {MNG_FN_SET_OUTPUTPROFILE2, "set_outputprofile2"},
- {MNG_FN_SET_SRGBPROFILE2, "set_srgbprofile2"},
- {MNG_FN_SET_OUTPUTSRGB, "set_outputsrgb"},
- {MNG_FN_SET_SRGBIMPLICIT, "set_srgbimplicit"},
- {MNG_FN_SET_CACHEPLAYBACK, "set_cacheplayback"},
- {MNG_FN_SET_DOPROGRESSIVE, "set_doprogressive"},
- {MNG_FN_SET_CRCMODE, "set_crcmode"},
-
- {MNG_FN_GET_USERDATA, "get_userdata"},
- {MNG_FN_GET_SIGTYPE, "get_sigtype"},
- {MNG_FN_GET_IMAGETYPE, "get_imagetype"},
- {MNG_FN_GET_IMAGEWIDTH, "get_imagewidth"},
- {MNG_FN_GET_IMAGEHEIGHT, "get_imageheight"},
- {MNG_FN_GET_TICKS, "get_ticks"},
- {MNG_FN_GET_FRAMECOUNT, "get_framecount"},
- {MNG_FN_GET_LAYERCOUNT, "get_layercount"},
- {MNG_FN_GET_PLAYTIME, "get_playtime"},
- {MNG_FN_GET_SIMPLICITY, "get_simplicity"},
- {MNG_FN_GET_CANVASSTYLE, "get_canvasstyle"},
- {MNG_FN_GET_BKGDSTYLE, "get_bkgdstyle"},
- {MNG_FN_GET_BGCOLOR, "get_bgcolor"},
- {MNG_FN_GET_STORECHUNKS, "get_storechunks"},
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
- {MNG_FN_GET_VIEWGAMMA, "get_viewgamma"},
- {MNG_FN_GET_DISPLAYGAMMA, "get_displaygamma"},
-#ifndef MNG_NO_DFLT_INFO
- {MNG_FN_GET_DFLTIMGGAMMA, "get_dfltimggamma"},
-#endif
-#endif
- {MNG_FN_GET_SRGB, "get_srgb"},
-#ifndef MNG_SKIP_MAXCANVAS
- {MNG_FN_GET_MAXCANVASWIDTH, "get_maxcanvaswidth"},
- {MNG_FN_GET_MAXCANVASHEIGHT, "get_maxcanvasheight"},
-#endif
-#ifndef MNG_NO_ACCESS_ZLIB
- {MNG_FN_GET_ZLIB_LEVEL, "get_zlib_level"},
- {MNG_FN_GET_ZLIB_METHOD, "get_zlib_method"},
- {MNG_FN_GET_ZLIB_WINDOWBITS, "get_zlib_windowbits"},
- {MNG_FN_GET_ZLIB_MEMLEVEL, "get_zlib_memlevel"},
- {MNG_FN_GET_ZLIB_STRATEGY, "get_zlib_strategy"},
- {MNG_FN_GET_ZLIB_MAXIDAT, "get_zlib_maxidat"},
-#endif
-#ifndef MNG_NO_ACCESS_JPEG
- {MNG_FN_GET_JPEG_DCTMETHOD, "get_jpeg_dctmethod"},
- {MNG_FN_GET_JPEG_QUALITY, "get_jpeg_quality"},
- {MNG_FN_GET_JPEG_SMOOTHING, "get_jpeg_smoothing"},
- {MNG_FN_GET_JPEG_PROGRESSIVE, "get_jpeg_progressive"},
- {MNG_FN_GET_JPEG_OPTIMIZED, "get_jpeg_optimized"},
- {MNG_FN_GET_JPEG_MAXJDAT, "get_jpeg_maxjdat"},
-#endif
- {MNG_FN_GET_SPEED, "get_speed"},
- {MNG_FN_GET_IMAGELEVEL, "get_imagelevel"},
- {MNG_FN_GET_SUSPENSIONMODE, "get_speed"},
- {MNG_FN_GET_STARTTIME, "get_starttime"},
- {MNG_FN_GET_RUNTIME, "get_runtime"},
-#ifndef MNG_NO_CURRENT_INFO
- {MNG_FN_GET_CURRENTFRAME, "get_currentframe"},
- {MNG_FN_GET_CURRENTLAYER, "get_currentlayer"},
- {MNG_FN_GET_CURRENTPLAYTIME, "get_currentplaytime"},
-#endif
- {MNG_FN_GET_SECTIONBREAKS, "get_sectionbreaks"},
- {MNG_FN_GET_ALPHADEPTH, "get_alphadepth"},
- {MNG_FN_GET_BITDEPTH, "get_bitdepth"},
- {MNG_FN_GET_COLORTYPE, "get_colortype"},
- {MNG_FN_GET_COMPRESSION, "get_compression"},
- {MNG_FN_GET_FILTER, "get_filter"},
- {MNG_FN_GET_INTERLACE, "get_interlace"},
- {MNG_FN_GET_ALPHABITDEPTH, "get_alphabitdepth"},
- {MNG_FN_GET_ALPHACOMPRESSION, "get_alphacompression"},
- {MNG_FN_GET_ALPHAFILTER, "get_alphafilter"},
- {MNG_FN_GET_ALPHAINTERLACE, "get_alphainterlace"},
- {MNG_FN_GET_USEBKGD, "get_usebkgd"},
- {MNG_FN_GET_REFRESHPASS, "get_refreshpass"},
- {MNG_FN_GET_CACHEPLAYBACK, "get_cacheplayback"},
- {MNG_FN_GET_DOPROGRESSIVE, "get_doprogressive"},
- {MNG_FN_GET_LASTBACKCHUNK, "get_lastbackchunk"},
- {MNG_FN_GET_LASTSEEKNAME, "get_lastseekname"},
-#ifndef MNG_NO_CURRENT_INFO
- {MNG_FN_GET_TOTALFRAMES, "get_totalframes"},
- {MNG_FN_GET_TOTALLAYERS, "get_totallayers"},
- {MNG_FN_GET_TOTALPLAYTIME, "get_totalplaytime"},
-#endif
- {MNG_FN_GET_CRCMODE, "get_crcmode"},
- {MNG_FN_GET_CURRFRAMDELAY, "get_currframdelay"},
-
- {MNG_FN_STATUS_ERROR, "status_error"},
- {MNG_FN_STATUS_READING, "status_reading"},
- {MNG_FN_STATUS_SUSPENDBREAK, "status_suspendbreak"},
- {MNG_FN_STATUS_CREATING, "status_creating"},
- {MNG_FN_STATUS_WRITING, "status_writing"},
- {MNG_FN_STATUS_DISPLAYING, "status_displaying"},
- {MNG_FN_STATUS_RUNNING, "status_running"},
- {MNG_FN_STATUS_TIMERBREAK, "status_timerbreak"},
- {MNG_FN_STATUS_DYNAMIC, "status_dynamic"},
- {MNG_FN_STATUS_RUNNINGEVENT, "status_runningevent"},
-
- {MNG_FN_ITERATE_CHUNKS, "iterate_chunks"},
- {MNG_FN_COPY_CHUNK, "copy_chunk"},
-
- {MNG_FN_GETCHUNK_IHDR, "getchunk_ihdr"},
- {MNG_FN_GETCHUNK_PLTE, "getchunk_plte"},
- {MNG_FN_GETCHUNK_IDAT, "getchunk_idat"},
- {MNG_FN_GETCHUNK_IEND, "getchunk_iend"},
- {MNG_FN_GETCHUNK_TRNS, "getchunk_trns"},
-#ifndef MNG_SKIPCHUNK_gAMA
- {MNG_FN_GETCHUNK_GAMA, "getchunk_gama"},
-#endif
-#ifndef MNG_SKIPCHUNK_cHRM
- {MNG_FN_GETCHUNK_CHRM, "getchunk_chrm"},
-#endif
-#ifndef MNG_SKIPCHUNK_sRGB
- {MNG_FN_GETCHUNK_SRGB, "getchunk_srgb"},
-#endif
-#ifndef MNG_SKIPCHUNK_iCCP
- {MNG_FN_GETCHUNK_ICCP, "getchunk_iccp"},
-#endif
-#ifndef MNG_SKIPCHUNK_tEXt
- {MNG_FN_GETCHUNK_TEXT, "getchunk_text"},
-#endif
-#ifndef MNG_SKIPCHUNK_zTXt
- {MNG_FN_GETCHUNK_ZTXT, "getchunk_ztxt"},
-#endif
-#ifndef MNG_SKIPCHUNK_iTXt
- {MNG_FN_GETCHUNK_ITXT, "getchunk_itxt"},
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
- {MNG_FN_GETCHUNK_BKGD, "getchunk_bkgd"},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYs
- {MNG_FN_GETCHUNK_PHYS, "getchunk_phys"},
-#endif
-#ifndef MNG_SKIPCHUNK_sBIT
- {MNG_FN_GETCHUNK_SBIT, "getchunk_sbit"},
-#endif
-#ifndef MNG_SKIPCHUNK_sPLT
- {MNG_FN_GETCHUNK_SPLT, "getchunk_splt"},
-#endif
-#ifndef MNG_SKIPCHUNK_hIST
- {MNG_FN_GETCHUNK_HIST, "getchunk_hist"},
-#endif
-#ifndef MNG_SKIPCHUNK_tIME
- {MNG_FN_GETCHUNK_TIME, "getchunk_time"},
-#endif
- {MNG_FN_GETCHUNK_MHDR, "getchunk_mhdr"},
- {MNG_FN_GETCHUNK_MEND, "getchunk_mend"},
-#ifndef MNG_SKIPCHUNK_LOOP
- {MNG_FN_GETCHUNK_LOOP, "getchunk_loop"},
- {MNG_FN_GETCHUNK_ENDL, "getchunk_endl"},
-#endif
- {MNG_FN_GETCHUNK_DEFI, "getchunk_defi"},
-#ifndef MNG_SKIPCHUNK_BASI
- {MNG_FN_GETCHUNK_BASI, "getchunk_basi"},
-#endif
- {MNG_FN_GETCHUNK_CLON, "getchunk_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_GETCHUNK_PAST, "getchunk_past"},
-#endif
- {MNG_FN_GETCHUNK_DISC, "getchunk_disc"},
- {MNG_FN_GETCHUNK_BACK, "getchunk_back"},
- {MNG_FN_GETCHUNK_FRAM, "getchunk_fram"},
- {MNG_FN_GETCHUNK_MOVE, "getchunk_move"},
- {MNG_FN_GETCHUNK_CLIP, "getchunk_clip"},
- {MNG_FN_GETCHUNK_SHOW, "getchunk_show"},
- {MNG_FN_GETCHUNK_TERM, "getchunk_term"},
-#ifndef MNG_SKIPCHUNK_SAVE
- {MNG_FN_GETCHUNK_SAVE, "getchunk_save"},
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
- {MNG_FN_GETCHUNK_SEEK, "getchunk_seek"},
-#endif
-#ifndef MNG_SKIPCHUNK_eXPI
- {MNG_FN_GETCHUNK_EXPI, "getchunk_expi"},
-#endif
-#ifndef MNG_SKIPCHUNK_fPRI
- {MNG_FN_GETCHUNK_FPRI, "getchunk_fpri"},
-#endif
-#ifndef MNG_SKIPCHUNK_nEED
- {MNG_FN_GETCHUNK_NEED, "getchunk_need"},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYg
- {MNG_FN_GETCHUNK_PHYG, "getchunk_phyg"},
-#endif
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_GETCHUNK_JHDR, "getchunk_jhdr"},
- {MNG_FN_GETCHUNK_JDAT, "getchunk_jdat"},
- {MNG_FN_GETCHUNK_JSEP, "getchunk_jsep"},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_GETCHUNK_DHDR, "getchunk_dhdr"},
- {MNG_FN_GETCHUNK_PROM, "getchunk_prom"},
- {MNG_FN_GETCHUNK_IPNG, "getchunk_ipng"},
- {MNG_FN_GETCHUNK_PPLT, "getchunk_pplt"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_GETCHUNK_IJNG, "getchunk_ijng"},
-#endif
-#ifndef MNG_SKIPCHUNK_DROP
- {MNG_FN_GETCHUNK_DROP, "getchunk_drop"},
-#endif
-#ifndef MNG_SKIPCHUNK_DBYK
- {MNG_FN_GETCHUNK_DBYK, "getchunk_dbyk"},
-#endif
-#ifndef MNG_SKIPCHUNK_ORDR
- {MNG_FN_GETCHUNK_ORDR, "getchunk_ordr"},
-#endif
-#endif
- {MNG_FN_GETCHUNK_UNKNOWN, "getchunk_unknown"},
- {MNG_FN_GETCHUNK_MAGN, "getchunk_magn"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_GETCHUNK_JDAA, "getchunk_jdaa"},
-#endif
-#ifndef MNG_SKIPCHUNK_evNT
- {MNG_FN_GETCHUNK_EVNT, "getchunk_evnt"},
-#endif
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_FN_GETCHUNK_MPNG, "getchunk_mpng"},
-#endif
-
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_GETCHUNK_PAST_SRC, "getchunk_past_src"},
-#endif
-#ifndef MNG_SKIPCHUNK_SAVE
- {MNG_FN_GETCHUNK_SAVE_ENTRY, "getchunk_save_entry"},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_GETCHUNK_PPLT_ENTRY, "getchunk_pplt_entry"},
- {MNG_FN_GETCHUNK_ORDR_ENTRY, "getchunk_ordr_entry"},
-#endif
-#ifndef MNG_SKIPCHUNK_evNT
- {MNG_FN_GETCHUNK_EVNT_ENTRY, "getchunk_evnt_entry"},
-#endif
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_FN_GETCHUNK_MPNG_FRAME, "getchunk_mpng_frame"},
-#endif
-
- {MNG_FN_PUTCHUNK_IHDR, "putchunk_ihdr"},
- {MNG_FN_PUTCHUNK_PLTE, "putchunk_plte"},
- {MNG_FN_PUTCHUNK_IDAT, "putchunk_idat"},
- {MNG_FN_PUTCHUNK_IEND, "putchunk_iend"},
- {MNG_FN_PUTCHUNK_TRNS, "putchunk_trns"},
-#ifndef MNG_SKIPCHUNK_gAMA
- {MNG_FN_PUTCHUNK_GAMA, "putchunk_gama"},
-#endif
-#ifndef MNG_SKIPCHUNK_cHRM
- {MNG_FN_PUTCHUNK_CHRM, "putchunk_chrm"},
-#endif
-#ifndef MNG_SKIPCHUNK_sRGB
- {MNG_FN_PUTCHUNK_SRGB, "putchunk_srgb"},
-#endif
-#ifndef MNG_SKIPCHUNK_iCCP
- {MNG_FN_PUTCHUNK_ICCP, "putchunk_iccp"},
-#endif
-#ifndef MNG_SKIPCHUNK_tEXt
- {MNG_FN_PUTCHUNK_TEXT, "putchunk_text"},
-#endif
-#ifndef MNG_SKIPCHUNK_zTXt
- {MNG_FN_PUTCHUNK_ZTXT, "putchunk_ztxt"},
-#endif
-#ifndef MNG_SKIPCHUNK_iTXt
- {MNG_FN_PUTCHUNK_ITXT, "putchunk_itxt"},
-#endif
-#ifndef MNG_SKIPCHUNK_bKGD
- {MNG_FN_PUTCHUNK_BKGD, "putchunk_bkgd"},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYs
- {MNG_FN_PUTCHUNK_PHYS, "putchunk_phys"},
-#endif
-#ifndef MNG_SKIPCHUNK_sBIT
- {MNG_FN_PUTCHUNK_SBIT, "putchunk_sbit"},
-#endif
-#ifndef MNG_SKIPCHUNK_sPLT
- {MNG_FN_PUTCHUNK_SPLT, "putchunk_splt"},
-#endif
-#ifndef MNG_SKIPCHUNK_hIST
- {MNG_FN_PUTCHUNK_HIST, "putchunk_hist"},
-#endif
-#ifndef MNG_SKIPCHUNK_tIME
- {MNG_FN_PUTCHUNK_TIME, "putchunk_time"},
-#endif
- {MNG_FN_PUTCHUNK_MHDR, "putchunk_mhdr"},
- {MNG_FN_PUTCHUNK_MEND, "putchunk_mend"},
- {MNG_FN_PUTCHUNK_LOOP, "putchunk_loop"},
- {MNG_FN_PUTCHUNK_ENDL, "putchunk_endl"},
- {MNG_FN_PUTCHUNK_DEFI, "putchunk_defi"},
- {MNG_FN_PUTCHUNK_BASI, "putchunk_basi"},
- {MNG_FN_PUTCHUNK_CLON, "putchunk_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_PUTCHUNK_PAST, "putchunk_past"},
-#endif
- {MNG_FN_PUTCHUNK_DISC, "putchunk_disc"},
- {MNG_FN_PUTCHUNK_BACK, "putchunk_back"},
- {MNG_FN_PUTCHUNK_FRAM, "putchunk_fram"},
- {MNG_FN_PUTCHUNK_MOVE, "putchunk_move"},
- {MNG_FN_PUTCHUNK_CLIP, "putchunk_clip"},
- {MNG_FN_PUTCHUNK_SHOW, "putchunk_show"},
- {MNG_FN_PUTCHUNK_TERM, "putchunk_term"},
-#ifndef MNG_SKIPCHUNK_SAVE
- {MNG_FN_PUTCHUNK_SAVE, "putchunk_save"},
-#endif
-#ifndef MNG_SKIPCHUNK_SEEK
- {MNG_FN_PUTCHUNK_SEEK, "putchunk_seek"},
-#endif
-#ifndef MNG_SKIPCHUNK_eXPI
- {MNG_FN_PUTCHUNK_EXPI, "putchunk_expi"},
-#endif
-#ifndef MNG_SKIPCHUNK_fPRI
- {MNG_FN_PUTCHUNK_FPRI, "putchunk_fpri"},
-#endif
-#ifndef MNG_SKIPCHUNK_nEED
- {MNG_FN_PUTCHUNK_NEED, "putchunk_need"},
-#endif
-#ifndef MNG_SKIPCHUNK_pHYg
- {MNG_FN_PUTCHUNK_PHYG, "putchunk_phyg"},
-#endif
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_PUTCHUNK_JHDR, "putchunk_jhdr"},
- {MNG_FN_PUTCHUNK_JDAT, "putchunk_jdat"},
- {MNG_FN_PUTCHUNK_JSEP, "putchunk_jsep"},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_PUTCHUNK_DHDR, "putchunk_dhdr"},
- {MNG_FN_PUTCHUNK_PROM, "putchunk_prom"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_PUTCHUNK_IPNG, "putchunk_ipng"},
-#endif
- {MNG_FN_PUTCHUNK_PPLT, "putchunk_pplt"},
- {MNG_FN_PUTCHUNK_IJNG, "putchunk_ijng"},
-#ifndef MNG_SKIPCHUNK_DROP
- {MNG_FN_PUTCHUNK_DROP, "putchunk_drop"},
-#endif
-#ifndef MNG_SKIPCHUNK_DBYK
- {MNG_FN_PUTCHUNK_DBYK, "putchunk_dbyk"},
-#endif
-#ifndef MNG_SKIPCHUNK_ORDR
- {MNG_FN_PUTCHUNK_ORDR, "putchunk_ordr"},
-#endif
-#endif
- {MNG_FN_PUTCHUNK_UNKNOWN, "putchunk_unknown"},
- {MNG_FN_PUTCHUNK_MAGN, "putchunk_magn"},
- {MNG_FN_PUTCHUNK_JDAA, "putchunk_jdaa"},
-#ifndef MNG_SKIPCHUNK_evNT
- {MNG_FN_PUTCHUNK_EVNT, "putchunk_evnt"},
-#endif
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_FN_PUTCHUNK_MPNG, "putchunk_mpng"},
-#endif
-
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_PUTCHUNK_PAST_SRC, "putchunk_past_src"},
-#endif
-#ifndef MNG_SKIPCHUNK_SAVE
- {MNG_FN_PUTCHUNK_SAVE_ENTRY, "putchunk_save_entry"},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_PUTCHUNK_PPLT_ENTRY, "putchunk_pplt_entry"},
-#ifndef MNG_SKIPCHUNK_ORDR
- {MNG_FN_PUTCHUNK_ORDR_ENTRY, "putchunk_ordr_entry"},
-#endif
-#endif
-#ifndef MNG_SKIPCHUNK_evNT
- {MNG_FN_PUTCHUNK_EVNT_ENTRY, "putchunk_evnt_entry"},
-#endif
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_FN_PUTCHUNK_MPNG_FRAME, "putchunk_mpng_frame"},
-#endif
-
- {MNG_FN_GETIMGDATA_SEQ, "getimgdata_seq"},
- {MNG_FN_GETIMGDATA_CHUNKSEQ, "getimgdata_chunkseq"},
- {MNG_FN_GETIMGDATA_CHUNK, "getimgdata_chunk"},
-
- {MNG_FN_PUTIMGDATA_IHDR, "putimgdata_ihdr"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_PUTIMGDATA_JHDR, "putimgdata_jhdr"},
- {MNG_FN_PUTIMGDATA_BASI, "putimgdata_basi"},
- {MNG_FN_PUTIMGDATA_DHDR, "putimgdata_dhdr"},
-#endif
-
- {MNG_FN_UPDATEMNGHEADER, "updatemngheader"},
- {MNG_FN_UPDATEMNGSIMPLICITY, "updatemngsimplicity"},
-
- {MNG_FN_PROCESS_RAW_CHUNK, "process_raw_chunk"},
- {MNG_FN_READ_GRAPHIC, "read_graphic"},
- {MNG_FN_DROP_CHUNKS, "drop_chunks"},
- {MNG_FN_PROCESS_ERROR, "process_error"},
- {MNG_FN_CLEAR_CMS, "clear_cms"},
- {MNG_FN_DROP_OBJECTS, "drop_objects"},
- {MNG_FN_READ_CHUNK, "read_chunk"},
- {MNG_FN_LOAD_BKGDLAYER, "load_bkgdlayer"},
- {MNG_FN_NEXT_FRAME, "next_frame"},
- {MNG_FN_NEXT_LAYER, "next_layer"},
- {MNG_FN_INTERFRAME_DELAY, "interframe_delay"},
- {MNG_FN_DISPLAY_IMAGE, "display_image"},
- {MNG_FN_DROP_IMGOBJECTS, "drop_imgobjects"},
- {MNG_FN_DROP_ANIOBJECTS, "drop_aniobjects"},
- {MNG_FN_INFLATE_BUFFER, "inflate_buffer"},
- {MNG_FN_DEFLATE_BUFFER, "deflate_buffer"},
- {MNG_FN_WRITE_RAW_CHUNK, "write_raw_chunk"},
- {MNG_FN_WRITE_GRAPHIC, "write_graphic"},
- {MNG_FN_SAVE_STATE, "save_state"},
- {MNG_FN_RESTORE_STATE, "restore_state"},
- {MNG_FN_DROP_SAVEDATA, "drop_savedata"},
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_EXECUTE_DELTA_IMAGE, "execute_delta_image"},
-#endif
- {MNG_FN_PROCESS_DISPLAY, "process_display"},
- {MNG_FN_CLEAR_CANVAS, "clear_canvas"},
- {MNG_FN_READ_DATABUFFER, "read_databuffer"},
- {MNG_FN_STORE_ERROR, "store_error"},
- {MNG_FN_DROP_INVALID_OBJECTS, "drop_invalid_objects"},
- {MNG_FN_RELEASE_PUSHDATA, "release_pushdata"},
- {MNG_FN_READ_DATA, "read_data"},
- {MNG_FN_READ_CHUNK_CRC, "read_chunk_crc"},
- {MNG_FN_RELEASE_PUSHCHUNK, "release_pushchunk"},
-
- {MNG_FN_DISPLAY_RGB8, "display_rgb8"},
- {MNG_FN_DISPLAY_RGBA8, "display_rgba8"},
- {MNG_FN_DISPLAY_ARGB8, "display_argb8"},
- {MNG_FN_DISPLAY_BGR8, "display_bgr8"},
- {MNG_FN_DISPLAY_BGRA8, "display_bgra8"},
- {MNG_FN_DISPLAY_ABGR8, "display_abgr8"},
- {MNG_FN_DISPLAY_RGB16, "display_rgb16"},
- {MNG_FN_DISPLAY_RGBA16, "display_rgba16"},
- {MNG_FN_DISPLAY_ARGB16, "display_argb16"},
- {MNG_FN_DISPLAY_BGR16, "display_bgr16"},
- {MNG_FN_DISPLAY_BGRA16, "display_bgra16"},
- {MNG_FN_DISPLAY_ABGR16, "display_abgr16"},
- {MNG_FN_DISPLAY_INDEX8, "display_index8"},
- {MNG_FN_DISPLAY_INDEXA8, "display_indexa8"},
- {MNG_FN_DISPLAY_AINDEX8, "display_aindex8"},
- {MNG_FN_DISPLAY_GRAY8, "display_gray8"},
- {MNG_FN_DISPLAY_GRAY16, "display_gray16"},
- {MNG_FN_DISPLAY_GRAYA8, "display_graya8"},
- {MNG_FN_DISPLAY_GRAYA16, "display_graya16"},
- {MNG_FN_DISPLAY_AGRAY8, "display_agray8"},
- {MNG_FN_DISPLAY_AGRAY16, "display_agray16"},
- {MNG_FN_DISPLAY_DX15, "display_dx15"},
- {MNG_FN_DISPLAY_DX16, "display_dx16"},
- {MNG_FN_DISPLAY_RGB8_A8, "display_rgb8_a8"},
- {MNG_FN_DISPLAY_BGRA8PM, "display_bgra8_pm"},
- {MNG_FN_DISPLAY_BGRX8, "display_bgrx8"},
- {MNG_FN_DISPLAY_RGB565, "display_rgb565"},
- {MNG_FN_DISPLAY_RGBA565, "display_rgba565"},
- {MNG_FN_DISPLAY_BGR565, "display_bgr565"},
- {MNG_FN_DISPLAY_BGRA565, "display_bgra565"},
- {MNG_FN_DISPLAY_RGBA8_PM, "display_rgba8_pm"},
- {MNG_FN_DISPLAY_ARGB8_PM, "display_argb8_pm"},
- {MNG_FN_DISPLAY_ABGR8_PM, "display_abgr8_pm"},
- {MNG_FN_DISPLAY_BGR565_A8, "display_bgr565_a8"},
-
- {MNG_FN_INIT_FULL_CMS, "init_full_cms"},
- {MNG_FN_CORRECT_FULL_CMS, "correct_full_cms"},
- {MNG_FN_INIT_GAMMA_ONLY, "init_gamma_only"},
- {MNG_FN_CORRECT_GAMMA_ONLY, "correct_gamma_only"},
- {MNG_FN_CORRECT_APP_CMS, "correct_app_cms"},
- {MNG_FN_INIT_FULL_CMS_OBJ, "init_full_cms_obj"},
- {MNG_FN_INIT_GAMMA_ONLY_OBJ, "init_gamma_only_obj"},
- {MNG_FN_INIT_APP_CMS, "init_app_cms"},
- {MNG_FN_INIT_APP_CMS_OBJ, "init_app_cms_obj"},
-
- {MNG_FN_PROCESS_G1, "process_g1"},
- {MNG_FN_PROCESS_G2, "process_g2"},
- {MNG_FN_PROCESS_G4, "process_g4"},
- {MNG_FN_PROCESS_G8, "process_g8"},
- {MNG_FN_PROCESS_G16, "process_g16"},
- {MNG_FN_PROCESS_RGB8, "process_rgb8"},
- {MNG_FN_PROCESS_RGB16, "process_rgb16"},
- {MNG_FN_PROCESS_IDX1, "process_idx1"},
- {MNG_FN_PROCESS_IDX2, "process_idx2"},
- {MNG_FN_PROCESS_IDX4, "process_idx4"},
- {MNG_FN_PROCESS_IDX8, "process_idx8"},
- {MNG_FN_PROCESS_GA8, "process_ga8"},
- {MNG_FN_PROCESS_GA16, "process_ga16"},
- {MNG_FN_PROCESS_RGBA8, "process_rgba8"},
- {MNG_FN_PROCESS_RGBA16, "process_rgba16"},
-
- {MNG_FN_INIT_G1_I, "init_g1_i"},
- {MNG_FN_INIT_G2_I, "init_g2_i"},
- {MNG_FN_INIT_G4_I, "init_g4_i"},
- {MNG_FN_INIT_G8_I, "init_g8_i"},
- {MNG_FN_INIT_G16_I, "init_g16_i"},
- {MNG_FN_INIT_RGB8_I, "init_rgb8_i"},
- {MNG_FN_INIT_RGB16_I, "init_rgb16_i"},
- {MNG_FN_INIT_IDX1_I, "init_idx1_i"},
- {MNG_FN_INIT_IDX2_I, "init_idx2_i"},
- {MNG_FN_INIT_IDX4_I, "init_idx4_i"},
- {MNG_FN_INIT_IDX8_I, "init_idx8_i"},
- {MNG_FN_INIT_GA8_I, "init_ga8_i"},
- {MNG_FN_INIT_GA16_I, "init_ga16_i"},
- {MNG_FN_INIT_RGBA8_I, "init_rgba8_i"},
- {MNG_FN_INIT_RGBA16_I, "init_rgba16_i"},
-#ifndef MNG_OPTIMIZE_FOOTPRINT_INIT
- {MNG_FN_INIT_G1_NI, "init_g1_ni"},
- {MNG_FN_INIT_G2_NI, "init_g2_ni"},
- {MNG_FN_INIT_G4_NI, "init_g4_ni"},
- {MNG_FN_INIT_G8_NI, "init_g8_ni"},
- {MNG_FN_INIT_G16_NI, "init_g16_ni"},
- {MNG_FN_INIT_RGB8_NI, "init_rgb8_ni"},
- {MNG_FN_INIT_RGB16_NI, "init_rgb16_ni"},
- {MNG_FN_INIT_IDX1_NI, "init_idx1_ni"},
- {MNG_FN_INIT_IDX2_NI, "init_idx2_ni"},
- {MNG_FN_INIT_IDX4_NI, "init_idx4_ni"},
- {MNG_FN_INIT_IDX8_NI, "init_idx8_ni"},
- {MNG_FN_INIT_GA8_NI, "init_ga8_ni"},
- {MNG_FN_INIT_GA16_NI, "init_ga16_ni"},
- {MNG_FN_INIT_RGBA8_NI, "init_rgba8_ni"},
- {MNG_FN_INIT_RGBA16_NI, "init_rgba16_ni"},
-#endif
-
- {MNG_FN_INIT_ROWPROC, "init_rowproc"},
- {MNG_FN_NEXT_ROW, "next_row"},
- {MNG_FN_CLEANUP_ROWPROC, "cleanup_rowproc"},
-
- {MNG_FN_FILTER_A_ROW, "filter_a_row"},
- {MNG_FN_FILTER_SUB, "filter_sub"},
- {MNG_FN_FILTER_UP, "filter_up"},
- {MNG_FN_FILTER_AVERAGE, "filter_average"},
- {MNG_FN_FILTER_PAETH, "filter_paeth"},
-
- {MNG_FN_INIT_ROWDIFFERING, "init_rowdiffering"},
- {MNG_FN_DIFFER_G1, "differ_g1"},
- {MNG_FN_DIFFER_G2, "differ_g2"},
- {MNG_FN_DIFFER_G4, "differ_g4"},
- {MNG_FN_DIFFER_G8, "differ_g8"},
- {MNG_FN_DIFFER_G16, "differ_g16"},
- {MNG_FN_DIFFER_RGB8, "differ_rgb8"},
- {MNG_FN_DIFFER_RGB16, "differ_rgb16"},
- {MNG_FN_DIFFER_IDX1, "differ_idx1"},
- {MNG_FN_DIFFER_IDX2, "differ_idx2"},
- {MNG_FN_DIFFER_IDX4, "differ_idx4"},
- {MNG_FN_DIFFER_IDX8, "differ_idx8"},
- {MNG_FN_DIFFER_GA8, "differ_ga8"},
- {MNG_FN_DIFFER_GA16, "differ_ga16"},
- {MNG_FN_DIFFER_RGBA8, "differ_rgba8"},
- {MNG_FN_DIFFER_RGBA16, "differ_rgba16"},
-
- {MNG_FN_CREATE_IMGDATAOBJECT, "create_imgdataobject"},
- {MNG_FN_FREE_IMGDATAOBJECT, "free_imgdataobject"},
- {MNG_FN_CLONE_IMGDATAOBJECT, "clone_imgdataobject"},
- {MNG_FN_CREATE_IMGOBJECT, "create_imgobject"},
- {MNG_FN_FREE_IMGOBJECT, "free_imgobject"},
- {MNG_FN_FIND_IMGOBJECT, "find_imgobject"},
- {MNG_FN_CLONE_IMGOBJECT, "clone_imgobject"},
- {MNG_FN_RESET_OBJECTDETAILS, "reset_objectdetails"},
- {MNG_FN_RENUM_IMGOBJECT, "renum_imgobject"},
- {MNG_FN_PROMOTE_IMGOBJECT, "promote_imgobject"},
- {MNG_FN_MAGNIFY_IMGOBJECT, "magnify_imgobject"},
- {MNG_FN_COLORCORRECT_OBJECT, "colorcorrect_object"},
-
- {MNG_FN_STORE_G1, "store_g1"},
- {MNG_FN_STORE_G2, "store_g2"},
- {MNG_FN_STORE_G4, "store_g4"},
- {MNG_FN_STORE_G8, "store_g8"},
- {MNG_FN_STORE_G16, "store_g16"},
- {MNG_FN_STORE_RGB8, "store_rgb8"},
- {MNG_FN_STORE_RGB16, "store_rgb16"},
- {MNG_FN_STORE_IDX1, "store_idx1"},
- {MNG_FN_STORE_IDX2, "store_idx2"},
- {MNG_FN_STORE_IDX4, "store_idx4"},
- {MNG_FN_STORE_IDX8, "store_idx8"},
- {MNG_FN_STORE_GA8, "store_ga8"},
- {MNG_FN_STORE_GA16, "store_ga16"},
- {MNG_FN_STORE_RGBA8, "store_rgba8"},
- {MNG_FN_STORE_RGBA16, "store_rgba16"},
-
- {MNG_FN_RETRIEVE_G8, "retrieve_g8"},
- {MNG_FN_RETRIEVE_G16, "retrieve_g16"},
- {MNG_FN_RETRIEVE_RGB8, "retrieve_rgb8"},
- {MNG_FN_RETRIEVE_RGB16, "retrieve_rgb16"},
- {MNG_FN_RETRIEVE_IDX8, "retrieve_idx8"},
- {MNG_FN_RETRIEVE_GA8, "retrieve_ga8"},
- {MNG_FN_RETRIEVE_GA16, "retrieve_ga16"},
- {MNG_FN_RETRIEVE_RGBA8, "retrieve_rgba8"},
- {MNG_FN_RETRIEVE_RGBA16, "retrieve_rgba16"},
-
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_DELTA_G1, "delta_g1"},
- {MNG_FN_DELTA_G2, "delta_g2"},
- {MNG_FN_DELTA_G4, "delta_g4"},
- {MNG_FN_DELTA_G8, "delta_g8"},
- {MNG_FN_DELTA_G16, "delta_g16"},
- {MNG_FN_DELTA_RGB8, "delta_rgb8"},
- {MNG_FN_DELTA_RGB16, "delta_rgb16"},
- {MNG_FN_DELTA_IDX1, "delta_idx1"},
- {MNG_FN_DELTA_IDX2, "delta_idx2"},
- {MNG_FN_DELTA_IDX4, "delta_idx4"},
- {MNG_FN_DELTA_IDX8, "delta_idx8"},
- {MNG_FN_DELTA_GA8, "delta_ga8"},
- {MNG_FN_DELTA_GA16, "delta_ga16"},
- {MNG_FN_DELTA_RGBA8, "delta_rgba8"},
- {MNG_FN_DELTA_RGBA16, "delta_rgba16"},
-#endif
-
- {MNG_FN_CREATE_ANI_LOOP, "create_ani_loop"},
- {MNG_FN_CREATE_ANI_ENDL, "create_ani_endl"},
- {MNG_FN_CREATE_ANI_DEFI, "create_ani_defi"},
- {MNG_FN_CREATE_ANI_BASI, "create_ani_basi"},
- {MNG_FN_CREATE_ANI_CLON, "create_ani_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_CREATE_ANI_PAST, "create_ani_past"},
-#endif
- {MNG_FN_CREATE_ANI_DISC, "create_ani_disc"},
- {MNG_FN_CREATE_ANI_BACK, "create_ani_back"},
- {MNG_FN_CREATE_ANI_FRAM, "create_ani_fram"},
- {MNG_FN_CREATE_ANI_MOVE, "create_ani_move"},
- {MNG_FN_CREATE_ANI_CLIP, "create_ani_clip"},
- {MNG_FN_CREATE_ANI_SHOW, "create_ani_show"},
- {MNG_FN_CREATE_ANI_TERM, "create_ani_term"},
- {MNG_FN_CREATE_ANI_SAVE, "create_ani_save"},
- {MNG_FN_CREATE_ANI_SEEK, "create_ani_seek"},
- {MNG_FN_CREATE_ANI_GAMA, "create_ani_gama"},
- {MNG_FN_CREATE_ANI_CHRM, "create_ani_chrm"},
- {MNG_FN_CREATE_ANI_SRGB, "create_ani_srgb"},
- {MNG_FN_CREATE_ANI_ICCP, "create_ani_iccp"},
- {MNG_FN_CREATE_ANI_PLTE, "create_ani_plte"},
- {MNG_FN_CREATE_ANI_TRNS, "create_ani_trns"},
- {MNG_FN_CREATE_ANI_BKGD, "create_ani_bkgd"},
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_CREATE_ANI_DHDR, "create_ani_dhdr"},
- {MNG_FN_CREATE_ANI_PROM, "create_ani_prom"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_CREATE_ANI_IPNG, "create_ani_ipng"},
-#endif
- {MNG_FN_CREATE_ANI_IJNG, "create_ani_ijng"},
- {MNG_FN_CREATE_ANI_PPLT, "create_ani_pplt"},
-#endif
- {MNG_FN_CREATE_ANI_MAGN, "create_ani_magn"},
-
- {MNG_FN_CREATE_ANI_IMAGE, "create_ani_image"},
- {MNG_FN_CREATE_EVENT, "create_event"},
-
- {MNG_FN_FREE_ANI_LOOP, "free_ani_loop"},
- {MNG_FN_FREE_ANI_ENDL, "free_ani_endl"},
- {MNG_FN_FREE_ANI_DEFI, "free_ani_defi"},
- {MNG_FN_FREE_ANI_BASI, "free_ani_basi"},
- {MNG_FN_FREE_ANI_CLON, "free_ani_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_FREE_ANI_PAST, "free_ani_past"},
-#endif
- {MNG_FN_FREE_ANI_DISC, "free_ani_disc"},
- {MNG_FN_FREE_ANI_BACK, "free_ani_back"},
- {MNG_FN_FREE_ANI_FRAM, "free_ani_fram"},
- {MNG_FN_FREE_ANI_MOVE, "free_ani_move"},
- {MNG_FN_FREE_ANI_CLIP, "free_ani_clip"},
- {MNG_FN_FREE_ANI_SHOW, "free_ani_show"},
- {MNG_FN_FREE_ANI_TERM, "free_ani_term"},
- {MNG_FN_FREE_ANI_SAVE, "free_ani_save"},
- {MNG_FN_FREE_ANI_SEEK, "free_ani_seek"},
- {MNG_FN_FREE_ANI_GAMA, "free_ani_gama"},
- {MNG_FN_FREE_ANI_CHRM, "free_ani_chrm"},
- {MNG_FN_FREE_ANI_SRGB, "free_ani_srgb"},
- {MNG_FN_FREE_ANI_ICCP, "free_ani_iccp"},
- {MNG_FN_FREE_ANI_PLTE, "free_ani_plte"},
- {MNG_FN_FREE_ANI_TRNS, "free_ani_trns"},
- {MNG_FN_FREE_ANI_BKGD, "free_ani_bkgd"},
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_FREE_ANI_DHDR, "free_ani_dhdr"},
- {MNG_FN_FREE_ANI_PROM, "free_ani_prom"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_FREE_ANI_IPNG, "free_ani_ipng"},
-#endif
- {MNG_FN_FREE_ANI_IJNG, "free_ani_ijng"},
- {MNG_FN_FREE_ANI_PPLT, "free_ani_pplt"},
-#endif
- {MNG_FN_FREE_ANI_MAGN, "free_ani_magn"},
-
- {MNG_FN_FREE_ANI_IMAGE, "free_ani_image"},
- {MNG_FN_FREE_EVENT, "free_event"},
-
- {MNG_FN_PROCESS_ANI_LOOP, "process_ani_loop"},
- {MNG_FN_PROCESS_ANI_ENDL, "process_ani_endl"},
- {MNG_FN_PROCESS_ANI_DEFI, "process_ani_defi"},
- {MNG_FN_PROCESS_ANI_BASI, "process_ani_basi"},
- {MNG_FN_PROCESS_ANI_CLON, "process_ani_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_PROCESS_ANI_PAST, "process_ani_past"},
-#endif
- {MNG_FN_PROCESS_ANI_DISC, "process_ani_disc"},
- {MNG_FN_PROCESS_ANI_BACK, "process_ani_back"},
- {MNG_FN_PROCESS_ANI_FRAM, "process_ani_fram"},
- {MNG_FN_PROCESS_ANI_MOVE, "process_ani_move"},
- {MNG_FN_PROCESS_ANI_CLIP, "process_ani_clip"},
- {MNG_FN_PROCESS_ANI_SHOW, "process_ani_show"},
- {MNG_FN_PROCESS_ANI_TERM, "process_ani_term"},
- {MNG_FN_PROCESS_ANI_SAVE, "process_ani_save"},
- {MNG_FN_PROCESS_ANI_SEEK, "process_ani_seek"},
- {MNG_FN_PROCESS_ANI_GAMA, "process_ani_gama"},
- {MNG_FN_PROCESS_ANI_CHRM, "process_ani_chrm"},
- {MNG_FN_PROCESS_ANI_SRGB, "process_ani_srgb"},
- {MNG_FN_PROCESS_ANI_ICCP, "process_ani_iccp"},
- {MNG_FN_PROCESS_ANI_PLTE, "process_ani_plte"},
- {MNG_FN_PROCESS_ANI_TRNS, "process_ani_trns"},
- {MNG_FN_PROCESS_ANI_BKGD, "process_ani_bkgd"},
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_PROCESS_ANI_DHDR, "process_ani_dhdr"},
- {MNG_FN_PROCESS_ANI_PROM, "process_ani_prom"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_PROCESS_ANI_IPNG, "process_ani_ipng"},
-#endif
- {MNG_FN_PROCESS_ANI_IJNG, "process_ani_ijng"},
- {MNG_FN_PROCESS_ANI_PPLT, "process_ani_pplt"},
-#endif
- {MNG_FN_PROCESS_ANI_MAGN, "process_ani_magn"},
-
- {MNG_FN_PROCESS_ANI_IMAGE, "process_ani_image"},
- {MNG_FN_PROCESS_EVENT, "process_event"},
-
- {MNG_FN_RESTORE_BACKIMAGE, "restore_backimage"},
- {MNG_FN_RESTORE_BACKCOLOR, "restore_backcolor"},
- {MNG_FN_RESTORE_BGCOLOR, "restore_bgcolor"},
- {MNG_FN_RESTORE_RGB8, "restore_rgb8"},
- {MNG_FN_RESTORE_BGR8, "restore_bgr8"},
- {MNG_FN_RESTORE_BKGD, "restore_bkgd"},
- {MNG_FN_RESTORE_BGRX8, "restore_bgrx8"},
- {MNG_FN_RESTORE_RGB565, "restore_rgb565"},
-
- {MNG_FN_INIT_IHDR, "init_ihdr"},
- {MNG_FN_INIT_PLTE, "init_plte"},
- {MNG_FN_INIT_IDAT, "init_idat"},
- {MNG_FN_INIT_IEND, "init_iend"},
- {MNG_FN_INIT_TRNS, "init_trns"},
- {MNG_FN_INIT_GAMA, "init_gama"},
- {MNG_FN_INIT_CHRM, "init_chrm"},
- {MNG_FN_INIT_SRGB, "init_srgb"},
- {MNG_FN_INIT_ICCP, "init_iccp"},
- {MNG_FN_INIT_TEXT, "init_text"},
- {MNG_FN_INIT_ZTXT, "init_ztxt"},
- {MNG_FN_INIT_ITXT, "init_itxt"},
- {MNG_FN_INIT_BKGD, "init_bkgd"},
- {MNG_FN_INIT_PHYS, "init_phys"},
- {MNG_FN_INIT_SBIT, "init_sbit"},
- {MNG_FN_INIT_SPLT, "init_splt"},
- {MNG_FN_INIT_HIST, "init_hist"},
- {MNG_FN_INIT_TIME, "init_time"},
- {MNG_FN_INIT_MHDR, "init_mhdr"},
- {MNG_FN_INIT_MEND, "init_mend"},
- {MNG_FN_INIT_LOOP, "init_loop"},
- {MNG_FN_INIT_ENDL, "init_endl"},
- {MNG_FN_INIT_DEFI, "init_defi"},
- {MNG_FN_INIT_BASI, "init_basi"},
- {MNG_FN_INIT_CLON, "init_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_INIT_PAST, "init_past"},
-#endif
- {MNG_FN_INIT_DISC, "init_disc"},
- {MNG_FN_INIT_BACK, "init_back"},
- {MNG_FN_INIT_FRAM, "init_fram"},
- {MNG_FN_INIT_MOVE, "init_move"},
- {MNG_FN_INIT_CLIP, "init_clip"},
- {MNG_FN_INIT_SHOW, "init_show"},
- {MNG_FN_INIT_TERM, "init_term"},
- {MNG_FN_INIT_SAVE, "init_save"},
- {MNG_FN_INIT_SEEK, "init_seek"},
- {MNG_FN_INIT_EXPI, "init_expi"},
- {MNG_FN_INIT_FPRI, "init_fpri"},
- {MNG_FN_INIT_NEED, "init_need"},
- {MNG_FN_INIT_PHYG, "init_phyg"},
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_INIT_JHDR, "init_jhdr"},
- {MNG_FN_INIT_JDAT, "init_jdat"},
- {MNG_FN_INIT_JSEP, "init_jsep"},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_INIT_DHDR, "init_dhdr"},
- {MNG_FN_INIT_PROM, "init_prom"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_INIT_IPNG, "init_ipng"},
-#endif
- {MNG_FN_INIT_PPLT, "init_pplt"},
- {MNG_FN_INIT_IJNG, "init_ijng"},
- {MNG_FN_INIT_DROP, "init_drop"},
- {MNG_FN_INIT_DBYK, "init_dbyk"},
- {MNG_FN_INIT_ORDR, "init_ordr"},
-#endif
- {MNG_FN_INIT_UNKNOWN, "init_unknown"},
- {MNG_FN_INIT_MAGN, "init_magn"},
- {MNG_FN_INIT_JDAA, "init_jdaa"},
- {MNG_FN_INIT_EVNT, "init_evnt"},
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_FN_INIT_MPNG, "init_mpng"},
-#endif
-
- {MNG_FN_ASSIGN_IHDR, "assign_ihdr"},
- {MNG_FN_ASSIGN_PLTE, "assign_plte"},
- {MNG_FN_ASSIGN_IDAT, "assign_idat"},
- {MNG_FN_ASSIGN_IEND, "assign_iend"},
- {MNG_FN_ASSIGN_TRNS, "assign_trns"},
- {MNG_FN_ASSIGN_GAMA, "assign_gama"},
- {MNG_FN_ASSIGN_CHRM, "assign_chrm"},
- {MNG_FN_ASSIGN_SRGB, "assign_srgb"},
- {MNG_FN_ASSIGN_ICCP, "assign_iccp"},
- {MNG_FN_ASSIGN_TEXT, "assign_text"},
- {MNG_FN_ASSIGN_ZTXT, "assign_ztxt"},
- {MNG_FN_ASSIGN_ITXT, "assign_itxt"},
- {MNG_FN_ASSIGN_BKGD, "assign_bkgd"},
- {MNG_FN_ASSIGN_PHYS, "assign_phys"},
- {MNG_FN_ASSIGN_SBIT, "assign_sbit"},
- {MNG_FN_ASSIGN_SPLT, "assign_splt"},
- {MNG_FN_ASSIGN_HIST, "assign_hist"},
- {MNG_FN_ASSIGN_TIME, "assign_time"},
- {MNG_FN_ASSIGN_MHDR, "assign_mhdr"},
- {MNG_FN_ASSIGN_MEND, "assign_mend"},
- {MNG_FN_ASSIGN_LOOP, "assign_loop"},
- {MNG_FN_ASSIGN_ENDL, "assign_endl"},
- {MNG_FN_ASSIGN_DEFI, "assign_defi"},
- {MNG_FN_ASSIGN_BASI, "assign_basi"},
- {MNG_FN_ASSIGN_CLON, "assign_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_ASSIGN_PAST, "assign_past"},
-#endif
- {MNG_FN_ASSIGN_DISC, "assign_disc"},
- {MNG_FN_ASSIGN_BACK, "assign_back"},
- {MNG_FN_ASSIGN_FRAM, "assign_fram"},
- {MNG_FN_ASSIGN_MOVE, "assign_move"},
- {MNG_FN_ASSIGN_CLIP, "assign_clip"},
- {MNG_FN_ASSIGN_SHOW, "assign_show"},
- {MNG_FN_ASSIGN_TERM, "assign_term"},
- {MNG_FN_ASSIGN_SAVE, "assign_save"},
- {MNG_FN_ASSIGN_SEEK, "assign_seek"},
- {MNG_FN_ASSIGN_EXPI, "assign_expi"},
- {MNG_FN_ASSIGN_FPRI, "assign_fpri"},
- {MNG_FN_ASSIGN_NEED, "assign_need"},
- {MNG_FN_ASSIGN_PHYG, "assign_phyg"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_ASSIGN_JHDR, "assign_jhdr"},
- {MNG_FN_ASSIGN_JDAT, "assign_jdat"},
- {MNG_FN_ASSIGN_JSEP, "assign_jsep"},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_ASSIGN_DHDR, "assign_dhdr"},
- {MNG_FN_ASSIGN_PROM, "assign_prom"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_ASSIGN_IPNG, "assign_ipng"},
-#endif
- {MNG_FN_ASSIGN_PPLT, "assign_pplt"},
- {MNG_FN_ASSIGN_IJNG, "assign_ijng"},
- {MNG_FN_ASSIGN_DROP, "assign_drop"},
- {MNG_FN_ASSIGN_DBYK, "assign_dbyk"},
- {MNG_FN_ASSIGN_ORDR, "assign_ordr"},
-#endif
- {MNG_FN_ASSIGN_UNKNOWN, "assign_unknown"},
- {MNG_FN_ASSIGN_MAGN, "assign_magn"},
- {MNG_FN_ASSIGN_JDAA, "assign_jdaa"},
- {MNG_FN_ASSIGN_EVNT, "assign_evnt"},
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_FN_ASSIGN_MPNG, "assign_mpng"},
-#endif
-
- {MNG_FN_FREE_IHDR, "free_ihdr"},
- {MNG_FN_FREE_PLTE, "free_plte"},
- {MNG_FN_FREE_IDAT, "free_idat"},
- {MNG_FN_FREE_IEND, "free_iend"},
- {MNG_FN_FREE_TRNS, "free_trns"},
- {MNG_FN_FREE_GAMA, "free_gama"},
- {MNG_FN_FREE_CHRM, "free_chrm"},
- {MNG_FN_FREE_SRGB, "free_srgb"},
- {MNG_FN_FREE_ICCP, "free_iccp"},
- {MNG_FN_FREE_TEXT, "free_text"},
- {MNG_FN_FREE_ZTXT, "free_ztxt"},
- {MNG_FN_FREE_ITXT, "free_itxt"},
- {MNG_FN_FREE_BKGD, "free_bkgd"},
- {MNG_FN_FREE_PHYS, "free_phys"},
- {MNG_FN_FREE_SBIT, "free_sbit"},
- {MNG_FN_FREE_SPLT, "free_splt"},
- {MNG_FN_FREE_HIST, "free_hist"},
- {MNG_FN_FREE_TIME, "free_time"},
- {MNG_FN_FREE_MHDR, "free_mhdr"},
- {MNG_FN_FREE_MEND, "free_mend"},
- {MNG_FN_FREE_LOOP, "free_loop"},
- {MNG_FN_FREE_ENDL, "free_endl"},
- {MNG_FN_FREE_DEFI, "free_defi"},
- {MNG_FN_FREE_BASI, "free_basi"},
- {MNG_FN_FREE_CLON, "free_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_FREE_PAST, "free_past"},
-#endif
- {MNG_FN_FREE_DISC, "free_disc"},
- {MNG_FN_FREE_BACK, "free_back"},
- {MNG_FN_FREE_FRAM, "free_fram"},
- {MNG_FN_FREE_MOVE, "free_move"},
- {MNG_FN_FREE_CLIP, "free_clip"},
- {MNG_FN_FREE_SHOW, "free_show"},
- {MNG_FN_FREE_TERM, "free_term"},
- {MNG_FN_FREE_SAVE, "free_save"},
- {MNG_FN_FREE_SEEK, "free_seek"},
- {MNG_FN_FREE_EXPI, "free_expi"},
- {MNG_FN_FREE_FPRI, "free_fpri"},
- {MNG_FN_FREE_NEED, "free_need"},
- {MNG_FN_FREE_PHYG, "free_phyg"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_FREE_JHDR, "free_jhdr"},
- {MNG_FN_FREE_JDAT, "free_jdat"},
- {MNG_FN_FREE_JSEP, "free_jsep"},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_FREE_DHDR, "free_dhdr"},
- {MNG_FN_FREE_PROM, "free_prom"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_FREE_IPNG, "free_ipng"},
-#endif
- {MNG_FN_FREE_PPLT, "free_pplt"},
- {MNG_FN_FREE_IJNG, "free_ijng"},
- {MNG_FN_FREE_DROP, "free_drop"},
- {MNG_FN_FREE_DBYK, "free_dbyk"},
- {MNG_FN_FREE_ORDR, "free_ordr"},
-#endif
- {MNG_FN_FREE_UNKNOWN, "free_unknown"},
- {MNG_FN_FREE_MAGN, "free_magn"},
- {MNG_FN_FREE_JDAA, "free_jdaa"},
- {MNG_FN_FREE_EVNT, "free_evnt"},
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_FN_FREE_MPNG, "free_mpng"},
-#endif
-
- {MNG_FN_READ_IHDR, "read_ihdr"},
- {MNG_FN_READ_PLTE, "read_plte"},
- {MNG_FN_READ_IDAT, "read_idat"},
- {MNG_FN_READ_IEND, "read_iend"},
- {MNG_FN_READ_TRNS, "read_trns"},
- {MNG_FN_READ_GAMA, "read_gama"},
- {MNG_FN_READ_CHRM, "read_chrm"},
- {MNG_FN_READ_SRGB, "read_srgb"},
- {MNG_FN_READ_ICCP, "read_iccp"},
- {MNG_FN_READ_TEXT, "read_text"},
- {MNG_FN_READ_ZTXT, "read_ztxt"},
- {MNG_FN_READ_ITXT, "read_itxt"},
- {MNG_FN_READ_BKGD, "read_bkgd"},
- {MNG_FN_READ_PHYS, "read_phys"},
- {MNG_FN_READ_SBIT, "read_sbit"},
- {MNG_FN_READ_SPLT, "read_splt"},
- {MNG_FN_READ_HIST, "read_hist"},
- {MNG_FN_READ_TIME, "read_time"},
- {MNG_FN_READ_MHDR, "read_mhdr"},
- {MNG_FN_READ_MEND, "read_mend"},
- {MNG_FN_READ_LOOP, "read_loop"},
- {MNG_FN_READ_ENDL, "read_endl"},
- {MNG_FN_READ_DEFI, "read_defi"},
- {MNG_FN_READ_BASI, "read_basi"},
- {MNG_FN_READ_CLON, "read_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_READ_PAST, "read_past"},
-#endif
- {MNG_FN_READ_DISC, "read_disc"},
- {MNG_FN_READ_BACK, "read_back"},
- {MNG_FN_READ_FRAM, "read_fram"},
- {MNG_FN_READ_MOVE, "read_move"},
- {MNG_FN_READ_CLIP, "read_clip"},
- {MNG_FN_READ_SHOW, "read_show"},
- {MNG_FN_READ_TERM, "read_term"},
- {MNG_FN_READ_SAVE, "read_save"},
- {MNG_FN_READ_SEEK, "read_seek"},
- {MNG_FN_READ_EXPI, "read_expi"},
- {MNG_FN_READ_FPRI, "read_fpri"},
- {MNG_FN_READ_NEED, "read_need"},
- {MNG_FN_READ_PHYG, "read_phyg"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_READ_JHDR, "read_jhdr"},
- {MNG_FN_READ_JDAT, "read_jdat"},
- {MNG_FN_READ_JSEP, "read_jsep"},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_READ_DHDR, "read_dhdr"},
- {MNG_FN_READ_PROM, "read_prom"},
- {MNG_FN_READ_IPNG, "read_ipng"},
- {MNG_FN_READ_PPLT, "read_pplt"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_READ_IJNG, "read_ijng"},
-#endif
- {MNG_FN_READ_DROP, "read_drop"},
- {MNG_FN_READ_DBYK, "read_dbyk"},
- {MNG_FN_READ_ORDR, "read_ordr"},
-#endif
- {MNG_FN_READ_UNKNOWN, "read_unknown"},
- {MNG_FN_READ_MAGN, "read_magn"},
- {MNG_FN_READ_JDAA, "read_jdaa"},
- {MNG_FN_READ_EVNT, "read_evnt"},
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_FN_READ_MPNG, "read_mpng"},
-#endif
-
- {MNG_FN_WRITE_IHDR, "write_ihdr"},
- {MNG_FN_WRITE_PLTE, "write_plte"},
- {MNG_FN_WRITE_IDAT, "write_idat"},
- {MNG_FN_WRITE_IEND, "write_iend"},
- {MNG_FN_WRITE_TRNS, "write_trns"},
- {MNG_FN_WRITE_GAMA, "write_gama"},
- {MNG_FN_WRITE_CHRM, "write_chrm"},
- {MNG_FN_WRITE_SRGB, "write_srgb"},
- {MNG_FN_WRITE_ICCP, "write_iccp"},
- {MNG_FN_WRITE_TEXT, "write_text"},
- {MNG_FN_WRITE_ZTXT, "write_ztxt"},
- {MNG_FN_WRITE_ITXT, "write_itxt"},
- {MNG_FN_WRITE_BKGD, "write_bkgd"},
- {MNG_FN_WRITE_PHYS, "write_phys"},
- {MNG_FN_WRITE_SBIT, "write_sbit"},
- {MNG_FN_WRITE_SPLT, "write_splt"},
- {MNG_FN_WRITE_HIST, "write_hist"},
- {MNG_FN_WRITE_TIME, "write_time"},
- {MNG_FN_WRITE_MHDR, "write_mhdr"},
- {MNG_FN_WRITE_MEND, "write_mend"},
- {MNG_FN_WRITE_LOOP, "write_loop"},
- {MNG_FN_WRITE_ENDL, "write_endl"},
- {MNG_FN_WRITE_DEFI, "write_defi"},
- {MNG_FN_WRITE_BASI, "write_basi"},
- {MNG_FN_WRITE_CLON, "write_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_WRITE_PAST, "write_past"},
-#endif
- {MNG_FN_WRITE_DISC, "write_disc"},
- {MNG_FN_WRITE_BACK, "write_back"},
- {MNG_FN_WRITE_FRAM, "write_fram"},
- {MNG_FN_WRITE_MOVE, "write_move"},
- {MNG_FN_WRITE_CLIP, "write_clip"},
- {MNG_FN_WRITE_SHOW, "write_show"},
- {MNG_FN_WRITE_TERM, "write_term"},
- {MNG_FN_WRITE_SAVE, "write_save"},
- {MNG_FN_WRITE_SEEK, "write_seek"},
- {MNG_FN_WRITE_EXPI, "write_expi"},
- {MNG_FN_WRITE_FPRI, "write_fpri"},
- {MNG_FN_WRITE_NEED, "write_need"},
- {MNG_FN_WRITE_PHYG, "write_phyg"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_WRITE_JHDR, "write_jhdr"},
- {MNG_FN_WRITE_JDAT, "write_jdat"},
- {MNG_FN_WRITE_JSEP, "write_jsep"},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_WRITE_DHDR, "write_dhdr"},
- {MNG_FN_WRITE_PROM, "write_prom"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_WRITE_IPNG, "write_ipng"},
-#endif
- {MNG_FN_WRITE_PPLT, "write_pplt"},
- {MNG_FN_WRITE_IJNG, "write_ijng"},
- {MNG_FN_WRITE_DROP, "write_drop"},
- {MNG_FN_WRITE_DBYK, "write_dbyk"},
- {MNG_FN_WRITE_ORDR, "write_ordr"},
-#endif
- {MNG_FN_WRITE_UNKNOWN, "write_unknown"},
- {MNG_FN_WRITE_MAGN, "write_magn"},
- {MNG_FN_WRITE_JDAA, "write_jdaa"},
- {MNG_FN_WRITE_EVNT, "write_evnt"},
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- {MNG_FN_WRITE_MPNG, "write_mpng"},
-#endif
-
- {MNG_FN_ZLIB_INITIALIZE, "zlib_initialize"},
- {MNG_FN_ZLIB_CLEANUP, "zlib_cleanup"},
- {MNG_FN_ZLIB_INFLATEINIT, "zlib_inflateinit"},
- {MNG_FN_ZLIB_INFLATEROWS, "zlib_inflaterows"},
- {MNG_FN_ZLIB_INFLATEDATA, "zlib_inflatedata"},
- {MNG_FN_ZLIB_INFLATEFREE, "zlib_inflatefree"},
- {MNG_FN_ZLIB_DEFLATEINIT, "zlib_deflateinit"},
- {MNG_FN_ZLIB_DEFLATEROWS, "zlib_deflaterows"},
- {MNG_FN_ZLIB_DEFLATEDATA, "zlib_deflatedata"},
- {MNG_FN_ZLIB_DEFLATEFREE, "zlib_deflatefree"},
-
- {MNG_FN_PROCESS_DISPLAY_IHDR, "process_display_ihdr"},
- {MNG_FN_PROCESS_DISPLAY_PLTE, "process_display_plte"},
- {MNG_FN_PROCESS_DISPLAY_IDAT, "process_display_idat"},
- {MNG_FN_PROCESS_DISPLAY_IEND, "process_display_iend"},
- {MNG_FN_PROCESS_DISPLAY_TRNS, "process_display_trns"},
- {MNG_FN_PROCESS_DISPLAY_GAMA, "process_display_gama"},
- {MNG_FN_PROCESS_DISPLAY_CHRM, "process_display_chrm"},
- {MNG_FN_PROCESS_DISPLAY_SRGB, "process_display_srgb"},
- {MNG_FN_PROCESS_DISPLAY_ICCP, "process_display_iccp"},
- {MNG_FN_PROCESS_DISPLAY_BKGD, "process_display_bkgd"},
- {MNG_FN_PROCESS_DISPLAY_PHYS, "process_display_phys"},
- {MNG_FN_PROCESS_DISPLAY_SBIT, "process_display_sbit"},
- {MNG_FN_PROCESS_DISPLAY_SPLT, "process_display_splt"},
- {MNG_FN_PROCESS_DISPLAY_HIST, "process_display_hist"},
- {MNG_FN_PROCESS_DISPLAY_MHDR, "process_display_mhdr"},
- {MNG_FN_PROCESS_DISPLAY_MEND, "process_display_mend"},
- {MNG_FN_PROCESS_DISPLAY_LOOP, "process_display_loop"},
- {MNG_FN_PROCESS_DISPLAY_ENDL, "process_display_endl"},
- {MNG_FN_PROCESS_DISPLAY_DEFI, "process_display_defi"},
- {MNG_FN_PROCESS_DISPLAY_BASI, "process_display_basi"},
- {MNG_FN_PROCESS_DISPLAY_CLON, "process_display_clon"},
-#ifndef MNG_SKIPCHUNK_PAST
- {MNG_FN_PROCESS_DISPLAY_PAST, "process_display_past"},
-#endif
- {MNG_FN_PROCESS_DISPLAY_DISC, "process_display_disc"},
- {MNG_FN_PROCESS_DISPLAY_BACK, "process_display_back"},
- {MNG_FN_PROCESS_DISPLAY_FRAM, "process_display_fram"},
- {MNG_FN_PROCESS_DISPLAY_MOVE, "process_display_move"},
- {MNG_FN_PROCESS_DISPLAY_CLIP, "process_display_clip"},
- {MNG_FN_PROCESS_DISPLAY_SHOW, "process_display_show"},
- {MNG_FN_PROCESS_DISPLAY_TERM, "process_display_term"},
- {MNG_FN_PROCESS_DISPLAY_SAVE, "process_display_save"},
- {MNG_FN_PROCESS_DISPLAY_SEEK, "process_display_seek"},
- {MNG_FN_PROCESS_DISPLAY_EXPI, "process_display_expi"},
- {MNG_FN_PROCESS_DISPLAY_FPRI, "process_display_fpri"},
- {MNG_FN_PROCESS_DISPLAY_NEED, "process_display_need"},
- {MNG_FN_PROCESS_DISPLAY_PHYG, "process_display_phyg"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_PROCESS_DISPLAY_JHDR, "process_display_jhdr"},
- {MNG_FN_PROCESS_DISPLAY_JDAT, "process_display_jdat"},
- {MNG_FN_PROCESS_DISPLAY_JSEP, "process_display_jsep"},
-#endif
-#ifndef MNG_NO_DELTA_PNG
- {MNG_FN_PROCESS_DISPLAY_DHDR, "process_display_dhdr"},
- {MNG_FN_PROCESS_DISPLAY_PROM, "process_display_prom"},
-#ifdef MNG_INCLUDE_JNG
- {MNG_FN_PROCESS_DISPLAY_IPNG, "process_display_ipng"},
-#endif
- {MNG_FN_PROCESS_DISPLAY_PPLT, "process_display_pplt"},
- {MNG_FN_PROCESS_DISPLAY_IJNG, "process_display_ijng"},
- {MNG_FN_PROCESS_DISPLAY_DROP, "process_display_drop"},
- {MNG_FN_PROCESS_DISPLAY_DBYK, "process_display_dbyk"},
- {MNG_FN_PROCESS_DISPLAY_ORDR, "process_display_ordr"},
-#endif
- {MNG_FN_PROCESS_DISPLAY_MAGN, "process_display_magn"},
- {MNG_FN_PROCESS_DISPLAY_JDAA, "process_display_jdaa"},
-
- {MNG_FN_JPEG_INITIALIZE, "jpeg_initialize"},
- {MNG_FN_JPEG_CLEANUP, "jpeg_cleanup"},
- {MNG_FN_JPEG_DECOMPRESSINIT, "jpeg_decompressinit"},
- {MNG_FN_JPEG_DECOMPRESSDATA, "jpeg_decompressdata"},
- {MNG_FN_JPEG_DECOMPRESSFREE, "jpeg_decompressfree"},
-
- {MNG_FN_STORE_JPEG_G8, "store_jpeg_g8"},
- {MNG_FN_STORE_JPEG_RGB8, "store_jpeg_rgb8"},
- {MNG_FN_STORE_JPEG_G12, "store_jpeg_g12"},
- {MNG_FN_STORE_JPEG_RGB12, "store_jpeg_rgb12"},
- {MNG_FN_STORE_JPEG_GA8, "store_jpeg_ga8"},
- {MNG_FN_STORE_JPEG_RGBA8, "store_jpeg_rgba8"},
- {MNG_FN_STORE_JPEG_GA12, "store_jpeg_ga12"},
- {MNG_FN_STORE_JPEG_RGBA12, "store_jpeg_rgba12"},
- {MNG_FN_STORE_JPEG_G8_ALPHA, "store_jpeg_g8_alpha"},
- {MNG_FN_STORE_JPEG_RGB8_ALPHA, "store_jpeg_rgb8_alpha"},
-
- {MNG_FN_INIT_JPEG_A1_NI, "init_jpeg_a1_ni"},
- {MNG_FN_INIT_JPEG_A2_NI, "init_jpeg_a2_ni"},
- {MNG_FN_INIT_JPEG_A4_NI, "init_jpeg_a4_ni"},
- {MNG_FN_INIT_JPEG_A8_NI, "init_jpeg_a8_ni"},
- {MNG_FN_INIT_JPEG_A16_NI, "init_jpeg_a16_ni"},
-
- {MNG_FN_STORE_JPEG_G8_A1, "store_jpeg_g8_a1"},
- {MNG_FN_STORE_JPEG_G8_A2, "store_jpeg_g8_a2"},
- {MNG_FN_STORE_JPEG_G8_A4, "store_jpeg_g8_a4"},
- {MNG_FN_STORE_JPEG_G8_A8, "store_jpeg_g8_a8"},
- {MNG_FN_STORE_JPEG_G8_A16, "store_jpeg_g8_a16"},
-
- {MNG_FN_STORE_JPEG_RGB8_A1, "store_jpeg_rgb8_a1"},
- {MNG_FN_STORE_JPEG_RGB8_A2, "store_jpeg_rgb8_a2"},
- {MNG_FN_STORE_JPEG_RGB8_A4, "store_jpeg_rgb8_a4"},
- {MNG_FN_STORE_JPEG_RGB8_A8, "store_jpeg_rgb8_a8"},
- {MNG_FN_STORE_JPEG_RGB8_A16, "store_jpeg_rgb8_a16"},
-
- {MNG_FN_STORE_JPEG_G12_A1, "store_jpeg_g12_a1"},
- {MNG_FN_STORE_JPEG_G12_A2, "store_jpeg_g12_a2"},
- {MNG_FN_STORE_JPEG_G12_A4, "store_jpeg_g12_a4"},
- {MNG_FN_STORE_JPEG_G12_A8, "store_jpeg_g12_a8"},
- {MNG_FN_STORE_JPEG_G12_A16, "store_jpeg_g12_a16"},
-
- {MNG_FN_STORE_JPEG_RGB12_A1, "store_jpeg_rgb12_a1"},
- {MNG_FN_STORE_JPEG_RGB12_A2, "store_jpeg_rgb12_a2"},
- {MNG_FN_STORE_JPEG_RGB12_A4, "store_jpeg_rgb12_a4"},
- {MNG_FN_STORE_JPEG_RGB12_A8, "store_jpeg_rgb12_a8"},
- {MNG_FN_STORE_JPEG_RGB12_A16, "store_jpeg_rgb12_a16"},
-
- {MNG_FN_NEXT_JPEG_ALPHAROW, "next_jpeg_alpharow"},
- {MNG_FN_NEXT_JPEG_ROW, "next_jpeg_row"},
- {MNG_FN_DISPLAY_JPEG_ROWS, "display_jpeg_rows"},
-
- {MNG_FN_MAGNIFY_G8_X1, "magnify_g8_x1"},
- {MNG_FN_MAGNIFY_G8_X2, "magnify_g8_x2"},
- {MNG_FN_MAGNIFY_RGB8_X1, "magnify_rgb8_x1"},
- {MNG_FN_MAGNIFY_RGB8_X2, "magnify_rgb8_x2"},
- {MNG_FN_MAGNIFY_GA8_X1, "magnify_ga8_x1"},
- {MNG_FN_MAGNIFY_GA8_X2, "magnify_ga8_x2"},
- {MNG_FN_MAGNIFY_GA8_X3, "magnify_ga8_x3"},
- {MNG_FN_MAGNIFY_GA8_X4, "magnify_ga8_x4"},
- {MNG_FN_MAGNIFY_RGBA8_X1, "magnify_rgba8_x1"},
- {MNG_FN_MAGNIFY_RGBA8_X2, "magnify_rgba8_x2"},
- {MNG_FN_MAGNIFY_RGBA8_X3, "magnify_rgba8_x3"},
- {MNG_FN_MAGNIFY_RGBA8_X4, "magnify_rgba8_x4"},
- {MNG_FN_MAGNIFY_G8_X3, "magnify_g8_x3"},
- {MNG_FN_MAGNIFY_RGB8_X3, "magnify_rgb8_x3"},
- {MNG_FN_MAGNIFY_GA8_X5, "magnify_ga8_x5"},
- {MNG_FN_MAGNIFY_RGBA8_X5, "magnify_rgba8_x5"},
-
- {MNG_FN_MAGNIFY_G8_Y1, "magnify_g8_y1"},
- {MNG_FN_MAGNIFY_G8_Y2, "magnify_g8_y2"},
- {MNG_FN_MAGNIFY_RGB8_Y1, "magnify_rgb8_y1"},
- {MNG_FN_MAGNIFY_RGB8_Y2, "magnify_rgb8_y2"},
- {MNG_FN_MAGNIFY_GA8_Y1, "magnify_ga8_y1"},
- {MNG_FN_MAGNIFY_GA8_Y2, "magnify_ga8_y2"},
- {MNG_FN_MAGNIFY_GA8_Y3, "magnify_ga8_y3"},
- {MNG_FN_MAGNIFY_GA8_Y4, "magnify_ga8_y4"},
- {MNG_FN_MAGNIFY_RGBA8_Y1, "magnify_rgba8_y1"},
- {MNG_FN_MAGNIFY_RGBA8_Y2, "magnify_rgba8_y2"},
- {MNG_FN_MAGNIFY_RGBA8_Y3, "magnify_rgba8_y3"},
- {MNG_FN_MAGNIFY_RGBA8_Y4, "magnify_rgba8_y4"},
- {MNG_FN_MAGNIFY_G8_Y3, "magnify_g8_y3"},
- {MNG_FN_MAGNIFY_RGB8_Y3, "magnify_rgb8_y3"},
- {MNG_FN_MAGNIFY_GA8_Y5, "magnify_ga8_y5"},
- {MNG_FN_MAGNIFY_RGBA8_Y5, "magnify_rgba8_y5"},
-
- {MNG_FN_MAGNIFY_G8_X1, "magnify_g8_x1"},
- {MNG_FN_MAGNIFY_G8_X2, "magnify_g8_x2"},
- {MNG_FN_MAGNIFY_RGB8_X1, "magnify_rgb8_x1"},
- {MNG_FN_MAGNIFY_RGB8_X2, "magnify_rgb8_x2"},
- {MNG_FN_MAGNIFY_GA8_X1, "magnify_ga8_x1"},
- {MNG_FN_MAGNIFY_GA8_X2, "magnify_ga8_x2"},
- {MNG_FN_MAGNIFY_GA8_X3, "magnify_ga8_x3"},
- {MNG_FN_MAGNIFY_GA8_X4, "magnify_ga8_x4"},
- {MNG_FN_MAGNIFY_RGBA8_X1, "magnify_rgba8_x1"},
- {MNG_FN_MAGNIFY_RGBA8_X2, "magnify_rgba8_x2"},
- {MNG_FN_MAGNIFY_RGBA8_X3, "magnify_rgba8_x3"},
- {MNG_FN_MAGNIFY_RGBA8_X4, "magnify_rgba8_x4"},
- {MNG_FN_MAGNIFY_G8_X3, "magnify_g8_x3"},
- {MNG_FN_MAGNIFY_RGB8_X3, "magnify_rgb8_x3"},
- {MNG_FN_MAGNIFY_GA8_X5, "magnify_ga8_x5"},
- {MNG_FN_MAGNIFY_RGBA8_X5, "magnify_rgba8_x5"},
-
- {MNG_FN_MAGNIFY_G8_Y1, "magnify_g8_y1"},
- {MNG_FN_MAGNIFY_G8_Y2, "magnify_g8_y2"},
- {MNG_FN_MAGNIFY_RGB8_Y1, "magnify_rgb8_y1"},
- {MNG_FN_MAGNIFY_RGB8_Y2, "magnify_rgb8_y2"},
- {MNG_FN_MAGNIFY_GA8_Y1, "magnify_ga8_y1"},
- {MNG_FN_MAGNIFY_GA8_Y2, "magnify_ga8_y2"},
- {MNG_FN_MAGNIFY_GA8_Y3, "magnify_ga8_y3"},
- {MNG_FN_MAGNIFY_GA8_Y4, "magnify_ga8_y4"},
- {MNG_FN_MAGNIFY_RGBA8_Y1, "magnify_rgba8_y1"},
- {MNG_FN_MAGNIFY_RGBA8_Y2, "magnify_rgba8_y2"},
- {MNG_FN_MAGNIFY_RGBA8_Y3, "magnify_rgba8_y3"},
- {MNG_FN_MAGNIFY_RGBA8_Y4, "magnify_rgba8_y4"},
- {MNG_FN_MAGNIFY_G8_Y3, "magnify_g8_y3"},
- {MNG_FN_MAGNIFY_RGB8_Y3, "magnify_rgb8_y3"},
- {MNG_FN_MAGNIFY_GA8_Y5, "magnify_ga8_y5"},
- {MNG_FN_MAGNIFY_RGBA8_Y5, "magnify_rgba8_y5"},
-
- {MNG_FN_DELTA_G1_G1, "delta_g1_g1"},
- {MNG_FN_DELTA_G2_G2, "delta_g2_g2"},
- {MNG_FN_DELTA_G4_G4, "delta_g4_g4"},
- {MNG_FN_DELTA_G8_G8, "delta_g8_g8"},
- {MNG_FN_DELTA_G16_G16, "delta_g16_g16"},
- {MNG_FN_DELTA_RGB8_RGB8, "delta_rgb8_rgb8"},
- {MNG_FN_DELTA_RGB16_RGB16, "delta_rgb16_rgb16"},
- {MNG_FN_DELTA_GA8_GA8, "delta_ga8_ga8"},
- {MNG_FN_DELTA_GA8_G8, "delta_ga8_g8"},
- {MNG_FN_DELTA_GA8_A8, "delta_ga8_a8"},
- {MNG_FN_DELTA_GA16_GA16, "delta_ga16_ga16"},
- {MNG_FN_DELTA_GA16_G16, "delta_ga16_g16"},
- {MNG_FN_DELTA_GA16_A16, "delta_ga16_a16"},
- {MNG_FN_DELTA_RGBA8_RGBA8, "delta_rgba8_rgba8"},
- {MNG_FN_DELTA_RGBA8_RGB8, "delta_rgba8_rgb8"},
- {MNG_FN_DELTA_RGBA8_A8, "delta_rgba8_a8"},
- {MNG_FN_DELTA_RGBA16_RGBA16, "delta_rgba16_rgba16"},
- {MNG_FN_DELTA_RGBA16_RGB16, "delta_rgba16_rgb16"},
- {MNG_FN_DELTA_RGBA16_A16, "delta_rgba16_a16"},
-
- {MNG_FN_PROMOTE_G8_G8, "promote_g8_g8"},
- {MNG_FN_PROMOTE_G8_G16, "promote_g8_g16"},
- {MNG_FN_PROMOTE_G16_G16, "promote_g8_g16"},
- {MNG_FN_PROMOTE_G8_GA8, "promote_g8_ga8"},
- {MNG_FN_PROMOTE_G8_GA16, "promote_g8_ga16"},
- {MNG_FN_PROMOTE_G16_GA16, "promote_g16_ga16"},
- {MNG_FN_PROMOTE_G8_RGB8, "promote_g8_rgb8"},
- {MNG_FN_PROMOTE_G8_RGB16, "promote_g8_rgb16"},
- {MNG_FN_PROMOTE_G16_RGB16, "promote_g16_rgb16"},
- {MNG_FN_PROMOTE_G8_RGBA8, "promote_g8_rgba8"},
- {MNG_FN_PROMOTE_G8_RGBA16, "promote_g8_rgba16"},
- {MNG_FN_PROMOTE_G16_RGBA16, "promote_g16_rgba16"},
- {MNG_FN_PROMOTE_GA8_GA16, "promote_ga8_ga16"},
- {MNG_FN_PROMOTE_GA8_RGBA8, "promote_ga8_rgba8"},
- {MNG_FN_PROMOTE_GA8_RGBA16, "promote_ga8_rgba16"},
- {MNG_FN_PROMOTE_GA16_RGBA16, "promote_ga16_rgba16"},
- {MNG_FN_PROMOTE_RGB8_RGB16, "promote_rgb8_rgb16"},
- {MNG_FN_PROMOTE_RGB8_RGBA8, "promote_rgb8_rgba8"},
- {MNG_FN_PROMOTE_RGB8_RGBA16, "promote_rgb8_rgba16"},
- {MNG_FN_PROMOTE_RGB16_RGBA16, "promote_rgb16_rgba16"},
- {MNG_FN_PROMOTE_RGBA8_RGBA16, "promote_rgba8_rgba16"},
- {MNG_FN_PROMOTE_IDX8_RGB8, "promote_idx8_rgb8"},
- {MNG_FN_PROMOTE_IDX8_RGB16, "promote_idx8_rgb16"},
- {MNG_FN_PROMOTE_IDX8_RGBA8, "promote_idx8_rgba8"},
- {MNG_FN_PROMOTE_IDX8_RGBA16, "promote_idx8_rgba16"},
-
- {MNG_FN_SCALE_G1_G2, "scale_g1_g2"},
- {MNG_FN_SCALE_G1_G4, "scale_g1_g4"},
- {MNG_FN_SCALE_G1_G8, "scale_g1_g8"},
- {MNG_FN_SCALE_G1_G16, "scale_g1_g16"},
- {MNG_FN_SCALE_G2_G4, "scale_g2_g4"},
- {MNG_FN_SCALE_G2_G8, "scale_g2_g8"},
- {MNG_FN_SCALE_G2_G16, "scale_g2_g16"},
- {MNG_FN_SCALE_G4_G8, "scale_g4_g8"},
- {MNG_FN_SCALE_G4_G16, "scale_g4_g16"},
- {MNG_FN_SCALE_G8_G16, "scale_g8_g16"},
- {MNG_FN_SCALE_GA8_GA16, "scale_ga8_ga16"},
- {MNG_FN_SCALE_RGB8_RGB16, "scale_rgb8_rgb16"},
- {MNG_FN_SCALE_RGBA8_RGBA16, "scale_rgba8_rgba16"},
-
- {MNG_FN_SCALE_G2_G1, "scale_g2_g1"},
- {MNG_FN_SCALE_G4_G1, "scale_g4_g1"},
- {MNG_FN_SCALE_G8_G1, "scale_g8_g1"},
- {MNG_FN_SCALE_G16_G1, "scale_g16_g1"},
- {MNG_FN_SCALE_G4_G2, "scale_g4_g2"},
- {MNG_FN_SCALE_G8_G2, "scale_g8_g2"},
- {MNG_FN_SCALE_G16_G2, "scale_g16_g2"},
- {MNG_FN_SCALE_G8_G4, "scale_g8_g4"},
- {MNG_FN_SCALE_G16_G4, "scale_g16_g4"},
- {MNG_FN_SCALE_G16_G8, "scale_g16_g8"},
- {MNG_FN_SCALE_GA16_GA8, "scale_ga16_ga8"},
- {MNG_FN_SCALE_RGB16_RGB8, "scale_rgb16_rgb8"},
- {MNG_FN_SCALE_RGBA16_RGBA8, "scale_rgba16_rgba8"},
-
- {MNG_FN_COMPOSEOVER_RGBA8, "composeover_rgba8"},
- {MNG_FN_COMPOSEOVER_RGBA16, "composeover_rgba16"},
- {MNG_FN_COMPOSEUNDER_RGBA8, "composeunder_rgba8"},
- {MNG_FN_COMPOSEUNDER_RGBA16, "composeunder_rgba16"},
-
- {MNG_FN_FLIP_RGBA8, "flip_rgba8"},
- {MNG_FN_FLIP_RGBA16, "flip_rgba16"},
- {MNG_FN_TILE_RGBA8, "tile_rgba8"},
- {MNG_FN_TILE_RGBA16, "tile_rgba16"}
-
- };
-#endif /* MNG_INCLUDE_TRACE_STINGS */
-
-/* ************************************************************************** */
-
-mng_retcode mng_trace (mng_datap pData,
- mng_uint32 iFunction,
- mng_uint32 iLocation)
-{
- mng_pchar zName = 0; /* bufferptr for tracestring */
-
- if ((pData == 0) || (pData->iMagic != MNG_MAGIC))
- return MNG_INVALIDHANDLE; /* no good if the handle is corrupt */
-
- if (pData->fTraceproc) /* report back to user ? */
- {
-#ifdef MNG_INCLUDE_TRACE_STRINGS
- { /* binary search variables */
- mng_int32 iTop, iLower, iUpper, iMiddle;
- mng_trace_entryp pEntry; /* pointer to found entry */
- /* determine max index of table */
- iTop = (sizeof (trace_table) / sizeof (trace_table [0])) - 1;
-
- iLower = 0; /* initialize binary search */
- iMiddle = iTop >> 1; /* start in the middle */
- iUpper = iTop;
- pEntry = 0; /* no goods yet! */
-
- do /* the binary search itself */
- {
- if (trace_table [iMiddle].iFunction < iFunction)
- iLower = iMiddle + 1;
- else if (trace_table [iMiddle].iFunction > iFunction)
- iUpper = iMiddle - 1;
- else
- {
- pEntry = &trace_table [iMiddle];
- break;
- };
-
- iMiddle = (iLower + iUpper) >> 1;
- }
- while (iLower <= iUpper);
-
- if (pEntry) /* found it ? */
- zName = pEntry->zTracetext;
-
- }
-#endif
- /* oke, now tell */
- if (!pData->fTraceproc (((mng_handle)pData), iFunction, iLocation, zName))
- return MNG_APPTRACEABORT;
-
- }
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_TRACE_PROCS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_trace.h b/src/3rdparty/libmng/libmng_trace.h
deleted file mode 100644
index 0c749d978f..0000000000
--- a/src/3rdparty/libmng/libmng_trace.h
+++ /dev/null
@@ -1,1474 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_trace.h copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : Trace functions (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the trace functions * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - added chunk-access function trace-codes * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * 0.5.1 - 05/13/2000 - G.Juyn * */
-/* * - added save_state & restore_state trace-codes * */
-/* * 0.5.1 - 05/15/2000 - G.Juyn * */
-/* * - added getimgdata & putimgdata trace-codes * */
-/* * * */
-/* * 0.5.2 - 05/20/2000 - G.Juyn * */
-/* * - added JNG tracecodes * */
-/* * 0.5.2 - 05/23/2000 - G.Juyn * */
-/* * - added trace-table entry definition * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - added tracecodes for global animation color-chunks * */
-/* * - added tracecodes for get/set of default ZLIB/IJG parms * */
-/* * - added tracecodes for global PLTE,tRNS,bKGD * */
-/* * 0.5.2 - 05/30/2000 - G.Juyn * */
-/* * - added tracecodes for image-object promotion * */
-/* * - added tracecodes for delta-image processing * */
-/* * 0.5.2 - 06/02/2000 - G.Juyn * */
-/* * - added tracecodes for getalphaline callback * */
-/* * 0.5.2 - 06/05/2000 - G.Juyn * */
-/* * - added tracecode for RGB8_A8 canvasstyle * */
-/* * 0.5.2 - 06/06/2000 - G.Juyn * */
-/* * - added tracecode for mng_read_resume HLAPI function * */
-/* * * */
-/* * 0.5.3 - 06/06/2000 - G.Juyn * */
-/* * - added tracecodes for tracing JPEG progression * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - added tracecodes for get/set speedtype * */
-/* * - added tracecodes for get imagelevel * */
-/* * 0.5.3 - 06/22/2000 - G.Juyn * */
-/* * - added tracecode for delta-image processing * */
-/* * - added tracecodes for PPLT chunk processing * */
-/* * * */
-/* * 0.9.1 - 07/07/2000 - G.Juyn * */
-/* * - added tracecodes for special display processing * */
-/* * 0.9.1 - 07/08/2000 - G.Juyn * */
-/* * - added tracecode for get/set suspensionmode * */
-/* * - added tracecodes for get/set display variables * */
-/* * - added tracecode for read_databuffer (I/O-suspension) * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - added tracecodes for SAVE/SEEK callbacks * */
-/* * - added tracecodes for get/set sectionbreaks * */
-/* * - added tracecode for special error routine * */
-/* * 0.9.1 - 07/19/2000 - G.Juyn * */
-/* * - added tracecode for updatemngheader * */
-/* * * */
-/* * 0.9.2 - 07/31/2000 - G.Juyn * */
-/* * - added tracecodes for status_xxxxx functions * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * - added tracecode for updatemngsimplicity * */
-/* * * */
-/* * 0.9.3 - 08/26/2000 - G.Juyn * */
-/* * - added MAGN chunk * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * 0.9.3 - 10/10/2000 - G.Juyn * */
-/* * - added support for alpha-depth prediction * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - added JDAA chunk * */
-/* * - added support for nEED * */
-/* * 0.9.3 - 10/16/2000 - G.Juyn * */
-/* * - added functions to retrieve PNG/JNG specific header-info * */
-/* * - added optional support for bKGD for PNG images * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - added callback to process non-critical unknown chunks * */
-/* * - added routine to discard "invalid" objects * */
-/* * 0.9.3 - 10/19/2000 - G.Juyn * */
-/* * - implemented delayed delta-processing * */
-/* * 0.9.3 - 10/20/2000 - G.Juyn * */
-/* * - added get/set for bKGD preference setting * */
-/* * 0.9.3 - 10/21/2000 - G.Juyn * */
-/* * - added get function for interlace/progressive display * */
-/* * * */
-/* * 0.9.4 - 1/18/2001 - G.Juyn * */
-/* * - added "new" MAGN methods 3, 4 & 5 * */
-/* * * */
-/* * 1.0.1 - 02/08/2001 - G.Juyn * */
-/* * - added MEND processing callback * */
-/* * 1.0.1 - 04/21/2001 - G.Juyn (code by G.Kelly) * */
-/* * - added BGRA8 canvas with premultiplied alpha * */
-/* * 1.0.1 - 05/02/2001 - G.Juyn * */
-/* * - added "default" sRGB generation (Thanks Marti!) * */
-/* * * */
-/* * 1.0.2 - 06/23/2001 - G.Juyn * */
-/* * - added optimization option for MNG-video playback * */
-/* * - added processterm callback * */
-/* * 1.0.2 - 06/25/2001 - G.Juyn * */
-/* * - added option to turn off progressive refresh * */
-/* * * */
-/* * 1.0.3 - 08/06/2001 - G.Juyn * */
-/* * - added get function for last processed BACK chunk * */
-/* * * */
-/* * 1.0.5 - 08/15/2002 - G.Juyn * */
-/* * - completed PROM support * */
-/* * - completed delta-image support * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * - added HLAPI function to copy chunks * */
-/* * 1.0.5 - 09/14/2002 - G.Juyn * */
-/* * - added event handling for dynamic MNG * */
-/* * 1.0.5 - 09/20/2002 - G.Juyn * */
-/* * - added support for PAST * */
-/* * 1.0.5 - 09/22/2002 - G.Juyn * */
-/* * - added bgrx8 canvas (filler byte) * */
-/* * 1.0.5 - 09/23/2002 - G.Juyn * */
-/* * - added in-memory color-correction of abstract images * */
-/* * - added compose over/under routines for PAST processing * */
-/* * - added flip & tile routines for PAST processing * */
-/* * 1.0.5 - 10/09/2002 - G.Juyn * */
-/* * - fixed trace-constants for PAST chunk * */
-/* * 1.0.5 - 11/07/2002 - G.Juyn * */
-/* * - added support to get totals after mng_read() * */
-/* * * */
-/* * 1.0.6 - 07/14/2003 - G.Randers-Pehrson * */
-/* * - added conditionals around rarely used features * */
-/* * * */
-/* * 1.0.7 - 11/27/2003 - R.A * */
-/* * - added CANVAS_RGB565 and CANVAS_BGR565 * */
-/* * 1.0.7 - 01/25/2004 - J.S * */
-/* * - added premultiplied alpha canvas' for RGBA, ARGB, ABGR * */
-/* * 1.0.7 - 03/10/2004 - G.R-P * */
-/* * - added conditionals around openstream/closestream * */
-/* * * */
-/* * 1.0.8 - 04/02/2004 - G.Juyn * */
-/* * - added CRC existence & checking flags * */
-/* * 1.0.8 - 04/11/2004 - G.Juyn * */
-/* * - added data-push mechanisms for specialized decoders * */
-/* * * */
-/* * 1.0.9 - 10/03/2004 - G.Juyn * */
-/* * - added function to retrieve current FRAM delay * */
-/* * 1.0.9 - 10/14/2004 - G.Juyn * */
-/* * - added bgr565_a8 canvas-style (thanks to J. Elvander) * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 07/06/2007 - G.R-P bugfix by Lucas Quintana * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_trace_h_
-#define _libmng_trace_h_
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_TRACE_PROCS
-
-/* ************************************************************************** */
-
-/* TODO: add a trace-mask so certain functions can be excluded */
-
-mng_retcode mng_trace (mng_datap pData,
- mng_uint32 iFunction,
- mng_uint32 iLocation);
-
-/* ************************************************************************** */
-
-#define MNG_TRACE(D,F,L) { mng_retcode iR = mng_trace (D,F,L); \
- if (iR) return iR; }
-
-#define MNG_TRACEB(D,F,L) { if (mng_trace (D,F,L)) return MNG_FALSE; }
-
-#define MNG_TRACEX(D,F,L) { if (mng_trace (D,F,L)) return 0; }
-
-/* ************************************************************************** */
-
-#define MNG_LC_START 1
-#define MNG_LC_END 2
-#define MNG_LC_INITIALIZE 3
-#define MNG_LC_CLEANUP 4
-
-/* ************************************************************************** */
-
-#define MNG_LC_JPEG_CREATE_DECOMPRESS 101
-#define MNG_LC_JPEG_READ_HEADER 102
-#define MNG_LC_JPEG_START_DECOMPRESS 103
-#define MNG_LC_JPEG_START_OUTPUT 104
-#define MNG_LC_JPEG_READ_SCANLINES 105
-#define MNG_LC_JPEG_FINISH_OUTPUT 106
-#define MNG_LC_JPEG_FINISH_DECOMPRESS 107
-#define MNG_LC_JPEG_DESTROY_DECOMPRESS 108
-
-/* ************************************************************************** */
-
-#define MNG_FN_INITIALIZE 1
-#define MNG_FN_RESET 2
-#define MNG_FN_CLEANUP 3
-#define MNG_FN_READ 4
-#define MNG_FN_WRITE 5
-#define MNG_FN_CREATE 6
-#define MNG_FN_READDISPLAY 7
-#define MNG_FN_DISPLAY 8
-#define MNG_FN_DISPLAY_RESUME 9
-#define MNG_FN_DISPLAY_FREEZE 10
-#define MNG_FN_DISPLAY_RESET 11
-#ifndef MNG_NO_DISPLAY_GO_SUPPORTED
-#define MNG_FN_DISPLAY_GOFRAME 12
-#define MNG_FN_DISPLAY_GOLAYER 13
-#define MNG_FN_DISPLAY_GOTIME 14
-#endif
-#define MNG_FN_GETLASTERROR 15
-#define MNG_FN_READ_RESUME 16
-#define MNG_FN_TRAPEVENT 17
-#define MNG_FN_READ_PUSHDATA 18
-#define MNG_FN_READ_PUSHSIG 19
-#define MNG_FN_READ_PUSHCHUNK 20
-
-#define MNG_FN_SETCB_MEMALLOC 101
-#define MNG_FN_SETCB_MEMFREE 102
-#define MNG_FN_SETCB_READDATA 103
-#define MNG_FN_SETCB_WRITEDATA 104
-#define MNG_FN_SETCB_ERRORPROC 105
-#define MNG_FN_SETCB_TRACEPROC 106
-#define MNG_FN_SETCB_PROCESSHEADER 107
-#define MNG_FN_SETCB_PROCESSTEXT 108
-#define MNG_FN_SETCB_GETCANVASLINE 109
-#define MNG_FN_SETCB_GETBKGDLINE 110
-#define MNG_FN_SETCB_REFRESH 111
-#define MNG_FN_SETCB_GETTICKCOUNT 112
-#define MNG_FN_SETCB_SETTIMER 113
-#define MNG_FN_SETCB_PROCESSGAMMA 114
-#define MNG_FN_SETCB_PROCESSCHROMA 115
-#define MNG_FN_SETCB_PROCESSSRGB 116
-#define MNG_FN_SETCB_PROCESSICCP 117
-#define MNG_FN_SETCB_PROCESSAROW 118
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
-#define MNG_FN_SETCB_OPENSTREAM 119
-#define MNG_FN_SETCB_CLOSESTREAM 120
-#endif
-#define MNG_FN_SETCB_GETALPHALINE 121
-#define MNG_FN_SETCB_PROCESSSAVE 122
-#define MNG_FN_SETCB_PROCESSSEEK 123
-#define MNG_FN_SETCB_PROCESSNEED 124
-#define MNG_FN_SETCB_PROCESSUNKNOWN 125
-#define MNG_FN_SETCB_PROCESSMEND 126
-#define MNG_FN_SETCB_PROCESSTERM 127
-#define MNG_FN_SETCB_RELEASEDATA 128
-
-#define MNG_FN_GETCB_MEMALLOC 201
-#define MNG_FN_GETCB_MEMFREE 202
-#define MNG_FN_GETCB_READDATA 203
-#define MNG_FN_GETCB_WRITEDATA 204
-#define MNG_FN_GETCB_ERRORPROC 205
-#define MNG_FN_GETCB_TRACEPROC 206
-#define MNG_FN_GETCB_PROCESSHEADER 207
-#define MNG_FN_GETCB_PROCESSTEXT 208
-#define MNG_FN_GETCB_GETCANVASLINE 209
-#define MNG_FN_GETCB_GETBKGDLINE 210
-#define MNG_FN_GETCB_REFRESH 211
-#define MNG_FN_GETCB_GETTICKCOUNT 212
-#define MNG_FN_GETCB_SETTIMER 213
-#define MNG_FN_GETCB_PROCESSGAMMA 214
-#define MNG_FN_GETCB_PROCESSCHROMA 215
-#define MNG_FN_GETCB_PROCESSSRGB 216
-#define MNG_FN_GETCB_PROCESSICCP 217
-#define MNG_FN_GETCB_PROCESSAROW 218
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
-#define MNG_FN_GETCB_OPENSTREAM 219
-#define MNG_FN_GETCB_CLOSESTREAM 220
-#endif
-#define MNG_FN_GETCB_GETALPHALINE 221
-#define MNG_FN_GETCB_PROCESSSAVE 222
-#define MNG_FN_GETCB_PROCESSSEEK 223
-#define MNG_FN_GETCB_PROCESSNEED 224
-#define MNG_FN_GETCB_PROCESSUNKNOWN 225
-#define MNG_FN_GETCB_PROCESSMEND 226
-#define MNG_FN_GETCB_PROCESSTERM 227
-#define MNG_FN_GETCB_RELEASEDATA 228
-
-#define MNG_FN_SET_USERDATA 301
-#define MNG_FN_SET_CANVASSTYLE 302
-#define MNG_FN_SET_BKGDSTYLE 303
-#define MNG_FN_SET_BGCOLOR 304
-#define MNG_FN_SET_STORECHUNKS 305
-#define MNG_FN_SET_VIEWGAMMA 306
-#define MNG_FN_SET_DISPLAYGAMMA 307
-#define MNG_FN_SET_DFLTIMGGAMMA 308
-#define MNG_FN_SET_SRGB 309
-#define MNG_FN_SET_OUTPUTPROFILE 310
-#define MNG_FN_SET_SRGBPROFILE 311
-#define MNG_FN_SET_MAXCANVASWIDTH 312
-#define MNG_FN_SET_MAXCANVASHEIGHT 313
-#define MNG_FN_SET_MAXCANVASSIZE 314
-#define MNG_FN_SET_ZLIB_LEVEL 315
-#define MNG_FN_SET_ZLIB_METHOD 316
-#define MNG_FN_SET_ZLIB_WINDOWBITS 317
-#define MNG_FN_SET_ZLIB_MEMLEVEL 318
-#define MNG_FN_SET_ZLIB_STRATEGY 319
-#define MNG_FN_SET_ZLIB_MAXIDAT 320
-#define MNG_FN_SET_JPEG_DCTMETHOD 321
-#define MNG_FN_SET_JPEG_QUALITY 322
-#define MNG_FN_SET_JPEG_SMOOTHING 323
-#define MNG_FN_SET_JPEG_PROGRESSIVE 324
-#define MNG_FN_SET_JPEG_OPTIMIZED 325
-#define MNG_FN_SET_JPEG_MAXJDAT 326
-#define MNG_FN_SET_SPEED 327
-#define MNG_FN_SET_SUSPENSIONMODE 328
-#define MNG_FN_SET_SECTIONBREAKS 329
-#define MNG_FN_SET_USEBKGD 330
-#define MNG_FN_SET_OUTPUTPROFILE2 331
-#define MNG_FN_SET_SRGBPROFILE2 332
-#define MNG_FN_SET_OUTPUTSRGB 333
-#define MNG_FN_SET_SRGBIMPLICIT 334
-#define MNG_FN_SET_CACHEPLAYBACK 335
-#define MNG_FN_SET_DOPROGRESSIVE 336
-#define MNG_FN_SET_CRCMODE 337
-
-#define MNG_FN_GET_USERDATA 401
-#define MNG_FN_GET_SIGTYPE 402
-#define MNG_FN_GET_IMAGETYPE 403
-#define MNG_FN_GET_IMAGEWIDTH 404
-#define MNG_FN_GET_IMAGEHEIGHT 405
-#define MNG_FN_GET_TICKS 406
-#define MNG_FN_GET_FRAMECOUNT 407
-#define MNG_FN_GET_LAYERCOUNT 408
-#define MNG_FN_GET_PLAYTIME 409
-#define MNG_FN_GET_SIMPLICITY 410
-#define MNG_FN_GET_CANVASSTYLE 411
-#define MNG_FN_GET_BKGDSTYLE 412
-#define MNG_FN_GET_BGCOLOR 413
-#define MNG_FN_GET_STORECHUNKS 414
-#define MNG_FN_GET_VIEWGAMMA 415
-#define MNG_FN_GET_DISPLAYGAMMA 416
-#define MNG_FN_GET_DFLTIMGGAMMA 417
-#define MNG_FN_GET_SRGB 418
-#define MNG_FN_GET_MAXCANVASWIDTH 419
-#define MNG_FN_GET_MAXCANVASHEIGHT 420
-#define MNG_FN_GET_ZLIB_LEVEL 421
-#define MNG_FN_GET_ZLIB_METHOD 422
-#define MNG_FN_GET_ZLIB_WINDOWBITS 423
-#define MNG_FN_GET_ZLIB_MEMLEVEL 424
-#define MNG_FN_GET_ZLIB_STRATEGY 425
-#define MNG_FN_GET_ZLIB_MAXIDAT 426
-#define MNG_FN_GET_JPEG_DCTMETHOD 427
-#define MNG_FN_GET_JPEG_QUALITY 428
-#define MNG_FN_GET_JPEG_SMOOTHING 429
-#define MNG_FN_GET_JPEG_PROGRESSIVE 430
-#define MNG_FN_GET_JPEG_OPTIMIZED 431
-#define MNG_FN_GET_JPEG_MAXJDAT 432
-#define MNG_FN_GET_SPEED 433
-#define MNG_FN_GET_IMAGELEVEL 434
-#define MNG_FN_GET_SUSPENSIONMODE 435
-#define MNG_FN_GET_STARTTIME 436
-#define MNG_FN_GET_RUNTIME 437
-#define MNG_FN_GET_CURRENTFRAME 438
-#define MNG_FN_GET_CURRENTLAYER 439
-#define MNG_FN_GET_CURRENTPLAYTIME 440
-#define MNG_FN_GET_SECTIONBREAKS 441
-#define MNG_FN_GET_ALPHADEPTH 442
-#define MNG_FN_GET_BITDEPTH 443
-#define MNG_FN_GET_COLORTYPE 444
-#define MNG_FN_GET_COMPRESSION 445
-#define MNG_FN_GET_FILTER 446
-#define MNG_FN_GET_INTERLACE 447
-#define MNG_FN_GET_ALPHABITDEPTH 448
-#define MNG_FN_GET_ALPHACOMPRESSION 449
-#define MNG_FN_GET_ALPHAFILTER 450
-#define MNG_FN_GET_ALPHAINTERLACE 451
-#define MNG_FN_GET_USEBKGD 452
-#define MNG_FN_GET_REFRESHPASS 453
-#define MNG_FN_GET_CACHEPLAYBACK 454
-#define MNG_FN_GET_DOPROGRESSIVE 455
-#define MNG_FN_GET_LASTBACKCHUNK 456
-#define MNG_FN_GET_LASTSEEKNAME 457
-#define MNG_FN_GET_TOTALFRAMES 458
-#define MNG_FN_GET_TOTALLAYERS 459
-#define MNG_FN_GET_TOTALPLAYTIME 460
-#define MNG_FN_GET_CRCMODE 461
-#define MNG_FN_GET_CURRFRAMDELAY 462
-
-#define MNG_FN_STATUS_ERROR 481
-#define MNG_FN_STATUS_READING 482
-#define MNG_FN_STATUS_SUSPENDBREAK 483
-#define MNG_FN_STATUS_CREATING 484
-#define MNG_FN_STATUS_WRITING 485
-#define MNG_FN_STATUS_DISPLAYING 486
-#define MNG_FN_STATUS_RUNNING 487
-#define MNG_FN_STATUS_TIMERBREAK 488
-#define MNG_FN_STATUS_DYNAMIC 489
-#define MNG_FN_STATUS_RUNNINGEVENT 490
-
-/* ************************************************************************** */
-
-#define MNG_FN_ITERATE_CHUNKS 601
-#define MNG_FN_COPY_CHUNK 602
-
-#define MNG_FN_GETCHUNK_IHDR 701
-#define MNG_FN_GETCHUNK_PLTE 702
-#define MNG_FN_GETCHUNK_IDAT 703
-#define MNG_FN_GETCHUNK_IEND 704
-#define MNG_FN_GETCHUNK_TRNS 705
-#define MNG_FN_GETCHUNK_GAMA 706
-#define MNG_FN_GETCHUNK_CHRM 707
-#define MNG_FN_GETCHUNK_SRGB 708
-#define MNG_FN_GETCHUNK_ICCP 709
-#define MNG_FN_GETCHUNK_TEXT 710
-#define MNG_FN_GETCHUNK_ZTXT 711
-#define MNG_FN_GETCHUNK_ITXT 712
-#define MNG_FN_GETCHUNK_BKGD 713
-#define MNG_FN_GETCHUNK_PHYS 714
-#define MNG_FN_GETCHUNK_SBIT 715
-#define MNG_FN_GETCHUNK_SPLT 716
-#define MNG_FN_GETCHUNK_HIST 717
-#define MNG_FN_GETCHUNK_TIME 718
-#define MNG_FN_GETCHUNK_MHDR 719
-#define MNG_FN_GETCHUNK_MEND 720
-#define MNG_FN_GETCHUNK_LOOP 721
-#define MNG_FN_GETCHUNK_ENDL 722
-#define MNG_FN_GETCHUNK_DEFI 723
-#define MNG_FN_GETCHUNK_BASI 724
-#define MNG_FN_GETCHUNK_CLON 725
-#define MNG_FN_GETCHUNK_PAST 726
-#define MNG_FN_GETCHUNK_DISC 727
-#define MNG_FN_GETCHUNK_BACK 728
-#define MNG_FN_GETCHUNK_FRAM 729
-#define MNG_FN_GETCHUNK_MOVE 730
-#define MNG_FN_GETCHUNK_CLIP 731
-#define MNG_FN_GETCHUNK_SHOW 732
-#define MNG_FN_GETCHUNK_TERM 733
-#define MNG_FN_GETCHUNK_SAVE 734
-#define MNG_FN_GETCHUNK_SEEK 735
-#define MNG_FN_GETCHUNK_EXPI 736
-#define MNG_FN_GETCHUNK_FPRI 737
-#define MNG_FN_GETCHUNK_NEED 738
-#define MNG_FN_GETCHUNK_PHYG 739
-#define MNG_FN_GETCHUNK_JHDR 740
-#define MNG_FN_GETCHUNK_JDAT 741
-#define MNG_FN_GETCHUNK_JSEP 742
-#define MNG_FN_GETCHUNK_DHDR 743
-#define MNG_FN_GETCHUNK_PROM 744
-#define MNG_FN_GETCHUNK_IPNG 745
-#define MNG_FN_GETCHUNK_PPLT 746
-#define MNG_FN_GETCHUNK_IJNG 747
-#define MNG_FN_GETCHUNK_DROP 748
-#define MNG_FN_GETCHUNK_DBYK 749
-#define MNG_FN_GETCHUNK_ORDR 750
-#define MNG_FN_GETCHUNK_UNKNOWN 751
-#define MNG_FN_GETCHUNK_MAGN 752
-#define MNG_FN_GETCHUNK_JDAA 753
-#define MNG_FN_GETCHUNK_EVNT 754
-#define MNG_FN_GETCHUNK_MPNG 755
-
-#define MNG_FN_GETCHUNK_PAST_SRC 781
-#define MNG_FN_GETCHUNK_SAVE_ENTRY 782
-#define MNG_FN_GETCHUNK_PPLT_ENTRY 783
-#define MNG_FN_GETCHUNK_ORDR_ENTRY 784
-#define MNG_FN_GETCHUNK_EVNT_ENTRY 785
-#define MNG_FN_GETCHUNK_MPNG_FRAME 786
-
-#define MNG_FN_PUTCHUNK_IHDR 801
-#define MNG_FN_PUTCHUNK_PLTE 802
-#define MNG_FN_PUTCHUNK_IDAT 803
-#define MNG_FN_PUTCHUNK_IEND 804
-#define MNG_FN_PUTCHUNK_TRNS 805
-#define MNG_FN_PUTCHUNK_GAMA 806
-#define MNG_FN_PUTCHUNK_CHRM 807
-#define MNG_FN_PUTCHUNK_SRGB 808
-#define MNG_FN_PUTCHUNK_ICCP 809
-#define MNG_FN_PUTCHUNK_TEXT 810
-#define MNG_FN_PUTCHUNK_ZTXT 811
-#define MNG_FN_PUTCHUNK_ITXT 812
-#define MNG_FN_PUTCHUNK_BKGD 813
-#define MNG_FN_PUTCHUNK_PHYS 814
-#define MNG_FN_PUTCHUNK_SBIT 815
-#define MNG_FN_PUTCHUNK_SPLT 816
-#define MNG_FN_PUTCHUNK_HIST 817
-#define MNG_FN_PUTCHUNK_TIME 818
-#define MNG_FN_PUTCHUNK_MHDR 819
-#define MNG_FN_PUTCHUNK_MEND 820
-#define MNG_FN_PUTCHUNK_LOOP 821
-#define MNG_FN_PUTCHUNK_ENDL 822
-#define MNG_FN_PUTCHUNK_DEFI 823
-#define MNG_FN_PUTCHUNK_BASI 824
-#define MNG_FN_PUTCHUNK_CLON 825
-#define MNG_FN_PUTCHUNK_PAST 826
-#define MNG_FN_PUTCHUNK_DISC 827
-#define MNG_FN_PUTCHUNK_BACK 828
-#define MNG_FN_PUTCHUNK_FRAM 829
-#define MNG_FN_PUTCHUNK_MOVE 830
-#define MNG_FN_PUTCHUNK_CLIP 831
-#define MNG_FN_PUTCHUNK_SHOW 832
-#define MNG_FN_PUTCHUNK_TERM 833
-#define MNG_FN_PUTCHUNK_SAVE 834
-#define MNG_FN_PUTCHUNK_SEEK 835
-#define MNG_FN_PUTCHUNK_EXPI 836
-#define MNG_FN_PUTCHUNK_FPRI 837
-#define MNG_FN_PUTCHUNK_NEED 838
-#define MNG_FN_PUTCHUNK_PHYG 839
-#define MNG_FN_PUTCHUNK_JHDR 840
-#define MNG_FN_PUTCHUNK_JDAT 841
-#define MNG_FN_PUTCHUNK_JSEP 842
-#define MNG_FN_PUTCHUNK_DHDR 843
-#define MNG_FN_PUTCHUNK_PROM 844
-#define MNG_FN_PUTCHUNK_IPNG 845
-#define MNG_FN_PUTCHUNK_PPLT 846
-#define MNG_FN_PUTCHUNK_IJNG 847
-#define MNG_FN_PUTCHUNK_DROP 848
-#define MNG_FN_PUTCHUNK_DBYK 849
-#define MNG_FN_PUTCHUNK_ORDR 850
-#define MNG_FN_PUTCHUNK_UNKNOWN 851
-#define MNG_FN_PUTCHUNK_MAGN 852
-#define MNG_FN_PUTCHUNK_JDAA 853
-#define MNG_FN_PUTCHUNK_EVNT 854
-#define MNG_FN_PUTCHUNK_MPNG 855
-
-#define MNG_FN_PUTCHUNK_PAST_SRC 881
-#define MNG_FN_PUTCHUNK_SAVE_ENTRY 882
-#define MNG_FN_PUTCHUNK_PPLT_ENTRY 883
-#define MNG_FN_PUTCHUNK_ORDR_ENTRY 884
-#define MNG_FN_PUTCHUNK_EVNT_ENTRY 885
-#define MNG_FN_PUTCHUNK_MPNG_FRAME 886
-
-/* ************************************************************************** */
-
-#define MNG_FN_GETIMGDATA_SEQ 901
-#define MNG_FN_GETIMGDATA_CHUNKSEQ 902
-#define MNG_FN_GETIMGDATA_CHUNK 903
-
-#define MNG_FN_PUTIMGDATA_IHDR 951
-#define MNG_FN_PUTIMGDATA_JHDR 952
-#define MNG_FN_PUTIMGDATA_BASI 953
-#define MNG_FN_PUTIMGDATA_DHDR 954
-
-#define MNG_FN_UPDATEMNGHEADER 981
-#define MNG_FN_UPDATEMNGSIMPLICITY 982
-
-/* ************************************************************************** */
-
-#define MNG_FN_PROCESS_RAW_CHUNK 1001
-#define MNG_FN_READ_GRAPHIC 1002
-#define MNG_FN_DROP_CHUNKS 1003
-#define MNG_FN_PROCESS_ERROR 1004
-#define MNG_FN_CLEAR_CMS 1005
-#define MNG_FN_DROP_OBJECTS 1006
-#define MNG_FN_READ_CHUNK 1007
-#define MNG_FN_LOAD_BKGDLAYER 1008
-#define MNG_FN_NEXT_FRAME 1009
-#define MNG_FN_NEXT_LAYER 1010
-#define MNG_FN_INTERFRAME_DELAY 1011
-#define MNG_FN_DISPLAY_IMAGE 1012
-#define MNG_FN_DROP_IMGOBJECTS 1013
-#define MNG_FN_DROP_ANIOBJECTS 1014
-#define MNG_FN_INFLATE_BUFFER 1015
-#define MNG_FN_DEFLATE_BUFFER 1016
-#define MNG_FN_WRITE_RAW_CHUNK 1017
-#define MNG_FN_WRITE_GRAPHIC 1018
-#define MNG_FN_SAVE_STATE 1019
-#define MNG_FN_RESTORE_STATE 1020
-#define MNG_FN_DROP_SAVEDATA 1021
-#define MNG_FN_EXECUTE_DELTA_IMAGE 1022
-#define MNG_FN_PROCESS_DISPLAY 1023
-#define MNG_FN_CLEAR_CANVAS 1024
-#define MNG_FN_READ_DATABUFFER 1025
-#define MNG_FN_STORE_ERROR 1026
-#define MNG_FN_DROP_INVALID_OBJECTS 1027
-#define MNG_FN_RELEASE_PUSHDATA 1028
-#define MNG_FN_READ_DATA 1029
-#define MNG_FN_READ_CHUNK_CRC 1030
-#define MNG_FN_RELEASE_PUSHCHUNK 1031
-
-/* ************************************************************************** */
-
-#define MNG_FN_DISPLAY_RGB8 1101
-#define MNG_FN_DISPLAY_RGBA8 1102
-#define MNG_FN_DISPLAY_ARGB8 1103
-#define MNG_FN_DISPLAY_BGR8 1104
-#define MNG_FN_DISPLAY_BGRA8 1105
-#define MNG_FN_DISPLAY_ABGR8 1106
-#define MNG_FN_DISPLAY_RGB16 1107
-#define MNG_FN_DISPLAY_RGBA16 1108
-#define MNG_FN_DISPLAY_ARGB16 1109
-#define MNG_FN_DISPLAY_BGR16 1110
-#define MNG_FN_DISPLAY_BGRA16 1111
-#define MNG_FN_DISPLAY_ABGR16 1112
-#define MNG_FN_DISPLAY_INDEX8 1113
-#define MNG_FN_DISPLAY_INDEXA8 1114
-#define MNG_FN_DISPLAY_AINDEX8 1115
-#define MNG_FN_DISPLAY_GRAY8 1116
-#define MNG_FN_DISPLAY_GRAY16 1117
-#define MNG_FN_DISPLAY_GRAYA8 1118
-#define MNG_FN_DISPLAY_GRAYA16 1119
-#define MNG_FN_DISPLAY_AGRAY8 1120
-#define MNG_FN_DISPLAY_AGRAY16 1121
-#define MNG_FN_DISPLAY_DX15 1122
-#define MNG_FN_DISPLAY_DX16 1123
-#define MNG_FN_DISPLAY_RGB8_A8 1124
-#define MNG_FN_DISPLAY_BGRA8PM 1125
-#define MNG_FN_DISPLAY_BGRX8 1126
-#define MNG_FN_DISPLAY_RGB565 1127
-#define MNG_FN_DISPLAY_RGBA565 1128
-#define MNG_FN_DISPLAY_BGR565 1129
-#define MNG_FN_DISPLAY_BGRA565 1130
-#define MNG_FN_DISPLAY_RGBA8_PM 1131
-#define MNG_FN_DISPLAY_ARGB8_PM 1132
-#define MNG_FN_DISPLAY_ABGR8_PM 1133
-#define MNG_FN_DISPLAY_BGR565_A8 1134
-#define MNG_FN_DISPLAY_RGB555 1135
-#define MNG_FN_DISPLAY_BGR555 1136
-
-/* ************************************************************************** */
-
-#define MNG_FN_INIT_FULL_CMS 1201
-#define MNG_FN_CORRECT_FULL_CMS 1202
-#define MNG_FN_INIT_GAMMA_ONLY 1204
-#define MNG_FN_CORRECT_GAMMA_ONLY 1205
-#define MNG_FN_CORRECT_APP_CMS 1206
-#define MNG_FN_INIT_FULL_CMS_OBJ 1207
-#define MNG_FN_INIT_GAMMA_ONLY_OBJ 1208
-#define MNG_FN_INIT_APP_CMS 1209
-#define MNG_FN_INIT_APP_CMS_OBJ 1210
-
-/* ************************************************************************** */
-
-#define MNG_FN_PROCESS_G1 1301
-#define MNG_FN_PROCESS_G2 1302
-#define MNG_FN_PROCESS_G4 1303
-#define MNG_FN_PROCESS_G8 1304
-#define MNG_FN_PROCESS_G16 1305
-#define MNG_FN_PROCESS_RGB8 1306
-#define MNG_FN_PROCESS_RGB16 1307
-#define MNG_FN_PROCESS_IDX1 1308
-#define MNG_FN_PROCESS_IDX2 1309
-#define MNG_FN_PROCESS_IDX4 1310
-#define MNG_FN_PROCESS_IDX8 1311
-#define MNG_FN_PROCESS_GA8 1312
-#define MNG_FN_PROCESS_GA16 1313
-#define MNG_FN_PROCESS_RGBA8 1314
-#define MNG_FN_PROCESS_RGBA16 1315
-
-/* ************************************************************************** */
-
-#define MNG_FN_INIT_G1_NI 1401
-#define MNG_FN_INIT_G1_I 1402
-#define MNG_FN_INIT_G2_NI 1403
-#define MNG_FN_INIT_G2_I 1404
-#define MNG_FN_INIT_G4_NI 1405
-#define MNG_FN_INIT_G4_I 1406
-#define MNG_FN_INIT_G8_NI 1407
-#define MNG_FN_INIT_G8_I 1408
-#define MNG_FN_INIT_G16_NI 1409
-#define MNG_FN_INIT_G16_I 1410
-#define MNG_FN_INIT_RGB8_NI 1411
-#define MNG_FN_INIT_RGB8_I 1412
-#define MNG_FN_INIT_RGB16_NI 1413
-#define MNG_FN_INIT_RGB16_I 1414
-#define MNG_FN_INIT_IDX1_NI 1415
-#define MNG_FN_INIT_IDX1_I 1416
-#define MNG_FN_INIT_IDX2_NI 1417
-#define MNG_FN_INIT_IDX2_I 1418
-#define MNG_FN_INIT_IDX4_NI 1419
-#define MNG_FN_INIT_IDX4_I 1420
-#define MNG_FN_INIT_IDX8_NI 1421
-#define MNG_FN_INIT_IDX8_I 1422
-#define MNG_FN_INIT_GA8_NI 1423
-#define MNG_FN_INIT_GA8_I 1424
-#define MNG_FN_INIT_GA16_NI 1425
-#define MNG_FN_INIT_GA16_I 1426
-#define MNG_FN_INIT_RGBA8_NI 1427
-#define MNG_FN_INIT_RGBA8_I 1428
-#define MNG_FN_INIT_RGBA16_NI 1429
-#define MNG_FN_INIT_RGBA16_I 1430
-
-#define MNG_FN_INIT_ROWPROC 1497
-#define MNG_FN_NEXT_ROW 1498
-#define MNG_FN_CLEANUP_ROWPROC 1499
-
-/* ************************************************************************** */
-
-#define MNG_FN_FILTER_A_ROW 1501
-#define MNG_FN_FILTER_SUB 1502
-#define MNG_FN_FILTER_UP 1503
-#define MNG_FN_FILTER_AVERAGE 1504
-#define MNG_FN_FILTER_PAETH 1505
-
-#define MNG_FN_INIT_ROWDIFFERING 1551
-#define MNG_FN_DIFFER_G1 1552
-#define MNG_FN_DIFFER_G2 1553
-#define MNG_FN_DIFFER_G4 1554
-#define MNG_FN_DIFFER_G8 1555
-#define MNG_FN_DIFFER_G16 1556
-#define MNG_FN_DIFFER_RGB8 1557
-#define MNG_FN_DIFFER_RGB16 1558
-#define MNG_FN_DIFFER_IDX1 1559
-#define MNG_FN_DIFFER_IDX2 1560
-#define MNG_FN_DIFFER_IDX4 1561
-#define MNG_FN_DIFFER_IDX8 1562
-#define MNG_FN_DIFFER_GA8 1563
-#define MNG_FN_DIFFER_GA16 1564
-#define MNG_FN_DIFFER_RGBA8 1565
-#define MNG_FN_DIFFER_RGBA16 1566
-
-/* ************************************************************************** */
-
-#define MNG_FN_CREATE_IMGDATAOBJECT 1601
-#define MNG_FN_FREE_IMGDATAOBJECT 1602
-#define MNG_FN_CLONE_IMGDATAOBJECT 1603
-#define MNG_FN_CREATE_IMGOBJECT 1604
-#define MNG_FN_FREE_IMGOBJECT 1605
-#define MNG_FN_FIND_IMGOBJECT 1606
-#define MNG_FN_CLONE_IMGOBJECT 1607
-#define MNG_FN_RESET_OBJECTDETAILS 1608
-#define MNG_FN_RENUM_IMGOBJECT 1609
-#define MNG_FN_PROMOTE_IMGOBJECT 1610
-#define MNG_FN_MAGNIFY_IMGOBJECT 1611
-#define MNG_FN_COLORCORRECT_OBJECT 1612
-
-/* ************************************************************************** */
-
-#define MNG_FN_STORE_G1 1701
-#define MNG_FN_STORE_G2 1702
-#define MNG_FN_STORE_G4 1703
-#define MNG_FN_STORE_G8 1704
-#define MNG_FN_STORE_G16 1705
-#define MNG_FN_STORE_RGB8 1706
-#define MNG_FN_STORE_RGB16 1707
-#define MNG_FN_STORE_IDX1 1708
-#define MNG_FN_STORE_IDX2 1709
-#define MNG_FN_STORE_IDX4 1710
-#define MNG_FN_STORE_IDX8 1711
-#define MNG_FN_STORE_GA8 1712
-#define MNG_FN_STORE_GA16 1713
-#define MNG_FN_STORE_RGBA8 1714
-#define MNG_FN_STORE_RGBA16 1715
-
-#define MNG_FN_RETRIEVE_G8 1751
-#define MNG_FN_RETRIEVE_G16 1752
-#define MNG_FN_RETRIEVE_RGB8 1753
-#define MNG_FN_RETRIEVE_RGB16 1754
-#define MNG_FN_RETRIEVE_IDX8 1755
-#define MNG_FN_RETRIEVE_GA8 1756
-#define MNG_FN_RETRIEVE_GA16 1757
-#define MNG_FN_RETRIEVE_RGBA8 1758
-#define MNG_FN_RETRIEVE_RGBA16 1759
-
-#define MNG_FN_DELTA_G1 1771
-#define MNG_FN_DELTA_G2 1772
-#define MNG_FN_DELTA_G4 1773
-#define MNG_FN_DELTA_G8 1774
-#define MNG_FN_DELTA_G16 1775
-#define MNG_FN_DELTA_RGB8 1776
-#define MNG_FN_DELTA_RGB16 1777
-#define MNG_FN_DELTA_IDX1 1778
-#define MNG_FN_DELTA_IDX2 1779
-#define MNG_FN_DELTA_IDX4 1780
-#define MNG_FN_DELTA_IDX8 1781
-#define MNG_FN_DELTA_GA8 1782
-#define MNG_FN_DELTA_GA16 1783
-#define MNG_FN_DELTA_RGBA8 1784
-#define MNG_FN_DELTA_RGBA16 1785
-
-/* ************************************************************************** */
-
-#define MNG_FN_CREATE_ANI_LOOP 1801
-#define MNG_FN_CREATE_ANI_ENDL 1802
-#define MNG_FN_CREATE_ANI_DEFI 1803
-#define MNG_FN_CREATE_ANI_BASI 1804
-#define MNG_FN_CREATE_ANI_CLON 1805
-#define MNG_FN_CREATE_ANI_PAST 1806
-#define MNG_FN_CREATE_ANI_DISC 1807
-#define MNG_FN_CREATE_ANI_BACK 1808
-#define MNG_FN_CREATE_ANI_FRAM 1809
-#define MNG_FN_CREATE_ANI_MOVE 1810
-#define MNG_FN_CREATE_ANI_CLIP 1811
-#define MNG_FN_CREATE_ANI_SHOW 1812
-#define MNG_FN_CREATE_ANI_TERM 1813
-#define MNG_FN_CREATE_ANI_SAVE 1814
-#define MNG_FN_CREATE_ANI_SEEK 1815
-#define MNG_FN_CREATE_ANI_GAMA 1816
-#define MNG_FN_CREATE_ANI_CHRM 1817
-#define MNG_FN_CREATE_ANI_SRGB 1818
-#define MNG_FN_CREATE_ANI_ICCP 1819
-#define MNG_FN_CREATE_ANI_PLTE 1820
-#define MNG_FN_CREATE_ANI_TRNS 1821
-#define MNG_FN_CREATE_ANI_BKGD 1822
-#define MNG_FN_CREATE_ANI_DHDR 1823
-#define MNG_FN_CREATE_ANI_PROM 1824
-#define MNG_FN_CREATE_ANI_IPNG 1825
-#define MNG_FN_CREATE_ANI_IJNG 1826
-#define MNG_FN_CREATE_ANI_PPLT 1827
-#define MNG_FN_CREATE_ANI_MAGN 1828
-
-#define MNG_FN_CREATE_ANI_IMAGE 1891
-#define MNG_FN_CREATE_EVENT 1892
-
-/* ************************************************************************** */
-
-#define MNG_FN_FREE_ANI_LOOP 1901
-#define MNG_FN_FREE_ANI_ENDL 1902
-#define MNG_FN_FREE_ANI_DEFI 1903
-#define MNG_FN_FREE_ANI_BASI 1904
-#define MNG_FN_FREE_ANI_CLON 1905
-#define MNG_FN_FREE_ANI_PAST 1906
-#define MNG_FN_FREE_ANI_DISC 1907
-#define MNG_FN_FREE_ANI_BACK 1908
-#define MNG_FN_FREE_ANI_FRAM 1909
-#define MNG_FN_FREE_ANI_MOVE 1910
-#define MNG_FN_FREE_ANI_CLIP 1911
-#define MNG_FN_FREE_ANI_SHOW 1912
-#define MNG_FN_FREE_ANI_TERM 1913
-#define MNG_FN_FREE_ANI_SAVE 1914
-#define MNG_FN_FREE_ANI_SEEK 1915
-#define MNG_FN_FREE_ANI_GAMA 1916
-#define MNG_FN_FREE_ANI_CHRM 1917
-#define MNG_FN_FREE_ANI_SRGB 1918
-#define MNG_FN_FREE_ANI_ICCP 1919
-#define MNG_FN_FREE_ANI_PLTE 1920
-#define MNG_FN_FREE_ANI_TRNS 1921
-#define MNG_FN_FREE_ANI_BKGD 1922
-#define MNG_FN_FREE_ANI_DHDR 1923
-#define MNG_FN_FREE_ANI_PROM 1924
-#define MNG_FN_FREE_ANI_IPNG 1925
-#define MNG_FN_FREE_ANI_IJNG 1926
-#define MNG_FN_FREE_ANI_PPLT 1927
-#define MNG_FN_FREE_ANI_MAGN 1928
-
-#define MNG_FN_FREE_ANI_IMAGE 1991
-#define MNG_FN_FREE_EVENT 1992
-
-/* ************************************************************************** */
-
-#define MNG_FN_PROCESS_ANI_LOOP 2001
-#define MNG_FN_PROCESS_ANI_ENDL 2002
-#define MNG_FN_PROCESS_ANI_DEFI 2003
-#define MNG_FN_PROCESS_ANI_BASI 2004
-#define MNG_FN_PROCESS_ANI_CLON 2005
-#define MNG_FN_PROCESS_ANI_PAST 2006
-#define MNG_FN_PROCESS_ANI_DISC 2007
-#define MNG_FN_PROCESS_ANI_BACK 2008
-#define MNG_FN_PROCESS_ANI_FRAM 2009
-#define MNG_FN_PROCESS_ANI_MOVE 2010
-#define MNG_FN_PROCESS_ANI_CLIP 2011
-#define MNG_FN_PROCESS_ANI_SHOW 2012
-#define MNG_FN_PROCESS_ANI_TERM 2013
-#define MNG_FN_PROCESS_ANI_SAVE 2014
-#define MNG_FN_PROCESS_ANI_SEEK 2015
-#define MNG_FN_PROCESS_ANI_GAMA 2016
-#define MNG_FN_PROCESS_ANI_CHRM 2017
-#define MNG_FN_PROCESS_ANI_SRGB 2018
-#define MNG_FN_PROCESS_ANI_ICCP 2019
-#define MNG_FN_PROCESS_ANI_PLTE 2020
-#define MNG_FN_PROCESS_ANI_TRNS 2021
-#define MNG_FN_PROCESS_ANI_BKGD 2022
-#define MNG_FN_PROCESS_ANI_DHDR 2023
-#define MNG_FN_PROCESS_ANI_PROM 2024
-#define MNG_FN_PROCESS_ANI_IPNG 2025
-#define MNG_FN_PROCESS_ANI_IJNG 2026
-#define MNG_FN_PROCESS_ANI_PPLT 2027
-#define MNG_FN_PROCESS_ANI_MAGN 2028
-
-#define MNG_FN_PROCESS_ANI_IMAGE 2091
-#define MNG_FN_PROCESS_EVENT 2092
-
-/* ************************************************************************** */
-
-#define MNG_FN_RESTORE_BACKIMAGE 2101
-#define MNG_FN_RESTORE_BACKCOLOR 2102
-#define MNG_FN_RESTORE_BGCOLOR 2103
-#define MNG_FN_RESTORE_RGB8 2104
-#define MNG_FN_RESTORE_BGR8 2105
-#define MNG_FN_RESTORE_BKGD 2106
-#define MNG_FN_RESTORE_BGRX8 2107
-#define MNG_FN_RESTORE_RGB565 2108
-#define MNG_FN_RESTORE_BGR565 2109
-
-/* ************************************************************************** */
-
-#define MNG_FN_INIT_IHDR 2201
-#define MNG_FN_INIT_PLTE 2202
-#define MNG_FN_INIT_IDAT 2203
-#define MNG_FN_INIT_IEND 2204
-#define MNG_FN_INIT_TRNS 2205
-#define MNG_FN_INIT_GAMA 2206
-#define MNG_FN_INIT_CHRM 2207
-#define MNG_FN_INIT_SRGB 2208
-#define MNG_FN_INIT_ICCP 2209
-#define MNG_FN_INIT_TEXT 2210
-#define MNG_FN_INIT_ZTXT 2211
-#define MNG_FN_INIT_ITXT 2212
-#define MNG_FN_INIT_BKGD 2213
-#define MNG_FN_INIT_PHYS 2214
-#define MNG_FN_INIT_SBIT 2215
-#define MNG_FN_INIT_SPLT 2216
-#define MNG_FN_INIT_HIST 2217
-#define MNG_FN_INIT_TIME 2218
-#define MNG_FN_INIT_MHDR 2219
-#define MNG_FN_INIT_MEND 2220
-#define MNG_FN_INIT_LOOP 2221
-#define MNG_FN_INIT_ENDL 2222
-#define MNG_FN_INIT_DEFI 2223
-#define MNG_FN_INIT_BASI 2224
-#define MNG_FN_INIT_CLON 2225
-#define MNG_FN_INIT_PAST 2226
-#define MNG_FN_INIT_DISC 2227
-#define MNG_FN_INIT_BACK 2228
-#define MNG_FN_INIT_FRAM 2229
-#define MNG_FN_INIT_MOVE 2230
-#define MNG_FN_INIT_CLIP 2231
-#define MNG_FN_INIT_SHOW 2232
-#define MNG_FN_INIT_TERM 2233
-#define MNG_FN_INIT_SAVE 2234
-#define MNG_FN_INIT_SEEK 2235
-#define MNG_FN_INIT_EXPI 2236
-#define MNG_FN_INIT_FPRI 2237
-#define MNG_FN_INIT_NEED 2238
-#define MNG_FN_INIT_PHYG 2239
-#define MNG_FN_INIT_JHDR 2240
-#define MNG_FN_INIT_JDAT 2241
-#define MNG_FN_INIT_JSEP 2242
-#define MNG_FN_INIT_DHDR 2243
-#define MNG_FN_INIT_PROM 2244
-#define MNG_FN_INIT_IPNG 2245
-#define MNG_FN_INIT_PPLT 2246
-#define MNG_FN_INIT_IJNG 2247
-#define MNG_FN_INIT_DROP 2248
-#define MNG_FN_INIT_DBYK 2249
-#define MNG_FN_INIT_ORDR 2250
-#define MNG_FN_INIT_UNKNOWN 2251
-#define MNG_FN_INIT_MAGN 2252
-#define MNG_FN_INIT_JDAA 2253
-#define MNG_FN_INIT_EVNT 2254
-#define MNG_FN_INIT_MPNG 2255
-
-/* ************************************************************************** */
-
-#define MNG_FN_ASSIGN_IHDR 2301
-#define MNG_FN_ASSIGN_PLTE 2302
-#define MNG_FN_ASSIGN_IDAT 2303
-#define MNG_FN_ASSIGN_IEND 2304
-#define MNG_FN_ASSIGN_TRNS 2305
-#define MNG_FN_ASSIGN_GAMA 2306
-#define MNG_FN_ASSIGN_CHRM 2307
-#define MNG_FN_ASSIGN_SRGB 2308
-#define MNG_FN_ASSIGN_ICCP 2309
-#define MNG_FN_ASSIGN_TEXT 2310
-#define MNG_FN_ASSIGN_ZTXT 2311
-#define MNG_FN_ASSIGN_ITXT 2312
-#define MNG_FN_ASSIGN_BKGD 2313
-#define MNG_FN_ASSIGN_PHYS 2314
-#define MNG_FN_ASSIGN_SBIT 2315
-#define MNG_FN_ASSIGN_SPLT 2316
-#define MNG_FN_ASSIGN_HIST 2317
-#define MNG_FN_ASSIGN_TIME 2318
-#define MNG_FN_ASSIGN_MHDR 2319
-#define MNG_FN_ASSIGN_MEND 2320
-#define MNG_FN_ASSIGN_LOOP 2321
-#define MNG_FN_ASSIGN_ENDL 2322
-#define MNG_FN_ASSIGN_DEFI 2323
-#define MNG_FN_ASSIGN_BASI 2324
-#define MNG_FN_ASSIGN_CLON 2325
-#define MNG_FN_ASSIGN_PAST 2326
-#define MNG_FN_ASSIGN_DISC 2327
-#define MNG_FN_ASSIGN_BACK 2328
-#define MNG_FN_ASSIGN_FRAM 2329
-#define MNG_FN_ASSIGN_MOVE 2330
-#define MNG_FN_ASSIGN_CLIP 2331
-#define MNG_FN_ASSIGN_SHOW 2332
-#define MNG_FN_ASSIGN_TERM 2333
-#define MNG_FN_ASSIGN_SAVE 2334
-#define MNG_FN_ASSIGN_SEEK 2335
-#define MNG_FN_ASSIGN_EXPI 2336
-#define MNG_FN_ASSIGN_FPRI 2337
-#define MNG_FN_ASSIGN_NEED 2338
-#define MNG_FN_ASSIGN_PHYG 2339
-#define MNG_FN_ASSIGN_JHDR 2340
-#define MNG_FN_ASSIGN_JDAT 2341
-#define MNG_FN_ASSIGN_JSEP 2342
-#define MNG_FN_ASSIGN_DHDR 2343
-#define MNG_FN_ASSIGN_PROM 2344
-#define MNG_FN_ASSIGN_IPNG 2345
-#define MNG_FN_ASSIGN_PPLT 2346
-#define MNG_FN_ASSIGN_IJNG 2347
-#define MNG_FN_ASSIGN_DROP 2348
-#define MNG_FN_ASSIGN_DBYK 2349
-#define MNG_FN_ASSIGN_ORDR 2350
-#define MNG_FN_ASSIGN_UNKNOWN 2351
-#define MNG_FN_ASSIGN_MAGN 2352
-#define MNG_FN_ASSIGN_JDAA 2353
-#define MNG_FN_ASSIGN_EVNT 2354
-#define MNG_FN_ASSIGN_MPNG 2355
-
-/* ************************************************************************** */
-
-#define MNG_FN_FREE_IHDR 2401
-#define MNG_FN_FREE_PLTE 2402
-#define MNG_FN_FREE_IDAT 2403
-#define MNG_FN_FREE_IEND 2404
-#define MNG_FN_FREE_TRNS 2405
-#define MNG_FN_FREE_GAMA 2406
-#define MNG_FN_FREE_CHRM 2407
-#define MNG_FN_FREE_SRGB 2408
-#define MNG_FN_FREE_ICCP 2409
-#define MNG_FN_FREE_TEXT 2410
-#define MNG_FN_FREE_ZTXT 2411
-#define MNG_FN_FREE_ITXT 2412
-#define MNG_FN_FREE_BKGD 2413
-#define MNG_FN_FREE_PHYS 2414
-#define MNG_FN_FREE_SBIT 2415
-#define MNG_FN_FREE_SPLT 2416
-#define MNG_FN_FREE_HIST 2417
-#define MNG_FN_FREE_TIME 2418
-#define MNG_FN_FREE_MHDR 2419
-#define MNG_FN_FREE_MEND 2420
-#define MNG_FN_FREE_LOOP 2421
-#define MNG_FN_FREE_ENDL 2422
-#define MNG_FN_FREE_DEFI 2423
-#define MNG_FN_FREE_BASI 2424
-#define MNG_FN_FREE_CLON 2425
-#define MNG_FN_FREE_PAST 2426
-#define MNG_FN_FREE_DISC 2427
-#define MNG_FN_FREE_BACK 2428
-#define MNG_FN_FREE_FRAM 2429
-#define MNG_FN_FREE_MOVE 2430
-#define MNG_FN_FREE_CLIP 2431
-#define MNG_FN_FREE_SHOW 2432
-#define MNG_FN_FREE_TERM 2433
-#define MNG_FN_FREE_SAVE 2434
-#define MNG_FN_FREE_SEEK 2435
-#define MNG_FN_FREE_EXPI 2436
-#define MNG_FN_FREE_FPRI 2437
-#define MNG_FN_FREE_NEED 2438
-#define MNG_FN_FREE_PHYG 2439
-#define MNG_FN_FREE_JHDR 2440
-#define MNG_FN_FREE_JDAT 2441
-#define MNG_FN_FREE_JSEP 2442
-#define MNG_FN_FREE_DHDR 2443
-#define MNG_FN_FREE_PROM 2444
-#define MNG_FN_FREE_IPNG 2445
-#define MNG_FN_FREE_PPLT 2446
-#define MNG_FN_FREE_IJNG 2447
-#define MNG_FN_FREE_DROP 2448
-#define MNG_FN_FREE_DBYK 2449
-#define MNG_FN_FREE_ORDR 2450
-#define MNG_FN_FREE_UNKNOWN 2451
-#define MNG_FN_FREE_MAGN 2452
-#define MNG_FN_FREE_JDAA 2453
-#define MNG_FN_FREE_EVNT 2454
-#define MNG_FN_FREE_MPNG 2455
-
-/* ************************************************************************** */
-
-#define MNG_FN_READ_IHDR 2601
-#define MNG_FN_READ_PLTE 2602
-#define MNG_FN_READ_IDAT 2603
-#define MNG_FN_READ_IEND 2604
-#define MNG_FN_READ_TRNS 2605
-#define MNG_FN_READ_GAMA 2606
-#define MNG_FN_READ_CHRM 2607
-#define MNG_FN_READ_SRGB 2608
-#define MNG_FN_READ_ICCP 2609
-#define MNG_FN_READ_TEXT 2610
-#define MNG_FN_READ_ZTXT 2611
-#define MNG_FN_READ_ITXT 2612
-#define MNG_FN_READ_BKGD 2613
-#define MNG_FN_READ_PHYS 2614
-#define MNG_FN_READ_SBIT 2615
-#define MNG_FN_READ_SPLT 2616
-#define MNG_FN_READ_HIST 2617
-#define MNG_FN_READ_TIME 2618
-#define MNG_FN_READ_MHDR 2619
-#define MNG_FN_READ_MEND 2620
-#define MNG_FN_READ_LOOP 2621
-#define MNG_FN_READ_ENDL 2622
-#define MNG_FN_READ_DEFI 2623
-#define MNG_FN_READ_BASI 2624
-#define MNG_FN_READ_CLON 2625
-#define MNG_FN_READ_PAST 2626
-#define MNG_FN_READ_DISC 2627
-#define MNG_FN_READ_BACK 2628
-#define MNG_FN_READ_FRAM 2629
-#define MNG_FN_READ_MOVE 2630
-#define MNG_FN_READ_CLIP 2631
-#define MNG_FN_READ_SHOW 2632
-#define MNG_FN_READ_TERM 2633
-#define MNG_FN_READ_SAVE 2634
-#define MNG_FN_READ_SEEK 2635
-#define MNG_FN_READ_EXPI 2636
-#define MNG_FN_READ_FPRI 2637
-#define MNG_FN_READ_NEED 2638
-#define MNG_FN_READ_PHYG 2639
-#define MNG_FN_READ_JHDR 2640
-#define MNG_FN_READ_JDAT 2641
-#define MNG_FN_READ_JSEP 2642
-#define MNG_FN_READ_DHDR 2643
-#define MNG_FN_READ_PROM 2644
-#define MNG_FN_READ_IPNG 2645
-#define MNG_FN_READ_PPLT 2646
-#define MNG_FN_READ_IJNG 2647
-#define MNG_FN_READ_DROP 2648
-#define MNG_FN_READ_DBYK 2649
-#define MNG_FN_READ_ORDR 2650
-#define MNG_FN_READ_UNKNOWN 2651
-#define MNG_FN_READ_MAGN 2652
-#define MNG_FN_READ_JDAA 2653
-#define MNG_FN_READ_EVNT 2654
-#define MNG_FN_READ_MPNG 2655
-
-/* ************************************************************************** */
-
-#define MNG_FN_WRITE_IHDR 2801
-#define MNG_FN_WRITE_PLTE 2802
-#define MNG_FN_WRITE_IDAT 2803
-#define MNG_FN_WRITE_IEND 2804
-#define MNG_FN_WRITE_TRNS 2805
-#define MNG_FN_WRITE_GAMA 2806
-#define MNG_FN_WRITE_CHRM 2807
-#define MNG_FN_WRITE_SRGB 2808
-#define MNG_FN_WRITE_ICCP 2809
-#define MNG_FN_WRITE_TEXT 2810
-#define MNG_FN_WRITE_ZTXT 2811
-#define MNG_FN_WRITE_ITXT 2812
-#define MNG_FN_WRITE_BKGD 2813
-#define MNG_FN_WRITE_PHYS 2814
-#define MNG_FN_WRITE_SBIT 2815
-#define MNG_FN_WRITE_SPLT 2816
-#define MNG_FN_WRITE_HIST 2817
-#define MNG_FN_WRITE_TIME 2818
-#define MNG_FN_WRITE_MHDR 2819
-#define MNG_FN_WRITE_MEND 2820
-#define MNG_FN_WRITE_LOOP 2821
-#define MNG_FN_WRITE_ENDL 2822
-#define MNG_FN_WRITE_DEFI 2823
-#define MNG_FN_WRITE_BASI 2824
-#define MNG_FN_WRITE_CLON 2825
-#define MNG_FN_WRITE_PAST 2826
-#define MNG_FN_WRITE_DISC 2827
-#define MNG_FN_WRITE_BACK 2828
-#define MNG_FN_WRITE_FRAM 2829
-#define MNG_FN_WRITE_MOVE 2830
-#define MNG_FN_WRITE_CLIP 2831
-#define MNG_FN_WRITE_SHOW 2832
-#define MNG_FN_WRITE_TERM 2833
-#define MNG_FN_WRITE_SAVE 2834
-#define MNG_FN_WRITE_SEEK 2835
-#define MNG_FN_WRITE_EXPI 2836
-#define MNG_FN_WRITE_FPRI 2837
-#define MNG_FN_WRITE_NEED 2838
-#define MNG_FN_WRITE_PHYG 2839
-#define MNG_FN_WRITE_JHDR 2840
-#define MNG_FN_WRITE_JDAT 2841
-#define MNG_FN_WRITE_JSEP 2842
-#define MNG_FN_WRITE_DHDR 2843
-#define MNG_FN_WRITE_PROM 2844
-#define MNG_FN_WRITE_IPNG 2845
-#define MNG_FN_WRITE_PPLT 2846
-#define MNG_FN_WRITE_IJNG 2847
-#define MNG_FN_WRITE_DROP 2848
-#define MNG_FN_WRITE_DBYK 2849
-#define MNG_FN_WRITE_ORDR 2850
-#define MNG_FN_WRITE_UNKNOWN 2851
-#define MNG_FN_WRITE_MAGN 2852
-#define MNG_FN_WRITE_JDAA 2853
-#define MNG_FN_WRITE_EVNT 2854
-#define MNG_FN_WRITE_MPNG 2855
-
-/* ************************************************************************** */
-
-#define MNG_FN_ZLIB_INITIALIZE 3001
-#define MNG_FN_ZLIB_CLEANUP 3002
-#define MNG_FN_ZLIB_INFLATEINIT 3003
-#define MNG_FN_ZLIB_INFLATEROWS 3004
-#define MNG_FN_ZLIB_INFLATEDATA 3005
-#define MNG_FN_ZLIB_INFLATEFREE 3006
-#define MNG_FN_ZLIB_DEFLATEINIT 3007
-#define MNG_FN_ZLIB_DEFLATEROWS 3008
-#define MNG_FN_ZLIB_DEFLATEDATA 3009
-#define MNG_FN_ZLIB_DEFLATEFREE 3010
-
-/* ************************************************************************** */
-
-#define MNG_FN_PROCESS_DISPLAY_IHDR 3201
-#define MNG_FN_PROCESS_DISPLAY_PLTE 3202
-#define MNG_FN_PROCESS_DISPLAY_IDAT 3203
-#define MNG_FN_PROCESS_DISPLAY_IEND 3204
-#define MNG_FN_PROCESS_DISPLAY_TRNS 3205
-#define MNG_FN_PROCESS_DISPLAY_GAMA 3206
-#define MNG_FN_PROCESS_DISPLAY_CHRM 3207
-#define MNG_FN_PROCESS_DISPLAY_SRGB 3208
-#define MNG_FN_PROCESS_DISPLAY_ICCP 3209
-#define MNG_FN_PROCESS_DISPLAY_BKGD 3210
-#define MNG_FN_PROCESS_DISPLAY_PHYS 3211
-#define MNG_FN_PROCESS_DISPLAY_SBIT 3212
-#define MNG_FN_PROCESS_DISPLAY_SPLT 3213
-#define MNG_FN_PROCESS_DISPLAY_HIST 3214
-#define MNG_FN_PROCESS_DISPLAY_MHDR 3215
-#define MNG_FN_PROCESS_DISPLAY_MEND 3216
-#define MNG_FN_PROCESS_DISPLAY_LOOP 3217
-#define MNG_FN_PROCESS_DISPLAY_ENDL 3218
-#define MNG_FN_PROCESS_DISPLAY_DEFI 3219
-#define MNG_FN_PROCESS_DISPLAY_BASI 3220
-#define MNG_FN_PROCESS_DISPLAY_CLON 3221
-#define MNG_FN_PROCESS_DISPLAY_PAST 3222
-#define MNG_FN_PROCESS_DISPLAY_DISC 3223
-#define MNG_FN_PROCESS_DISPLAY_BACK 3224
-#define MNG_FN_PROCESS_DISPLAY_FRAM 3225
-#define MNG_FN_PROCESS_DISPLAY_MOVE 3226
-#define MNG_FN_PROCESS_DISPLAY_CLIP 3227
-#define MNG_FN_PROCESS_DISPLAY_SHOW 3228
-#define MNG_FN_PROCESS_DISPLAY_TERM 3229
-#define MNG_FN_PROCESS_DISPLAY_SAVE 3230
-#define MNG_FN_PROCESS_DISPLAY_SEEK 3231
-#define MNG_FN_PROCESS_DISPLAY_EXPI 3232
-#define MNG_FN_PROCESS_DISPLAY_FPRI 3233
-#define MNG_FN_PROCESS_DISPLAY_NEED 3234
-#define MNG_FN_PROCESS_DISPLAY_PHYG 3235
-#define MNG_FN_PROCESS_DISPLAY_JHDR 3236
-#define MNG_FN_PROCESS_DISPLAY_JDAT 3237
-#define MNG_FN_PROCESS_DISPLAY_JSEP 3238
-#define MNG_FN_PROCESS_DISPLAY_DHDR 3239
-#define MNG_FN_PROCESS_DISPLAY_PROM 3240
-#define MNG_FN_PROCESS_DISPLAY_IPNG 3241
-#define MNG_FN_PROCESS_DISPLAY_PPLT 3242
-#define MNG_FN_PROCESS_DISPLAY_IJNG 3243
-#define MNG_FN_PROCESS_DISPLAY_DROP 3244
-#define MNG_FN_PROCESS_DISPLAY_DBYK 3245
-#define MNG_FN_PROCESS_DISPLAY_ORDR 3246
-#define MNG_FN_PROCESS_DISPLAY_MAGN 3247
-#define MNG_FN_PROCESS_DISPLAY_JDAA 3248
-
-/* ************************************************************************** */
-
-#define MNG_FN_JPEG_INITIALIZE 3401
-#define MNG_FN_JPEG_CLEANUP 3402
-#define MNG_FN_JPEG_DECOMPRESSINIT 3403
-#define MNG_FN_JPEG_DECOMPRESSDATA 3404
-#define MNG_FN_JPEG_DECOMPRESSFREE 3405
-
-#define MNG_FN_STORE_JPEG_G8 3501
-#define MNG_FN_STORE_JPEG_RGB8 3502
-#define MNG_FN_STORE_JPEG_G12 3503
-#define MNG_FN_STORE_JPEG_RGB12 3504
-#define MNG_FN_STORE_JPEG_GA8 3505
-#define MNG_FN_STORE_JPEG_RGBA8 3506
-#define MNG_FN_STORE_JPEG_GA12 3507
-#define MNG_FN_STORE_JPEG_RGBA12 3508
-#define MNG_FN_STORE_JPEG_G8_ALPHA 3509
-#define MNG_FN_STORE_JPEG_RGB8_ALPHA 3510
-
-#define MNG_FN_INIT_JPEG_A1_NI 3511
-#define MNG_FN_INIT_JPEG_A2_NI 3512
-#define MNG_FN_INIT_JPEG_A4_NI 3513
-#define MNG_FN_INIT_JPEG_A8_NI 3514
-#define MNG_FN_INIT_JPEG_A16_NI 3515
-
-#define MNG_FN_STORE_JPEG_G8_A1 3521
-#define MNG_FN_STORE_JPEG_G8_A2 3522
-#define MNG_FN_STORE_JPEG_G8_A4 3523
-#define MNG_FN_STORE_JPEG_G8_A8 3524
-#define MNG_FN_STORE_JPEG_G8_A16 3525
-
-#define MNG_FN_STORE_JPEG_RGB8_A1 3531
-#define MNG_FN_STORE_JPEG_RGB8_A2 3532
-#define MNG_FN_STORE_JPEG_RGB8_A4 3533
-#define MNG_FN_STORE_JPEG_RGB8_A8 3534
-#define MNG_FN_STORE_JPEG_RGB8_A16 3535
-
-#define MNG_FN_STORE_JPEG_G12_A1 3541
-#define MNG_FN_STORE_JPEG_G12_A2 3542
-#define MNG_FN_STORE_JPEG_G12_A4 3543
-#define MNG_FN_STORE_JPEG_G12_A8 3544
-#define MNG_FN_STORE_JPEG_G12_A16 3545
-
-#define MNG_FN_STORE_JPEG_RGB12_A1 3551
-#define MNG_FN_STORE_JPEG_RGB12_A2 3552
-#define MNG_FN_STORE_JPEG_RGB12_A4 3553
-#define MNG_FN_STORE_JPEG_RGB12_A8 3554
-#define MNG_FN_STORE_JPEG_RGB12_A16 3555
-
-#define MNG_FN_NEXT_JPEG_ALPHAROW 3591
-#define MNG_FN_NEXT_JPEG_ROW 3592
-#define MNG_FN_DISPLAY_JPEG_ROWS 3593
-
-/* ************************************************************************** */
-
-#define MNG_FN_MAGNIFY_G8_X1 3701
-#define MNG_FN_MAGNIFY_G8_X2 3702
-#define MNG_FN_MAGNIFY_RGB8_X1 3703
-#define MNG_FN_MAGNIFY_RGB8_X2 3704
-#define MNG_FN_MAGNIFY_GA8_X1 3705
-#define MNG_FN_MAGNIFY_GA8_X2 3706
-#define MNG_FN_MAGNIFY_GA8_X3 3707
-#define MNG_FN_MAGNIFY_GA8_X4 3708
-#define MNG_FN_MAGNIFY_RGBA8_X1 3709
-#define MNG_FN_MAGNIFY_RGBA8_X2 3710
-#define MNG_FN_MAGNIFY_RGBA8_X3 3711
-#define MNG_FN_MAGNIFY_RGBA8_X4 3712
-#define MNG_FN_MAGNIFY_G8_X3 3713
-#define MNG_FN_MAGNIFY_RGB8_X3 3714
-#define MNG_FN_MAGNIFY_GA8_X5 3715
-#define MNG_FN_MAGNIFY_RGBA8_X5 3716
-
-#define MNG_FN_MAGNIFY_G16_X1 3725
-#define MNG_FN_MAGNIFY_G16_X2 3726
-#define MNG_FN_MAGNIFY_RGB16_X1 3727
-#define MNG_FN_MAGNIFY_RGB16_X2 3728
-#define MNG_FN_MAGNIFY_GA16_X1 3729
-#define MNG_FN_MAGNIFY_GA16_X2 3730
-#define MNG_FN_MAGNIFY_GA16_X3 3731
-#define MNG_FN_MAGNIFY_GA16_X4 3732
-#define MNG_FN_MAGNIFY_RGBA16_X1 3733
-#define MNG_FN_MAGNIFY_RGBA16_X2 3734
-#define MNG_FN_MAGNIFY_RGBA16_X3 3735
-#define MNG_FN_MAGNIFY_RGBA16_X4 3736
-#define MNG_FN_MAGNIFY_G16_X3 3737
-#define MNG_FN_MAGNIFY_RGB16_X3 3738
-#define MNG_FN_MAGNIFY_GA16_X5 3739
-#define MNG_FN_MAGNIFY_RGBA16_X5 3740
-
-#define MNG_FN_MAGNIFY_G8_Y1 3751
-#define MNG_FN_MAGNIFY_G8_Y2 3752
-#define MNG_FN_MAGNIFY_RGB8_Y1 3753
-#define MNG_FN_MAGNIFY_RGB8_Y2 3754
-#define MNG_FN_MAGNIFY_GA8_Y1 3755
-#define MNG_FN_MAGNIFY_GA8_Y2 3756
-#define MNG_FN_MAGNIFY_GA8_Y3 3757
-#define MNG_FN_MAGNIFY_GA8_Y4 3758
-#define MNG_FN_MAGNIFY_RGBA8_Y1 3759
-#define MNG_FN_MAGNIFY_RGBA8_Y2 3760
-#define MNG_FN_MAGNIFY_RGBA8_Y3 3761
-#define MNG_FN_MAGNIFY_RGBA8_Y4 3762
-#define MNG_FN_MAGNIFY_G8_Y3 3763
-#define MNG_FN_MAGNIFY_RGB8_Y3 3764
-#define MNG_FN_MAGNIFY_GA8_Y5 3765
-#define MNG_FN_MAGNIFY_RGBA8_Y5 3766
-
-#define MNG_FN_MAGNIFY_G16_Y1 3775
-#define MNG_FN_MAGNIFY_G16_Y2 3776
-#define MNG_FN_MAGNIFY_RGB16_Y1 3777
-#define MNG_FN_MAGNIFY_RGB16_Y2 3778
-#define MNG_FN_MAGNIFY_GA16_Y1 3779
-#define MNG_FN_MAGNIFY_GA16_Y2 3780
-#define MNG_FN_MAGNIFY_GA16_Y3 3781
-#define MNG_FN_MAGNIFY_GA16_Y4 3782
-#define MNG_FN_MAGNIFY_RGBA16_Y1 3783
-#define MNG_FN_MAGNIFY_RGBA16_Y2 3784
-#define MNG_FN_MAGNIFY_RGBA16_Y3 3785
-#define MNG_FN_MAGNIFY_RGBA16_Y4 3786
-#define MNG_FN_MAGNIFY_G16_Y3 3787
-#define MNG_FN_MAGNIFY_RGB16_Y3 3788
-#define MNG_FN_MAGNIFY_GA16_Y5 3789
-#define MNG_FN_MAGNIFY_RGBA16_Y5 3790
-
-/* ************************************************************************** */
-
-#define MNG_FN_DELTA_G1_G1 3801
-#define MNG_FN_DELTA_G2_G2 3802
-#define MNG_FN_DELTA_G4_G4 3803
-#define MNG_FN_DELTA_G8_G8 3804
-#define MNG_FN_DELTA_G16_G16 3805
-#define MNG_FN_DELTA_RGB8_RGB8 3806
-#define MNG_FN_DELTA_RGB16_RGB16 3807
-#define MNG_FN_DELTA_GA8_GA8 3808
-#define MNG_FN_DELTA_GA8_G8 3809
-#define MNG_FN_DELTA_GA8_A8 3810
-#define MNG_FN_DELTA_GA16_GA16 3811
-#define MNG_FN_DELTA_GA16_G16 3812
-#define MNG_FN_DELTA_GA16_A16 3813
-#define MNG_FN_DELTA_RGBA8_RGBA8 3814
-#define MNG_FN_DELTA_RGBA8_RGB8 3815
-#define MNG_FN_DELTA_RGBA8_A8 3816
-#define MNG_FN_DELTA_RGBA16_RGBA16 3817
-#define MNG_FN_DELTA_RGBA16_RGB16 3818
-#define MNG_FN_DELTA_RGBA16_A16 3819
-
-#define MNG_FN_PROMOTE_G8_G8 3901
-#define MNG_FN_PROMOTE_G8_G16 3902
-#define MNG_FN_PROMOTE_G16_G16 3903
-#define MNG_FN_PROMOTE_G8_GA8 3904
-#define MNG_FN_PROMOTE_G8_GA16 3905
-#define MNG_FN_PROMOTE_G16_GA16 3906
-#define MNG_FN_PROMOTE_G8_RGB8 3907
-#define MNG_FN_PROMOTE_G8_RGB16 3908
-#define MNG_FN_PROMOTE_G16_RGB16 3909
-#define MNG_FN_PROMOTE_G8_RGBA8 3910
-#define MNG_FN_PROMOTE_G8_RGBA16 3911
-#define MNG_FN_PROMOTE_G16_RGBA16 3912
-#define MNG_FN_PROMOTE_GA8_GA16 3913
-#define MNG_FN_PROMOTE_GA8_RGBA8 3914
-#define MNG_FN_PROMOTE_GA8_RGBA16 3915
-#define MNG_FN_PROMOTE_GA16_RGBA16 3916
-#define MNG_FN_PROMOTE_RGB8_RGB16 3917
-#define MNG_FN_PROMOTE_RGB8_RGBA8 3918
-#define MNG_FN_PROMOTE_RGB8_RGBA16 3919
-#define MNG_FN_PROMOTE_RGB16_RGBA16 3920
-#define MNG_FN_PROMOTE_RGBA8_RGBA16 3921
-#define MNG_FN_PROMOTE_IDX8_RGB8 3922
-#define MNG_FN_PROMOTE_IDX8_RGB16 3923
-#define MNG_FN_PROMOTE_IDX8_RGBA8 3924
-#define MNG_FN_PROMOTE_IDX8_RGBA16 3925
-
-#define MNG_FN_SCALE_G1_G2 4001
-#define MNG_FN_SCALE_G1_G4 4002
-#define MNG_FN_SCALE_G1_G8 4003
-#define MNG_FN_SCALE_G1_G16 4004
-#define MNG_FN_SCALE_G2_G4 4005
-#define MNG_FN_SCALE_G2_G8 4006
-#define MNG_FN_SCALE_G2_G16 4007
-#define MNG_FN_SCALE_G4_G8 4008
-#define MNG_FN_SCALE_G4_G16 4009
-#define MNG_FN_SCALE_G8_G16 4010
-#define MNG_FN_SCALE_GA8_GA16 4011
-#define MNG_FN_SCALE_RGB8_RGB16 4012
-#define MNG_FN_SCALE_RGBA8_RGBA16 4013
-
-#define MNG_FN_SCALE_G2_G1 4021
-#define MNG_FN_SCALE_G4_G1 4022
-#define MNG_FN_SCALE_G8_G1 4023
-#define MNG_FN_SCALE_G16_G1 4024
-#define MNG_FN_SCALE_G4_G2 4025
-#define MNG_FN_SCALE_G8_G2 4026
-#define MNG_FN_SCALE_G16_G2 4027
-#define MNG_FN_SCALE_G8_G4 4028
-#define MNG_FN_SCALE_G16_G4 4029
-#define MNG_FN_SCALE_G16_G8 4030
-#define MNG_FN_SCALE_GA16_GA8 4031
-#define MNG_FN_SCALE_RGB16_RGB8 4032
-#define MNG_FN_SCALE_RGBA16_RGBA8 4033
-
-#define MNG_FN_COMPOSEOVER_RGBA8 4501
-#define MNG_FN_COMPOSEOVER_RGBA16 4502
-#define MNG_FN_COMPOSEUNDER_RGBA8 4503
-#define MNG_FN_COMPOSEUNDER_RGBA16 4504
-
-#define MNG_FN_FLIP_RGBA8 4521
-#define MNG_FN_FLIP_RGBA16 4522
-#define MNG_FN_TILE_RGBA8 4523
-#define MNG_FN_TILE_RGBA16 4524
-
-/* ************************************************************************** */
-/* * * */
-/* * Trace string-table entry * */
-/* * * */
-/* ************************************************************************** */
-
-typedef struct {
- mng_uint32 iFunction;
- mng_pchar zTracetext;
- } mng_trace_entry;
-typedef mng_trace_entry const * mng_trace_entryp;
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_TRACE_PROCS */
-
-/* ************************************************************************** */
-
-#endif /* _libmng_trace_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_types.h b/src/3rdparty/libmng/libmng_types.h
deleted file mode 100644
index 81fb29f528..0000000000
--- a/src/3rdparty/libmng/libmng_types.h
+++ /dev/null
@@ -1,574 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_types.h copyright (c) 2000-2007 G.Juyn * */
-/* * version : 1.0.10 * */
-/* * * */
-/* * purpose : type specifications * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Specification of the types used by the library * */
-/* * Creates platform-independant structure * */
-/* * * */
-/* * changes : 0.5.1 - 05/06/2000 - G.Juyn * */
-/* * - added iteratechunk callback definition * */
-/* * 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - improved definitions for DLL support * */
-/* * - added 8-bit palette definition * */
-/* * - added general array definitions * */
-/* * - added MNG_NULL definition * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - changed most callback prototypes to allow the app * */
-/* * to report errors during callback processing * */
-/* * 0.5.1 - 05/16/2000 - G.Juyn * */
-/* * - moved standard header includes into this file * */
-/* * (stdlib/mem for mem-mngmt & math for fp gamma-calc) * */
-/* * * */
-/* * 0.5.2 - 05/18/2000 - G.Juyn * */
-/* * - B003 - fixed problem with <mem.h> being proprietary * */
-/* * to Borland platform * */
-/* * - added helper definitions for JNG (IJG-based) * */
-/* * - fixed support for IJGSRC6B * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - added default IJG compression parameters and such * */
-/* * 0.5.2 - 05/31/2000 - G.Juyn * */
-/* * - fixed inclusion for memcpy (contributed by Tim Rowley) * */
-/* * - added mng_int32p (contributed by Tim Rowley) * */
-/* * 0.5.2 - 06/02/2000 - G.Juyn * */
-/* * - removed SWAP_ENDIAN reference (contributed by Tim Rowley)* */
-/* * - added getalphaline callback for RGB8_A8 canvasstyle * */
-/* * * */
-/* * 0.5.3 - 06/21/2000 - G.Juyn * */
-/* * - added speedtype to facilitate testing * */
-/* * 0.5.3 - 06/27/2000 - G.Juyn * */
-/* * - added typedef for mng_size_t * */
-/* * - changed size parameter for memory callbacks to * */
-/* * mng_size_t * */
-/* * 0.5.3 - 06/28/2000 - G.Juyn * */
-/* * - changed definition of 32-bit ints (64-bit platforms) * */
-/* * - changed definition of mng_handle (64-bit platforms) * */
-/* * 0.5.3 - 06/29/2000 - G.Juyn * */
-/* * - changed definition of mng_handle (again) * */
-/* * - swapped refresh parameters * */
-/* * - added inclusion of stdlib.h for abs() * */
-/* * * */
-/* * 0.9.0 - 06/30/2000 - G.Juyn * */
-/* * - changed refresh parameters to 'x,y,width,height' * */
-/* * 0.9.1 - 07/10/2000 - G.Juyn * */
-/* * - added suspendbuffer constants * */
-/* * 0.9.1 - 07/15/2000 - G.Juyn * */
-/* * - added callbacks for SAVE/SEEK processing * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/07/2000 - G.Juyn * */
-/* * - B111300 - fixup for improved portability * */
-/* * 0.9.3 - 08/12/2000 - G.Juyn * */
-/* * - added workaround for faulty PhotoShop iCCP chunk * */
-/* * 0.9.3 - 09/11/2000 - G.Juyn * */
-/* * - added export of zlib functions from windows dll * */
-/* * - fixed inclusion parameters once again to make those * */
-/* * external libs work together * */
-/* * - re-fixed fixed inclusion parameters * */
-/* * (these freeking libraries make me mad) * */
-/* * 0.9.3 - 10/11/2000 - G.Juyn * */
-/* * - added support for nEED * */
-/* * 0.9.3 - 10/17/2000 - G.Juyn * */
-/* * - added callback to process non-critical unknown chunks * */
-/* * * */
-/* * 0.9.4 - 11/20/2000 - R.Giles * */
-/* * - fixed inclusion of lcms header for non-windows platforms * */
-/* * 0.9.4 - 12/12/2000 - G.Juyn * */
-/* * - changed callback convention for MSVC (Thanks Chad) * */
-/* * 0.9.4 - 12/16/2000 - G.Juyn * */
-/* * - fixed mixup of data- & function-pointers (thanks Dimitri)* */
-/* * * */
-/* * 1.0.1 - 02/08/2001 - G.Juyn * */
-/* * - added MEND processing callback * */
-/* * * */
-/* * 1.0.2 - 06/23/2001 - G.Juyn * */
-/* * - added processterm callback * */
-/* * * */
-/* * 1.0.3 - 08/06/2001 - G.Juyn * */
-/* * - changed inclusion of lcms.h for Linux platforms * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * * */
-/* * 1.0.6 - 04/11/2003 - G.Juyn * */
-/* * - B719420 - fixed several MNG_APP_CMS problems * */
-/* * 1.0.6 - 06/15/2003 - R.Giles * */
-/* * - lcms.h inclusion is generally no longer prefixed * */
-/* * 1.0.6 - 07/07/2003 - G. R-P. * */
-/* * - added png_imgtypes enumeration * */
-/* * * */
-/* * 1.0.7 - 03/10/2004 - G.R-P * */
-/* * - added conditionals around openstream/closestream * */
-/* * * */
-/* * 1.0.8 - 04/11/2004 - G.Juyn * */
-/* * - added data-push mechanisms for specialized decoders * */
-/* * 1.0.8 - 08/01/2004 - G.Juyn * */
-/* * - added support for 3+byte pixelsize for JPEG's * */
-/* * * */
-/* * 1.0.9 - 12/05/2004 - G.Juyn * */
-/* * - inclusion of zlib/lcms/ijgsrc6b with <> instead of "" * */
-/* * 1.0.9 - 12/06/2004 - G.Juyn * */
-/* * - added conditional MNG_OPTIMIZE_CHUNKREADER * */
-/* * * */
-/* * 1.0.10 - 04/08/2007 - G.Juyn * */
-/* * - added support for mPNG proposal * */
-/* * 1.0.10 - 04/12/2007 - G.Juyn * */
-/* * - added support for ANG proposal * */
-/* * * */
-/* ************************************************************************** */
-
-#ifndef _libmng_types_h_
-#define _libmng_types_h_
-
-/* ************************************************************************** */
-
-#ifdef __BORLANDC__
-#pragma option -AT /* turn off strict ANSI-C for the moment */
-#endif
-
-#ifndef WIN32
-#if defined(_WIN32) || defined(__WIN32__) || defined(_Windows) || defined(_WINDOWS)
-#define WIN32 /* gather them into a single define */
-#endif
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Here's where the external & standard libs are embedded * */
-/* * * */
-/* * (it can be a bit of a pain in the lower-back to get them to work * */
-/* * together) * */
-/* * * */
-/* ************************************************************************** */
-
-#ifdef WIN32 /* only include needed stuff */
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#endif
-
-#ifdef MNG_USE_DLL
-#ifdef MNG_SKIP_ZLIB
-#undef MNG_INCLUDE_ZLIB
-#endif
-#ifdef MNG_SKIP_LCMS
-#undef MNG_INCLUDE_LCMS
-#endif
-#ifdef MNG_SKIP_IJG6B
-#undef MNG_INCLUDE_IJG6B
-#endif
-#endif
-
-#ifdef MNG_INCLUDE_ZLIB /* zlib by Mark Adler & Jean-loup Gailly */
-#include <zlib.h>
-#endif
-
-#ifdef MNG_INCLUDE_LCMS /* little cms by Marti Maria Saguer */
-#ifndef ZLIB_DLL
-#undef FAR
-#endif
-#include <lcms.h>
-#endif /* MNG_INCLUDE_LCMS */
-
-#ifdef MNG_INCLUDE_IJG6B /* IJG's jpgsrc6b */
-#include <stdio.h>
-#ifdef MNG_USE_SETJMP
-#include <setjmp.h> /* needed for error-recovery (blergh) */
-#else
-#ifdef WIN32
-#define USE_WINDOWS_MESSAGEBOX /* display a messagebox under Windoze */
-#endif
-#endif /* MNG_USE_SETJMP */
-#ifdef FAR
-#undef FAR /* possibly defined by zlib or lcms */
-#endif
-#define JPEG_INTERNAL_OPTIONS /* for RGB_PIXELSIZE */
-#include <jpeglib.h> /* all that for JPEG support :-) */
-#endif /* MNG_INCLUDE_IJG6B */
-
-#if defined(MNG_INTERNAL_MEMMNGMT) || defined(MNG_INCLUDE_FILTERS)
-#include <stdlib.h> /* "calloc" & "free" & "abs" */
-#endif
-
-#include <limits.h> /* get proper integer widths */
-
-#ifdef WIN32
-#if defined __BORLANDC__
-#include <mem.h> /* defines "memcpy" for BCB */
-#else
-#include <memory.h> /* defines "memcpy" for other win32 platforms */
-#endif
-#include <string.h> /* "strncmp" + "strcmp" */
-#else /* WIN32 */
-#ifdef BSD
-#include <strings.h> /* defines "memcpy", etc for BSD (?) */
-#else
-#include <string.h> /* defines "memcpy", etc for all others (???) */
-#endif
-#endif /* WIN32 */
-
-#if defined(MNG_FULL_CMS) || defined(MNG_GAMMA_ONLY) || defined(MNG_APP_CMS)
-#include <math.h> /* fp gamma-calculation */
-#endif
-
-/* ************************************************************************** */
-/* * * */
-/* * Platform-dependant stuff * */
-/* * * */
-/* ************************************************************************** */
-
-/* TODO: this may require some elaboration for other platforms;
- only works with BCB for now */
-
-#ifndef MNG_DLL
-#if defined(MNG_BUILD_DLL) || defined(MNG_USE_DLL)
-#define MNG_DLL
-#endif
-#endif
-
-#define MNG_LOCAL static
-
-#if defined(MNG_DLL) && defined(WIN32) /* setup DLL calling conventions */
-#define MNG_DECL __stdcall
-#if defined(MNG_BUILD_DLL)
-#define MNG_EXT __declspec(dllexport)
-#elif defined(MNG_USE_DLL)
-#define MNG_EXT __declspec(dllimport)
-#else
-#define MNG_EXT
-#endif
-#ifdef MNG_STRICT_ANSI
-#undef MNG_STRICT_ANSI /* can't do strict-ANSI with this DLL-stuff */
-#endif
-#else
-#define MNG_DECL /* dummies for non-DLL */
-#define MNG_EXT
-#endif /* MNG_DLL && WIN32 */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* now force ANSI-C from here on */
-#endif
-
-/* ************************************************************************** */
-
-#if USHRT_MAX == 0xffffffffU /* get the proper 32-bit width !!! */
-typedef unsigned short mng_uint32;
-typedef signed short mng_int32;
-#elif UINT_MAX == 0xffffffffU
-typedef unsigned int mng_uint32;
-typedef signed int mng_int32;
-#elif ULONG_MAX == 0xffffffffU
-typedef unsigned long mng_uint32;
-typedef signed long mng_int32;
-#else
-#error "Sorry, I can't find any 32-bit integers on this platform."
-#endif
-
-typedef signed short mng_int16; /* other basic integers */
-typedef unsigned short mng_uint16;
-typedef signed char mng_int8;
-typedef unsigned char mng_uint8;
-
-typedef double mng_float; /* basic float */
-
-typedef size_t mng_size_t; /* size field for memory allocation */
-
-typedef char * mng_pchar; /* string */
-typedef void * mng_ptr; /* generic pointer */
-typedef void (*mng_fptr) (void); /* generic function pointer */
-
-/* ************************************************************************** */
-/* * * */
-/* * Platform-independant from here * */
-/* * * */
-/* ************************************************************************** */
-
-typedef mng_uint32 * mng_uint32p; /* pointer to unsigned longs */
-typedef mng_int32 * mng_int32p; /* pointer to longs */
-typedef mng_uint16 * mng_uint16p; /* pointer to unsigned words */
-typedef mng_uint8 * mng_uint8p; /* pointer to unsigned bytes */
-
-typedef mng_int8 mng_bool; /* booleans */
-
-struct mng_data_struct;
-typedef struct mng_data_struct * mng_handle; /* generic handle */
-
-typedef mng_int32 mng_retcode; /* generic return code */
-typedef mng_int32 mng_chunkid; /* 4-byte chunkname identifier */
-typedef mng_ptr mng_chunkp; /* pointer to a chunk-structure */
-typedef mng_ptr mng_objectp; /* pointer to an object-structure */
-
-typedef mng_chunkid * mng_chunkidp; /* pointer to chunkid */
-
-typedef struct { /* 8-bit palette element */
- mng_uint8 iRed;
- mng_uint8 iGreen;
- mng_uint8 iBlue;
- } mng_palette8e;
-typedef mng_palette8e mng_palette8[256]; /* 8-bit palette */
-typedef mng_palette8e * mng_palette8ep;
-
-typedef mng_uint8 mng_uint8arr[256]; /* generic arrays */
-typedef mng_uint8 mng_uint8arr4[4];
-typedef mng_uint16 mng_uint16arr[256];
-typedef mng_uint32 mng_uint32arr2[2];
-
-/* ************************************************************************** */
-
-#define MNG_FALSE 0
-#define MNG_TRUE 1
-#define MNG_NULL 0
-
-#define MNG_SUSPENDBUFFERSIZE 32768
-#define MNG_SUSPENDREQUESTSIZE 1024
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-
-/* size of temporary zlib buffer for deflate processing */
-#define MNG_ZLIB_MAXBUF 8192
-
-/* default zlib compression parameters for deflateinit2 */
-#define MNG_ZLIB_LEVEL 9 /* level */
-#define MNG_ZLIB_METHOD Z_DEFLATED /* method */
-#define MNG_ZLIB_WINDOWBITS 15 /* window size */
-#define MNG_ZLIB_MEMLEVEL 9 /* memory level */
-#define MNG_ZLIB_STRATEGY Z_DEFAULT_STRATEGY /* strategy */
-
-#define MNG_MAX_IDAT_SIZE 4096 /* maximum size of IDAT data */
-
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_JNG
-
-#ifdef MNG_INCLUDE_IJG6B /* IJG helper defs */
-typedef struct jpeg_compress_struct mngjpeg_comp;
-typedef struct jpeg_decompress_struct mngjpeg_decomp;
-typedef struct jpeg_error_mgr mngjpeg_error;
-typedef struct jpeg_source_mgr mngjpeg_source;
-
-typedef mngjpeg_comp * mngjpeg_compp;
-typedef mngjpeg_decomp * mngjpeg_decompp;
-typedef mngjpeg_error * mngjpeg_errorp;
-typedef mngjpeg_source * mngjpeg_sourcep;
-
-typedef J_DCT_METHOD mngjpeg_dctmethod;
-
-/* default IJG parameters for compression */
-#define MNG_JPEG_DCT JDCT_DEFAULT /* DCT algorithm (JDCT_ISLOW) */
-#define MNG_JPEG_QUALITY 100 /* quality 0..100; 100=best */
-#define MNG_JPEG_SMOOTHING 0 /* default no smoothing */
-#define MNG_JPEG_PROGRESSIVE MNG_FALSE /* default is just baseline */
-#define MNG_JPEG_OPTIMIZED MNG_FALSE /* default is not optimized */
-#endif /* MNG_INCLUDE_IJG6B */
-
-#define MNG_JPEG_MAXBUF 65500 /* max size of temp JPEG buffer */
-#define MNG_MAX_JDAT_SIZE 4096 /* maximum size of JDAT data */
-
-#endif /* MNG_INCLUDE_JNG */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_LCMS
-typedef cmsHPROFILE mng_cmsprof; /* little CMS helper defs */
-typedef cmsHTRANSFORM mng_cmstrans;
-typedef cmsCIExyY mng_CIExyY;
-typedef cmsCIExyYTRIPLE mng_CIExyYTRIPLE;
-typedef LPGAMMATABLE mng_gammatabp;
-#endif /* MNG_INCLUDE_LCMS */
-
-/* ************************************************************************** */
-
- /* enumeration of known graphics types */
-enum mng_imgtypes {mng_it_unknown, mng_it_png, mng_it_mng, mng_it_jng
-#ifdef MNG_INCLUDE_MPNG_PROPOSAL
- ,mng_it_mpng
-#endif
-#ifdef MNG_INCLUDE_ANG_PROPOSAL
- ,mng_it_ang
-#endif
- };
-typedef enum mng_imgtypes mng_imgtype;
-
- /* enumeration of animation speed-types */
-enum mng_speedtypes {mng_st_normal, mng_st_fast, mng_st_slow, mng_st_slowest};
-typedef enum mng_speedtypes mng_speedtype;
-
-#ifdef MNG_OPTIMIZE_CHUNKREADER
- /* enumeration object-creation indicators */
-enum mng_createobjtypes {mng_create_none, mng_create_always, mng_create_ifglobal};
-typedef enum mng_createobjtypes mng_createobjtype;
-#endif
-
-/* ************************************************************************** */
-
-/* enumeration of PNG image types */
-#ifdef MNG_OPTIMIZE_FOOTPRINT_INIT
-enum png_imgtypes
- {
- png_g1,
- png_g2,
- png_g4,
- png_g8,
- png_rgb8,
- png_idx1,
- png_idx2,
- png_idx4,
- png_idx8,
- png_ga8,
- png_rgba8,
-#ifdef MNG_INCLUDE_JNG
- png_jpeg_a1,
- png_jpeg_a2,
- png_jpeg_a4,
- png_jpeg_a8,
-#endif
-#ifndef MNG_NO_16BIT_SUPPORT
- png_g16,
- png_ga16,
- png_rgb16,
- png_rgba16,
-#ifdef MNG_INCLUDE_JNG
- png_jpeg_a16,
-#endif
-#endif
- png_none
- };
-
-typedef enum png_imgtypes png_imgtype;
-#endif
-/* ************************************************************************** */
-
- /* memory management callbacks */
-typedef mng_ptr (MNG_DECL *mng_memalloc) (mng_size_t iLen);
-typedef void (MNG_DECL *mng_memfree) (mng_ptr iPtr,
- mng_size_t iLen);
-
-typedef void (MNG_DECL *mng_releasedata) (mng_ptr pUserdata,
- mng_ptr pData,
- mng_size_t iLength);
-
- /* I/O management callbacks */
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
-typedef mng_bool (MNG_DECL *mng_openstream) (mng_handle hHandle);
-typedef mng_bool (MNG_DECL *mng_closestream) (mng_handle hHandle);
-#endif
-typedef mng_bool (MNG_DECL *mng_readdata) (mng_handle hHandle,
- mng_ptr pBuf,
- mng_uint32 iBuflen,
- mng_uint32p pRead);
-typedef mng_bool (MNG_DECL *mng_writedata) (mng_handle hHandle,
- mng_ptr pBuf,
- mng_uint32 iBuflen,
- mng_uint32p pWritten);
-
- /* error & trace processing callbacks */
-typedef mng_bool (MNG_DECL *mng_errorproc) (mng_handle hHandle,
- mng_int32 iErrorcode,
- mng_int8 iSeverity,
- mng_chunkid iChunkname,
- mng_uint32 iChunkseq,
- mng_int32 iExtra1,
- mng_int32 iExtra2,
- mng_pchar zErrortext);
-typedef mng_bool (MNG_DECL *mng_traceproc) (mng_handle hHandle,
- mng_int32 iFuncnr,
- mng_int32 iFuncseq,
- mng_pchar zFuncname);
-
- /* read processing callbacks */
-typedef mng_bool (MNG_DECL *mng_processheader) (mng_handle hHandle,
- mng_uint32 iWidth,
- mng_uint32 iHeight);
-typedef mng_bool (MNG_DECL *mng_processtext) (mng_handle hHandle,
- mng_uint8 iType,
- mng_pchar zKeyword,
- mng_pchar zText,
- mng_pchar zLanguage,
- mng_pchar zTranslation);
-typedef mng_bool (MNG_DECL *mng_processsave) (mng_handle hHandle);
-typedef mng_bool (MNG_DECL *mng_processseek) (mng_handle hHandle,
- mng_pchar zName);
-typedef mng_bool (MNG_DECL *mng_processneed) (mng_handle hHandle,
- mng_pchar zKeyword);
-typedef mng_bool (MNG_DECL *mng_processmend) (mng_handle hHandle,
- mng_uint32 iIterationsdone,
- mng_uint32 iIterationsleft);
-typedef mng_bool (MNG_DECL *mng_processunknown) (mng_handle hHandle,
- mng_chunkid iChunkid,
- mng_uint32 iRawlen,
- mng_ptr pRawdata);
-typedef mng_bool (MNG_DECL *mng_processterm) (mng_handle hHandle,
- mng_uint8 iTermaction,
- mng_uint8 iIteraction,
- mng_uint32 iDelay,
- mng_uint32 iItermax);
-
- /* display processing callbacks */
-typedef mng_ptr (MNG_DECL *mng_getcanvasline) (mng_handle hHandle,
- mng_uint32 iLinenr);
-typedef mng_ptr (MNG_DECL *mng_getbkgdline) (mng_handle hHandle,
- mng_uint32 iLinenr);
-typedef mng_ptr (MNG_DECL *mng_getalphaline) (mng_handle hHandle,
- mng_uint32 iLinenr);
-typedef mng_bool (MNG_DECL *mng_refresh) (mng_handle hHandle,
- mng_uint32 iX,
- mng_uint32 iY,
- mng_uint32 iWidth,
- mng_uint32 iHeight);
-
- /* timer management callbacks */
-typedef mng_uint32 (MNG_DECL *mng_gettickcount) (mng_handle hHandle);
-typedef mng_bool (MNG_DECL *mng_settimer) (mng_handle hHandle,
- mng_uint32 iMsecs);
-
- /* color management callbacks */
-typedef mng_bool (MNG_DECL *mng_processgamma) (mng_handle hHandle,
- mng_uint32 iGamma);
-typedef mng_bool (MNG_DECL *mng_processchroma) (mng_handle hHandle,
- mng_uint32 iWhitepointx,
- mng_uint32 iWhitepointy,
- mng_uint32 iRedx,
- mng_uint32 iRedy,
- mng_uint32 iGreenx,
- mng_uint32 iGreeny,
- mng_uint32 iBluex,
- mng_uint32 iBluey);
-typedef mng_bool (MNG_DECL *mng_processsrgb) (mng_handle hHandle,
- mng_uint8 iRenderingintent);
-typedef mng_bool (MNG_DECL *mng_processiccp) (mng_handle hHandle,
- mng_uint32 iProfilesize,
- mng_ptr pProfile);
-typedef mng_bool (MNG_DECL *mng_processarow) (mng_handle hHandle,
- mng_uint32 iRowsamples,
- mng_bool bIsRGBA16,
- mng_ptr pRow);
-
- /* chunk access callback(s) */
-typedef mng_bool (MNG_DECL *mng_iteratechunk) (mng_handle hHandle,
- mng_handle hChunk,
- mng_chunkid iChunkid,
- mng_uint32 iChunkseq);
-
-/* ************************************************************************** */
-
-#endif /* _libmng_types_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_write.c b/src/3rdparty/libmng/libmng_write.c
deleted file mode 100644
index 79ff544384..0000000000
--- a/src/3rdparty/libmng/libmng_write.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_write.c copyright (c) 2000-2004 G.Juyn * */
-/* * version : 1.0.9 * */
-/* * * */
-/* * purpose : Write management (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the write management routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * 0.5.1 - 05/16/2000 - G.Juyn * */
-/* * - moved the actual write_graphic functionality from * */
-/* * mng_hlapi to its appropriate function here * */
-/* * * */
-/* * 0.9.1 - 07/19/2000 - G.Juyn * */
-/* * - fixed writing of signature * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * * */
-/* * 1.0.8 - 07/06/2004 - G.R-P * */
-/* * - added conditionals around openstream/closestream * */
-/* * - defend against using undefined Open/Closestream function * */
-/* * 1.0.8 - 08/02/2004 - G.Juyn * */
-/* * - added conditional to allow easier writing of large MNG's * */
-/* * * */
-/* * 1.0.9 - 09/25/2004 - G.Juyn * */
-/* * - replaced MNG_TWEAK_LARGE_FILES with permanent solution * */
-/* * 1.0.9 - 12/20/2004 - G.Juyn * */
-/* * - cleaned up macro-invocations (thanks to D. Airlie) * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_memory.h"
-#include "libmng_chunks.h"
-#include "libmng_chunk_io.h"
-#include "libmng_write.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#if defined(MNG_SUPPORT_READ) || defined(MNG_SUPPORT_WRITE)
-mng_retcode mng_drop_chunks (mng_datap pData)
-{
- mng_chunkp pChunk;
- mng_chunkp pNext;
- mng_cleanupchunk fCleanup;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DROP_CHUNKS, MNG_LC_START);
-#endif
-
- pChunk = pData->pFirstchunk; /* and get first stored chunk (if any) */
-
- while (pChunk) /* more chunks to discard ? */
- {
- pNext = ((mng_chunk_headerp)pChunk)->pNext;
- /* call appropriate cleanup */
- fCleanup = ((mng_chunk_headerp)pChunk)->fCleanup;
- fCleanup (pData, pChunk);
-
- pChunk = pNext; /* neeeext */
- }
-
- pData->pFirstchunk = MNG_NULL;
- pData->pLastchunk = MNG_NULL;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_DROP_CHUNKS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_READ || MNG_SUPPORT_WRITE */
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_WRITE_PROCS
-
-/* ************************************************************************** */
-
-mng_retcode mng_write_graphic (mng_datap pData)
-{
- mng_chunkp pChunk;
- mng_retcode iRetcode;
- mng_uint32 iWritten;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_GRAPHIC, MNG_LC_START);
-#endif
-
- pChunk = pData->pFirstchunk; /* we'll start with the first, thank you */
-
- if (pChunk) /* is there anything to write ? */
- { /* open the file */
- if (!pData->bWriting)
- {
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- if (pData->fOpenstream && !pData->fOpenstream ((mng_handle)pData))
- MNG_ERROR (pData, MNG_APPIOERROR);
-#endif
- {
- pData->bWriting = MNG_TRUE; /* indicate writing */
- pData->iWritebufsize = 32768; /* get a temporary write buffer */
- /* reserve 12 bytes for length, chunkname & crc */
- MNG_ALLOC (pData, pData->pWritebuf, pData->iWritebufsize+12);
-
- /* write the signature */
- if (((mng_chunk_headerp)pChunk)->iChunkname == MNG_UINT_IHDR)
- mng_put_uint32 (pData->pWritebuf, PNG_SIG);
- else
- if (((mng_chunk_headerp)pChunk)->iChunkname == MNG_UINT_JHDR)
- mng_put_uint32 (pData->pWritebuf, JNG_SIG);
- else
- mng_put_uint32 (pData->pWritebuf, MNG_SIG);
-
- mng_put_uint32 (pData->pWritebuf+4, POST_SIG);
-
- if (!pData->fWritedata ((mng_handle)pData, pData->pWritebuf, 8, &iWritten))
- {
- MNG_FREE (pData, pData->pWritebuf, pData->iWritebufsize+12);
- MNG_ERROR (pData, MNG_APPIOERROR);
- }
-
- if (iWritten != 8) /* disk full ? */
- {
- MNG_FREE (pData, pData->pWritebuf, pData->iWritebufsize+12);
- MNG_ERROR (pData, MNG_OUTPUTERROR);
- }
- }
- }
-
- while (pChunk) /* so long as there's something to write */
- { /* let's call its output routine */
- iRetcode = ((mng_chunk_headerp)pChunk)->fWrite (pData, pChunk);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- /* neeeext */
- pChunk = ((mng_chunk_headerp)pChunk)->pNext;
- }
-
- if (!pData->bCreating)
- { /* free the temporary buffer */
- MNG_FREE (pData, pData->pWritebuf, pData->iWritebufsize+12);
-
- pData->bWriting = MNG_FALSE; /* done writing */
- /* close the stream now */
-#ifndef MNG_NO_OPEN_CLOSE_STREAM
- if (pData->fClosestream && !pData->fClosestream ((mng_handle)pData))
- MNG_ERROR (pData, MNG_APPIOERROR);
-#endif
-
- } else {
- /* cleanup the written chunks */
- iRetcode = mng_drop_chunks (pData);
- if (iRetcode) /* on error bail out */
- return iRetcode;
- }
- }
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_WRITE_GRAPHIC, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_WRITE_PROCS */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
-
diff --git a/src/3rdparty/libmng/libmng_write.h b/src/3rdparty/libmng/libmng_write.h
deleted file mode 100644
index df058fb774..0000000000
--- a/src/3rdparty/libmng/libmng_write.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_write.h copyright (c) 2000-2004 G.Juyn * */
-/* * version : 1.0.9 * */
-/* * * */
-/* * purpose : Write management (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the write management routines * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * * */
-/* * 1.0.9 - 09/25/2004 - G.Juyn * */
-/* * - replaced MNG_TWEAK_LARGE_FILES with permanent solution * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_write_h_
-#define _libmng_write_h_
-
-/* ************************************************************************** */
-
-mng_retcode mng_drop_chunks (mng_datap pData);
-
-mng_retcode mng_write_graphic (mng_datap pData);
-
-/* ************************************************************************** */
-
-#endif /* _libmng_write_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/libmng_zlib.c b/src/3rdparty/libmng/libmng_zlib.c
deleted file mode 100644
index 7d102e160d..0000000000
--- a/src/3rdparty/libmng/libmng_zlib.c
+++ /dev/null
@@ -1,607 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_zlib.c copyright (c) 2000-2004 G.Juyn * */
-/* * version : 1.0.9 * */
-/* * * */
-/* * purpose : ZLIB library interface (implementation) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : implementation of the ZLIB library interface * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * 0.5.1 - 05/11/2000 - G.Juyn * */
-/* * - filled the deflatedata routine * */
-/* * 0.5.1 - 05/12/2000 - G.Juyn * */
-/* * - changed trace to macro for callback error-reporting * */
-/* * * */
-/* * 0.5.2 - 05/20/2000 - G.Juyn * */
-/* * - fixed for JNG alpha handling * */
-/* * 0.5.2 - 05/24/2000 - G.Juyn * */
-/* * - moved init of default zlib parms from here to * */
-/* * "mng_hlapi.c" * */
-/* * * */
-/* * 0.5.3 - 06/16/2000 - G.Juyn * */
-/* * - changed progressive-display processing * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* * 0.9.3 - 08/08/2000 - G.Juyn * */
-/* * - fixed compiler-warnings from Mozilla * */
-/* * 0.9.3 - 09/07/2000 - G.Juyn * */
-/* * - added support for new filter_types * */
-/* * * */
-/* * 1.0.5 - 08/07/2002 - G.Juyn * */
-/* * - added test-option for PNG filter method 193 (=no filter) * */
-/* * 1.0.5 - 08/19/2002 - G.Juyn * */
-/* * - B597134 - libmng pollutes the linker namespace * */
-/* * 1.0.5 - 09/19/2002 - G.Juyn * */
-/* * - added warning for too much IDAT data * */
-/* * * */
-/* * 1.0.6 - 07/07/2003 - G.R-P * */
-/* * - added MNG_NO_16BIT_SUPPORT support * */
-/* * * */
-/* * 1.0.9 - 10/09/2004 - G.R-P * */
-/* * - added MNG_NO_1_2_4BIT_SUPPORT support * */
-/* * * */
-/* ************************************************************************** */
-
-#include "libmng.h"
-#include "libmng_data.h"
-#include "libmng_error.h"
-#include "libmng_trace.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#include "libmng_memory.h"
-#include "libmng_pixels.h"
-#include "libmng_filter.h"
-#include "libmng_zlib.h"
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-/* ************************************************************************** */
-
-#ifdef MNG_INCLUDE_ZLIB
-
-/* ************************************************************************** */
-
-voidpf mngzlib_alloc (voidpf pData,
- uInt iCount,
- uInt iSize)
-{
- voidpf pPtr; /* temporary space */
-
-#ifdef MNG_INTERNAL_MEMMNGMT
- pPtr = calloc (iCount, iSize); /* local allocation */
-#else
- if (((mng_datap)pData)->fMemalloc) /* callback function set ? */
- pPtr = ((mng_datap)pData)->fMemalloc (iCount * iSize);
- else
- pPtr = Z_NULL; /* can't allocate! */
-#endif
-
- return pPtr; /* return the result */
-}
-
-/* ************************************************************************** */
-
-void mngzlib_free (voidpf pData,
- voidpf pAddress)
-{
-#ifdef MNG_INTERNAL_MEMMNGMT
- free (pAddress); /* free locally */
-#else
- if (((mng_datap)pData)->fMemfree) /* callback set? */
- ((mng_datap)pData)->fMemfree (pAddress, 1);
-#endif
-}
-
-/* ************************************************************************** */
-
-mng_retcode mngzlib_initialize (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_INITIALIZE, MNG_LC_START);
-#endif
-
-#ifdef MNG_INTERNAL_MEMMNGMT
- pData->sZlib.zalloc = Z_NULL; /* let zlib figure out memory management */
- pData->sZlib.zfree = Z_NULL;
- pData->sZlib.opaque = Z_NULL;
-#else /* use user-provided callbacks */
- pData->sZlib.zalloc = mngzlib_alloc;
- pData->sZlib.zfree = mngzlib_free;
- pData->sZlib.opaque = (voidpf)pData;
-#endif
-
- pData->bInflating = MNG_FALSE; /* not performing any action yet */
- pData->bDeflating = MNG_FALSE;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_INITIALIZE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-mng_retcode mngzlib_cleanup (mng_datap pData)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_CLEANUP, MNG_LC_START);
-#endif
-
- if (pData->bInflating) /* force zlib cleanup */
- mngzlib_inflatefree (pData);
- if (pData->bDeflating)
- mngzlib_deflatefree (pData);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_CLEANUP, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-mng_retcode mngzlib_inflateinit (mng_datap pData)
-{
- int iZrslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEINIT, MNG_LC_START);
-#endif
- /* initialize zlib structures and such */
- iZrslt = inflateInit (&pData->sZlib);
-
- if (iZrslt != Z_OK) /* on error bail out */
- MNG_ERRORZ (pData, (mng_uint32)iZrslt);
-
- pData->bInflating = MNG_TRUE; /* really inflating something now */
- pData->sZlib.next_out = 0; /* force JIT initialization */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEINIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-#ifdef MNG_SUPPORT_DISPLAY
-mng_retcode mngzlib_inflaterows (mng_datap pData,
- mng_uint32 iInlen,
- mng_uint8p pIndata)
-{
- int iZrslt;
- mng_retcode iRslt;
- mng_ptr pSwap;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEROWS, MNG_LC_START);
-#endif
-
- pData->sZlib.next_in = pIndata; /* let zlib know where to get stuff */
- pData->sZlib.avail_in = (uInt)iInlen;
-
- if (pData->sZlib.next_out == 0) /* initialize output variables ? */
- { /* let zlib know where to store stuff */
- pData->sZlib.next_out = pData->pWorkrow;
- pData->sZlib.avail_out = (uInt)(pData->iRowsize + pData->iPixelofs);
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iPNGdepth < 8)
- pData->sZlib.avail_out = (uInt)((pData->iPNGdepth*pData->iRowsize + 7)/8
- + pData->iPixelofs);
-#endif
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iPNGdepth > 8)
- pData->sZlib.avail_out = (uInt)(2*pData->iRowsize + pData->iPixelofs);
-#endif
- }
-
- do
- { /* now inflate a row */
- iZrslt = inflate (&pData->sZlib, Z_SYNC_FLUSH);
- /* produced a full row ? */
- if (((iZrslt == Z_OK) || (iZrslt == Z_STREAM_END)) &&
- (pData->sZlib.avail_out == 0))
- { /* image not completed yet ? */
- if (pData->iRow < (mng_int32)pData->iDataheight)
- {
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iPNGdepth == 1)
- {
- /* Inflate Workrow to 8-bit */
- mng_int32 iX;
- mng_uint8p pSrc = pData->pWorkrow+1;
- mng_uint8p pDest = pSrc + pData->iRowsize - (pData->iRowsize+7)/8;
-
- for (iX = ((pData->iRowsize+7)/8) ; iX > 0 ; iX--)
- *pDest++ = *pSrc++;
-
- pDest = pData->pWorkrow+1;
- pSrc = pDest + pData->iRowsize - (pData->iRowsize+7)/8;
- for (iX = pData->iRowsize; ;)
- {
- *pDest++ = (((*pSrc)>>7)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>6)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>5)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>4)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>3)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>2)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>1)&1);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc) )&1);
- if (iX-- <= 0)
- break;
- pSrc++;
- }
- }
- else if (pData->iPNGdepth == 2)
- {
- /* Inflate Workrow to 8-bit */
- mng_int32 iX;
- mng_uint8p pSrc = pData->pWorkrow+1;
- mng_uint8p pDest = pSrc + pData->iRowsize - (2*pData->iRowsize+7)/8;
-
- for (iX = ((2*pData->iRowsize+7)/8) ; iX > 0 ; iX--)
- *pDest++ = *pSrc++;
-
- pDest = pData->pWorkrow+1;
- pSrc = pDest + pData->iRowsize - (2*pData->iRowsize+7)/8;
- for (iX = pData->iRowsize; ;)
- {
- *pDest++ = (((*pSrc)>>6)&3);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>4)&3);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc)>>2)&3);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc) )&3);
- if (iX-- <= 0)
- break;
- pSrc++;
- }
- }
- else if (pData->iPNGdepth == 4)
- {
- /* Inflate Workrow to 8-bit */
- mng_int32 iX;
- mng_uint8p pSrc = pData->pWorkrow+1;
- mng_uint8p pDest = pSrc + pData->iRowsize - (4*pData->iRowsize+7)/8;
-
- for (iX = ((4*pData->iRowsize+7)/8) ; iX > 0 ; iX--)
- *pDest++ = *pSrc++;
-
- pDest = pData->pWorkrow+1;
- pSrc = pDest + pData->iRowsize - (4*pData->iRowsize+7)/8;
- for (iX = pData->iRowsize; ;)
- {
- *pDest++ = (((*pSrc)>>4)&0x0f);
- if (iX-- <= 0)
- break;
- *pDest++ = (((*pSrc) )&0x0f);
- if (iX-- <= 0)
- break;
- pSrc++;
- }
- }
- if (pData->iPNGdepth < 8 && pData->iColortype == 0)
- {
- /* Expand samples to 8-bit by LBR */
- mng_int32 iX;
- mng_uint8p pSrc = pData->pWorkrow+1;
- mng_uint8 multiplier[]={0,255,85,0,17,0,0,0,1};
-
- for (iX = pData->iRowsize; iX > 0; iX--)
- *pSrc++ *= multiplier[pData->iPNGdepth];
- }
-#endif
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iPNGdepth > 8)
- {
- /* Reduce Workrow to 8-bit */
- mng_int32 iX;
- mng_uint8p pSrc = pData->pWorkrow+1;
- mng_uint8p pDest = pSrc;
-
- for (iX = pData->iRowsize; iX > 0; iX--)
- {
- *pDest = *pSrc;
- pDest++;
- pSrc+=2;
- }
- }
-#endif
-
-#ifdef FILTER192 /* has leveling info ? */
- if (pData->iFilterofs == MNG_FILTER_DIFFERING)
- iRslt = init_rowdiffering (pData);
- else
-#endif
- iRslt = MNG_NOERROR;
- /* filter the row if necessary */
- if ((!iRslt) && (pData->iFilterofs < pData->iPixelofs ) &&
- (*(pData->pWorkrow + pData->iFilterofs)) )
- iRslt = mng_filter_a_row (pData);
- else
- iRslt = MNG_NOERROR;
- /* additional leveling/differing ? */
- if ((!iRslt) && (pData->fDifferrow))
- {
- iRslt = ((mng_differrow)pData->fDifferrow) (pData);
-
- pSwap = pData->pWorkrow;
- pData->pWorkrow = pData->pPrevrow;
- pData->pPrevrow = pSwap; /* make sure we're processing the right data */
- }
-
- if (!iRslt)
- {
-#ifdef MNG_INCLUDE_JNG
- if (pData->bHasJHDR) /* is JNG alpha-channel ? */
- { /* just store in object ? */
- if ((!iRslt) && (pData->fStorerow))
- iRslt = ((mng_storerow)pData->fStorerow) (pData);
- }
- else
-#endif /* MNG_INCLUDE_JNG */
- { /* process this row */
- if ((!iRslt) && (pData->fProcessrow))
- iRslt = ((mng_processrow)pData->fProcessrow) (pData);
- /* store in object ? */
- if ((!iRslt) && (pData->fStorerow))
- iRslt = ((mng_storerow)pData->fStorerow) (pData);
- /* color correction ? */
- if ((!iRslt) && (pData->fCorrectrow))
- iRslt = ((mng_correctrow)pData->fCorrectrow) (pData);
- /* slap onto canvas ? */
- if ((!iRslt) && (pData->fDisplayrow))
- {
- iRslt = ((mng_displayrow)pData->fDisplayrow) (pData);
-
- if (!iRslt) /* check progressive display refresh */
- iRslt = mng_display_progressive_check (pData);
-
- }
- }
- }
-
- if (iRslt) /* on error bail out */
- MNG_ERROR (pData, iRslt);
-
- if (!pData->fDifferrow) /* swap row-pointers */
- {
- pSwap = pData->pWorkrow;
- pData->pWorkrow = pData->pPrevrow;
- pData->pPrevrow = pSwap; /* so prev points to the processed row! */
- }
-
- iRslt = mng_next_row (pData); /* adjust variables for next row */
-
- if (iRslt) /* on error bail out */
- MNG_ERROR (pData, iRslt);
- }
- /* let zlib know where to store next output */
- pData->sZlib.next_out = pData->pWorkrow;
- pData->sZlib.avail_out = (uInt)(pData->iRowsize + pData->iPixelofs);
-#ifdef MNG_NO_1_2_4BIT_SUPPORT
- if (pData->iPNGdepth < 8)
- pData->sZlib.avail_out = (uInt)((pData->iPNGdepth*pData->iRowsize + 7)/8
- + pData->iPixelofs);
-#endif
-#ifdef MNG_NO_16BIT_SUPPORT
- if (pData->iPNGdepth > 8)
- pData->sZlib.avail_out = (uInt)(2*pData->iRowsize + pData->iPixelofs);
-#endif
- }
- } /* until some error or EOI
- or all pixels received */
- while ( (iZrslt == Z_OK) && (pData->sZlib.avail_in > 0) &&
- ( (pData->iRow < (mng_int32)pData->iDataheight) ||
- ( (pData->iPass >= 0) && (pData->iPass < 7) ) ) );
- /* on error bail out */
- if ((iZrslt != Z_OK) && (iZrslt != Z_STREAM_END))
- MNG_ERRORZ (pData, (mng_uint32)iZrslt);
- /* too much data ? */
- if ((iZrslt == Z_OK) && (pData->sZlib.avail_in > 0))
- MNG_WARNING (pData, MNG_TOOMUCHIDAT);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEROWS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-#endif /* MNG_SUPPORT_DISPLAY */
-
-/* ************************************************************************** */
-
-mng_retcode mngzlib_inflatedata (mng_datap pData,
- mng_uint32 iInlen,
- mng_uint8p pIndata)
-{
- int iZrslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEDATA, MNG_LC_START);
-#endif
- /* let zlib know where to get stuff */
- pData->sZlib.next_in = pIndata;
- pData->sZlib.avail_in = (uInt)iInlen;
- /* now inflate the data in one go! */
- iZrslt = inflate (&pData->sZlib, Z_FINISH);
- /* not enough room in output-buffer ? */
- if ((iZrslt == Z_BUF_ERROR) || (pData->sZlib.avail_in > 0))
- return MNG_BUFOVERFLOW;
- /* on error bail out */
- if ((iZrslt != Z_OK) && (iZrslt != Z_STREAM_END))
- MNG_ERRORZ (pData, (mng_uint32)iZrslt);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mngzlib_inflatefree (mng_datap pData)
-{
- int iZrslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEFREE, MNG_LC_START);
-#endif
-
- pData->bInflating = MNG_FALSE; /* stopped it */
-
- iZrslt = inflateEnd (&pData->sZlib); /* let zlib cleanup its own stuff */
-
- if (iZrslt != Z_OK) /* on error bail out */
- MNG_ERRORZ (pData, (mng_uint32)iZrslt);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEFREE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-mng_retcode mngzlib_deflateinit (mng_datap pData)
-{
- int iZrslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_DEFLATEINIT, MNG_LC_START);
-#endif
- /* initialize zlib structures and such */
- iZrslt = deflateInit2 (&pData->sZlib, pData->iZlevel, pData->iZmethod,
- pData->iZwindowbits, pData->iZmemlevel,
- pData->iZstrategy);
-
- if (iZrslt != Z_OK) /* on error bail out */
- MNG_ERRORZ (pData, (mng_uint32)iZrslt);
-
- pData->bDeflating = MNG_TRUE; /* really deflating something now */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_DEFLATEINIT, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-mng_retcode mngzlib_deflaterows (mng_datap pData,
- mng_uint32 iInlen,
- mng_uint8p pIndata)
-{
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_DEFLATEROWS, MNG_LC_START);
-#endif
-
-
-
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_DEFLATEROWS, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mngzlib_deflatedata (mng_datap pData,
- mng_uint32 iInlen,
- mng_uint8p pIndata)
-{
- int iZrslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_DEFLATEDATA, MNG_LC_START);
-#endif
-
- pData->sZlib.next_in = pIndata; /* let zlib know where to get stuff */
- pData->sZlib.avail_in = (uInt)iInlen;
- /* now deflate the data in one go! */
- iZrslt = deflate (&pData->sZlib, Z_FINISH);
- /* not enough room in output-buffer ? */
- if ((iZrslt == Z_BUF_ERROR) || (pData->sZlib.avail_in > 0))
- return MNG_BUFOVERFLOW;
- /* on error bail out */
- if ((iZrslt != Z_OK) && (iZrslt != Z_STREAM_END))
- MNG_ERRORZ (pData, (mng_uint32)iZrslt);
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_DEFLATEDATA, MNG_LC_END);
-#endif
-
- return MNG_NOERROR;
-}
-
-/* ************************************************************************** */
-
-mng_retcode mngzlib_deflatefree (mng_datap pData)
-{
- int iZrslt;
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_DEFLATEFREE, MNG_LC_START);
-#endif
-
- iZrslt = deflateEnd (&pData->sZlib); /* let zlib cleanup its own stuff */
-
- if (iZrslt != Z_OK) /* on error bail out */
- MNG_ERRORZ (pData, (mng_uint32)iZrslt);
-
- pData->bDeflating = MNG_FALSE; /* stopped it */
-
-#ifdef MNG_SUPPORT_TRACE
- MNG_TRACE (pData, MNG_FN_ZLIB_DEFLATEFREE, MNG_LC_END);
-#endif
-
- return MNG_NOERROR; /* done */
-}
-
-/* ************************************************************************** */
-
-#endif /* MNG_INCLUDE_ZLIB */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
-
diff --git a/src/3rdparty/libmng/libmng_zlib.h b/src/3rdparty/libmng/libmng_zlib.h
deleted file mode 100644
index cfc3918234..0000000000
--- a/src/3rdparty/libmng/libmng_zlib.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ************************************************************************** */
-/* * For conditions of distribution and use, * */
-/* * see copyright notice in libmng.h * */
-/* ************************************************************************** */
-/* * * */
-/* * project : libmng * */
-/* * file : libmng_zlib.h copyright (c) 2000-2002 G.Juyn * */
-/* * version : 1.0.0 * */
-/* * * */
-/* * purpose : ZLIB package interface (definition) * */
-/* * * */
-/* * author : G.Juyn * */
-/* * * */
-/* * comment : Definition of the ZLIB package interface * */
-/* * * */
-/* * changes : 0.5.1 - 05/08/2000 - G.Juyn * */
-/* * - changed strict-ANSI stuff * */
-/* * * */
-/* * 0.9.2 - 08/05/2000 - G.Juyn * */
-/* * - changed file-prefixes * */
-/* * * */
-/* ************************************************************************** */
-
-#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
-#pragma option -A /* force ANSI-C */
-#endif
-
-#ifndef _libmng_zlib_h_
-#define _libmng_zlib_h_
-
-/* ************************************************************************** */
-
-mng_retcode mngzlib_initialize (mng_datap pData);
-mng_retcode mngzlib_cleanup (mng_datap pData);
-
-mng_retcode mngzlib_inflateinit (mng_datap pData);
-mng_retcode mngzlib_inflaterows (mng_datap pData,
- mng_uint32 iInlen,
- mng_uint8p pIndata);
-mng_retcode mngzlib_inflatedata (mng_datap pData,
- mng_uint32 iInlen,
- mng_uint8p pIndata);
-mng_retcode mngzlib_inflatefree (mng_datap pData);
-
-mng_retcode mngzlib_deflateinit (mng_datap pData);
-mng_retcode mngzlib_deflaterows (mng_datap pData,
- mng_uint32 iInlen,
- mng_uint8p pIndata);
-mng_retcode mngzlib_deflatedata (mng_datap pData,
- mng_uint32 iInlen,
- mng_uint8p pIndata);
-mng_retcode mngzlib_deflatefree (mng_datap pData);
-
-/* ************************************************************************** */
-
-#endif /* _libmng_zlib_h_ */
-
-/* ************************************************************************** */
-/* * end of file * */
-/* ************************************************************************** */
diff --git a/src/3rdparty/libmng/makefiles/Makefile.am b/src/3rdparty/libmng/makefiles/Makefile.am
deleted file mode 100644
index b53523e9aa..0000000000
--- a/src/3rdparty/libmng/makefiles/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = 1.3 foreign no-dependencies
-
-# include the app subdirectories in the distribution
-EXTRA_DIST = makefiles doc contrib
-
-
-# libmng release @VERSION@
-libmng_la_LDFLAGS = -version-info 1:0:0
-
-lib_LTLIBRARIES = libmng.la
-
-include_HEADERS = libmng.h libmng_conf.h libmng_types.h
-noinst_HEADERS = libmng_chunk_io.h libmng_chunk_prc.h libmng_chunks.h \
- libmng_cms.h libmng_data.h libmng_display.h libmng_dither.h \
- libmng_error.h libmng_filter.h libmng_jpeg.h libmng_memory.h \
- libmng_object_prc.h libmng_objects.h libmng_pixels.h \
- libmng_read.h libmng_trace.h libmng_write.h libmng_zlib.h
-
-libmng_la_SOURCES = libmng_callback_xs.c libmng_chunk_io.c \
- libmng_chunk_prc.c libmng_chunk_xs.c libmng_cms.c \
- libmng_display.c libmng_dither.c libmng_error.c \
- libmng_filter.c libmng_hlapi.c libmng_jpeg.c \
- libmng_object_prc.c libmng_pixels.c libmng_prop_xs.c \
- libmng_read.c libmng_trace.c libmng_write.c libmng_zlib.c
-
-man_MANS = doc/man/libmng.3 doc/man/jng.5 doc/man/mng.5
-
diff --git a/src/3rdparty/libmng/makefiles/README b/src/3rdparty/libmng/makefiles/README
deleted file mode 100644
index 63faaafb0c..0000000000
--- a/src/3rdparty/libmng/makefiles/README
+++ /dev/null
@@ -1,27 +0,0 @@
-For conditions of distribution and use, see copyright notice in libmng.h
-or the file LICENSE in the top-level directory of the source distribution.
-
-This directory hosts the makefiles for a number of supported platforms.
-
-If you're using a system with POSIX shell capabilities, you can use the
-'configure' script in the top-level directory, or generate it by running
-'autogen.sh' if you have the necessary tools installed.
-
-Otherwise, copy the module for your environment (or the closest thing)
-into the libmng source-directory and change it to your needs. If you
-create a new file for a platform not on the list send it to me (gerard @
-libmng.com) and I'll be happy to include it in the next release!
-
-
-Current files:
-
-makefile.bcb3 - Borland C++ Builder
-makefile.vcwin32 - Microsoft Visual C++
-makefile.unix - generic Unix
-makefile.linux - Linux ELF (builds shared library)
-makefile.dj - DJGPP
-makefile.mingw - builds a static library for mingw32
-makefile.mingwdll - builds a dynamic library for mingw32
-makefile.irix - builds a static library for SGI/IRIX (6.5.21)
-
-Makefile.am, configure.in and acinclude.m4 (if present) - automake/autoconf source
diff --git a/src/3rdparty/libmng/makefiles/configure.in b/src/3rdparty/libmng/makefiles/configure.in
deleted file mode 100644
index e7cb75c006..0000000000
--- a/src/3rdparty/libmng/makefiles/configure.in
+++ /dev/null
@@ -1,193 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT
-AC_CONFIG_SRCDIR([libmng.h])
-AC_PREREQ(2.52)
-
-dnl this call will define PACKAGE and VERSION
-dnl please use this as the primary reference for the version number
-AM_INIT_AUTOMAKE(libmng, 1.0.9)
-
-dnl pass the version string on the the makefiles
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_ISC_POSIX
-AM_C_PROTOTYPES
-if test "x$U" != "x"; then
- AC_MSG_ERROR(Compiler not ANSI compliant)
-fi
-AM_PROG_LIBTOOL
-AC_PROG_INSTALL
-
-dnl support for files >2GB
-AC_SYS_LARGEFILE
-
-dnl Check for required header files
-AC_HEADER_STDC
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-dnl need pow and fabs
-AC_CHECK_FUNC(pow, , AC_CHECK_LIB(m, pow, LIBS="$LIBS -lm"))
-
-
-dnl what functionality we want to add (read, write, display).
-dnl all on by default. see libmng_conf.h for full descriptions
-
-dnl not building a standard shared object?
-AC_ARG_ENABLE(buildso,
-[ --disable-buildso disable building standard shared object])
-if test "x$enable_buildso" != "xno"; then
- AC_DEFINE(MNG_BUILD_SO)
-fi
-
-dnl we only support the full mng spec for now (no LC or VLC)
-AC_DEFINE(MNG_SUPPORT_FULL)
-
-dnl remove support in library to read images?
-AC_ARG_ENABLE(read,
-[ --disable-read remove read support from library])
-if test "x$enable_read" != "xno"; then
- AC_DEFINE(MNG_SUPPORT_READ)
-fi
-
-dnl remove support in library to write images?
-AC_ARG_ENABLE(write,
-[ --disable-write remove write support from library])
-if test "x$enable_write" != "xno"; then
- AC_DEFINE(MNG_SUPPORT_WRITE)
-fi
-
-dnl remove support in library to display images?
-AC_ARG_ENABLE(display,
-[ --disable-display remove display support from library])
-if test "x$enable_display" != "xno"; then
- AC_DEFINE(MNG_SUPPORT_DISPLAY)
-fi
-
-dnl remove support for 'dynamic' MNG?
-AC_ARG_ENABLE(dynamic,
-[ --disable-dynamic remove dynamic MNG support from library])
-if test "x$enable_dynamic" != "xno"; then
- AC_DEFINE(MNG_SUPPORT_DYNAMICMNG)
-fi
-
-dnl remove support in library to access chunks?
-AC_ARG_ENABLE(chunks,
-[ --disable-chunks remove support for chunk access])
-if test "x$enable_chunks" != "xno"; then
- AC_DEFINE(MNG_ACCESS_CHUNKS)
-fi
-
-dnl disable support for accessing chunks that have been previously read?
-AC_ARG_ENABLE(storechunks,
-[ --disable-storechunks remove support for access of previous chunks])
-if test "x$enable_storechunks" != "xno"; then
- AC_DEFINE(MNG_STORE_CHUNKS)
-fi
-
-dnl enable support for debug tracing callbacks and messages?
-AC_ARG_ENABLE(trace,
-[ --enable-trace include support for debug tracing callbacks],[
-if test "x$enable_trace" = "xyes"; then
- AC_DEFINE(MNG_SUPPORT_TRACE)
- AC_DEFINE(MNG_TRACE_TELLTALE)
-fi
-])
-
-dnl verbose error text
-dnl this should always be on
-AC_DEFINE(MNG_ERROR_TELLTALE)
-
-
-dnl libz is required.
-AC_ARG_WITH(zlib,
-[ --with-zlib[=DIR] use zlib include/library files in DIR],[
- if test -d "$withval"; then
- CPPFLAGS="$CPPFLAGS -I$withval/include"
- LDFLAGS="$LDFLAGS -L$withval/lib"
- fi
-])
-AC_CHECK_HEADER(zlib.h,
- AC_CHECK_LIB(z, gzread, , AC_MSG_ERROR(zlib library not found)),
- AC_MSG_ERROR(zlib header not found)
-)
-
-dnl check for jpeg library
-AC_ARG_WITH(jpeg,
-[ --with-jpeg[=DIR] use jpeg include/library files in DIR],
-[with_jpeg=$withval],[with_jpeg=_auto])
-
- if test "x$with_jpeg" != "xno" -a "x$with_jpeg" != "xyes" -a \
- "x$with_jpeg" != "x_auto"; then
- # Save in case test with directory specified fails
- _cppflags=${CPPFLAGS}
- _ldflags=${LDFLAGS}
- _restore=1
-
- CPPFLAGS="${CPPFLAGS} -I$withval/include"
- LDFLAGS="${LDFLAGS} -L$withval/lib"
- else
- _restore=0
- fi
-
- if test "x$with_jpeg" != "xno"; then
- AC_CHECK_HEADER(jpeglib.h,
- AC_CHECK_LIB(jpeg, jpeg_read_header, [
- LIBS="$LIBS -ljpeg"
- AC_DEFINE(HAVE_LIBJPEG)
- _restore=0
- ],
- AC_MSG_WARN(jpeg library not found)),
- AC_MSG_WARN(jpeg header not found)
- )
- fi
-
- test $_restore -eq 1 && CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
-
-dnl check for lcms library
-AC_ARG_WITH(lcms,
-[ --with-lcms[=DIR] use lcms include/library files in DIR],
-[with_lcms=$withval],[with_lcms=_auto])
-
- if test "x$with_lcms" != "xno" -a "x$with_lcms" != "xyes" -a \
- "x$with_lcms" != "x_auto"; then
- # Save in case test with directory specified fails
- _cppflags=$CPPFLAGS
- _ldflags=$LDFLAGS
- _restore=1
-
- CPPFLAGS="$CPPFLAGS -I$withval/include"
- LDFLAGS="$LDFLAGS -L$withval/lib"
- else
- _restore=0
- fi
-
- if test "x$with_lcms" != "xno"; then
- AC_CHECK_HEADER(lcms.h, [
- have_lcms=yes
- AC_CHECK_LIB(lcms, cmsCreateRGBProfile, [
- LIBS="$LIBS -llcms"
- AC_DEFINE(HAVE_LIBLCMS)
- dnl for now this implies MNG_INCLUDE_LCMS in the headers:
- AC_DEFINE(MNG_FULL_CMS)
- _restore=0
- have_lcms=yes
- ],[
- have_lcms=no
- ])
- ])
- dnl give feedback only if the user asked specifically for lcms
- if test "x$with_lcms" != "x_auto" -a "x$have_lcms" != "xyes"; then
- AC_MSG_WARN([lcms not found... disabling CMS support])
- fi
- fi
-
- test $_restore -eq 1 && CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/src/3rdparty/libmng/makefiles/makefile.bcb3 b/src/3rdparty/libmng/makefiles/makefile.bcb3
deleted file mode 100644
index 3ddcb2d139..0000000000
--- a/src/3rdparty/libmng/makefiles/makefile.bcb3
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# For conditions of distribution and use, see copyright notice in libmng.h
-#
-# makefile for libmng - THE MNG library
-# this makefile is suitable for Borland C++ Builder.
-# it works (at least) with Borland C++ Builder v3
-
-# Configuration options are now in mng_conf.h
-# this option forces dll compatibility
-MNGOPT = -DMNG_BUILD_DLL
-
-# The name of your C compiler:
-CC= bcc32
-
-# compiler options:
-CFLAGS= -WD -O2 -Hc -w-par -k -y -v -vi -c -tWD \
- -wuse -wucp -wstv -wstu -wsig -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp \
- -wamb -Tkh30000 -ff -5 -I.;..\zlib;..\jpgsrc6b;..\lcms\include $(MNGOPT)
-
-# source files
-SOURCES= libmng_hlapi.c libmng_callback_xs.c libmng_prop_xs.c libmng_chunk_xs.c \
- libmng_chunk_descr.c libmng_read.c libmng_write.c libmng_display.c \
- libmng_object_prc.c libmng_chunk_prc.c libmng_chunk_io.c libmng_error.c \
- libmng_trace.c libmng_pixels.c libmng_filter.c libmng_dither.c \
- libmng_zlib.c libmng_jpeg.c libmng_cms.c
-
-# object files
-OBJECTS= libmng_hlapi.obj libmng_callback_xs.obj libmng_prop_xs.obj libmng_chunk_xs.obj \
- libmng_chunk_descr.obj libmng_read.obj libmng_write.obj libmng_display.obj \
- libmng_object_prc.obj libmng_chunk_prc.obj libmng_chunk_io.obj libmng_error.obj \
- libmng_trace.obj libmng_pixels.obj libmng_filter.obj libmng_dither.obj \
- libmng_zlib.obj libmng_jpeg.obj libmng_cms.obj
-
-# type dependancies
-.c.obj:
- $(CC) $(CFLAGS) -c{ $<}
-
-# make options
-all: libmng.lib
-
-clean:
- - del *.obj
- - del libmng.lib
-
-# file dependancies
-libmng.lib: $(OBJECTS)
- - del libmng.lib
- tlib libmng.lib /E /C @&&|
-+libmng_hlapi.obj +libmng_callback_xs.obj +libmng_prop_xs.obj +libmng_chunk_xs.obj &
-+libmng_read.obj +libmng_write.obj +libmng_display.obj &
-+libmng_object_prc.obj +libmng_chunk_prc.obj +libmng_chunk_io.obj +libmng_error.obj &
-+libmng_trace.obj +libmng_pixels.obj +libmng_filter.obj +libmng_dither.obj &
-+libmng_zlib.obj +libmng_jpeg.obj +libmng_cms.obj
-|
-
-libmng_hlapi.obj: libmng_hlapi.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_memory.h libmng_error.h libmng_trace.h libmng_read.h \
- libmng_write.h libmng_display.h libmng_zlib.h libmng_cms.h libmng_zlib.h
-libmng_callback_xs.obj: libmng_callback_xs.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_prop_xs.obj: libmng_prop_xs.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_cms.h
-libmng_chunk_xs.obj: libmng_chunk_xs.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_error.h libmng_trace.h
-libmng_read.obj: libmng_read.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_prc.h libmng_chunk_io.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_read.h libmng_display.h
-libmng_write.obj: libmng_write.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_write.h
-libmng_display.obj: libmng_display.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_zlib.h libmng_cms.h \
- libmng_pixels.h libmng_display.h
-libmng_object_prc.obj: libmng_object_prc.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_display.h libmng_pixels.h
-libmng_chunk_descr.obj: libmng_chunk_descr.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h
-libmng_chunk_prc.obj: libmng_chunk_prc.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h
-libmng_chunk_io.obj: libmng_chunk_io.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h libmng_chunks.h \
- libmng_chunk_io.h libmng_chunk_prc libmng_memory.h libmng_error.h \
- libmng_trace.h libmng_display.h libmng_zlib.h libmng_pixels.h
-libmng_error.obj: libmng_error.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_trace.obj: libmng_trace.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_pixels.obj: libmng_pixels.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_memory.h libmng_error.h libmng_trace.h \
- libmng_cms.h libmng_filter.h libmng_pixels.h
-libmng_filter.obj: libmng_filter.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_filter.h
-libmng_dither.obj: libmng_dither.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_dither.h
-libmng_zlib.obj: libmng_zlib.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h \
- libmng_filter.h libmng_zlib.h
-libmng_jpeg.obj: libmng_jpeg.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h \
- libmng_pixels.h libmng_jpeg.h
-libmng_cms.obj: libmng_cms.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_error.h libmng_trace.h libmng_cms.h
-
diff --git a/src/3rdparty/libmng/makefiles/makefile.dj b/src/3rdparty/libmng/makefiles/makefile.dj
deleted file mode 100644
index 2cef088817..0000000000
--- a/src/3rdparty/libmng/makefiles/makefile.dj
+++ /dev/null
@@ -1,155 +0,0 @@
-#
-# For conditions of distribution and use, see copyright notice in libmng.h
-#
-# makefile for libmng - THE MNG library
-# This makefile have been tested on DJGPP v2
-# (Based on makefile.linux since both are GNU compilers)
-#
-# By Silvio Fonseca - gissi@sti.com.br
-
-#compiler
-CC=gcc
-
-#default build options
-OPTIONS=
-
-#DJGPP directory
-prefix=C:/DJGPP
-installprefix=C:\DJGPP
-
-#ZLIB Library and includes
-ZLIBLIB=$(prefix)/lib
-#ZLIBLIB=../zlib
-ZLIBINC=$(prefix)/include
-#ZLIBINC=../zlib
-
-#Jpeg library and includes
-JPEGLIB=$(prefix)/lib
-#JPEGLIB=../jpgsrc
-JPEGINC=$(prefix)/include
-#JPEGINC=../jpgsrc
-
-#Lcms library and includes
-LCMSLIB=$(prefix)/lib
-#LCMSLIB=../lcms
-LCMSINC=$(prefix)/include
-#LCMSINC=../lcms
-
-ALIGN=
-# for i386:
-#ALIGN=-malign-loops=2 -malign-functions=2
-
-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
- -Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
-
-CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -funroll-loops \
- $(OPTIONS) $(ALIGN) # $(WARNMORE) -g
-LDFLAGS=-L. -Wl,-rpath,. \
- -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
- -L$(JPEGLIB) -Wl,-rpath,$(JPEGLIB) \
- -L$(LCMSLIB) -Wl,-rpath,$(LCMSLIB) \
- -lmng -lz -ljpeg -llcms -lm
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-OBJS = \
- libmng_callback_xs.o \
- libmng_chunk_io.o \
- libmng_chunk_descr.o \
- libmng_chunk_prc.o \
- libmng_chunk_xs.o \
- libmng_cms.o \
- libmng_display.o \
- libmng_dither.o \
- libmng_error.o \
- libmng_filter.o \
- libmng_hlapi.o \
- libmng_jpeg.o \
- libmng_object_prc.o \
- libmng_pixels.o \
- libmng_prop_xs.o \
- libmng_read.o \
- libmng_trace.o \
- libmng_write.o \
- libmng_zlib.o
-
-OBJSDLL = $(OBJS:.0=.pic.o)
-
-.SUFFIXES: .c .o .pic.o
-
-.c.pic.o:
- $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
-
-all: libmng.a
-
-libmng.a: $(OBJS)
- ar rc $@ $(OBJS)
- ranlib $@
-
-install: libmng.a
- -@md $(installprefix)\include $(installprefix)\lib
- copy libmng.h $(installprefix)\include
- copy libmng_conf.h $(installprefix)\include
- copy libmng_types.h $(installprefix)\include
- copy libmng.a $(installprefix)\lib
-
-clean:
- del *.o
- del libmng.a
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-libmng_hlapi.o libmng_hlapi.pic.o: libmng_hlapi.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_memory.h libmng_error.h libmng_trace.h libmng_read.h \
- libmng_write.h libmng_display.h libmng_zlib.h libmng_cms.h libmng_zlib.h
-libmng_callback_xs.o libmng_callback_xs.pic.o: libmng_callback_xs.c libmng.h \
- libmng_conf.h libmng_types.h libmng_data.h libmng_error.h libmng_trace.h
-libmng_prop_xs.o libmng_prop_xs.pic.o: libmng_prop_xs.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_error.h libmng_trace.h libmng_cms.h
-libmng_chunk_xs.o libmng_chunk_xs.pic.o: libmng_chunk_xs.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_prc.h \
- libmng_error.h libmng_trace.h
-libmng_read.o libmng_read.pic.o: libmng_read.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_prc.h libmng_chunk_io.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_read.h libmng_display.h
-libmng_write.o libmng_write.pic.o: libmng_write.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_write.h
-libmng_display.o libmng_display.pic.o: libmng_display.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_zlib.h libmng_cms.h libmng_pixels.h \
- libmng_display.h
-libmng_object_prc.o libmng_object_prc.pic.o: libmng_object_prc.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_display.h libmng_pixels.h
-libmng_chunk_descr.o libmng_chunk_descr.pic.o: libmng_chunk_descr.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_descr.h \
- libmng_chunk_prc.h libmng_memory.h libmng_error.h libmng_trace.h
-libmng_chunk_prc.o libmng_chunk_prc.pic.o: libmng_chunk_prc.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h
-libmng_chunk_io.o libmng_chunk_io.pic.o: libmng_chunk_io.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_io.h libmng_chunk_prc.h libmng_memory.h libmng_error.h \
- libmng_trace.h libmng_display.h libmng_zlib.h libmng_pixels.h
-libmng_error.o libmng_error.pic.o: libmng_error.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_trace.o libmng_trace.pic.o: libmng_trace.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_pixels.o libmng_pixels.pic.o: libmng_pixels.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_memory.h libmng_error.h libmng_trace.h \
- libmng_cms.h libmng_filter.h libmng_pixels.h
-libmng_filter.o libmng_filter.pic.o: libmng_filter.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_filter.h
-libmng_dither.o libmng_dither.pic.o: libmng_dither.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_dither.h
-libmng_zlib.o libmng_zlib.pic.o: libmng_zlib.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h \
- libmng_filter.h libmng_zlib.h
-libmng_jpeg.o libmng_jpeg.pic.o: libmng_jpeg.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h libmng_jpeg.h
-libmng_cms.o libmng_cms.pic.o: libmng_cms.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_error.h libmng_trace.h libmng_cms.h
-
diff --git a/src/3rdparty/libmng/makefiles/makefile.linux b/src/3rdparty/libmng/makefiles/makefile.linux
deleted file mode 100644
index e06a8294c6..0000000000
--- a/src/3rdparty/libmng/makefiles/makefile.linux
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# For conditions of distribution and use, see copyright notice in libmng.h
-#
-# makefile for libmng - THE MNG library
-# this makefile is suitable for Linux ELF with gcc
-#
-# (this file is heavily copied from makefile.linux in the libpng package)
-
-# compiler
-CC=gcc
-
-# default build options (this forces shared library compatibility!!)
-#OPTIONS = -DMNG_BUILD_SO
-OPTIONS = -DMNG_BUILD_SO -DMNG_FULL_CMS
-
-# where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h
-prefix=/usr/local
-
-# Where the zlib library and include files are located
-#ZLIBLIB=../zlib
-#ZLIBINC=../zlib
-ZLIBLIB=/usr/local/lib
-ZLIBINC=/usr/local/include
-
-# Where the jpeg library and include files are located
-#JPEGLIB=../jpgsrc
-#JPEGINC=../jpgsrc
-JPEGLIB=/usr/local/lib
-JPEGINC=/usr/local/include
-
-# Where the lcms library and include files are located
-#LCMSLIB=../lcms/lib
-#LCMSINC=../lcms/source
-LCMSLIB=/usr/local/lib
-LCMSINC=/usr/local/include
-
-ALIGN=
-# for i386:
-#ALIGN=-malign-loops=2 -malign-functions=2
-
-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
- -Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
-
-# for pgcc version 2.95.1, -O3 is buggy; don't use it.
-
-CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -funroll-loops \
- $(OPTIONS) $(ALIGN) # $(WARNMORE) -g
-LDFLAGS=-L. -Wl,-rpath,. \
- -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
- -L$(JPEGLIB) -Wl,-rpath,$(JPEGLIB) \
- -L$(LCMSLIB) -Wl,-rpath,$(LCMSLIB) \
- -lmng -lz -ljpeg -llcms -lm
-
-RANLIB=ranlib
-#RANLIB=echo
-
-# current version numbers
-MNGMAJ = 1
-MNGMIN = 1.0.9
-MNGVER = $(MNGMAJ).$(MNGMIN)
-
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-OBJS = \
- libmng_callback_xs.o \
- libmng_chunk_io.o \
- libmng_chunk_descr.o \
- libmng_chunk_prc.o \
- libmng_chunk_xs.o \
- libmng_cms.o \
- libmng_display.o \
- libmng_dither.o \
- libmng_error.o \
- libmng_filter.o \
- libmng_hlapi.o \
- libmng_jpeg.o \
- libmng_object_prc.o \
- libmng_pixels.o \
- libmng_prop_xs.o \
- libmng_read.o \
- libmng_trace.o \
- libmng_write.o \
- libmng_zlib.o
-
-OBJSDLL = $(OBJS:.0=.pic.o)
-
-.SUFFIXES: .c .o .pic.o
-
-.c.pic.o:
- $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
-
-all: libmng.a libmng.so
-
-libmng.a: $(OBJS)
- ar rc $@ $(OBJS)
- $(RANLIB) $@
-
-libmng.so: libmng.so.$(MNGMAJ)
- ln -sf libmng.so.$(MNGMAJ) libmng.so
-
-libmng.so.$(MNGMAJ): libmng.so.$(MNGVER)
- ln -sf libmng.so.$(MNGVER) libmng.so.$(MNGMAJ)
-
-libmng.so.$(MNGVER): $(OBJSDLL)
-# $(CC) -shared -Wl,-soname,libmng.so.$(MNGMAJ) -o libmng.so.$(MNGVER) \
-# $(OBJSDLL) -L$(ZLIBLIB) -L$(JPEGLIB) -L$(LCMSLIB) -lz -lm -lc
- $(CC) -shared -Wl,-soname,libmng.so.$(MNGMAJ) -o libmng.so.$(MNGVER) \
- $(OBJSDLL) -L$(ZLIBLIB) -L$(JPEGLIB) -ljpeg -L$(LCMSLIB) -llcms \
- -lz -lm -lc
-
-install: libmng.a libmng.so.$(MNGVER)
- -@mkdir $(INCPATH) $(LIBPATH)
- cp libmng.h libmng_conf.h libmng_types.h $(INCPATH)
- chmod 644 $(INCPATH)/libmng.h $(INCPATH)/libmng_conf.h $(INCPATH)/libmng_types.h
- cp libmng.a libmng.so.$(MNGVER) $(LIBPATH)
- chmod 755 $(LIBPATH)/libmng.so.$(MNGVER)
- -@/bin/rm -f $(LIBPATH)/libmng.so.$(MNGMAJ) $(LIBPATH)/libmng.so
- (cd $(LIBPATH); ln -sf libmng.so.$(MNGVER) libmng.so.$(MNGMAJ); \
- ln -sf libmng.so.$(MNGMAJ) libmng.so)
-
-clean:
- /bin/rm -f *.o libmng.a libmng.so*
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-libmng_hlapi.o libmng_hlapi.pic.o: libmng_hlapi.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_memory.h libmng_error.h libmng_trace.h libmng_read.h \
- libmng_write.h libmng_display.h libmng_zlib.h libmng_cms.h libmng_zlib.h
-libmng_callback_xs.o libmng_callback_xs.pic.o: libmng_callback_xs.c libmng.h \
- libmng_conf.h libmng_types.h libmng_data.h libmng_error.h libmng_trace.h
-libmng_prop_xs.o libmng_prop_xs.pic.o: libmng_prop_xs.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_error.h libmng_trace.h libmng_cms.h
-libmng_chunk_xs.o libmng_chunk_xs.pic.o: libmng_chunk_xs.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_prc.h \
- libmng_error.h libmng_trace.h
-libmng_read.o libmng_read.pic.o: libmng_read.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_prc.h libmng_chunk_io.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_read.h libmng_display.h
-libmng_write.o libmng_write.pic.o: libmng_write.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_write.h
-libmng_display.o libmng_display.pic.o: libmng_display.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_zlib.h libmng_cms.h libmng_pixels.h \
- libmng_display.h
-libmng_object_prc.o libmng_object_prc.pic.o: libmng_object_prc.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_display.h libmng_pixels.h
-libmng_chunk_descr.o libmng_chunk_descr.pic.o: libmng_chunk_descr.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_descr.h libmng_memory.h \
- libmng_chunk_prc.h libmng_error.h libmng_trace.h
-libmng_chunk_prc.o libmng_chunk_prc.pic.o: libmng_chunk_prc.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h
-libmng_chunk_io.o libmng_chunk_io.pic.o: libmng_chunk_io.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_io.h libmng_chunk_prc.h libmng_memory.h libmng_error.h \
- libmng_trace.h libmng_display.h libmng_zlib.h libmng_pixels.h
-libmng_error.o libmng_error.pic.o: libmng_error.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_trace.o libmng_trace.pic.o: libmng_trace.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_pixels.o libmng_pixels.pic.o: libmng_pixels.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_memory.h libmng_error.h libmng_trace.h \
- libmng_cms.h libmng_filter.h libmng_pixels.h
-libmng_filter.o libmng_filter.pic.o: libmng_filter.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_filter.h
-libmng_dither.o libmng_dither.pic.o: libmng_dither.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_dither.h
-libmng_zlib.o libmng_zlib.pic.o: libmng_zlib.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h \
- libmng_filter.h libmng_zlib.h
-libmng_jpeg.o libmng_jpeg.pic.o: libmng_jpeg.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h libmng_jpeg.h
-libmng_cms.o libmng_cms.pic.o: libmng_cms.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_error.h libmng_trace.h libmng_cms.h
-
diff --git a/src/3rdparty/libmng/makefiles/makefile.mingw b/src/3rdparty/libmng/makefiles/makefile.mingw
deleted file mode 100644
index 703ae30590..0000000000
--- a/src/3rdparty/libmng/makefiles/makefile.mingw
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-# For conditions of distribution and use, see copyright notice in libmng.h
-#
-# makefile for libmng - THE MNG library
-# this makefile is for MinGW32, it have been tested with gcc 2.95.3,
-# binutils 2.11.90 and mingw-runtime 1.0
-#
-# By Benoit Blanchon - benoit.blanchon@laposte.net
-#
-# Note : this makefile builds a static library; although it's seems to be
-# possible to build working DLL and import lib, I didn't manage do to it.
-# If you do, please let me know.
-
-# outputs
-LIBMNG_A = libmng.a
-INSTALL_PREFIX = C:/MinGW/
-# maybe you sould replace with anti-slashes
-
-# default build options
-OPTIONS = -DMNG_NO_CMS -DMNG_ACCESS_CHUNKS -DMNG_STORE_CHUNKS
-
-# Where the zlib library and include files are located
-ZLIBLIB=-lz
-#ZLIBLIB=-L../zlib -lz
-#ZLIBINC=-I../zlib
-
-# Where the jpeg library and include files are located
-JPEGLIB=-ljpeg
-#JPEGLIB=-L../jpgsrc -ljpeg
-#JPEGINC=-I../jpgsrc
-
-# Where the lcms library and include files are located
-#LCMSLIB=-llcms
-#LCMSLIB=-L../lcms/lib -llcms
-#LCMSINC=-I../lcms/source
-
-# file deletion command
-RM=rm -f
-#RM=del
-
-# directory creation command
-MKDIR=mkdir -p
-
-# file copy command
-COPY=cp
-#COPY=copy
-
-# compiler
-CC=gcc
-
-ALIGN=
-# for i386:
-#ALIGN=-malign-loops=2 -malign-functions=2
-
-CFLAGS=$(ZLIBINC) $(JPEGINC) $(LCMSINC) -Wall -O3 -funroll-loops $(OPTIONS) $(ALIGN)
-LDFLAGS=-L. -lmng $(ZLIBLIB) $(JPEGLIB) $(LCMSLIB) -lm
-
-# library (.a) file creation command
-AR= ar rc
-# second step in .a creation (use "touch" if not needed)
-AR2= ranlib
-
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-OBJS = \
- libmng_callback_xs.o \
- libmng_chunk_io.o \
- libmng_chunk_descr.o \
- libmng_chunk_prc.o \
- libmng_chunk_xs.o \
- libmng_cms.o \
- libmng_display.o \
- libmng_dither.o \
- libmng_error.o \
- libmng_filter.o \
- libmng_hlapi.o \
- libmng_jpeg.o \
- libmng_object_prc.o \
- libmng_pixels.o \
- libmng_prop_xs.o \
- libmng_read.o \
- libmng_trace.o \
- libmng_write.o \
- libmng_zlib.o
-
-.SUFFIXES: .c .o
-
-.c.o:
- $(CC) -c $(CFLAGS) -o $@ $*.c
-
-all: $(LIBMNG_A)
-
-$(LIBMNG_A) : $(OBJS)
- $(RM) $@
- $(AR) $@ $(OBJS)
- $(AR2) $@
-
-install : $(LIBMNG_A)
- $(MKDIR) $(INSTALL_PREFIX)include
- $(COPY) libmng.h $(INSTALL_PREFIX)include
- $(COPY) libmng_conf.h $(INSTALL_PREFIX)include
- $(COPY) libmng_types.h $(INSTALL_PREFIX)include
- $(MKDIR) $(INSTALL_PREFIX)lib
- $(COPY) $(LIBMNG_A) $(INSTALL_PREFIX)lib
-
-clean:
- $(RM) *.o
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-libmng_hlapi.o : libmng_hlapi.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_memory.h libmng_error.h libmng_trace.h libmng_read.h \
- libmng_write.h libmng_display.h libmng_zlib.h libmng_cms.h libmng_zlib.h
-libmng_callback_xs.o : libmng_callback_xs.c libmng.h \
- libmng_conf.h libmng_types.h libmng_data.h libmng_error.h libmng_trace.h
-libmng_prop_xs.o : libmng_prop_xs.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_error.h libmng_trace.h libmng_cms.h
-libmng_chunk_xs.o : libmng_chunk_xs.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_prc.h \
- libmng_error.h libmng_trace.h
-libmng_read.o : libmng_read.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_prc.h libmng_chunk_io.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_read.h libmng_display.h
-libmng_write.o : libmng_write.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_write.h
-libmng_display.o : libmng_display.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_zlib.h libmng_cms.h libmng_pixels.h \
- libmng_display.h
-libmng_object_prc.o : libmng_object_prc.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_display.h libmng_pixels.h
-libmng_chunk_descr.o : libmng_chunk_descr.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_descr.h \
- libmng_chunk_prc.h libmng_memory.h libmng_error.h libmng_trace.h
-libmng_chunk_prc.o : libmng_chunk_prc.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h
-libmng_chunk_io.o : libmng_chunk_io.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_io.h libmng_chunk_prc.h libmng_memory.h libmng_error.h \
- libmng_trace.h libmng_display.h libmng_zlib.h libmng_pixels.h
-libmng_error.o : libmng_error.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_trace.o : libmng_trace.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_pixels.o : libmng_pixels.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_memory.h libmng_error.h libmng_trace.h \
- libmng_cms.h libmng_filter.h libmng_pixels.h
-libmng_filter.o : libmng_filter.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_filter.h
-libmng_dither.o : libmng_dither.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_dither.h
-libmng_zlib.o : libmng_zlib.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h \
- libmng_filter.h libmng_zlib.h
-libmng_jpeg.o : libmng_jpeg.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h libmng_jpeg.h
-libmng_cms.o : libmng_cms.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_error.h libmng_trace.h libmng_cms.h
-
diff --git a/src/3rdparty/libmng/makefiles/makefile.mingwdll b/src/3rdparty/libmng/makefiles/makefile.mingwdll
deleted file mode 100644
index 2837218281..0000000000
--- a/src/3rdparty/libmng/makefiles/makefile.mingwdll
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# For conditions of distribution and use, see copyright notice in libmng.h
-#
-# makefile for libmng - THE MNG library
-# this makefile is for MinGW32, it has been tested with gcc 3.1,
-# binutils 2.12.90 and mingw-runtime 2.0
-#
-# By Benoit Blanchon - benoit.blanchon@laposte.net
-# DLL mods by F. Richter <frichter@gmx.li>
-#
-
-# outputs
-LIBMNG_A = libmng.a
-LIBMNG_DLL = libmng.1.dll
-INSTALL_PREFIX = C:/MinGW/
-# maybe you sould replace with anti-slashes
-
-# default build options
-OPTIONS = -DMNG_BUILD_DLL -DMNG_ACCESS_CHUNKS -DMNG_STORE_CHUNKS
-
-# Where the zlib library and include files are located
-ZLIBLIB=-lz
-#ZLIBLIB=-L../zlib -lz
-#ZLIBINC=-I../zlib
-
-# Where the jpeg library and include files are located
-JPEGLIB=-ljpeg
-#JPEGLIB=-L../jpgsrc -ljpeg
-#JPEGINC=-I../jpgsrc
-
-# Where the lcms library and include files are located
-#LCMSLIB=-llcms
-LCMSLIB=-L../lcms/lib -llcms
-LCMSINC=-I../lcms/source
-
-# file deletion command
-RM=rm -f
-#RM=del
-
-# directory creation command
-MKDIR=mkdir -p
-
-# file copy command
-COPY=cp
-#COPY=copy
-
-# compiler
-CC=gcc
-
-ALIGN=
-# for i386:
-#ALIGN=-malign-loops=2 -malign-functions=2
-
-CFLAGS=$(ZLIBINC) $(JPEGINC) $(LCMSINC) -Wall -O3 -funroll-loops $(OPTIONS) $(ALIGN) -s
-LDFLAGS=-L. -lmng $(ZLIBLIB) $(JPEGLIB) $(LCMSLIB) -lm -s
-
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-OBJS = \
- libmng_callback_xs.o \
- libmng_chunk_io.o \
- libmng_chunk_descr.o \
- libmng_chunk_prc.o \
- libmng_chunk_xs.o \
- libmng_cms.o \
- libmng_display.o \
- libmng_dither.o \
- libmng_error.o \
- libmng_filter.o \
- libmng_hlapi.o \
- libmng_jpeg.o \
- libmng_object_prc.o \
- libmng_pixels.o \
- libmng_prop_xs.o \
- libmng_read.o \
- libmng_trace.o \
- libmng_write.o \
- libmng_zlib.o
-
-.SUFFIXES: .c .o
-
-.c.o:
- $(CC) -c $(CFLAGS) -o $@ $*.c
-
-all: $(LIBMNG_A)
-
-$(LIBMNG_A): $(LIBMNG_DLL)
-
-$(LIBMNG_DLL) : $(OBJS)
- dllwrap --implib=$(LIBMNG_A) --dllname=$(LIBMNG_DLL) $(OBJS) $(LDFLAGS)
-
-install : $(LIBMNG_A)
- $(MKDIR) $(INSTALL_PREFIX)include
- $(COPY) libmng.h $(INSTALL_PREFIX)include
- $(COPY) libmng_conf.h $(INSTALL_PREFIX)include
- $(COPY) libmng_types.h $(INSTALL_PREFIX)include
- $(MKDIR) $(INSTALL_PREFIX)lib
- $(COPY) $(LIBMNG_A) $(INSTALL_PREFIX)lib
-
-clean:
- $(RM) *.o
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-libmng_hlapi.o : libmng_hlapi.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_memory.h libmng_error.h libmng_trace.h libmng_read.h \
- libmng_write.h libmng_display.h libmng_zlib.h libmng_cms.h libmng_zlib.h
-libmng_callback_xs.o : libmng_callback_xs.c libmng.h \
- libmng_conf.h libmng_types.h libmng_data.h libmng_error.h libmng_trace.h
-libmng_prop_xs.o : libmng_prop_xs.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_error.h libmng_trace.h libmng_cms.h
-libmng_chunk_xs.o : libmng_chunk_xs.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_prc.h \
- libmng_error.h libmng_trace.h
-libmng_read.o : libmng_read.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_prc.h libmng_chunk_io.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_read.h libmng_display.h
-libmng_write.o : libmng_write.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_write.h
-libmng_display.o : libmng_display.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_zlib.h libmng_cms.h libmng_pixels.h \
- libmng_display.h
-libmng_object_prc.o : libmng_object_prc.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_display.h libmng_pixels.h
-libmng_chunk_descr.o : libmng_chunk_descr.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_descr.h \
- libmng_chunk_prc.h libmng_memory.h libmng_error.h libmng_trace.h
-libmng_chunk_prc.o : libmng_chunk_prc.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h
-libmng_chunk_io.o : libmng_chunk_io.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_io.h libmng_chunk_prc.h libmng_memory.h libmng_error.h \
- libmng_trace.h libmng_display.h libmng_zlib.h libmng_pixels.h
-libmng_error.o : libmng_error.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_trace.o : libmng_trace.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_pixels.o : libmng_pixels.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_memory.h libmng_error.h libmng_trace.h \
- libmng_cms.h libmng_filter.h libmng_pixels.h
-libmng_filter.o : libmng_filter.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_filter.h
-libmng_dither.o : libmng_dither.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_dither.h
-libmng_zlib.o : libmng_zlib.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h \
- libmng_filter.h libmng_zlib.h
-libmng_jpeg.o : libmng_jpeg.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h libmng_jpeg.h
-libmng_cms.o : libmng_cms.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_error.h libmng_trace.h libmng_cms.h
-
diff --git a/src/3rdparty/libmng/makefiles/makefile.qnx b/src/3rdparty/libmng/makefiles/makefile.qnx
deleted file mode 100644
index 28f18d7634..0000000000
--- a/src/3rdparty/libmng/makefiles/makefile.qnx
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-# For conditions of distribution and use, see copyright notice in libmng.h
-#
-# makefile for libmng - THE MNG library
-# this makefile is suitable for QNX Neutrino
-
-# Configuration options are now in libmng_conf.h
-
-# The architecture of your target
-# one of arm, mips, ppc, sh, x86
-ARCH = mips
-
-# The name of the library
-LIBNAME = libmng
-ARNAME = $(LIBNAME).a
-SONAME = $(LIBNAME).so
-
-# current version numbers
-MNGMAJ = 1
-MNGMIN = 0.9
-MNGVER = $(MNGMAJ).$(MNGMIN)
-
-# The artefact output folder
-OBJDIR = bin
-
-# Location of jpeg header files
-JPEG_INC = $(QNX_TARGET)/usr/include/jpeg
-
-# Location of zlib header files
-ZLIB_INC = $(QNX_TARGET)/usr/include
-
-# Location of lcms header files
-# (switch on MNG_FULL_CMS in libmng_conf.h if you want to use this)
-LCMS_INC = $(QNX_TARGET)/usr/include/lcms
-
-# default build defines
-DEF =
-DEF_SO = -DMNG_BUILD_SO
-
-# compiler options:
-CFLAGS = -O2 -funroll-loops
-
-# include paths
-INC = -I$(ZLIB_INC) -I$(JPEG_INC)
-
-# The name of your C compiler:
-CC = nto$(ARCH)-gcc
-
-# source files
-SRC= \
- libmng_callback_xs.c \
- libmng_chunk_io.c \
- libmng_chunk_descr.c \
- libmng_chunk_prc.c \
- libmng_chunk_xs.c \
- libmng_cms.c \
- libmng_display.c \
- libmng_dither.c \
- libmng_error.c \
- libmng_filter.c \
- libmng_hlapi.c \
- libmng_jpeg.c \
- libmng_object_prc.c \
- libmng_pixels.c \
- libmng_prop_xs.c \
- libmng_read.c \
- libmng_trace.c \
- libmng_write.c \
- libmng_zlib.c
-
-# object files
-OBJ=$(addprefix $(OBJDIR)/$(ARCH)/, $(SRC:%.c=%.o))
-
-# object files for shared object
-OBJ_SO=$(addprefix $(OBJDIR)/$(ARCH)/, $(SRC:%.c=%.pic.o))
-
-# type dependancies
-$(OBJDIR)/$(ARCH)/%.o: %.c
- $(CC) $(CFLAGS) $(INC) $(DEF) -o $@ -c $<
-
-$(OBJDIR)/$(ARCH)/%.pic.o: %.c
- $(CC) $(CFLAGS) $(INC) $(DEF_SO) -fPIC -o $@ -c $<
-
-all: init $(ARNAME) $(SONAME)
-
-init:
- if [ ! -d $(OBJDIR)/$(ARCH) ]; then mkdir -p $(OBJDIR)/$(ARCH); fi
-
-$(ARNAME): $(OBJ)
- ar r $(OBJDIR)/$(ARCH)/$(ARNAME) $(OBJ)
-
-$(SONAME): $(SONAME).$(MNGMAJ)
- ln -sf $(OBJDIR)/$(ARCH)/$(SONAME).$(MNGMAJ) $(OBJDIR)/$(ARCH)/$(SONAME)
-
-$(SONAME).$(MNGMAJ): $(SONAME).$(MNGVER)
- ln -sf $(OBJDIR)/$(ARCH)/$(SONAME).$(MNGVER) $(OBJDIR)/$(ARCH)/$(SONAME).$(MNGMAJ)
-
-$(SONAME).$(MNGVER): $(OBJ_SO)
- $(CC) -shared -Wl,-soname,$(SONAME).$(MNGMAJ) -o $(OBJDIR)/$(ARCH)/$(SONAME).$(MNGVER) $(OBJ_SO) \
- -lz -lm -ljpeg
-# -lz -lm -ljpeg -llcms
-
-clean:
- rm -f $(OBJ) $(OBJ_SO)
- rm -f $(OBJDIR)/$(ARCH)/$(ARNAME) $(OBJDIR)/$(ARCH)/$(SONAME)*
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-libmng_hlapi.o libmng_hlapi.pic.o: libmng_hlapi.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_memory.h libmng_error.h libmng_trace.h libmng_read.h \
- libmng_write.h libmng_display.h libmng_zlib.h libmng_cms.h libmng_zlib.h
-libmng_callback_xs.o libmng_callback_xs.pic.o: libmng_callback_xs.c libmng.h \
- libmng_conf.h libmng_types.h libmng_data.h libmng_error.h libmng_trace.h
-libmng_prop_xs.o libmng_prop_xs.pic.o: libmng_prop_xs.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_error.h libmng_trace.h libmng_cms.h
-libmng_chunk_xs.o libmng_chunk_xs.pic.o: libmng_chunk_xs.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_prc.h \
- libmng_error.h libmng_trace.h
-libmng_read.o libmng_read.pic.o: libmng_read.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_prc.h libmng_chunk_io.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_read.h libmng_display.h
-libmng_write.o libmng_write.pic.o: libmng_write.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_write.h
-libmng_display.o libmng_display.pic.o: libmng_display.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_zlib.h libmng_cms.h libmng_pixels.h \
- libmng_display.h
-libmng_object_prc.o libmng_object_prc.pic.o: libmng_object_prc.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h libmng_display.h libmng_pixels.h
-libmng_chunk_descr.o libmng_chunk_descr.pic.o: libmng_chunk_descr.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_descr.h libmng_memory.h \
- libmng_chunk_prc.h libmng_error.h libmng_trace.h
-libmng_chunk_prc.o libmng_chunk_prc.pic.o: libmng_chunk_prc.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_chunks.h libmng_chunk_prc.h libmng_memory.h \
- libmng_error.h libmng_trace.h
-libmng_chunk_io.o libmng_chunk_io.pic.o: libmng_chunk_io.c libmng.h libmng_conf.h \
- libmng_types.h libmng_data.h libmng_objects.h libmng_object_prc.h \
- libmng_chunks.h libmng_chunk_io.h libmng_chunk_prc.h libmng_memory.h libmng_error.h \
- libmng_trace.h libmng_display.h libmng_zlib.h libmng_pixels.h
-libmng_error.o libmng_error.pic.o: libmng_error.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_trace.o libmng_trace.pic.o: libmng_trace.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h
-libmng_pixels.o libmng_pixels.pic.o: libmng_pixels.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_memory.h libmng_error.h libmng_trace.h \
- libmng_cms.h libmng_filter.h libmng_pixels.h
-libmng_filter.o libmng_filter.pic.o: libmng_filter.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_filter.h
-libmng_dither.o libmng_dither.pic.o: libmng_dither.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_error.h libmng_trace.h libmng_dither.h
-libmng_zlib.o libmng_zlib.pic.o: libmng_zlib.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h \
- libmng_filter.h libmng_zlib.h
-libmng_jpeg.o libmng_jpeg.pic.o: libmng_jpeg.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_memory.h libmng_error.h libmng_trace.h libmng_pixels.h libmng_jpeg.h
-libmng_cms.o libmng_cms.pic.o: libmng_cms.c libmng.h libmng_conf.h libmng_types.h \
- libmng_data.h libmng_objects.h libmng_error.h libmng_trace.h libmng_cms.h
diff --git a/src/3rdparty/libmng/makefiles/makefile.unix b/src/3rdparty/libmng/makefiles/makefile.unix
deleted file mode 100644
index 4d3fd97f4e..0000000000
--- a/src/3rdparty/libmng/makefiles/makefile.unix
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# For conditions of distribution and use, see copyright notice in libmng.h
-#
-# makefile for libmng - THE MNG library
-# this makefile is suitable for generic unix
-
-# Configuration options are now in libmng_conf.h
-
-# The name of your C compiler:
-CC= cc
-
-# Location of jpeg header files
-JPEG_INC= /cs/include/jpeg
-
-# Location of zlib header files
-ZLIB_INC= /cs/include
-
-# Location of lcms header files
-# (switch on MNG_FULL_CMS in libmng_conf.h if you want to use this)
-LCMS_INC= /ltmp/lcms-1.06/source
-
-# compiler options:
-CFLAGS= -O -I. -I$(ZLIB_INC) -I$(JPEG_INC) -I$(LCMS_INC)
-
-# source files
-SOURCES= \
- libmng_callback_xs.c \
- libmng_chunk_io.c \
- libmng_chunk_descr.c \
- libmng_chunk_prc.c \
- libmng_chunk_xs.c \
- libmng_cms.c \
- libmng_display.c \
- libmng_dither.c \
- libmng_error.c \
- libmng_filter.c \
- libmng_hlapi.c \
- libmng_jpeg.c \
- libmng_object_prc.c \
- libmng_pixels.c \
- libmng_prop_xs.c \
- libmng_read.c \
- libmng_trace.c \
- libmng_write.c \
- libmng_zlib.c
-
-# object files
-OBJECTS= $(SOURCES:%.c=%.o)
-
-# type dependancies
-.c.o:
- $(CC) $(CFLAGS) -c $<
-
-all: libmng.a
-
-clean:
- /bin/rm -f $(OBJECTS)
- /bin/rm -f libmng.a
- /bin/rm -f *~ core
-
-libmng.a: $(OBJECTS)
- ar r libmng.a $(OBJECTS)
-
-depend:
- makedepend -- $(CFLAGS) $(IFLAGS) -- *.c
-
-# DO NOT DELETE
diff --git a/src/3rdparty/libmng/makefiles/makefile.vcwin32 b/src/3rdparty/libmng/makefiles/makefile.vcwin32
deleted file mode 100644
index 6f9c2c0470..0000000000
--- a/src/3rdparty/libmng/makefiles/makefile.vcwin32
+++ /dev/null
@@ -1,99 +0,0 @@
-# makefile for libmng
-# Copyright (C) 2000 AM(s98t269@stmail.eng.kagawa-u.ac.jp)
-# For conditions of distribution and use, see copyright notice in libmng.h
-# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
-# Assumes that libjpeg.lib, *.h have been copied to ..\jpgsrc6b
-# Assumes that lcmsdll.lib and lcmsstat.lib have been copied to ..\lcms\lib\msvc
-# To use, do "nmake /f makefiles\makefile.vcwin32"
-
-# -------- Microsoft Visual C++ 4.0 and later, no assembler code --------
-
-CFLAGS= -Ox -GA3s -nologo -W3 -I..\zlib -I..\jpgsrc6b -I..\lcms\include
-
-CC=cl
-LD=link
-LDFLAGS=
-O=.obj
-
-#uncomment next to put error messages in a file
-#ERRFILE= >> mngerrs
-
-# variables
-OBJS1 = libmng_callback_xs$(O) libmng_chunk_io$(O) libmng_chunk_prc$(O) libmng_chunk_descr$(0)
-OBJS2 = libmng_chunk_xs$(O) libmng_cms$(O) libmng_display$(O) libmng_dither$(O)
-OBJS3 = libmng_error$(O) libmng_filter$(O) libmng_hlapi$(O) libmng_jpeg$(O)
-OBJS4 = libmng_object_prc$(O) libmng_pixels$(O) libmng_prop_xs$(O)
-OBJS5 = libmng_read$(O) libmng_trace$(O) libmng_write$(O) libmng_zlib$(O)
-
-all: libmng.lib
-
-libmng_callback_xs$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_chunk_io$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_chunk_descr$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_chunk_prc$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_chunk_xs$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_cms$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_display$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_dither$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_error$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_filter$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_hlapi$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_jpeg$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_object_prc$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_pixels$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_prop_xs$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_read$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_trace$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_write$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng_zlib$(O): libmng.h libmng_data.h libmng_error.h libmng_trace.h
- $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libmng.lib: $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5)
- echo something to del > libmng.lib
- del libmng.lib
- lib /OUT:libmng.lib $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5)
-
-mngtest.exe: mngtest.obj libmng.lib
- $(LD) $(LDFLAGS) mngtest.obj libmng.lib ..\zlib\zlib.lib /OUT:mngtest.exe /SUBSYSTEM:CONSOLE
-
-test: mngtest.exe
- mngtest
-
-# End of makefile for libmng
-
diff --git a/src/3rdparty/libmng/unmaintained/autogen.sh b/src/3rdparty/libmng/unmaintained/autogen.sh
deleted file mode 100755
index 308ae37393..0000000000
--- a/src/3rdparty/libmng/unmaintained/autogen.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-# autogen.sh
-#
-# invoke the auto* tools to create the configureation system
-
-# move out configure.in
-if ! test -f configure.in; then
- echo "copying configure.in"
- ln -s makefiles/configure.in .
-fi
-
-# move out the macros and run aclocal
-if test ! -f acinclude.m4 -a -r makefiles/acinclude.m4; then
- echo "copying configure macros"
- ln -s makefiles/acinclude.m4 .
-fi
-
-# copy up our Makefile template
-if ! test -f Makefile.am; then
- echo "copying automake template"
- ln -s makefiles/Makefile.am .
-fi
-
-echo "running aclocal"
-aclocal
-
-# libtool is named glibtool on MacOS X
-for LIBTOOLIZE in libtoolize glibtoolize nope; do
- ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 && break
-done
-if test x$LIBTOOLIZE = xnope; then
- echo "error: Could not find libtoolize in the path!"
- echo " You'll need to install a copy of libtool before continuing"
- echo " with the generation of the build system."
- echo
- exit 1
-fi
-
-echo "running $LIBTOOLIZE"
-$LIBTOOLIZE --automake
-
-echo "running automake"
-automake --foreign --add-missing
-
-echo "building configure script"
-autoconf
-
-# and finally invoke our new configure
-./configure $*
-
-# end
diff --git a/src/3rdparty/libpng/pngpriv.h b/src/3rdparty/libpng/pngpriv.h
index 9b90f26801..e248ad8bbe 100644
--- a/src/3rdparty/libpng/pngpriv.h
+++ b/src/3rdparty/libpng/pngpriv.h
@@ -179,9 +179,7 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
#if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \
defined(_WIN32) || defined(__WIN32__)
-# if !defined(__SYMBIAN32__)
-# include <windows.h> /* defines _WINDOWS_ macro */
-# endif
+# include <windows.h> /* defines _WINDOWS_ macro */
#endif
/* Moved here around 1.5.0beta36 from pngconf.h */
diff --git a/src/3rdparty/libtiff.pri b/src/3rdparty/libtiff.pri
deleted file mode 100644
index e43e1feca2..0000000000
--- a/src/3rdparty/libtiff.pri
+++ /dev/null
@@ -1,43 +0,0 @@
-INCLUDEPATH += $$PWD/libtiff/libtiff
-SOURCES += \
- $$PWD/libtiff/libtiff/tif_aux.c \
- $$PWD/libtiff/libtiff/tif_close.c \
- $$PWD/libtiff/libtiff/tif_codec.c \
- $$PWD/libtiff/libtiff/tif_color.c \
- $$PWD/libtiff/libtiff/tif_compress.c \
- $$PWD/libtiff/libtiff/tif_dir.c \
- $$PWD/libtiff/libtiff/tif_dirinfo.c \
- $$PWD/libtiff/libtiff/tif_dirread.c \
- $$PWD/libtiff/libtiff/tif_dirwrite.c \
- $$PWD/libtiff/libtiff/tif_dumpmode.c \
- $$PWD/libtiff/libtiff/tif_error.c \
- $$PWD/libtiff/libtiff/tif_extension.c \
- $$PWD/libtiff/libtiff/tif_fax3.c \
- $$PWD/libtiff/libtiff/tif_fax3sm.c \
- $$PWD/libtiff/libtiff/tif_flush.c \
- $$PWD/libtiff/libtiff/tif_getimage.c \
- $$PWD/libtiff/libtiff/tif_luv.c \
- $$PWD/libtiff/libtiff/tif_lzw.c \
- $$PWD/libtiff/libtiff/tif_next.c \
- $$PWD/libtiff/libtiff/tif_open.c \
- $$PWD/libtiff/libtiff/tif_packbits.c \
- $$PWD/libtiff/libtiff/tif_pixarlog.c \
- $$PWD/libtiff/libtiff/tif_predict.c \
- $$PWD/libtiff/libtiff/tif_print.c \
- $$PWD/libtiff/libtiff/tif_read.c \
- $$PWD/libtiff/libtiff/tif_strip.c \
- $$PWD/libtiff/libtiff/tif_swab.c \
- $$PWD/libtiff/libtiff/tif_thunder.c \
- $$PWD/libtiff/libtiff/tif_tile.c \
- $$PWD/libtiff/libtiff/tif_version.c \
- $$PWD/libtiff/libtiff/tif_warning.c \
- $$PWD/libtiff/libtiff/tif_write.c \
- $$PWD/libtiff/libtiff/tif_zip.c
-
-wince*: SOURCES += $$PWD/../corelib/kernel/qfunctions_wince.cpp \
- $$PWD/libtiff/libtiff/tif_wince.c
-win32: SOURCES += $$PWD/libtiff/libtiff/tif_win32.c
-else: SOURCES += $$PWD/libtiff/libtiff/tif_unix.c
-symbian: SOURCES += $$PWD/libtiff/port/lfind.c
-
-include($$PWD/zlib_dependency.pri)
diff --git a/src/3rdparty/libtiff/COPYRIGHT b/src/3rdparty/libtiff/COPYRIGHT
deleted file mode 100644
index 8282186151..0000000000
--- a/src/3rdparty/libtiff/COPYRIGHT
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) 1988-1997 Sam Leffler
-Copyright (c) 1991-1997 Silicon Graphics, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and
-its documentation for any purpose is hereby granted without fee, provided
-that (i) the above copyright notices and this permission notice appear in
-all copies of the software and related documentation, and (ii) the names of
-Sam Leffler and Silicon Graphics may not be used in any advertising or
-publicity relating to the software without the specific, prior written
-permission of Sam Leffler and Silicon Graphics.
-
-THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
diff --git a/src/3rdparty/libtiff/ChangeLog b/src/3rdparty/libtiff/ChangeLog
deleted file mode 100644
index 20cb7538fd..0000000000
--- a/src/3rdparty/libtiff/ChangeLog
+++ /dev/null
@@ -1,4426 +0,0 @@
-2009-11-04 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff 3.9.2 released.
-
-2009-11-03 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * tools/tiffcrop.c: Updated tiffcrop from Richard Nolde. This
- version has undergone substantial testing with arbitrary sample
- bit depths. Also eliminates GCC compilation warnings.
-
-2009-11-02 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * port/libport.h: Added header file for porting prototypes and
- extern declarations.
-
-2009-10-31 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tif_dirwrite.c (TIFFWriteAnyArray): Add missing break
- statement so writing an array of TIFF_DOUBLE works.
-
-2009-10-29 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tif_dirread.c: Eliminate GCC "dereferencing type-punned
- pointer" warnings.
-
-2009-10-28 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * html/tools.html: Add manual page links, and a summary
- description of tiffcrop.
-
-2009-10-07 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * configure.ac: x86_64 should use the same fill order as i386.
-
-2009-09-24 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * tools/tiffcrop.c, man/tiffcrop.1: New tiffcrop from Richard
- Nolde. Major updates to add significant functionality for reading
- and writing tile based images with bit depths not a multiple of 8
- which cannot be handled by tiffcp.
-
-2009-09-03 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tif_ojpeg.c (OJPEGWriteHeaderInfo): IJG JPEG 7 needs
- do_fancy_upsampling=FALSE in order to read raw data. Resolves
- "Bug 2090 - OJPEG crash with libjpeg v7".
- http://bugzilla.maptools.org/show_bug.cgi?id=2090
-
-2009-08-30 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * contrib/iptcutil/iptcutil.c,
- libtiff/tif_getimage.c,libtiff/tif_jpeg.c,libtiff/tif_ojpeg.c,tools/tiffcrop.c,tools/tiffgt.c:
- Applied patch from Oden Eriksson to allow building with GCC using
- the "-Wformat -Werror=format-security" flags.
-
-2009-08-28 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff 3.9.1 released.
-
-2009-08-28 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirwrite.c: Back out changes from 2007-11-22 that
- resulted in the final strip not being written in some circumstances.
- http://bugzilla.maptools.org/show_bug.cgi?id=2088
-
-2009-08-27 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tif_write.c (TIFFAppendToStrip): Remove cast which
- caused libtiff to output a wrong last strip with byte-count and
- strip-offset of zero. This cast was added on the day of the 3.9.0
- release.
-
- * libtiff/tif_config.vc.h: tiffiop.h needs the TIFF_INT64_T and
- TIFF_UINT64_T defines in order to compile. Copy existing
- definitions from tiffconf.vc.h.
-
-2009-08-21 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * test/Makefile.am (AUTOMAKE_OPTIONS): Colorized tests was not
- actually activated since it needed to be enabled in this
- Makefile.am. Also activated parallel-tests mode since it offers
- useful features such as per-test .log files and a summary test
- report .log file.
-
-2009-08-20 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff 3.9.0 released.
-
- * libtiff/tif_print.c (TIFFPrintDirectory): Applied patch for "tag
- error may cause segfault in tif_print.c."
- http://bugzilla.maptools.org/show_bug.cgi?id=1896
-
- * tools/{rgb2ycbcr.c, tiff2rgba.c}: Applied patch for
- CVE-2009-2347 libtiff: integer overflows in various inter-color
- space conversion tools.
- http://bugzilla.maptools.org/show_bug.cgi?id=2079
-
- * configure.ac: Updated autotools. Autoconf 2.64, Automake 1.11,
- libtool 2.2.6. Enabled support for silent build rules
- (--enable-silent-rules or 'make V=0') and colorized tests.
-
-2009-06-30 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_luv.c: correct return codes from encoderow to be
- 1 on success instead of zero.
- http://bugzilla.maptools.org/show_bug.cgi?id=2069
-
-2009-06-22 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_lzw.c: Fix buffer underflow bug.
- http://bugzilla.maptools.org/show_bug.cgi?id=2065
-
-2009-06-03 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_write.c: do not override the planar configuration to be
- contig for one sample files if planar configuration is already set.
- http://bugzilla.maptools.org/show_bug.cgi?id=2057
-
-2009-02-12 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_luv.c: Fix handling of tiled logluv images.
- http://bugzilla.maptools.org/show_bug.cgi?id=2005
-
-2009-01-23 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_predict.c: Add support for 32bit integer horz. predictors.
- http://bugzilla.maptools.org/show_bug.cgi?id=1911
-
-2009-01-20 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiffsplit.c: fix sampleformat to be shortv instead of longv.
-
-2009-01-12 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * tools/tiff2ps.c: Remove spurious message printed to stderr.
-
-2009-01-11 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * tools/tiff2ps.c: Incorporated significant functionality update
- from Richard Nolde. In particular, support for rotating the image
- by 90, 180, 270, and 'auto' has been added.
-
- * tools/tiffcrop.c: Incorporated significant functionality update
- from Richard Nolde.
-
-2009-01-06 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tiffiop.h: Add private type declarations for int64, and
- uint64 so that bundled utilities (like tiffcrop) can use it when
- necessary.
-
-2009-01-01 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * configure.ac: Updated to test for 64-bit types. This version of
- the library does not require a 64-bit type, but tiffcrop needs it.
-
-2008-12-31 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * Update to use current FSF autotools versions.
- * libtiff/tiffio.h: GCC will now validate format specifications
- for TIFFError(), TIFFErrorExt(), TIFFWarning(), and
- TIFFWarningExt() in order to reveal bugs. Cleaned up resulting
- warnings throughout for 32 bit build only.
-
-2008-12-31 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiffcrop.c, man/tiffcrop.1: A major update from Richard
- Nolde.
-
-2008-12-21 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: Avoid errors if the application writes a full
- strip for the last partial strip in a jpeg compressed file.
- http://bugzilla.maptools.org/show_bug.cgi?id=1981
-
-2008-12-21 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_getimage.c, tiffio.h: More ABI corrections.
- Removed SubsamplingHor/Ver from TIFFRGBAImage structure.
- http://bugzilla.maptools.org/show_bug.cgi?id=1980
-
-2008-12-18 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_getimage.c,tiffio.h: removed all use of UaToAa and
- Bitmap16to8 arrays in TIFFRGBAImage structure to restore ABI
- compatability. These were just an attempt to speed up processing
- with precalculated tables.
- http://bugzilla.maptools.org/show_bug.cgi?id=1979
-
- * libtiff/tif_codec.c: Avoid printing c->name if it does not exist.
-
-2008-10-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_jbig.c: Support the JBIG-KIT 2.0 (compatibility with
- the older versions retained).
-
-2008-09-05 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffsplit.c: Use dynamically allocated array instead of static
- when constructing output file names.
-
-2008-09-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffsplit.c: Get rid of unsafe strcpy()/strcat() calls when
- doing the filename/path construction.
-
- * tools/tiff2pdf.c: More appropriate format string in
- t2p_write_pdf_string(); avoid signed/unsigned mismatch.
-
- * libtiff/tif_lzw.c: Properly zero out the codetable. As per bug
-
- http://bugzilla.maptools.org/show_bug.cgi?id=1929
-
- * libtiff/tif_lzw.c: Properly zero out the string table. Fixes
- CVE-2008-2327 security issue.
-
-2008-05-24 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_codec.c: Avoid NULL pointer dereferencing for exotic
- compression codec codes.
-
- * tif_dirread.c: zero tif->tif_dir after freeing the directory
- in TIFFReadCustomDirectory(). I don't exactly remember why this
- was important.
-
- * tif_dirwrite.c: Fix potential memory leak writing large double
- tags.
-
- * tif_dirread.c: Fix unchecked malloc result.
-
-2008-01-30 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tif_fax3.c: Make find0span() and find1span() non-inline to
- make MSVC 6.0 compiler happy.
-
-2007-11-26 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_fax3.c: fix leak of FAXCS state (per bug 1603).
-
-2007-11-23 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure.com, libtiff/tif_vms.c: Better OpenVMS support. Patches
- from Alexey Chupahin.
-
-2007-11-22 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_write.c: Rip out the fancy logic in TIFFAppendToStrip() for
- establishing if an existing tile can be rewritten to the same location
- by comparing the current size to all the other blocks in the same
- directory. This is dangerous in many situations and can easily
- corrupt a file. (observed in esoteric GDAL situation that's hard to
- document). This change involves leaving the stripbytecount[] values
- unaltered till TIFFAppendToStrip(). Now we only write a block back
- to the same location it used to be at if the new data is the same
- size or smaller - otherwise we move it to the end of file.
-
- * tif_dirwrite.c: Try to avoid writing out a full readbuffer of tile
- data when writing the directory just because we have BEENWRITING at
- some point in the past. This was causing odd junk to be written out
- in a tile of data when a single tile had an interleaving of reading
- and writing with reading last. (highlighted by gdal
- autotest/gcore/tif_write.py test 7.
-
- * tif_predict.c: use working buffer in PredictorEncodeTile to avoid
- modifying callers buffer.
- http://trac.osgeo.org/gdal/ticket/1965
-
- * tif_predict.c/h, tif_lzw.c, tif_zip.c: Improvements so that
- predictor based encoding and decoding works in read-write update
- mode properly.
- http://trac.osgeo.org/gdal/ticket/1948
-
-2007-10-05 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiff2pdf.c: Fixed setting of alpha value per report on list.
-
-2007-09-13 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_dirinfo.c: _TIFFMergeFields() now only merges in field
- definitions that are missing. Existing definitions are silently
- ignored. (Bug #1585)
-
-2007-07-18 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{Makefile.am, Makefile.v}: Do not distribute tiffconf.h,
- remove tif_config.h/tiffconf.h during cleaning. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1573
-
-2007-07-13 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.9.0beta released.
-
-2007-07-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: Added missed extern optind as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1567
-
-2007-07-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2ps.c: Added support 16-bit images as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1566
-
- Patch from William Bader.
-
- * tools/tiff2pdf.c: Fix for TIFFTAG_JPEGTABLES tag fetching and
- significant upgrade of the whole utility as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1560
-
- Now we don't need tiffiop.h in tiff2pdf anymore and will open output
- PDF file using TIFFClientOpen() machinery as it is implemented
- by Leon Bottou.
-
-2007-06-29 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tif_dirinfo.c (_TIFFFindFieldInfo): Don't attempt to
- bsearch() on a NULL fieldinfo list.
- (_TIFFFindFieldInfoByName): Don't attempt to
- lfind() on a NULL fieldinfo list.
-
-2007-05-01 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirwrite.c: Fixed problem introduced with a fix for a
- byte swapping issue
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1363
-
- As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1550
-
-2007-04-27 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: Check the tmpfile() return status as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=154
-
-2007-04-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dir.h, tif_dirread.c, tif_dirinfo.c, tif_jpeg.c,
- tif_fax3.c, tif_jbig.c, tif_luv.c, tif_ojpeg.c, tif_pixarlog.c,
- tif_predict.c, tif_zip.c}: Finally fix bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1274
-
- by introducing _TIFFMergeFieldInfo() returning integer error status
- instead of void in case of problems with field merging (e.g., if the
- field with such a tag already registered). TIFFMergeFieldInfo() in
- public API remains void. Use _TIFFMergeFieldInfo() everywhere and
- check returned value.
-
-2007-04-07 Frank Warmerdam <warmerdam@pobox.com>
-
- * contrib/addtiffo/tif_overview.c: Fix problems with odd sized output
- blocks in TIFF_DownSample_Subsampled() (bug 1542).
-
-2007-04-06 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: Changed JPEGInitializeLibJPEG() so that it
- will convert from decompressor to compressor or compress to decompress
- if required by the force arguments. This works around a problem in
- where the JPEGFixupTestSubsampling() may cause a decompressor to
- be setup on a directory when later a compressor is required with the
- force flag set. Occurs with the addtiffo program for instance.
-
-2007-04-06 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirwrite.c: Fixed swapping of byte arrays stored
- in-place in tag offsets as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1363
-
- * tools/tiffcrop.c, man/tiffcrop.1: Significant update in
- functionality from Richard Nolde. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1525
-
-2007-03-28 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_fax3.c: "inline static" -> "static inline" for IRIC CC.
-
-2007-03-07 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tif_getimage.c: workaround for 'Fractional scanline' error reading
- OJPEG images with rowsperstrip that is not a multiple of vertical subsampling
- factor. This bug is mentioned in:
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1390
- http://www.asmail.be/msg0054766825.html
-
-2007-03-07 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tif_win32.c: made inclusion of windows.h unconditional
-
- * libtiff/tif_win32.c: replaced preprocessor indication for consiously
- unused arguments by standard C indication for the same
-
-2007-02-27 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Use uint32 type instead of tsize_t in byte
- counters in TIFFFetchData(). Should finally fix the issue
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=890
-
-2007-02-24 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffset.c: Properly handle tags with TIFF_VARIABLE writecount.
- As per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1350
-
- * libtiff/tif_dirread.c: Added special function to handle
- SubjectDistance EXIF tag as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1362
-
- * tools/tiff2pdf.c: Do not assume inches when the resolution units
- do not specified. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1366
-
- * tools/{tiffcp.c, tiffcrop.c}: Do not change RowsPerStrip value if
- it was set as infinite. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1368
-
- * tools/tiffcrop.c, man/tiffcrop.1: New tiffcrop utility contributed
- by Richard Nolde. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1383
-
-2007-02-22 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dir.c: Workaround for incorrect TIFFs with
- ExtraSamples == 999 produced by Corel Draw. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1490
-
- * libtiff/{tif_dirread.c, tif_read.c}: Type of the byte counters
- changed from tsize_t to uint32 to be able to work with data arrays
- larger than 2GB. Fixes bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=890
-
- Idea submitted by Matt Hancher.
-
-2007-01-31 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tif2rgba.c: This utility does not work properly on big-endian
- architectures. It was fixed including the bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1149
-
-2007-01-15 Mateusz Loskot <mateusz@loskot.net>
-
- * Submitted libtiff port for Windows CE platform
- * libtiff/tif_config.wince.h: Added configuration header for WinCE.
- * libtiff/tiffconf.wince.h: Ported old configuration header for WinCE.
- * libtiff/tif_wince.c: Added WinCE-specific implementation of some
- functons from tif_win32.c.
- * libtiff/tif_win32.c: Disabled some functions already reimplemented in tif_wince.c.
- * libtiff/tiffiop.h, port/lfind.c: Added conditional include of some
- standard header files for Windows CE build.
- * tools/tiffinfoce.c: Ported tiffinfo utility for Windows CE.
-
-2006-11-19 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_write.c: TIFFAppendToStrip() - clear sorted flag if
- we move a strip.
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1359
-
-2006-10-13 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dir.c: More fixes for vulnerabilities, reported
- in Gentoo bug ():
-
- http://bugs.gentoo.org/show_bug.cgi?id=142383
-
- * libtiff/contrib/dbs/xtiff/xtiff.c: Make xtiff utility compilable.
- Though it is still far from the state of being working and useful.
-
-2006-10-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_fax3.c: Save the state of printdir codec dependent
- method.
-
- * libtiff/tif_jpeg.c: Save the state of printdir codec dependent method
- as per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1273
-
- * libtiff/tif_win32.c: Fixed problem with offset value manipulation
- as per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1322
-
- * libtiff/{tif_read.c, tif_jpeg.c, tif_dir.c}: More fixes for
- vulnerabilities, reported in Gentoo bug ():
-
- http://bugs.gentoo.org/show_bug.cgi?id=142383
-
-2006-09-28 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_fax3.c, tif_next.c, tif_pixarlog.c}: Fixed multiple
- vulnerabilities, as per Gentoo bug ():
-
- http://bugs.gentoo.org/show_bug.cgi?id=142383
-
-2006-09-27 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_lzw.c, libtiff/tif_zip.c: Fixed problems with mixing
- encoding and decoding on the same read-write TIFF handle. The LZW
- code can now maintain encode and decode state at the same time. The
- ZIP code will switch back and forth as needed.
- http://bugzilla.remotesensing.org/show_bug.cgi?id=757
-
-2006-09-20 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff: Rename config.h.vc and tif_config.h.vc to config.vc.h and
- tif_config.vc.h for easier identification by folks using an IDE.
-
-2006-07-25 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_msdos.c: Avoid handle leak for failed opens. c/o Thierry Pierron
-
-2006-07-19 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_dirwrite.c: take care not to flush out buffer of strip/tile
- data in _TIFFWriteDirectory if TIFF_BEENWRITING not set. Relates
- to bug report by Peng Gao with black strip at bottom of images.
-
-2006-07-12 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_dirwrite.c: make sure to use uint32 for wordcount in
- TIFFWriteNormanTag if writecount is VARIABLE2 for ASCII fields.
- It already seems to have been done for other field types. Needed
- for "tiffset" on files with geotiff ascii text.
-
-2006-07-04 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * {configure.ac, libtiff/tif_config.h.vc, libtiff/tif_jbig.c}
- (JBIGDecode): jbg_newlen is not available in older JBIG-KIT and
- its use does not appear to be required, so use it only when it is
- available.
-
-2006-06-24 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirinfo.c: Added missed EXIF tag ColorSpace (40961).
-
- * libtiff/tif_dirread.c: Move IFD fetching code in the separate
- function TIFFFetchDirectory() avoiding code duplication in
- TIFFReadDirectory() and TIFFReadCustomDirectory().
-
-2006-06-19 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiff2pdf.c: Fix handling of -q values.
- http://bugzilla.remotesensing.org/show_bug.cgi?id=587
-
-2006-06-17 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_readdir.c: Added case in EstimateStripByteCounts() for tiled
- files. Modified TIFFReadDirectory() to not invoke
- EstimateStripByteCounts() for case where entry 0 and 1 are unequal
- but one of them is zero.
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1204
-
-2006-06-08 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_open.c, tif_dirread.c, tiffiop.h}: Move IFD looping
- checking code in the separate function TIFFCheckDirOffset().
-
- * libtiff/tif_aux.c: Added _TIFFCheckRealloc() function.
-
- * tools/tiffcmp.c: Fixed floating point comparison logic as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1191
-
- * libtiff/tif_fax3.c: Fixed problems in fax decoder as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1194
-
- * tools/tiff2pdf.c: Fixed buffer overflow condition in
- t2p_write_pdf_string() as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1196
-
-2006-06-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * {configure, configure.ac, libtiff/tif_jbig.c, tools/tiffcp.c}: Added
- support for JBIG compression scheme (34661 code) contributed by Lee
- Howard. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=896
-
- * configure, configure.ac: OJPEG support enabled by default.
-
- * contrib/ojpeg/: Removed. New OJPEG support does not need this patch.
-
-2006-06-03 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/{tif_dirinfo.c, tif_print.c} : Fix crash in
- TIFFPrintDirectory(). Joris Van Damme authored the fix.
-
-2006-04-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: Unified line ending characters (always use '\n')
- as per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1163
-
- * README.vms, Makefile.am, configure.com, libtiff/{Makefile.am,
- tif_config.h-vms, tif_stream.cxx, tif_vms.c, tiffconf.h-vms}:
- Added support for OpenVMS by Alexey Chupahin, elvis_75@mail.ru.
-
-2006-04-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/{fax2ps.c, fax2tiff.c, ppm2tiff.c, ras2tiff.c, tiff2pdf.c}:
- Properly set the binary mode for stdin stream as per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1141
-
- * man/{bmp2tiff.1, fax2ps.1, fax2tiff.1, gif2tiff.1, ras2tiff.1,
- raw2tiff.1, rgb2ycbcr.1, sgi2tiff.1, tiff2bw.1, tiff2pdf.1, tiff2ps.1,
- tiff2rgba.1, tiffcmp.1, tiffcp.1, tiffdither.1, tiffdump.1, tiffgt.1,
- tiffset.1}: Improvements in page formatting as per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1140
-
- * html/tools.html, html/man/Makefile.am, tools/tiff2pdf.c: Fixed
- typos as per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1139
-
-2006-04-18 Frank Warmerdam <warmerdam@pobox.com>
-
- * nmake.opt: use /EHsc for VS2005 compatibility. Also define
- _CRT_SECURE_NO_DEPRECATE to avoid noise on VS2005.
-
-2006-04-12 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tif_getimage.c: Added support for planarconfig separate
- non-subsampled YCbCr (i.e. separate YCbCr with subsampling [1,1])
-
-2006-04-11 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tif_getimage.c: Revision of all RGB(A) put routines
- - Conversion of unassociated alpha to associated alpha now done with
- more performant LUT, and calculation more correct
- - Conversion of 16bit data to 8bit data now done with
- more performant LUT, and calculation more correct
- - Bugfix of handling of 16bit RGB with unassociated alpha
-
-2006-04-11 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tif_getimage.c:
- - When there is no alpha, gtTileSeparate and gtStripSeparate allocated
- buffer for alpha strile and filled it, only to never read it back.
- Removed allocation and fill.
- - Minor rename of vars in gtTileSeparate and gtStripSeparate
- anticipating planned functionality extension
-
-2006-04-08 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tif_getimage.c: renamed pickTileContigCase to PickContigCase
- and pickTileSeparateCase to PickSeparateCase as both work on strips as
- well
-
- * libtiff/tif_getimage.c: moved img->get selection from
- TIFFRGBAImageBegin into PickContigCase and PickSeparateCase to create
- logical hook for planned functionality extension
-
-2006-04-08 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tif_ojpeg.c: resolved memory leak that was a consequence
- of inappropriate use of jpeg_abort instead of jpeg_destroy
-
-2006-04-07 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tif_getimage.c: replaced usage of TIFFScanlineSize in
- gtStripContig with TIFFNewScanlineSize so as to fix buggy behaviour
- on subsampled images - this ought to get sorted when we feel brave
- enough to replace TIFFScanlineSize alltogether
-
- * libtiff/tif_ojpeg.c: fixed bug in OJPEGReadSkip
-
-2006-04-04 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tiffio.h: added new type tstrile_t
-
- * libtiff/tif_dir.h: changed types of td_stripsperimage and td_nstrips
- to new tstrile_t, types of td_stripoffset and td_stripbytecount to
- toff_t*
-
- * libtiff/tif_ojpeg.c: totally new implementation
-
- * libtiff/tif_dirread.c: added several hacks to suit new support of
- OJPEG
-
- * libtiff/tif_getimage.c: removed TIFFTAG_JPEGCOLORMODE handling
- of OJPEG images in favor of tif_getimage.c native handling of
- YCbCr and desubsampling
-
-2006-03-29 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: JPEGVSetField() so that altering the photometric
- interpretation causes the "upsampled" flag to be recomputed. Fixes
- peculiar bug where photometric flag had to be set before jpegcolormode
- flag.
-
-2006-03-25 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tif_jpeg.c: strip size related bugfix in encode raw
-
- * libtiff/tif_strip.c: temporarilly added two new versions of
- TIFFScanlineSize
- - TIFFNewScanlineSize: proposed new version, after all related
- issues and side-effects are sorted out
- - TIFFOldScanlineSize: old version, from prior to 2006-03-21 change
- This needs further sorting out.
-
-2006-03-25 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * contrib/addtiffo/tif_ovrcache.c: bugfix to correctly pass size
- of last truncated strip data to TIFFWriteEncodedStrip
-
-2006-03-25 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/{tif_jpeg.c, tif_strip.c}: bugfix of tif_jpeg decode raw
-
-2006-03-25 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tif_getimage.c: bugfix/rewrite of putcontig8bitYCbCr22tile
-
- * libtiff/tif_getimage.c: added putcontig8bitYCbCr12tile
-
- * libtiff/tif_read.c: added support for new TIFF_NOREADRAW flag to
- prepare the path for new tif_ojpeg.c
-
-2006-03-23 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.8.2 released.
-
- * tools/Makefile.am: Use runtime paths linker flags when rpath
- option enabled.
-
-2006-03-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/libtiff.def: Added missed exports as per bug
- http://bugzilla.remotesensing.org/attachment.cgi?id=337
-
- * contrib/addtiffo/Makefile.vc, libtiff/Makefile.vc, port/Makefile.vc,
- tools/Makefile.vc: Makefiles improvements as per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1128
-
- * nmake.opt libtiff/{tif_config.h.vc, tif_unix.c, tiffio.h},
- tools/{fax2ps.c, fax2tiff.c, tiff2pdf.c}: Fixed win32 I/O functions
- usage as per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1127
-
- * libtiff/tif_strip.c: Take subsampling in account when calculating
- TIFFScanlineSize().
-
- * tools/tiffcp.c: Do not set RowsPerStrip bigger than image length.
-
-2006-03-17 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/fax2tiff.c: Fixed wrong TIFFerror() invocations as per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1125
-
- * tools/fax2ps.c: Fixed reading the input stream from stdin as per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1124
-
-2006-03-16 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tiffiop.h: Added decalration for
- _TIFFSetDefaultCompressionState().
-
- * libtiff/{tif_jpeg.c, tif_fax3.c, tif_zip.c, tif_pixarlog.c,
- tif_lzw.c, tif_luv.c}: Use _TIFFSetDefaultCompressionState() in all
- codec cleanup methods. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1120
-
-2006-03-15 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_jpeg.c: Do not cleanup codec state in TIFFInitJPEG(). As
- per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1119
-
- * tools/raw2tiff.c: Do not set RowsPerStrip larger than ImageLength.
- As per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1110
-
- * libtiff/tiffiop.h: dblparam_t typedef removed; GLOBALDATA macro
- removed; move here the STRIP_SIZE_DEFAULT macro definition.
-
- * libtiff/{tif_dirread.c, tif_strip.c}: Removed STRIP_SIZE_DEFAULT
- macro definition.
-
- * libtiff/tif_dir.c: Use double type instead of dblparam_t.
-
-2006-03-14 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Do not check the PlanarConfig tag presence
- in TIFFReadDirectory, because it is always set at the start of
- function and we allow TIFFs without that tag set.
-
-2005-03-13 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.8.1 released.
-
-2006-03-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Fixed error reporting in TIFFFetchAnyArray()
- function as per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1102
-
- * libtiff/tif_dirread.c: More wise check for integer overflow
- condition as per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1102
-
- * libtiff/{tif_jpeg.c, tif_pixarlog.c, tif_fax3.c, tif_zip.c}:
- Properly restore setfield/getfield methods in cleanup functions. As
- per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1102
-
-2006-03-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_predict.c, tif_predict.h}: Added new function
- TIFFPredictorCleanup() to restore parent decode/encode/field methods.
-
- * libtiff/{tif_lzw.c, tif_pixarlog.c, tif_zip.c}: Use
- TIFFPredictorCleanup() in codec cleanup methods. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1102
-
- * libtiff/tif_dirread.c: Fixed integer overflow condition in
- TIFFFetchData() function. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1102
-
-2006-03-01 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_ojpeg.c: Set the ReferenceBlackWhite with the
- TIFFSetField() method, not directly. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1043
-
- * tools/ppm2tiff.c: Added support for PBM files as per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1044
-
-2006-02-27 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_write.c: Small code rearrangement in TIFFWriteScanline()
- to avoid crash as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1081.
-
-2006-02-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: Functions t2p_sample_rgbaa_to_rgb() and
- t2p_sample_rgba_to_rgb() was used in place of each other, that was
- resulted in problems with RGBA images with associated alpha.
- As per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1097
-
-2006-02-23 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirwrite.c: Properly write TIFFTAG_DOTRANGE tag as per
- bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1088.
-
- * libtiff/tif_print.c: Properly read TIFFTAG_PAGENUMBER,
- TIFFTAG_HALFTONEHINTS, TIFFTAG_YCBCRSUBSAMPLING and TIFFTAG_DOTRANGE
- tags as per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1088.
-
- * tools/tiff2ps.c: Properly scale all the pages when converting
- multipage TIFF with /width/height/center options set. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1080
-
-2006-02-15 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: Do not create output file until all option checks
- will be done. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1072
-
- * tools/bmp2tiff.c: Added ability to create multipage TIFFs from the
- list of input files as per bug:
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1077
-
-2006-02-09 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_tile.c: Fix error reporting in TIFFCheckTile() as per
- bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1063.
-
- * tools/tiffgt.c: Avoid crashing in case of image unsupported by
- TIFFRGBAImage interface.
-
- * libtiff/tif_color.c: Avoid overflow in case of wrong input as per
- bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1065.
-
-2006-02-07 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiff2pdf.c: Fixed support for non-YCbCr encoded JPEG
- compressed TIFF files, per submission from Dan Cobra.
-
-2006-02-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dirread.c, tif_packbits.c, tif_win32.c}: Properly
- cast values to avoid warnings. As per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1033.
-
- * libtiff/tif_dirinfo.c: Use TIFF_NOTYPE instead of 0 when
- appropriate. As per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1033.
-
- * libtiff/tif_aux.c: Fixed type of temporary variable in
- _TIFFCheckMalloc() as per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1033.
-
-2006-02-06 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_aux.c: Return static array when fetching default
- YCbCrCoefficients (another problem, reported a the
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1029 entry).
-
-2006-02-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dir.c: Special handling for PageNumber, HalftoneHints,
- YCbCrSubsampling and DotRange tags as per bugs
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1029
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1034
-
- * libtiff/tif_dirread.c: Use _TIFFGetExifFieldInfo() instead of
- _TIFFGetFieldInfo() in TIFFReadEXIFDirectory() call as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1026.
-
-2006-01-23 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtool related stuff updated from the 2.1a branch.
-
-2006-01-11 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/bmp2tiff,pal2rgb,ppm2tiff,ras2tiff,raw2tiff,sgi2tiff,
- tiff2bw,tiffcp: Fixed jpeg option processing so -c jpeg:r:50 works
- properly as per bug:
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1025
-
-2006-01-09 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * configure.ac: Fix with_default_strip_size comparison as reported
- by Norihiko Murase.
-
-2006-01-08 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * test/Makefile.am (LIBTIFF): Due to linking against libtiff
- incorrectly, tests were not actually testing the uninstalled
- libtiff. Now they are.
-
-2006-01-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirinfo.c: Change definitions for TIFFTAG_ICCPROFILE,
- TIFFTAG_PHOTOSHOP, TIFFTAG_RICHTIFFIPTC, TIFFTAG_XMLPACKET: readcount
- should be uint32 value.
-
-2006-01-02 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * html/man/Makefile.am (htmldoc): Fix htmldoc rule so that it can
- be used if build directory is not the same as source directory.
- * man/{TIFFGetField.3tiff, TIFFSetField.3tiff}: Documented
- TIFFTAG_PHOTOSHOP, TIFFTAG_RICHTIFFIPTC, and TIFFTAG_XMLPACKET,
- and re-sorted tag names in alphabetical order.
-
-2005-12-29 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.8.0 released.
-
-2005-12-28 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * tools/bmp2tiff.c (main): Fixed warning regarding returning
- inconsistent types from a condition.
- * tools/tiffcmp.c (CheckLongTag): Eliminate warning due to printf
- format.
- * tools/bmp2tiff.c: Reduce compilation warnings on big-endian CPUs.
-
-2005-12-28 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * html/{index.html, support.hml, libtiff.html}: Cleaned up HTML
-
-2005-12-27 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tiffio.h: Added VC_EXTRALEAN definition before including
- windows.h, to reduce the compile time.
-
-2005-12-26 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tif_jpeg.c: Improve compilation under MinGW.
-
-2005-12-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dir.c, tif_dir.h, tif_dirread.c, tif_dirinfo.c}:
- tiffFieldInfo and exifFieldInfo arrays definitions moved back to
- tif_dirinfo.c; added _TIFFGetFieldInfo() and _TIFFGetExifFieldInfo()
- private functions to retrieve FieldInfo arrays.
-
-2005-12-24 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * html/build.html: Added some additional instructions for when
- building using MSVC under Windows. Also fixed two HTML syntax
- errors and used HTML Tidy to tidy up the HTML syntax and
- formatting.
-
-2005-12-24 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_aux.c, tif_dir.c, tif_dir.h, tif_dirwrite.c,
- tif_print.c, tif_getimage.c}: Make InkSet, NumberOfInks, DotRange and
- StoNits tags custom.
-
-2005-12-23 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_aux.c, tif_dir.c, tif_dir.h, tif_print.c}: Make
- WhitePoint tag custom.
-
- * libtiff/{tif_dir.h, tiff.h}: More EXIF tags added.
-
-2005-12-23 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/tiffio.h: fixed typo that potentially resulted in
- redefininition of USE_WIN32_FILEIO
-
- * libtiff/*: Added more 'dual-mode' error handling: Done TIFFWarning
- calls in core LibTiff.
-
-2005-12-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dir.c, tif_dir.h, tif_print.c}: Make RichTIFFIPTC,
- Photoshop and ICCProfile tags custom.
-
-2005-12-21 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * libtiff/*, contrib/*: Added 'dual-mode' error handling, enabling
- newer code to get context indicator in error handler and still
- remain compatible with older code: Done TIFFError calls everywhere
- except in tools
-
-2005-12-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffcp.c: Added many error reporting messages; fixed integer
- overflow as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=789
-
-2005-12-16 Frank Warmerdam <warmerdam@pobox.com>
-
- * contrib/addtiffo/*: Major upgrade by Joris to support subsampled
- YCbCr images in jpeg compressed TIFF files.
-
-2005-12-14 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffcp.c: Return non-zero status when reading fails (again).
-
-2005-12-13 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffcp.c: Return non-zero status when reading fails.
-
-2005-12-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dir.h, tiff.h}: Added more EXIF tags.
-
-2005-12-09 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dir.c, tif_dir.h, tif_print.c}: Make XMLPacket tag
- custom.
-
- * tools/tiffinfo.c: Print EXIF directory contents if exist.
-
- * libtiff/tiff.h: Few EXIF tag numbers added.
-
- * libtiff/{tif_dirinfo.c, tif_dirread.c, tif_dir.h, tif_dir.c,
- tiffio.h}: Preliminary support to read custom directories. New
- functions: TIFFReadCustomDirectory() and TIFFReadEXIFDirectory().
-
-2005-12-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dirinfo.c, tif_dirread.c, tif_dir.h, tif_dir.c}:
- More work to implement custom directory read support.
-
- * libtiff/{tif_aux.c, tif_dirinfo.c, tif_dirread.c, tif_dir.h,
- tif_dir.c, tif_print.c}: Make YCbCrCoefficients and ReferenceBlackWhite
- tags custom.
-
-2005-12-05 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: One more workaround for broken
- StripByteCounts tag. Handle the case when StripByteCounts array filled
- with completely wrong values.
-
-2005-11-30 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirinfo.c: Release file descriptor in case of failure
- in the TIFFOpenW() function as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1003
-
- * libtiff/tif_dirinfo.c: Correctly yse bsearch() and lfind()
- functions as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1008
-
-2005-11-20 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_open.c, tiff.h, tiffdump.c: Incorporate preliminary support
- for MS MDI format.
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1002
-
- * .cvsignore: many files added, and a few update according
- to suggestion of Brad HArds on tiff mailing list.
-
-2005-11-03 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/libtiff.def, tiffiop.h, tiffio.h: Made TIFFFreeDirectory
- public.
-
-2005-10-31 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/fax2tiff.c: Properly calculate sizes of temporary arrays
- as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=943
-
- * tools/fax2tiff.c: Added option '-r' to set RowsPerStrip parameter
- as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=944
-
- * tools/tiffdump.c: Fixed typeshift and typemask arrays initialization
- problem as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=946
-
- * tools/bmp2tiff.c: Fixed possible integer overflow error as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=965
-
- * libtiff/tif_dirinfo.c: Make XResolution, YResolution and
- ResolutionUnit tags modifiable during write process. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=977
-
- * tools/tiffsplit.c: Copy fax related fields over splitted parts
- as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=983
-
-2005-10-21 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_dirread.c: Don't try and split single strips into "0" strips
- in ChopUpSingleUncompressedStrip. This happens in some degenerate
- cases (like 1x1 files with stripbytecounts==0 (gtsmall.jp2 embed tiff)
-
-2005-10-20 Joris Van Damme <joris.at.lebbeke@skynet.be>
-
- * tif_fax3.c: changed 'at scanline ...' style warning/errors
- with incorrect use of tif_row, to 'at line ... of
- strip/tile ...' style
-
-2005-10-15 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_write.c: fixed setting of planarconfig as per bug report
- on the mailing list from Joris.
-
-2005-10-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure.ac, configure, nmake.opt, libtiff/{tif_config.h,
- tif_dirread.c}: Make the default strip size configurable via the
- --with-default-strip-size and STRIP_SIZE_DEFAULT options.
-
-2005-09-30 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * html/support.html: Fixed link to documentation on Greg Ward's
- LogLuv TIFF format.
-
-2005-09-28 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffdump.c: Fixed crash when reading malformed tags.
-
-2005-09-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: Added missed 'break' statement as per bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=932
-
-2005-09-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.7.4 released.
-
- * {configure, configure.ac, Makefile.am, autogen.sh}: Applied patch
- from Patrick Welche (all scripts moved in the 'config' and 'm4'
- directories).
-
-2005-09-12 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_open.c: reintroduce seek to avoid problem on solaris.
-
-2005-09-05 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dir.c: When prefreeing tv->value in TIFFSetFieldV
- also set it to NULL to avoid double free when re-setting custom
- string fields as per:
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=922
-
-2005-08-12 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_print.c: avoid signed/unsigned warning.
-
- * libtiff/tif_dirread.c: removed unused variable.
-
-2005-07-30 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dir.c: Fixed up support for swapping "double complex"
- values (128 bits as 2 64 bits doubles). GDAL gcore tests now
- pass on bigendian (macosx) system.
-
-2005-07-28 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_aux.c, tif_dirread.c, tif_fax3.c, tiffiop.h}: Rename
- CheckMalloc() function to _TIFFCheckMalloc() and make it available
- globally as an internal helper routine.
-
-2005-07-27 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dir.c: More improvements in the "pass by value" part of
- the custom tags handling code.
-
-2005-07-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dirread.c, tif_dirinfo.c}: Do not upcast BYTEs to
- SHORTs in the TIFFFetchByteArray(). Remove TIFFFetchExtraSamples()
- function, use TIFFFetchNormalTag() instead as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=831
-
- Remove TIFFFetchExtraSamples() function, use TIFFFetchNormalTag()
- instead.
-
- * libtiff/tiffconf.h.in: One more attempt to fix the AIX bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=39
-
-2005-07-25 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_print.c: Fixed printing of the BYTE and SBYTE arrays.
-
- * tools/tiffdump.c: Added support for TIFF_IFD datatype.
-
-2005-07-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_write.c: Do not check the PlanarConfiguration field in
- the TIFFWriteCheck() function in case of single band images (as per
- TIFF spec).
-
-2005-07-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * SConstruct, libtiff/SConstruct: Added the first very preliminary
- support for SCons software building tool (http://www.scons.org/).
- This is experimental infrastructure and it will exist along with the
- autotools mechanics.
-
-2005-07-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * port/{getopt.c, strcasecmp.c, strtoul.c}: Update modules from
- the NetBSD source tree (the old 4-clause BSD license changed to
- the new 3-clause one).
-
- * configure.ac, port/lfind.c, libtiff/tiffiop.h: Added lfind()
- replacement module.
-
- * port/dummy.c: Make the dummy function static.
-
-2005-07-06 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffcp.c: Fixed WhitePoint tag copying.
-
- * libtiff/{tif_dir.c, tif_dir.h, tif_dirinfo.c, tif_print.c}:
- Make FieldOfViewCotangent, MatrixWorldToScreen, MatrixWorldToCamera,
- ImageFullWidth, ImageFullLength and PrimaryChromaticities tags custom.
-
-2005-07-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.7.3 released.
-
- * configure, configure.ac: Do not use empty -R option when linking
- with --enable-rpath.
-
-2005-07-01 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffiop.h, tif_open.c}: Added open option 'h' to avoid
- reading the first IFD when needed. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=875
-
- * libtiff/tif_color.c: Better use of TIFFmin() macro to avoid side
- effects.
-
-2005-06-23 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: Print two characters per loop in the
- t2p_write_pdf_trailer(). As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=594
-
- * tools/tiffgt.c: Use MacOS X OpenGL framework when appropriate. As
- per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=844
-
- * acinclude.m4: Updated to latest OpenGL test macros versions.
-
- * libtiff/tiff.h: Use correct int size on Sparc 64bit/Sun compiler
- platform. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=855
-
-2005-06-14 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirinfo.c: Added support for ClipPath, XClipPathUnits
- and YClipPathUnits tags.
-
-2005-06-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * contrib/addtiffo/tif_ovrcache.c: Properly extract tile/strip size;
- use pixel sized shift in contigous case.
-
-2005-06-06 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * contrib/addtiffo/{tif_overview.c, tif_ovrcache.c, tif_ovrcache.h}:
- Make overviews working for contiguos images.
-
-2005-06-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_open.c: Replace runtime endianess check with the compile
- time one.
-
- * libtiff/tif_predict.c: Floating point predictor now works on
- big-endian hosts.
-
-2005-06-01 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dir.c: Use _TIFFsetString() function when read custom
- ASCII values.
-
- * libtiff/{tif_dirinfo.c, tif_dir.h, tif_dir.c, tif_print.c}: Make
- DocumentName, Artist, HostComputer, ImageDescription, Make, Model,
- Copyright, DateTime, PageName, TextureFormat, TextureWrapModes and
- TargetPrinter tags custom.
-
- * libtiff/tif_jpeg.c: Cleanup the codec state depending on
- TIFF_CODERSETUP flag (to fix memry leaks).
-
- * libtiff/tif_jpeg.c: Initialize JPEGTables array with zero after
- allocating.
-
-2005-05-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure.ac, libtiff/Makefile.am: Added workaround for
- OpenBSD/MirOS soname problem as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=838
-
- * libtiff/tif_dirwrite.c: Use tdir_count when calling
- TIFFCvtNativeToIEEEDouble() in the TIFFWriteDoubleArray() function as
- per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=845
-
-2005-05-25 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/ppm2tiff.c: Fixed format string when read PPM file header with
- the fscanf() function. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=861
-
- * libtiff/{tif_dirinfo.c, tif_print.c}: TIFFFetchByteArray() returns
- uint16 array when fetching the BYTE and SBYTE filds, so we should
- consider result as pointer to uint16 array and not as array of chars.
- As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=831
-
- * libtiff/tif_dir.c: More efficient custom tags retrieval as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=830
-
- * libtiff/tif_win32.c: Use FILE_SHARE_READ | FILE_SHARE_WRITE share
- mode in CreateFile() call as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=829
-
- * libtiff/Makefile.am: Fixed parallel compilation of the libtiff and
- libtiffxx libraries as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=826
-
- * contrib/addtiffo/{tif_overview.c, tif_ovrcache.h}: Sinchronized with
- GDAL.
-
-2005-05-23 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: Substantial fix for addtiffo problems with
- JPEG encoded TIFF files. Pre-allocate lots of space for jpegtables
- in directory.
-
-2005-05-22 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirread.c: Changed the code that computes
- stripbytecount[0] if it appears bogus to ignore if stripoffset[0] is
- zero. This is a common case with GDAL indicating a "null" tile/strip.
-
-2005-05-17 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffsplit.c: Check for JPEGTables tag presence before copying.
-
-2005-05-06 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirread.c: Applied similar change to
- TIFFFetchPerSampleLongs and TIFFFetchPerSampleAnys.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=843
-
- * libtiff/tif_jpeg.c: added LIB_JPEG_MK1 support in JPEGDecodeRaw().
-
-2005-05-06 Andrey Kiselev <dron@ak4719.spb.edu>
- * tools/tiff2pdfr.c, man/tiff2pdf.1: Calculate the tile width properly;
- added new option '-b' to use interpolation in output PDF files (Bruno
- Ledoux).
-
-2005-05-05 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirread.c: Ensure that broken files with too many
- values in PerSampleShorts work ok instead of crashing.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=843
-
-2005-04-27 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffdither.c: Copy the PhotometricInterpretation tag from the
- input file.
-
-2005-04-15 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_predict.c: Added ability to encode floating point
- predictor, as per TIFF Technical Note 3.
-
-2005-04-14 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_predict.h, tif_predict.c}: Added ability to decode
- floating point predictor, as per TIFF Technical Note 3.
-
-2005-04-13 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffio.h, tiffiop.h, tif_dir.c, tif_read.c, tif_swab.c}:
- Added _TIFFSwab24BitData() and TIFFSwabArrayOfLong() functions used to
- swap 24-bit floating point values.
-
- * libtiff/tiff.h: Added predictor constants.
-
-2005-04-08 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffiop.h, tif_dir.c}: Use uint32 type for appropriate
- values in _TIFFVSetField() function. Inspired by the bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=816
-
- * man/TIFFSetField.3tiff: Fixed definition of the TIFFTAG_INKNAMES tag
- as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=816
-
-2005-03-30 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_open.c: Do not read header in case the output file
- should be truncated (Ron).
-
- * libtiff/{tif_dirinfo.c, tif_config.h.vc}: Use lfind() instead
- of bsearch() in _TIFFFindFieldInfoByName() function (Ron).
-
- * libtiff/{tiff.h, tif_dirinfo.c}: Fixes in EXIF tag ordering (Ron).
-
-2005-03-22 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure.ac, libtiff/Makefile.am: Use libtool machinery to pass
- rpath option.
-
-2005-03-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dir.c, tif_print.c}: Handle all data types in custom
- tags.
-
-2005-03-18 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/dirinfo.c: Added DNG tags.
-
- * libtiff/{tif_dir.c, tif_print.c}: More improvements in custom tag
- handling code.
-
- * libtiff/tiff.h: More comments; added missed DNG tag (LensInfo);
- added DNG 1.1.0.0 tags.
-
- * tools/tif2pdf.c: Fixed problem with alpha channel handling as per
- bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=794
-
- * man/TIFFGetField.3tiff: Add a note about autoregistered tags.
-
-2005-03-17 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * nmake.opt: Build with Win32 CRT library by default.
-
- * tools/tiff2ps.c: Fixed typo in page size handling code.
-
- * libtiff/{tif_dir.c, tif_print.c}: Support for custom tags, passed
- by value.
-
- * libtiff/{tiff.h, tif_dirinfo.c, tiffiop.h}: Added EXIF related tags.
-
-2005-03-15 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.7.2 released.
-
-2005-03-09 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffcmp.c: Added ability to compare the 32-bit integer and
- floating point data; complain on unsupported bit depths.
-
-2005-03-05 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tif_stream.cxx: Use ios namespace instead of ios_base to support
- GCC 2.95.
-
- * libtiff/{tiff.h, tif_fax3.tif, tif_jpeg.c}: Applied correct patch from
- Lee Howard for HylaFax DCS tag
- (see http://bugzilla.remotesensing.org/show_bug.cgi?id=771)
-
-2005-03-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure, configure.ac: Use -rpath option instead of -R as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=732
-
- * libtiff/{tiff.h, tif_fax3.tif, tif_jpeg.c}: Applied patch from Lee
- Howard to support a new tag TIFFTAG_FAXDCS (34911) used in HylaFax
- software. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=771
-
- * nmake.opt, html/build.html: Add more comments, change the config
- file organization a bit as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=764
-
- * tools/tiffcmp.c: Use properly sized buffer in short arrays comparison
- as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=785
-
-2005-03-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: More logic to guess missed strip size as per
- bug http://bugzilla.remotesensing.org/show_bug.cgi?id=705
-
- * tools/fax2ps.c: Replace insecure mktemp() function with the
- tmpfile() as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=786
-
-2005-02-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tiff.h: Changed the int8 definition to be always signed char
- as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=727
-
- * libtiff/tiffio.h: Move TIFFOpenW() function into the extern "C"{}
- block as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=763
-
-2005-02-03 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * tools/tiffgt.c: Fix problem on big-endian CPUs so that images
- display more correctly. Images display brighter than they should
- on a Sun workstation.
-
-2005-02-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Estimate strip size in case of wrong or
- suspicious values in the tags. As per bugs
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=705
-
- and
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=320
-
- * tools/tiff2ps.c: Fixed problem with page sizes as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=742
-
-2005-01-31 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tiff.h (TIFFTAG_TILEWIDTH): Corrected description.
- (TIFFTAG_TILELENGTH): Corrected description.
-
-2005-01-30 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure.ac: Fixes for --with-docdir option as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=759
-
- * libtiff/tif_open.c: Remove unnesessary TIFFSeekFile() call as per
- bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=756
-
- * libtiff/tif_stream.cxx: Fixes for C++ stream interface from
- Michael Rinne and Edward Lam.
-
-2005-01-15 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure.ac: Make the documentation directory location configurable
- via the --with-docdir option (as suggested by Jeremy C. Reed).
-
- * libtiff/tif_color.c: Use double as the second argument of pow()
- function in TIFFCIELabToRGBInit(). As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=741
-
- * libtiff/tif_pixarlog.c: Avoid warnings when converting float to
- integer as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=740
-
- * libtiff/tif_getimage.c: Always fill the error message buffer in
- TIFFRGBAImageBegin() as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=739
-
-2005-01-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_jpeg.c: Added ability to read/write the fax specific
- TIFFTAG_FAXRECVPARAMS, TIFFTAG_FAXSUBADDRESS and TIFFTAG_FAXRECVTIME
- tags as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=736
-
- * libtiff/tif_win32.c: Fixed message formatting in functions
- Win32WarningHandler() and Win32ErrorHandler() as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=735
-
- * tools/tiff2ps.c: Interpret the -w and -h options independently. As
- per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=689
-
-2005-01-11 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tiffio.h: Move the color conversion routines in the 'extern
- "C"' section as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=727
-
- * libtiff/tiff.h: Restore back the workaround for AIX Visual Age C
- compiler to avoid double definition of BSD types as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=39
-
- * libtiff/Makefile.am: Place the C++ stream API in the separate
- library called libtiffxx to avoid unneeded dependencies. Probably
- there will be more C++ API in the future. As per bugs
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=733
-
- and
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=730
-
-2005-01-05 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffdump.c: Fixed problem when read broken TIFFs with the
- wrong tag counts (Dmitry V. Levin, Martin Pitt).
-
- * configure.ac: Replace --disable-c++ with the --disable-cxx option as
- per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=730
-
-2004-12-25 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_getimage.c: More fixes for multiple-alpha-channelled
- RGB-images as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=713
-
-
- * tools/tiffset.c: Convert character option to integer value as per
- bug http://bugzilla.remotesensing.org/show_bug.cgi?id=725
-
-2004-12-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.7.1 released.
-
- * html/tiffset.1.html: Add missed manual page as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=678
-
- * libtiff/tiff.h: Revert back libtiff data type definitions as per
- bug http://bugzilla.remotesensing.org/show_bug.cgi?id=687
-
-2004-12-19 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Do not forget about TIFF_VARIABLE2 when
- checking for tag count in TIFFReadDirectory() function. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=713
-
- * libtiff/{tif_dirread.c, tif_fax3.c}: More argument checking in
- CheckMallock() function.
-
- * libtiff/tif_getimage.c: Support for multiple-alpha-channelled
- RGB-images as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=718
-
-2004-12-15 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_getimage.c: #define A1 bracketing for clean build on
- SunPro compiler.
-
-2004-12-11 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * autogen.sh: aclocal and autoheader should be executed after
- libtoolize. Also add '-I .' to aclocal invocation to check
- current directory for macros.
-
-2004-12-10 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirwrite.c: Always write TIFFTAG_SUBIFD using LONG type
- as per bugs
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=703
-
- and
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=704
-
-2004-12-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * nmake.opt: Link with the user32.lib in windowed mode. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=697
-
- * libtiff/tif_win32.c: Use char* strings instead of TCHAR in windowed
- mode as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=697
-
- * libtiff/tif_config.in.vc: Removed unneded definitions for
- read/open/close/lseek functions to fix the
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=680
-
-2004-12-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dir.c, tif_dirread.c}: Remove TIFFReassignTagToIgnore()
- call from the TIFFReadDirectory() function. TIFFReassignTagToIgnore
- must be removed in the future, as it was never used properly. As per
- bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=692
-
-2004-11-30 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tif_jpeg.c: Added a work-around in order to allow
- compilation with the heavily modified version of libjpeg delivered
- with Cygwin.
-
-2004-11-29 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dir.c: Properly handle tags, which have the uint32
- counts. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=693
-
- * tools/fax2ps.c: Be able to extract the first page (#0). As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=690
-
-2004-11-28 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_unix.c: Make UNIX module compilable (and usable)
- on Windows.
-
- * nmake.opt: Add missed DLLNAME variable.
-
-2004-11-26 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/makefile.vc: make it easier to rename the libtiff DLL.
-
-2004-11-24 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * man/libtiff.3tiff: Improvements in the "LIST OF ROUTINES" table as
- per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=545
-
- * man/tiffset.1: Added manual page for tiffset tool written by Jay
- Berkenbilt. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=678
-
-2004-11-23 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_error.c: fixed TIFFerror call to be TIFFError.
-
-2004-11-21 Frank Warmerdam <warmerdam@pobox.com>
-
- * html/document.html: Updated Adobe web links as per email from Joris.
-
-2004-11-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffio.hxx, tiffio.h}: C++ stream interface moved to new
- file tiffio.hxx. We don't have any C++ in tiffio.h, those who want to
- use C++ streams should #include <tiffio.hxx>.
-
-2004-11-13 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tiff.h: Added Adobe DNG tags.
-
- * libtiff/tif_win32.c: Typo fixed.
-
- * libtiff/{tif_stream.cxx, tiffio.h}: C++ stream interface updated to
- be compliant with the latest standard. Appropriate additions in
- makefiles now completed.
-
-2004-11-11 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffset.c, libtiff/tif_dirinfo.c: Properly handle the
- different tag types. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=600
-
-2004-11-10 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_aux.c: Set the appropriate ReferenceBlackWhite array for
- YCbCr image which lacks that tag (noted by Hans Petter Selasky).
-
-2004-11-09 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_color.c: Division by zero fixed (Hans Petter Selasky).
-
-2004-11-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_stream.cxx, tiffio.h}: Added C++ stream interface
- contributed by Edward Lam (see
- http://bugzilla.remotesensing.org/show_bug.cgi?id=654 for details).
- Though no changes in any makefiles yet.
-
-2004-11-05 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_open.c: Removed close() in TIFFClientOpen() if file
- is bad. This is the callers responsibility.
- http://bugzilla.remotesensing.org/show_bug.cgi?id=651
-
-2004-11-05 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffio.h, tif_win32.c, libtiff.def}: Added TIFFOpenW()
- function to work with the double byte strings (used to represent
- filenames in some locales). As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=625
-
- * libtiff/tif_dirread.c: Fixed problem when fetching BitsPerSample and
- Compression tags of type LONG from broken TIFFS as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=662
-
- * libtiff/tif_dirinfo.c: Fixed definition for TIFFTAG_RICHTIFFIPTC,
- the writecount should have uint32 type. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=662
-
- * libtiff/tif_write.c: Fixed wrong if() statement in
- TIFFAppendToStrip() function as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=660
-
-2004-11-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirinfo.c: Change definition for TIFFTAG_EXTRASAMPLES
- field. The caller should supply a count when setting this field. As
- per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=648
-
- * libtiff/{tif_jpeg.c, tif_ojpeg.c}: TIFFTAG_JPEGTABLES should have
- uint32 count. Use this type everywhere.
-
-2004-11-03 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_next.c: avoid use of u_long and u_char types. Bug 653.
-
-2004-11-02 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiff2rgba.c: removed extra newlines in usage message.
-
-2004-10-30 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirwrite.c: Improvements in tag writing code.
-
- * tools/tiff2ps.c: Fixed wrong variable data type when read Position
- tags (Tristan Hill).
-
-2004-10-30 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tiffiop.h: added fallback definition of assert() if we
- don't have assert.h.
-
-2004-10-29 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_fax3.c: Fixed case with the wrong decode routines
- choosing when the incorrect Group4Options tag set. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=323
-
- * libtiff/tif_dirwrite.c: Fixed problem with passing count variable of
- wrong type when writing the TIFF_BYTE/TIFF_SBYTE tags in
- TIFFWriteNormalTag().
-
-2004-10-28 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2ps.c: Fixed wrong variable data type when read Resolution
- tags (Peter Fales).
-
- * tools/{bmp2tiff.c, raw2tiff.c}: Get rid of stream I/O functions.
-
-2004-10-28 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiff2pdf.c: added casts to avoid warnings.
-
- * libtiff/libtiff.def: Added several more entry points required
- to link fax2tiff.c against the DLL on windows.
-
-2004-10-27 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure, configure.ac: Added --enable-rpath option to embed linker
- paths into library binary.
-
-2004-10-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffset.c: Check the malloc return value (Dmitry V. Levin).
-
- * libtiff/{tif_strip.c, tif_tile.c}: Zero division problem fixed
- (Vladimir Nadvornik, Dmitry V. Levin).
-
-2004-10-16 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.7.0 released.
-
-2004-10-15 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tif_jpeg.c: There seems to be no need to include stdio.h
- in this file so its inclusion is removed. Including stdio.h
- sometimes incurs an INT32 typedef conflict between MinGW's
- basetsd.h and libjpeg's jmorecfg.h.
-
-2004-10-15 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * man/bmp2tiff.1: Added manual page for bmp2tiff utility.
-
-2004-10-13 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * tools/tiffcmp.c (leof): Renamed from 'eof' in order to avoid
- conflict noticed under MinGW.
- * ltmain.sh: Fix for MinGW compilation.
-
-2004-10-13 Frank Warmerdam <warmerdam@pobox.com>
-
- * man/tiffsplit.1: Fixed to indicate using aaa-zzz, not aa-zz.
- http://bugzilla.remotesensing.org/show_bug.cgi?id=635
-
-2004-10-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dirread.c, tif_jpeg.c, tif_luv.c, tif_ojpeg.c,
- tif_pixarlog.c, tif_write.c}: Handle the zero strip/tile sizes
- properly (Dmitry V. Levin, Marcus Meissner).
-
-2004-10-11 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirinfo.c: Type of the TIFFTAG_SUBIFD field changed
- to TIFF_IFD.
-
-2004-10-10 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/bmp2tif.c: Check the space allocation results.
-
-2004-10-09 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dir.c: Initialize td_tilewidth and td_tilelength fields
- of the TIFFDirectory structure with the 0 instead of -1 to avoid
- confusing integer overflows in TIFFTileRowSize() for striped images.
-
- * tools/tiff2pdf.c: Fixed TransferFunction tag handling reported
- by Ross A. Finlayson.
-
- * libtiff/tif_dir.c: Fixed custom tags handling as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=629
-
-2004-10-08 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirinfo.c: Fix bug with tif_foundfield and reallocation
- of tif_fieldinfo.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=630
-
-2004-10-04 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * contrib/iptcutil/README: Added the missing README which goes
- along with iptcutil.
-
-2004-10-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_compress.c: Improved error reporting in
- TIFFGetConfiguredCODECs() (Dmitry V. Levin).
-
-2004-10-02 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.7.0beta2 released.
-
- * libtiff/{tif_aux.c, tif_compress.c, tif_dirinfo.c, tif_dirwrite.c,
- tif_extension.c, tif_fax3.c, tif_luv.c, tif_packbits.c,
- tif_pixarlog.c, tif_write.c}: Added checks for failed memory
- allocations and integer overflows (Dmitry V. Levin).
-
- * libtiff/tiff.h: Missed TIFF_BIGTIFF_VERSION constant added.
-
-2004-10-01 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_open.c: added a more informative message if a BigTIFF
- file is opened.
-
-2004-09-30 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirinfo.c: changed type of XMLPacket (tag 700) to
- TIFFTAG_BYTE instead of TIFFTAG_UNDEFINED to comply with the info
- in the Adobe XMP Specification.
-
-2004-09-29 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_jpeg.c, tif_pixarlog.c}: Use _TIFFmemset() instead of
- memset().
-
- * libtiff/{tif_dirread.c, tif_strip.c, tif_tile.c}: Applied patches
- from Dmitry V. Levin to fix possible integer overflow problems.
-
-2004-09-28 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_getimage.c: Check for allocated buffers before clearing
- (Dmitry V. Levin).
-
-2004-09-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dir.h, tif_dir.c, tif_dirread.c, tif_write.c}:
- Optimize checking for the strip bounds.
-
- * libtiff/{tif_dirread.c, tif_strip.c}: TIFFScanlineSize() and
- TIFFRasterScanlineSize() functions report zero in the case of integer
- overflow now. Properly handle this case in TIFFReadDirectory()
- (patches from Dmitry V. Levin).
-
-2004-09-25 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_dirinfo.c, tif_strip.c, tif_tile.c}: Use TIFFhowmany8()
- macro where appropriate.
-
- * tools/tiff2bw.c: Write ImageWidth/Height tags to output file, as
- noted by Gennady Khokhorin.
-
- * libtiff/tif_dirread.c: Always check the return values, returned
- by the _TIFFmalloc() (Dmitry V. Levin).
-
- * libtiff/tif_dir.c: Fixed possible integer overflow _TIFFset*Array()
- functions (Dmitry V. Levin).
-
- * libtiff/{tif_dirread.c, tif_dir.c, tif_write.c}:
- Potential memory leak fixed in TIFFReadDirectory(), _TIFFVSetField(),
- TIFFGrowStrips() (found by Dmitry V. Levin).
-
-2004-09-24 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffio.h, tif_compress.c}: Added TIFFGetConfiguredCODECs()
- to get the list of configured codecs.
-
- * libtiff/{tiffiop.h, tif_dirread.c}: More overflow fixes from
- Dmitry V. Levin.
-
-2004-09-23 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Applied patch from Dmitry V. Levin to fix
- possible integer overflow in CheckMalloc() function.
-
-2004-09-22 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffiop.h, tif_strip.c}: Use TIFFhowmany8() macro instead
- of plain TIFFhowmany() where appropriate.
-
-2004-09-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_getimage.c: Initialize arrays after space allocation.
-
-2004-09-19 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.7.0beta released.
-
- * libtiff/{tif_luv.c, tif_next.c, tif_thunder.c}: Several buffer
- overruns fixed, as noted by Chris Evans.
-
-2004-09-14 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * commit: Added a script to make it more convenient to commit
- updates. The CVS commit message is extracted from this ChangeLog
- file.
-
-2004-09-14 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure.ac, configure, aclocal.m4, libtiff/{mkspans.c, tif_fax3.c,
- tif_getimage.c, tif_luv.c, tif_lzw.c, tif_ojpeg.c, tif_packbits.c,
- tif_predict.c, tif_read.c, tif_swab.c, tif_thunder.c, tif_write.c,
- tif_dir.c, tif_dirread.c, tif_dirwrite.c, tif_jpeg.c, tif_dirinfo.c,
- tif_vms.c, tif_print.c, tif_strip.c, tif_tile.c, tif_dir.h,
- tif_config.h.in, tiffiop.h}:
- Get rid of BSD data types (u_char, u_short, u_int, u_long).
-
-2004-09-13 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * libtiff/tiff.h: Fix column tagging. Reference current Adobe XMP
- specification. Reference libtiff bug tracking system to submit
- private tag additions.
-
-2004-09-12 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * tools/tiffgt.c: Include "tif_config.h".
-
- * configure.ac: Use AM_PROG_CC_C_O since it is now needed to build
- tiffgt. This results in the 'compile' script being added to the
- project.
-
- * tools/Makefile.am (tiffgt_CFLAGS): Add extra build options
- required to find OpenGL headers necessary to build tiffgt. Also
- ensure that the libtiff that we built is used rather than some other
- libtiff installed on the system.
-
-2004-09-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure.ac, acinclude.m4, aclocal.m4: New macros to detect GLUT
- libraries.
-
-2004-09-11 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-
- * configure.ac: Pass library configuration defines via
- tif_config.h rather than extending CPPFLAGS. Configure a
- libtiff/tiffconf.h in order to satisfy application requirements
- (not used by library build). Do not define _POSIX_C_SOURCE=2 since
- this causes failure to build on systems which properly respect
- this request.
-
- * libtiff/tiffconf.h.in: New file to act as the template for the
- configured tiffconf.h
-
- * libtiff/files.lst (HDRS): Install the configured tiffconf.h.
-
-2004-09-10 Frank Warmerdam <warmerdam@pobox.com>
-
- * html/internals.html: Split off a discussion of adding new tags
- into addingtags.html.
-
-2004-09-10 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * test/{ascii_tag.c, long_tag.c}: Preliminary test suite added.
-
- * tools/tiff2pdf.c: Fixed reading TransferFunction tag as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=590
-
- * libtiff/tif_print.c: Fixes in InkNames and NumberOfInks reporting.
-
- * libtiff/tif_dirread.c: Don't reject to read tags of the
- SamplesPerPixel size when the tag count is greater than number of
- samples as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=576
-
- * libtiff/tiff.h: Use _TIFF_DATA_TYPEDEFS_ guardian to switch off
- defining int8/uint8/... etc. types. As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=607
-
-2004-09-09 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiff2ps.c, tools/tiffmedian.c: fiddle with include files
- to avoid compile warnings about getopt() and a few other things.
-
-2004-09-02 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Use memcpy() function instead of pointer
- assigning magic in TIFFFetchFloat().
-
-2004-09-01 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffio.h, tif_open.c}: Applied patches from Joris Van Damme
- to avoid requirement for tiffiop.h inclusion in some applications. See
- here
-
- http://www.asmail.be/msg0054799560.html
-
- for details.
-
- * tools/fax2tiff.c: Use the new functions in the code.
-
-2004-08-25 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: Initialize arrays properly.
-
- * tools/tiff2ps.c: Avoid zero division in setupPageState() function;
- properly initialize array in PSDataBW().
-
-2004-08-24 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: More fixes for bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=590
-
- from Ross Finlayson.
-
-2004-08-23 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2ps.c: Fixed problem with uninitialized values.
-
- * libtiff/tif_dir.c: Initialize tif_foundfield data member in the
- TIFFDefaultDirectory() (in addition to 2004-08-19 fix).
-
- * tools/tiff2pdf.c: Fixed a bunch of problems as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=590
-
-2004-08-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: Applied patch from Ross Finlayson that checks
- that the input file has compression, photometric interpretation,
- etcetra, tags or if not than a more descriptive error is returned.
-
- * libtiff/tif_dirread.c: Fixed problem in TIFFReadDirectory() in the
- code, responsible for tag data type checking.
-
-2004-08-19 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffiop.h, tif_dirinfo.c}: Fixed problem with the static
- variable as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=593
-
-2004-08-16 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/ras2tiff.c: Fixed issue with missed big-endian checks as per
- bug http://bugzilla.remotesensing.org/show_bug.cgi?id=586
-
-2004-08-01 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_config.h.in, tif_config.h.vc}: config.h.in and
- config.h.vc files renamed in the tif_config.h.in and tif_config.h.vc.
-
-2004-07-24 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_lzw.c: LZW compression code is merged back from the
- separate package. All libtiff tools are updated to not advertise an
- abcence of LZW support.
-
-2004-07-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tiffio.h: Revert thandle_t back to void* type.
-
-2004-07-11 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_read.c, tif_tile.c, tif_strip.c}: Fixes in error
- messages, as suggested by Bernd Herd.
-
-2004-07-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dir.c: Call TIFFError() instead of producing warnings
- when setting custom tags by value. Reported by Eric Fieleke.
-
-2004-06-14 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/bmp2tiff.c: Add missed RawsPerStrip setting.
-
-2004-06-08 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/bmp2tiff.c: Added new utility to convert Windows BMP files
- into TIFFs.
-
-2004-06-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.7.0alpha released.
-
-2004-06-06 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiff.h, tif_dirwrite.c, tif_fax3.c, tif_packbits.c,}: Get rid
- of ugly 64-bit hacks, replace them with the clever (autoconf based )
- ones :-).
-
- * libtiff/tiffio.h: Define thandle_t as int, not void* (may cause
- problems in 64-bit environment).
-
-2004-06-05 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffset.c: tiffset now can set any libtiff supported tags.
- Tags can be supplied by the mnemonic name or number.
-
- * libtiff/{tiffio.h, tif_dir.h, tif_dirinfo.c,}: Added two new
- functions TIFFFindFieldInfoByName() and TIFFFieldWithName().
-
-2004-05-27 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_ojpeg.c: Fixed problem with duplicated SOI and SOF
- markers as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=581
-
-2004-05-24 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffsplit.c: Don't forget to copy Photometric
- Interpretation tag.
-
-2004-05-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_open.c, tiffio.h}: New function added:
- TIFFIsBigEndian(). Function returns nonzero if given was file written
- in big-endian order.
-
- * tools/tiffsplit.c: Fixed problem with unproperly written multibyte
- files. Now output files will be written using the same byte order
- flag as in the input image. See
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=574
-
- for details.
-
-2004-05-19 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_print.c: added (untested) support for printing
- SSHORT, SLONG and SRATIONAL fields.
-
- * tools/tiffcp.c: close output file on normal exit.
-
-2004-05-17 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_fax3.c: Avoid reading CCITT compression options
- if compression type mismatches. See
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=565
-
-2004-04-30 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_strip.c: Never return 0 from the
- TIFFNumberOfStrips().
-
-2004-04-29 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Workaround for broken TIFF writers which
- store single SampleFormat value for multisampled images. See
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=562
-
-2004-04-25 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure.ac, libtiff/{tiff.h, config.h.in}: Added tests for int8,
- int16 and int32 types to avoid complains on some compilers. Details at
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=39
-
-2004-04-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2pdf.c: Fixed problem with unaligned access as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=555
-
-2004-04-14 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_write.c: Allow in-place updating of the compressed
- images (don't work properly with all codecs). For details see GDAL bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=534
-
-2004-04-06 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_jpeg.c: Workaround for wrong sampling factors used
- in the Intergarph JPEG compressed TIFF images as per bug:
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=532
-
-2004-04-04 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_open.c: close clientdata if TIFFClientOpen() fails
- via bad2.
-
-2004-03-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffcp.c: Properly set Photometric Interpretation in case of
- JPEG compression of grayscale images.
-
- * tools/tiffcp.c: Don't emit warnings when Orientation tag does not
- present in the input image.
-
-2004-03-19 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * {many}: The first attempt to switch to autotools.
-
-2004-03-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_open.c: Use dummy mmap/munmap functions in
- TIFFClientOpen() when the appropriate client functions was not
- supplied by user.
-
-2004-03-02 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/ycbcr.c: fixed main() declaration as per:
- http://bugzilla.remotesensing.org/show_bug.cgi?id=513
-
-2004-02-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffsplit.c: Copy JPEGTables tag contents for JPEG compressed
- images. Reported by Artem Mirolubov.
-
- * libtiff/tif_dirread.c: Fixed problem with handling TIFF_UNDEFINED
- tag type in TIFFFetchNormalTag() as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=508
-
-2004-02-17 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_codec.c: Fixed typo in TIFFInitPackBits name as per:
- http://bugzilla.remotesensing.org/show_bug.cgi?id=494
-
-2004-02-05 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_fax3.c: Fixed problem with CCITT encoding modes as per
- bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=483
-
- But we need more work on fax codec to support update mode.
-
-2004-01-30 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/libtiff.def: Added TIFFCurrentDirOffset, TIFFWriteCheck,
- TIFFRGBAImageOK, and TIFFNumberOfDirectories as suggested by
- Scott Reynolds.
-
-2004-01-29 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tiff.h: Fixed tag definitions for TIFFTAG_YCLIPPATHUNITS
- and TIFFTAG_INDEXED as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=475
-
- * libtiff/{tif_win32.c, tif_unix.c}: Check whether the pointer is
- NULL before proceeding further as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=474
-
- Check results, returned by the TIFFFdOpen() before returning and close
- file if TIFFFdOpen() failed as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=468
-
- * libtiff/tif_open.c: More fixes for
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=468
-
-2004-01-28 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{libtiff.def, tif_close.c, tiffio.h, tif_open.c}: Separate
- TIFFCleanup() from the TIFFClose() in order to fix the bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=468
-
- * tools/tiffcp.c: Fixed problem with wrong interpretation of the
- InkNames tag as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=466
-
- Memory leak fixed.
-
-2004-01-21 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirwrite.c: Fixed handling of writable ASCII tags that
- are field_passcount=TRUE properly. Arguably anonymous custom tags
- should be declared as passcount=FALSE, but I don't want to change
- that without a careful review.
-
-2004-01-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_write.c: Fixed reporting size of the buffer in case of
- stripped image in TIFFWriteBufferSetup(). As per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=460
-
-2004-01-11 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dir.c: Incomplete cleanup in TIFFFreeDirectory(),
- patch from Gerben Koopmans.
-
- * libtiff/tif_dirread.c: Check field_passcount value before setting
- the value of undefined type, patch from Gerben Koopmans.
-
-2004-01-02 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffcp.c: Fixed problem with wrong Photometric setting for
- non-RGB images.
-
-2003-12-31 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_win32.c: Fixed problem with _TIFFrealloc() when the NULL
- pointer passed. Patch supplied by Larry Grill.
-
- * libtiff/{tiff.h, tif_fax3.c}:Fixes for AMD 64 platform as
- suggested by Jeremy C. Reed.
-
-2003-12-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff 3.6.1 released.
-
-2003-12-24 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * config.guess, config.sub: Updated from the recent upstream.
-
-2003-12-22 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_color, tif_getimage.c, tiffio.h}, man/TIFFcolor.3t:
- More cleanups in color conversion interface, added appropriate manual
- page.
-
-2003-12-19 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_extension.c, tif_dirinfo.c, tiff.h}: Warnings fixed as
- per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=357
-
- * tools/tiff2ps.c: Added support for alpha channel. Fixes
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=428
-
- * libtiff/{libtiff.def, tif_color.c, tif_getimage.c, tiffio.h}:
- Interface for Lab->RGB color conversion is finally cleaned up.
- Added support for ReferenceBlackWhite tag handling when converted from
- YCbCr color space. The latter closes
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=120
-
-2003-12-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_getimage.c, tiffio.h}: Avoid warnings.
-
- * libtiff/makefile.vc, tools/makefile.vc: Support for IJG JPEG
- library.
-
-2003-12-06 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_getimage.c, tif_aux.c}: Read WhitePoint tag from the
- file and properly use it for CIE Lab->RGB transform.
-
-2003-12-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_getimage.c, tif_color.c, tiffio.h}: YCbCr->RGB
- conversion routines now in the tif_color.c module. New function
- TIFFYCbCrtoRGB() available in TIFF API.
-
- * libtiff/tif_dirwrite.c: Handle TIFF_IFD tag type correctly.
-
-2003-12-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_getimage.c, tif_color.c, tiffio.h}: Improvements in
- CIE Lab conversion code. Start moving YCbCr stuff to the tif_color.c
- module.
-
- * libtiff/{tif_getimage.c, tiffio.h}, man{TIFFReadRGBAImage.3t,
- TIFFReadRGBAStrip.3t, TIFFReadRGBATile.3t, TIFFRGBAImage.3t}:
- Finally resolved problems with orientation handling. TIFFRGBAImage
- interface now properly supports all possible orientations, i.e. images
- will be flipped both in horizontal and vertical directions if
- required. 'Known bugs' section now removed from the appropriate manual
- pages. Closed bug entry:
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=322
-
-2003-12-02 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dir.c: Fixed order of the parameters in TIFFError()
- function calls as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=440
-
-2003-11-28 Ross Finlayson <libtiff@apexinternetsoftware.com>
-
- * tools/tiff2pdf.c: Some bugs fixed.
-
-2003-11-27 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_luv.c: Fixed bug in 48-bit to 24-bit conversion routine,
- reported by Antonio Scuri.
-
- * man/tiff2pdf.1: Few improvements in page layout.
-
- * Makefile.in, /man/Makefile.in, /html/man/tiff2pdf.1.html:
- Added support fpr tiff2pdf manual page.
-
-2003-11-26 Ross Finlayson <libtiff@apexinternetsoftware.com>
-
- * /man/tiff2pdf.1: File added to repository.
-
-2003-11-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * Makefile.in, /tools/{Makefile.in, makefile.vc}:
- Added support fpr tiff2pdf utility.
-
-2003-11-25 Ross Finlayson <libtiff@apexinternetsoftware.com>
-
- * /tools/tiff2pdf.c: File added to repository.
-
-2003-11-22 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * /tools/raw2tiff.c: sqrtf() replaced with sqrt().
-
-2003-11-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * /tools/raw2tiff.c: #include <getopt.h> removed.
-
- * tools/{Makefile.in, tiffgt.c}: Unmaintained and platform dependent
- sgigt utility removed and replaced with the completely rewritten
- portable tiffgt tool (depend on OpenGL and GLUT). Initial revision,
- there is a lot of things to improve.
-
- * libtiff/tif_ojpeg.c: TIFFVGetField() function now can properly
- extract the fields from the OJPEG files. Patch supplied by Ross
- Finlayson.
-
- * libtiff/{tiffio.h, tif_codec.c}, man/{libtiff.3t, TIFFcodec.3t}:
- Added new function TIFFIsCODECConfigured(), suggested by Ross
- Finlayson.
-
-2003-11-18 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirinfo.c: Implemented binary search in
- _TIFFMergeFieldInfo(). Patch supplied by Ross Finlayson.
-
- * libtiff/tif_dir.h: _TIFFFindOrRegisterdInfo declaration replaced
- with _TIFFFindOrRegisterFieldInfo as reported by Ross Finlayson.
-
-2003-11-17 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_dirread.c: do not mark all anonymously defined tags to be
- IGNOREd.
-
-2003-11-17 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * contrib/pds/{tif_pdsdirread.c, tif_pdsdirwrite.c}: Use
- TIFFDataWidth() function insted of tiffDataWidth array.
-
-2003-11-16 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiff.h, tif_dirinfo.c}: Added support for IFD (13)
- datatype, intruduced in "Adobe PageMaker TIFF Tech. Notes".
-
-2003-11-15 Frank Warmerdam <warmerdam@pobox.com>
-
- * Makefile.in: fixed missing backslash for tif_color.c in list.
-
-2003-11-13 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_color.c, tif_getimage.c, tiffio.h, Makefile.in}:
- New color space conversion code: CIE L*a*b* 1976 images now supported
- by the TIFFRGBAImage interface. All introduced routines go to new
- module tif_color.c. Eventually all color conversion functions should
- be moved there.
-
-2003-11-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/{ras2tiff.c, rasterfile.h}: Properly determine SUN Rasterfiles
- with the reverse byte order (it is reported by the magic header
- field). Problem reported by Andreas Wiesmann.
-
- * tools/raw2tiff.c, man/raw2tiff.1: Few improvements in correlation
- calculation function. Guessing mechanics now documented in manual page.
-
-2003-11-11 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/raw2tiff.c: Implemented image size guessing using
- correlation coefficient calculation between two neighbour lines.
-
-2003-11-09 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_tile.c: remove spurious use of "s" (sample) in the
- planarconfig_contig case in TIFFComputeTile().
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=387
-
-2003-11-09 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tiffiop.h: New macros: TIFFmax, TIFFmin and TIFFrint.
-
-2003-11-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffio.h, tif_strip.c}, man/{TIFFstrip.3t, libtiff.3t}:
- Added TIFFRawStripSize() function as suggested by Chris Hanson.
-
-2003-11-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_lzw.c, tif_fax3.c}: Proper support for update mode as
- per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=424
-
-2003-10-29 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/libtiff.def: Added TIFFReadRGBAImageOriented.
-
- * html/build.html: Added note about GNU make requirement.
-
-2003-10-25 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * Makefile.in: Fixes in using MAKEFLAGS as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=418
-
- * port/install.sh.in: Option -p added to the mkdir command to create
- all directory tree structure before installing.
-
-2003-10-18 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * /tools/tiff2ps.c: #include <strings.h> replaced with the
- #include <string.h>.
-
-2003-10-16 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * Makefile.in: Add an absolute path to the test_pics.sh call.
-
-2003-10-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tiffcomp.h: #define _BSDTYPES_DEFINED when defining BSD
- typedefs.
-
-2003-10-09 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure, libtiff/{Makefile.in, mkversion.c}:
- Relative buildings fixed.
-
- * tools/Makefile.in: Added "-I../libtiff" to the tiffset building
- rule.
-
-2003-10-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * Makefile.in: Added missed v3.6.0.html.
-
- * libtiff/tiffio.h: Typo fixed: ORIENTATION_BOTTOMLEFT replaced with
- ORIENTATION_BOTLEFT.
-
-2003-10-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * 3.6.0 final release.
-
-2003-10-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tif_getimage.c, tiffio.h}, man/TIFFReadRGBAImage.3t: New
- function TIFFReadRGBAImageOriented() implemented to retrieve raster
- array with user-specified origin position as suggested by Jason Frank.
- See
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=322
-
- for details.
-
- * tools/tiff2rgba.c: Switched to use TIFFReadRGBAImageOriented()
- instead of TIFFReadRGBAImage().
-
- * tools/tiff2ps.c: Fixed possible endless loop as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=404
-
-2003-09-30 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Check field counter against number of fields
- in order to fix
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=366
-
- * libtiff/tif_fax3.c: Fix wrong line numbering as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=342
-
-2003-09-25 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/{tiffiop.h, tif_dirread.c, tif_dir.c, tif_open.c,
- tif_close.c}: Store a list of opened IFD to prevent looping as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=383
-
-2003-09-23 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: More fixes for EstimateStripByteCounts(). See
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=358
-
-2003-08-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffmedian.c: int declaration replaced with the uint32 to
- support large images as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=382
-
-2003-08-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/Makefile.in: Fixed problem with building in different
- directory.
-
- * tools/tiff2ps.c: Added missing #include <strings.h>.
-
- * libtiff/tif_dirwrite.c: More fixes for custom tags code
- from Ashley Dreier.
-
-2003-08-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2ps.c: Added page size setting when creating PS Level 2.
- Patch submitted by Balatoni Denes (with corrections from Tom
- Kacvinsky).
-
- * tools/tiff2ps.c: Fixed PS comment emitted when FlateDecode is
- being used. Reported by Tom Kacvinsky.
-
- * libtiff/tif_dirwrite.c: Fixed problem with custom tags writing,
- reported by Ashley Dreier.
-
- * libtiff/tif_print.c: Fixed problem with float tags reading, support
- for printing RATIONAL and BYTE tags added.
-
-2003-08-05 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_lzw.c: Move LZW codec state block allocation back to
- TIFFInitLZW(), because its initialization in LZWSetupDecode() cause
- problems with predictor initialization. Remove O_RDONLY check during
- state block allocation to be able open LZW compressed files in update
- mode.
-
- Problem exist for libtiff version of the tif_lzw.c module. One from
- lzw-compression-kit hasn't such troubles.
-
-2003-08-04 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_write.c: modified tif_write.c so that the various
- encoded write functions use tif_postdecode() to apply byte order
- swapping (swab) to the application passed data buffer if the same
- would be done when reading. This allows us to write pixel data with
- more than 8 bits per sample to existing files of a non-native byte
- order. One side effect of this change is the applications buffer
- itself is altered in this case by the act of writing.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=171
-
-2003-07-25 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_open.c: avoid signed/unsigned casting warning
- initializing typemask as per patch from J.A. Strother.
-
- * tools/tiffcp.c: fixed signed/unsigned casting warning.
-
- * libtiff/tif_print.c: dos2unix conversion.
-
- * tools/tiffsplit.c: increased the maximum number of pages that
- can be split. Patch provided by Andrew J. Montalenti.
-
-2003-07-11 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/raw2tiff.c: Added option `-p' to explicitly select color
- space of input image data. Closes
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=364
-
-2003-07-08 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_aux.c, tif_codec.c, tif_dir.c, tif_dirread.c, tif_extension.c,
- tif_fax3.c, tif_getimage.c, tif_luv.c, tif_lzw.c, tif_next.c,
- tif_packbits.c, tif_predict.c, tif_print.c, tif_swab.c, tif_thunder.c:
- avoid casting warning at /W4.
-
-2003-07-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/thumbnail.c: Memory leak fixed as reported by Robert S. Kissel.
-
-2003-06-30 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_pixarlog.c: Unused variables removed.
-
- * libtiff/{tif_dirread.c, tif_dir.c}: Fixed problem with
- EstimateStripByteCounts() as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=358
-
- * libtiff/{tif_dirwrite.c, tif_packbits.c}: Fixed compilation on
- 64-bit architectures as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=357
-
- * libtiff/tif_dirinfo.c: TIFFDataWidth() returns 0 in case of
- unknown data type.
-
-2003-06-19 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_print.c: fixed some serious bugs when printing
- custom tags ... almost certain to crash.
-
- * libtiff/tif_dirread.c: Don't ignore custom fields that are
- autodefined. Not sure how this got to be like this.
-
-2003-06-18 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * 3.6.0 Beta2 released.
-
- * tools/tiffcmp.c, man/tiffcmp.1: Fixed problem with unused data
- comparing as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=349
-
- `-z' option now can be used to set the number of reported different
- bytes.
-
-2003-06-09 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffcp.c, man/tiffcp.1: Added possibility to specify value -1
- to -r option to get the entire image as one strip. See
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=343
-
- for details.
-
-2003-06-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffcp.c: Set the correct RowsPerStrip and PageNumber
- values as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=343
-
-2003-05-27 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: modified segment_height calculation to always
- be a full height tile for tiled images. Also changed error to just
- be a warning.
-
-2003-05-25 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/fax2tiff.c: Page numbering fixed, as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=341
-
-2003-05-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * contrib/ojpeg/{Makefile.in, jdhuff.h, jinclude.h, ojpeg.c, README},
- configure, Makefile.in: Switched back to the old behaviour. Likely
- better solution should be found for OJPEG support.
-
-2003-05-11 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/mkversion.c: Fixed problem with wrong string size when
- reading RELEASE-DATE file.
-
-2003-05-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2ps.c: Fixed bug in Ascii85EncodeBlock() function: array
- index was out of range.
-
-2003-05-06 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * contrib/ojpeg/{Makefile.in, jdhuff.h, jinclude.h, ojpeg.c, README},
- configure, Makefile.in: Improved libtiff compilation with OJPEG
- support. Now no need for patching IJG JPEG library, hack requred by
- libtiff will be compiled and used in-place. Implemented with
- suggestion and help from Bill Allombert, Debian's libjpeg maintainer.
-
- * libtiff/tif_aux.c: Properly handle TIFFTAG_PREDICTOR in
- TIFFVGetFieldDefaulted() function.
-
-2003-05-05 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/ppm2tiff.c: PPM header parser improved: now able to skip
- comments.
-
- * tools/tiffdither.c: Fixed problem with bit fill order tag setting:
- was not copied from source image.
-
- * libtiff/getimage.c: Workaround for some images without correct
- info about alpha channel as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=331
-
-2003-04-29 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2ps.c, man/tiff2ps.1: Add ability to generate PS Level 3.
- It basically allows one to use the /flateDecode filter for ZIP
- compressed TIFF images. Patch supplied by Tom Kacvinsky. Fixes
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=328
-
- * tools/tiff2ps.c: Force deadzone printing when EPS output specified
- as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=325
-
-2003-04-17 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Removed additional check for StripByteCounts
- due to problems with multidirectory images. Quality of error messages
- improved.
-
-2003-04-16 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiffcp.c: Fixed problem with colorspace conversion for JPEG
- encoded images. See bug entries
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=275
-
- and
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=23
-
- * libtiff/tif_dirread.c: Additional check for StripByteCounts
- correctness. Fixes
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=320
-
-2003-03-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/{fax2ps.c, fax2tiff.c, gif2tiff.c, pal2rgb.c, ppm2tiff.c,
- ras2tiff.c, raw2tiff.c, rgb2ycbcr.c, thumbnail.c, tiff2bw.c,
- tiff2ps.c, tiff2rgba.c, tiffcp.c, tiffdither.c, tiffinfo.c,
- tiffmedian.c}: Added library version reporting facility to all tools.
-
-2003-03-06 Frank Warmerdam <warmerdam@pobox.com>
-
- * port/install.sh.in: Fixed problems with install producing paths
- like ///usr/local/lib on cygwin.
-
-2003-02-27 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/fax2tiff.c, man/fax2tiff.1: New switch (-X) to set width of
- raw input page. Patch supplied by Julien Gaulmin. See
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=293
-
- for details.
-
-2003-02-26 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dir.c: fixed up the tif_postdecode settings
- responsible for byte swapping complex image data.
-
- * libtiff/tif_lzw.c: fixed so that decoder state isn't allocated till
- LZWSetupDecode(). Needed to read LZW files in "r+" mode.
-
-2003-02-07 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/ppm2tiff.c: Fixed problem with too many arguments.
-
-2003-02-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/raw2tiff.c: Memory leak fixed.
-
-2003-02-03 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/fax2tiff.c, man/fax2tiff.1: Applied patch from Julien Gaulmin
- (thanks, Julien!). More switches for fax2tiff tool for better control
- of input and output. Details at
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=272
-
-2003-02-03 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: Modified to defer initialization of jpeg
- library so that we can check if there is already any tile/strip data
- before deciding between creating a compressor or a decompressor.
-
-2003-01-31 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_write.c: TIFFWriteCheck() now fails if the image is
- a pre-existing compressed image. That is, image writing to
- pre-existing compressed images is not allowed.
-
- * libtiff/tif_open.c: Removed error if opening a compressed file
- in update mode.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=198
-
-2003-01-31 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * config.guess, config.sub: Updated to recent upstream versions.
-
-2003-01-15 Frank Warmerdam <warmerdam@pobox.com>
-
- * cut 3.6.0 Beta release.
-
-2002-12-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/fax2ps.c, man/fax2ps.1: Page size was determined
- in wrong way as per bug
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=239
-
-2002-12-17 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirread.c: Allow wrong sized arrays in
- TIFFFetchStripThing().
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=49
-
-2002-12-02 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dir.c: fix problem with test on td_customValueCount.
- Was using realloc even first time. Fix by Igor Venevtsev.
-
-2002-11-30 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dir.c: fixed bug with resetting an existing custom
- field value.
-
- * libtiff/tif_dir.c: Fixed potential problem with ascii "custom"
- tags in TIFFVGetField() ... added missing break.
-
-2002-10-14 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiff2ps.c: fixes a problem where "tiff2ps -1e" did not make
- the scanline buffer long enough when writing rgb triplets.
- The scanline needs to be 3 X the number of dots or else it will
- contain an incomplete triplet and programs that try to separate
- the eps by redefining the colorimage operator will get messed up.
- Patch supplied by William Bader.
-
- * Makefile.in: added tif_extension.c to file list as per
- http://bugzilla.remotesensing.org/show_bug.cgi?id=218.
-
-2002-10-11 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * configure, config.site, libtiff/{tif_unix.c, Makefile.in}: Fix for
- large files (>2GiB) supporting. New option in the config.site:
- LARGEFILE="yes". Should be enough for I/O of the large files.
-
-2002-10-10 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/html/v3.6.0.html: new release notes.
-
- * libtiff/index.html: removed faq, cvs snapshot cruft. Added email
- link for Andrey. Pointer to v3.6.0.html.
-
- * libtiff/Makefile.in: added direct rule for tiffvers.h for release.
-
-2002-10-07 Andrey Kiselev <dron@ak4719.spb.edu>
- * tools/tiff2ps.c, man/tiff2ps.1: Applied patch form Sebastian Eken
- (thanks, Sebastian!). New switches:
- -b # for a bottom margin of # inches
- -c center image
- -l # for a left margin of # inches
- -r rotate the image by 180 degrees
- New features merged with code for shrinking/overlapping.
- Previously added -c and -n switches (for overriding PS units) renamed
- in -x and -y respectively.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=200
-
- * html/man/*.html: Updated from actual manual pages.
-
-2002-10-06 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: fixed problem with boolean defined with wrong
- size on windows. Use #define boolean hack.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=188
-
- * libtiff/tiff.h: Don't do special type handling in tiff.h unless
- USING_VISUALAGE is defined.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=39
-
-2002-10-03 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tiff.h: added COMPRESSION_JP2000.
-
-2002-10-02 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_dirread.c: Another fix for the fetching SBYTE arrays
- by the TIFFFetchByteArray() function. Should finally resolve
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=52
-
- * configure: Set -DPIXARLOG_SUPPORT option along with -DZIP_SUPPORT
-
- * html/Makefile.in: New targets added: html and groffhtml for
- producing HTML representations of the manual pages automatically.
- html target uses man2html tool, groffhtml uses groff tool.
-
-2002-09-29 Frank Warmerdam <warmerdam@pobox.com>
-
- * configure, libtiff/Makefile.in: Added SCO OpenServer 5.0.6 support
- from John H. DuBois III.
-
-2002-09-15 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * Makefile.in, /man/{raw2tiff.1, Makefile.in, libtiff.3}: Added
- manual page for raw2tiff(1) tool.
-
-2002-09-12 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * /libtiff/{tiffio.h, tif_dir.h}: TIFFDataWidth() declaration moved to
- the tiffio.h header file.
-
- * Makefile.in, /man/{TIFFDataWidth.3t, Makefile.in, libtiff.3}: Added
- manual page for TIFFDataWidth() function
-
-2002-09-08 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirread.c: Expand v[2] to v[4] in TIFFFetchShortPair()
- as per http://bugzilla.remotesensing.org/show_bug.cgi?id=196.
-
- * tools/tiff2ps.c: Don't emit BeginData/EndData DSC comments
- since we are unable to properly include the amount to skip.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=80
-
-2002-09-02 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * /libtiff/tif_dirread.c: Fixed problem with SBYTE type data fetching
- in TIFFFetchByteArray(). Problem described at
- http://bugzilla.remotesensing.org/show_bug.cgi?id=52
-
-2002-08-22 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * /libtiff/tif_dirinfo.c: Further additions to free custom fields
- in _TIFFSetupFieldInfo() function.
- See http://bugzilla.remotesensing.org/show_bug.cgi?id=169 for details.
-
- * /libtiff/tif_lzw.c: Additional consistency checking added in
- LZWDecode() and LZWDecodeCompat().
- Fixes http://bugzilla.remotesensing.org/show_bug.cgi?id=190
- and http://bugzilla.remotesensing.org/show_bug.cgi?id=100
-
- * /libtiff/tif_lzw.c:
- Added check for valid code lengths in LZWDecode() and
- LZWDecodeCompat(). Fixes
- http://bugzilla.remotesensing.org/show_bug.cgi?id=115
-
-2002-08-16 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * /libtiff/{Makefile.vc, libtiff.def}:
- Missed declarations added.
-
-2002-08-15 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_getimage.c: Ensure that TIFFRGBAImageBegin() returns the
- return code from the underlying pick function.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=177
-
- * tif_dir.h: changed FIELD_CODEC to 66 from 64 to avoid overlap
- with FIELD_CUSTOM as mentioned in bug 169.
-
- * tif_close.c: added logic to free dynamically created anonymous
- field definitions to correct a small memory leak.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=169
-
-2002-08-10 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * /tools/{raw2tiff.c, Makefile.in, Makefile.lcc, Makefile.vc}:
- New tool: raw2tiff --- raw images to TIFF converter. No manual page yet.
-
-2002-07-31 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: Fixed problem with setting of nrows in
- JPEGDecode() as per bugzilla bug (issue 1):
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=129
-
- * libtiff/{tif_jpeg.c,tif_strip.c,tif_print.c}: Hacked tif_jpeg.c to
- fetch TIFFTAG_YCBCRSUBSAMPLING from the jpeg data stream if it isn't
- present in the tiff tags.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=168
-
- * libtiff/tif_read.c, libtiff/tif_write.c: TIFFReadScanline() and
- TIFFWriteScanline() now set tif_row explicitly in case the codec has
- fooled with the value.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=129
-
-2002-06-22 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * /tools/tiff2ps.c: Added workaround for some software that may crash
- when last strip of image contains fewer number of scanlines than
- specified by the `/Height' variable. See
- http://bugzilla.remotesensing.org/show_bug.cgi?id=164
- for explanation.
-
-2002-06-21 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2ps, man/tiff2ps.1: New functionality for tiff2ps utility:
- splitting long images in several pages. See
- http://bugzilla.remotesensing.org/show_bug.cgi?id=142 for explanation.
- Patch granted by John Williams <williams@morinda.com>.
-
-2002-06-11 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/contrib/win95: renamed to contrib/win_dib. Added new
- Tiffile.cpp example of converting TIFF files into a DIB on Win32.
- This one is described in:
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=143
-
- * libtiff/tif_ojpeg.c: Major upgrade from Scott. See details at:
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=156
-
-2002-05-10 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2ps: New commandline switches to override resolution
- units obtained from the input file. Closes
- http://bugzilla.remotesensing.org/show_bug.cgi?id=131
-
-2002-04-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/libtiff.def: Added missed declaration.
-
-2002-04-22 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/fax2tiff.c: Updated to reflect latest changes in libtiff.
- Closes http://bugzilla.remotesensing.org/show_bug.cgi?id=125
-
-2002-04-20 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_open.c: Pointers to custom procedures
- in TIFFClientOpen() are checked to be not NULL-pointers.
-
-2002-04-18 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/libtiff.def: Added missed declarations.
-
- * libtiff/tif_pixarlog.c: Updated for using tif_tagmethods structure.
-
-2002-04-16 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_lzw.c: Additional checks for data integrity introduced.
- Should finally close
- http://bugzilla.remotesensing.org/show_bug.cgi?id=100
-
-2002-04-10 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/tiff2ps: Division by zero fixed.
- Closes http://bugzilla.remotesensing.org/show_bug.cgi?id=88
-
-2002-04-09 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/: tif_dirwrite.c, tif_write.c, tiffio.h:
- TIFFCheckpointDirectory() routine added.
- Closes http://bugzilla.remotesensing.org/show_bug.cgi?id=124
-
- * man/: TIFFWriteDirectory.3t, Makefile.in: Added description
- for the new function.
-
-2002-04-08 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/: tif_codec.c, tif_compress.c, tiffiop.h: Introduced
- additional members tif->tif_decodestatus and tif->tif_encodestatus
- for correct handling of unconfigured codecs (we should not try to read
- data or to define data size without correct codecs).
-
- * libtiff/tif_getimage.c: The way of codecs checking in TIFFRGBAImageOK
- changed. Now it has used tif->tif_decodestatus and
- tif->tif_encodestatus.
- Should fix http://bugzilla.remotesensing.org/show_bug.cgi?id=119 (in
- case of __cvs_8.tif test image).
-
- * libtiff/: tif_dirinfo.c, tif_dirread.c: Somebody makes a bug in
- tif_dirread.c when TIFFCreateAnonFieldInfo was introduced.
- Closes http://bugzilla.remotesensing.org/show_bug.cgi?id=119 in case
- of _cvs_00000-00.tif, _cvs_00000-01.tif and _cvs_00000-02.tif.
-
-2002-04-04 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/: tif_lzw.c: Assertions in LZWDecode and LZWDecodeCompat
- replaced by warnings. Now libtiff should read corrupted LZW-compressed
- files by skipping bad strips.
- Closes http://bugzilla.remotesensing.org/show_bug.cgi?id=100
-
-2002-04-03 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirwrite.c: Removed some dead code.
-
- * libtiff/*: Cleanup some warnings.
-
- * libtiff/tif_dir.c: Fixed bug with count returned by TIFFGetField()
- for variable length FIELD_CUSTOM values. Was int * but should be
- u_short *.
-
-2002-04-01 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * tools/: tifcp.c: Added support for 'Orientation' tag in tiffcp
- utility (at cpStripToTile routine).
-
-2002-03-27 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_dirread.c: avoid div-by-zero if rowbytes is zero in chop func.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=111
-
- * tif_print.c: Fixed so that ASCII FIELD_CUSTOM values with
- passcount set FALSE can be printed (such as TIFFTAG_SOFTWARE).
-
- * libtiff/tif_dir.c,tif_dirinfo.c,tif_dir.h,tif_ojpeg.c: modified so
- that TIFFTAG_SOFTWARE uses FIELD_CUSTOM as an example.
-
-2002-03-26 Dwight Kelly <dbmalloc@remotesensing.org>
-
- * libtiff/: tiff.h, tif_dir.c, tif_dir.h, tif_dirinfo.c, tif_dirread.c,
- tif_dirwrite.c: Added get/put code for new tag XMLPACKET as defined
- in Adobe XMP Technote. Added missing INKSET tag value from TIFF 6.0 spec
- INKSET_MULTIINK (=2). Added missing tags from Adobe TIFF technotes:
- CLIPPATH, XCLIPPATHUNITS, YCLIPPATHUNITS, OPIIMAGEID, OPIPROXY and
- INDEXED. Added PHOTOMETRIC tag value from TIFF technote 4 ICCLAB (=9).
-
-2002-03-26 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/: tif_getimage.c: TIFFReadRGBAStrip and TIFFReadRGBATile
- now also uses TIFFRGBAImageOK before reading. This is additional fix
- for http://bugzilla.remotesensing.org/show_bug.cgi?id=110
-
-2002-03-25 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/: tif_getimage.c: Additional check for supported
- codecs added in TIFFRGBAImageOK and TIFFReadRGBAImage now uses
- TIFFRGBAImageOK before reading.
- Closes http://bugzilla.remotesensing.org/show_bug.cgi?id=110
-
-2002-03-15 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/: tif_dir.c, tif_dir.h, tif_dirinfo.c, tif_dirread.c,
- tif_dirwrite.c: Added routine TIFFDataWidth for detrmining
- TIFFDataType sizes instead of working with tiffDataWidth array
- directly. Should prevent out-of-borders bugs in case of unknown or
- broken data types. EstimateStripByteCounts routine modified, so it
- won't work when tags with uknown sizes founded.
- Closes http://bugzilla.remotesensing.org/show_bug.cgi?id=109
-
-2002-03-13 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/tif_getimage.c: Added support for correct handling
- `Orientation' tag in gtTileContig. Should be added in other gt*
- functions as well, but I have not images for testing yet. Partially
- resolves http://bugzilla.remotesensing.org/show_bug.cgi?id=23
-
-2002-03-10 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/: tif_dirinfo.c, tif_dirwrite.c: Added possibility to
- read broken TIFFs with LONG type used for TIFFTAG_COMPRESSION,
- TIFFTAG_BITSPERSAMPLE, TIFFTAG_PHOTOMETRIC. Closes
- http://bugzilla.remotesensing.org/show_bug.cgi?id=99
-
-2002-03-08 Andrey Kiselev <dron@ak4719.spb.edu>
-
- * libtiff/Makefile.in, tools/Makefile.in: Shared library will not
- be stripped when installing, utility binaries will do. Closes
- http://bugzilla.remotesensing.org/show_bug.cgi?id=93
-
-2002-02-28 Frank Warmerdam <warmerdam@pobox.com>
-
- * man/TIFFGetField: fixed type of TIFFTAG_COPYRIGHT.
-
- * man/libtiff.3t: added copyright tag info.
-
-2002-02-11 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/{tiff.h,tif_fax3.c}: Add support for __arch64__.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=94
-
- * man/Makefile.in: Patch DESTDIR handling
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=95
-
- * configure: OpenBSD changes for Sparc64 and DSO version.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=96
-
-2002-02-05 Frank Warmerdam <warmerdam@pobox.com>
-
- * config.site/configure: added support for OJPEG=yes option to enable
- OJPEG support from config.site.
-
-2002-01-27 Frank Warmerdam <warmerdam@pobox.com>
-
- * html/document.html: fixed links for TIFf 6 docs.
-
-2002-01-18 Frank Warmerdam <warmerdam@pobox.com>
-
- * config.guess, config.sub: Updated from ftp.gnu.org/pub/config.
-
- * libtiff/tif_read.c: Fixed TIFFReadEncodedStrip() to fail if the
- decodestrip function returns anything not greater than zero as per
- http://bugzilla.remotesensing.org/show_bug.cgi?id=97
-
- * configure: Modify CheckForBigEndian so it can work in a cross
- compiled situation.
-
-2002-01-16 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiffdump.c: include TIFFTAG_JPEGTABLES in tag list.
-
- * tools/tiffset.c: fix bug in error reporting.
-
- * tools/tiffcp.c: fix several warnings that show up with -Wall.
-
-2002-01-04 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: fixed computation of segment_width for
- tiles files to avoid error about it not matching the
- cinfo.d.image_width values ("JPEGPreDecode: Improper JPEG strip/tile
- size.") for ITIFF files. Apparently the problem was incorporated since
- 3.5.5, presumably during the OJPEG/JPEG work recently.
-
-2001-12-15 Frank Warmerdam <warmerdam@pobox.com>
-
- * configure, libtiff/Makefile.in: Changes for building on MacOS 10.1.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=94
-
- * libtiff/tif_getimage.c: If DEFAULT_EXTRASAMPLE_AS_ALPHA is 1
- (defined in tiffconf.h - 1 by default) then the RGBA interface
- will assume that a fourth extra sample is ASSOCALPHA if the
- EXTRASAMPLE value isn't set for it. This changes the behaviour of
- the library, but makes it work better with RGBA files produced by
- lots of applications that don't mark the alpha values properly.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=93
- http://bugzilla.remotesensing.org/show_bug.cgi?id=65
-
-2001-12-12 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: allow jpeg data stream sampling values to
- override those from tiff directory. This makes this work with
- ImageGear generated files.
-
-2001-12-07 Frank Warmerdam <warmerdam@pobox.com>
-
- * html/Makefile.in: added missing images per bug 92.
-
- * port/Makefile.in: fixed clean target per bug 92.
-
-2001-11-28 Frank Warmerdam <warmerdam@pobox.com>
-
- * Reissue 3.5.7 release.
-
- * libtiff/mkversion.c: Fix output of TIFF_VERSION to be
- YYYYMMDD so that it is increasing over time.
-
- * Makefile.in: Ensure that tiffvers.h is regenerated in the
- make release target.
-
- * Makefile.in: added libtiff/tiffvers.h to the release file list.
-
-2001-11-23 Frank Warmerdam <warmerdam@pobox.com>
-
- * added html/v3.5.7.html, updated html/index.html.
-
- * Makefile.in: added contrib/addtiffo/tif_ovrcache.{c,h}.
-
-2001-11-15 Frank Warmerdam <warmerdam@pobox.com>
-
- * configure: fixed test for -lm.
-
-2001-11-02 Frank Warmerdam <warmerdam@pobox.com>
-
- * Added PHOTOMETRIC_ITULAB as per bug 90.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=90
-
-2001-10-10 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tiff.h: I have created COMPRESSION_CCITT_T4,
- COMPRESSION_CCITT_T6, TIFFTAG_T4OPTIONS and TIFFTAG_T6OPTIONS aliases
- in keeping with TIFF 6.0 standard in tiff.h
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=83
-
-2001-09-26 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirwrite.c: added TIFFRewriteDirectory() function.
- Updated TIFFWriteDirectory man page to include TIFFRewriteDirectory.
-
-2001-09-24 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_lzw.c: Avoid MS VC++ 5.0 optimization bug.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=78
-
- * libtiff/tif_lzw.c: added dummy LZWSetupEncode() to report an
- error about LZW not being available.
-
- * libtiff/tif_dir.c: propagate failure to initialize compression
- back from TIFFSetField() as an error status, so applications can
- detect failure.
-
- * libtiff/tif_dir.c: removed the auto replacement of
- COMPRESSION_LZW with COMPRESSION_NONE in _TIFFVSetField().
-
- * Removed Makefile, tools/Makefile, port/install.sh, man/Makefile
- from CVS as they are all supposed to be auto-generated by configure.
-
-2001-09-22 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_ojpeg.c: new update from Scott.
-
-2001-09-09 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtif/tif_fax3.c: Removed #ifdef PURIFY logic, and modified to
- always use the "safe" version, even if there is a very slight
- cost in performance.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=54
-
- * libtiff/Makefile.in: Fixed @DSOSUB_VERSION to be @DSOSUF_VERSION@
- in two places.
-
- * libtiff/tif_getimage.c: Fixed problem with reading strips or
- tiles that don't start on a tile boundary. Fix contributed by
- Josep Vallverdu (from HP), and further described in bug 47.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=47
-
- * tools/tiff2ps.c: added OJPEG YCbCr to RGB support.
-
- * libtiff/tif_ojpeg.c: Applied substantial patch from Scott.
-
-2001-09-06 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_packbits.c: fixed memory overrun error.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=77
-
-2001-08-31 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_getimage.c: relax handling of contig case where
- there are extra samples that are supposed to be ignored. This
- should now work for 8bit greyscale or palletted images.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=75
-
-2001-08-28 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_getimage.c: Don't complain for CMYK (separated)
- images with more than four samples per pixel. See:
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=73
-
-2001-08-10 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_getimage.c: Use memmove() instead of TIFFmemcpy()
- in TIFFReadRGBATile() to avoid issues in cases of overlapping
- buffers. See Bug 69 in Bugzilla.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=69
-
- * tools/tiff2rgba.c: fixed getopt() call so that -b works again.
-
-2001-08-09 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tiff.h, libtiff/tif_fax3.c: added check for __LP64__
- when checking for 64 bit architectures as per bugzilla bug 67.
-
-2001-07-27 Frank Warmerdam <warmerdam@pobox.com>
-
- * man/Makefile.in: add TIFFClientOpen link as per debian submitted
- bug 66.
-
-2001-07-20 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_jpeg.c: Define HAVE_BOOLEAN on windows if RPCNDR.H
- has been included.
-
-2001-07-19 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_open.c: Seek back to zero after failed read,
- before writing header.
-
-2001-07-18 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_ojpeg.c: updates from Scott. Handles colors
- much better. Now depends on having patched libjpeg as per
- patch in contrib/ojpeg/*.
-
-2001-07-17 Frank Warmerdam <warmerdam@pobox.com>
-
- * */Makefile.in: added DESTDIR support.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=60
-
-2001-07-16 Frank Warmerdam <warmerdam@pobox.com>
-
- * configure, libtiff/Makefile.in: applied OpenBSD patches
- as per:
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=61
-
-2001-06-28 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_getimage.c: Fixed so that failure is properly
- reported by gtTileContig, gtStripContig, gtTileSeparate and
- gtStripSeparate.
-
- See http://bugzilla.remotesensing.org/show_bug.cgi?id=51
-
- * tiffcmp.c: Fixed multi samples per pixel support for ContigCompare.
- Updated bug section of tiffcmp.1 to note tiled file issues.
-
- See http://bugzilla.remotesensing.org/show_bug.cgi?id=53
-
-2001-06-22 Frank Warmerdam <warmerdam@pobox.com>
-
- * configure: Changes for DSO generation on AIX provided by
- John Marquart <jomarqua@indiana.edu>.
-
- * configure, libtiff/Makeifle.in: Modified to build DSOs properly
- on Darwin thanks to Robert Krajewski (rpk@alum.mit.edu) and
- Keisuke Fujii (fujiik@jlcuxf.kek.jp).
-
-2001-06-13 Frank Warmerdam <warmerdam@pobox.com>
-
- * tools/tiff2rgba.c: added -n flag to avoid emitting alpha component.
-
- * man/tiff2rgba.1: new
-
-2001-05-22 Frank Warmerdam <warmerdam@pobox.com>
-
- * Added tiffset and tif_ojpeg to the dist lists in Makefile.in.
-
-2001-05-13 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tools/thumbnail.c: changed default output compression
- to packbits from LZW since LZW isn't generally available.
-
-2001-05-12 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_ojpeg.c: New.
- libtiff/tif_jpeg.c, tiffconf.h, tif_getimage.c: changes related
- to OJPEG support.
-
- Scott Marovich <marovich@hpl.hp.com> supplied OJPEG support.
-
-2001-05-11 Frank Warmerdam <warmerdam@pobox.com>
-
- * tiff.h: removed, it duplicates libtiff/tiff.h.
-
-2001-05-08 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirinfo.c: moved pixar and copyright flags to
- ensure everything is in order.
-
- * libtiff/libtiff.def: added TIFFCreateDirectory and
- TIFFDefaultStripSize as per:
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=46
-
-2001-05-02 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirinfo.c: Modified the TIFF_BYTE definition for
- TIFFTAG_PHOTOSHOP to use a writecount of TIFF_VARIABLE2 (-3) to
- force use of uint32 counts instead of short counts.
-
- * libtiff/tif_dirwrite.c: Added support for TIFF_VARIABLE2 in the
- case of writing TIFF_BYTE/TIFF_SBYTE fields.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=43
-
-2001-05-01 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_dirinfo.c: removed duplicate TIFFTAG_PHOTOSHOP as per
- bug report http://bugzilla.remotesensing.org/show_bug.cgi?id=44
-
-2001-04-05 Frank Warmerdam <warmerdam@pobox.com>
-
- * tiffio.h: removed C++ style comment.
-
- * configure: fixed up SCRIPT_SH/SHELL handling.
-
- * Makefile.in: Fixed SCRIPT_SH/SHELL handling.
-
- * config.guess: documented more variables as per bug 40.
-
-2001-04-03 Frank Warmerdam <warmerdam@pobox.com>
-
- * configure, *Makefile.in: Various changes to improve configuration
- for HP/UX specifically, and also in general. They include:
- - Try to handle /usr/bin/sh instead of /bin/sh where necessary.
- - Upgrade to HP/UX 10.x+ compiler, linker and dso options.
- - Fixed mmap() test to avoid MMAP_FIXED ... it isn't available on HP
- - Use -${MAKEFLAGS} in sub makes from makefiles.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=40
-
-2001-04-02 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tiff.h: Applied hac to try and resolve the problem
- with the inttypes.h include file on AIX.
-
- See http://bugzilla.remotesensing.org/show_bug.cgi?id=39
-
- * VERSION: update to 3.5.7 beta in preparation for release.
-
- * configure/config.site: modified to check if -lm is needed for
- MACHDEPLIBS if not supplied by config.site. Needed for Darwin.
-
- * config.guess: updated wholesale to an FSF version apparently
- from 1998 (as opposed to 1994). This is mainly inspired by
- providing for MacOS X support.
-
-2001-03-29 Frank Warmerdam <warmerdam@pobox.com>
-
- * configure, Makefile.in, etc: added support for OPTIMIZER being
- set from config.site.
-
-2001-03-28 Frank Warmerdam <warmerdam@pobox.com>
-
- * fax2ps.c: Helge (libtiff at oldach.net) submitted fix:
-
- Here's a fix for fax2ps that corrects behaviour for non-Letter paper
- sizes. It fixes two problems:
-
- Without scaling (-S) the fax is now centered on the page size specified
- with -H and/or -W. Before, fax2ps was using an obscure and practially
- useless algorithm to allocate the image relative to Letter sized paper
- which sometime sled to useless whitespace on the paper, while at the
- same time cutting of the faxes printable area at the opposite border.
-
- Second, scaling now preserves aspect ratio, which makes unusual faxes
- (in particular short ones) print properly.
-
- See http://bugzilla.remotesensing.org/show_bug.cgi?id=35
-
- * tiff2ps.c/tiff2ps.1: Substantial changes to tiff2ps by
- Bruce A. Mallett. See check message for detailed information
- on all the changes, including a faster encoder, fixes for level
- 2 PostScript, and support for the imagemask operator.
-
-2001-03-27 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tiffio.h: Changed "#if LOGLUV_PUBLIC" to
- "#ifdef LOGLUV_PUBLIC" so it will work with VisualAge on AIX.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=39
-
-2001-03-16 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_dirinfo.c: moved definition of copyright tag in field list.
- Apparently they have to be in sorted order by tag id.
-
-2001-03-13 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_getimage.c: Added support for 16bit minisblack/miniswhite
- images in RGBA interface.
-
-2001-03-02 Frank Warmerdam <warmerdam@pobox.com>
-
- * Added TIFFTAG_COPYRIGHT support.
-
-2001-02-19 Frank Warmerdam <warmerdam@pobox.com>
-
- * Brent Roman contributed updated tiffcp utility (and tiffcp.1)
- with support for extracting subimages with the ,n syntax, and also
- adding the -b bias removal flag.
-
-2001-02-16 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/libtiff.def: Brent Roman submitted new version adding
- serveral missing entry points.
-
- * libtiff/tif_dirinfo.c: don't declare tiffFieldInfo static on VMS.
- Some sort of weird VMS thing.
-
- http://bugzilla.remotesensing.org/show_bug.cgi?id=31
-
- * tif_luv.c/tiff.h/tiffio.h:
- New version of TIFF LogLuv (SGILOG) modules contributed by Greg Ward
- (greg@shutterfly.com). He writes:
-
- 1) I improved the gamut-mapping function in tif_luv.c for imaginary
- colors, because some images were being super-saturated on the input
- side and this resulted in some strange color shifts in the output.
-
- 2) I added a psuedotag in tiff.h to control random dithering during
- LogLuv encoding. This is turned off by default for 32-bit LogLuv and
- on for 24-bit LogLuv output. Dithering improves the average color
- accuracy over the image.
-
- 3) I added a #define for LOG_LUV_PUBLIC, which is enabled by default in
- tiffio.h, to expose internal routines for converting between LogLuv and
- XYZ coordinates. This is helpful for writing more efficient,
- specialized conversion routines, especially for reading LogLuv files.
-
- Changes applied with minor edits.
-
-2001-01-23 Frank Warmerdam <warmerdam@pobox.com>
-
- * tif_fax3.c: keep rw_mode flag internal to fax3 state to remember
- whether we are encoding or decoding. This is to ensure graceful
- recovery if TIFFClientOpen() discovers an attempt to open a compressed
- file for "r+" access, and subsequently close it, as it resets the
- tif_mode flag to O_RDONLY in this case to avoid writes, confusing the
- compressor's concept of whether it is in encode or decode mode.
-
-2001-01-08 Mike Welles <mike@bangstate.com>
-
- * Makefile.in: Now cleaning up after itself after creating the .tar.gz and .zip
-
-2001-01-07 Frank Warmerdam <warmerdam@pobox.com>
-
- * html/libtiff.html: Fixed arguments in example for TIFFRGBAImageGet()
- as per bug report by Patrick Connor.
-
-2000-12-28 Frank Warmerdam <warmerdam@pobox.com>
-
- * Added RELEASE-DATE file to release file list.
-
- * Fixed libtiff/makefile.vc to make tiffvers.h not version.h.
-
-2000-12-22 Mike Welles <mike@bangstate.com>
- * added link to CVS mirror from index.html
-
- * updated html/internals.html to note that LZW compression is
- not supported by default.
-
-2000-12-22 Frank Warmerdam <warmerdam@pobox.com>
-
- * updated html/libtiff.html to not point at Niles' old JPL web site
- for the man pages, point at www.libtiff.org.
-
-2000-12-21 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/tif_apple.c: Applied "Carbon" support patches supplied by
- Leonard Rosenthol <leonardr@lazerware.com>. May interfere
- with correct building on older systems. If so, please let me know.
-
-2000-12-19 Mike Welles <mike@bangsate.com>
-
- * Took out LZW Encoding from tif_lzw.c
-
- * Created HOWTO-RELEASE
-
- * Created html/v3.5.6.html
-
- * updated index.html
-
-2000-12-01 Frank Warmerdam <warmerdam@pobox.com>
-
- * Added patches for EOFB support in tif_fax3.c and tif_fax3.h.
- Patches supplied by Frank Cringle <fdc@cliwe.ping.de>
- Example file at: ftp://ftp.remotesensing.org/pub/libtiff/eofb_396.tif
-
-2000-11-24 Frank Warmerdam <warmerdam@pobox.com>
-
- * libtiff/Makefile.in: Added an installPrivateHdrs and install-private
- target so that the private headers required by libgeotiff can be
- installed with the others. They are not installed by default.
-
- * libtiff/Makefile.in: Added @MACHLIBDEPS@ to LINUXdso and GNULDdso
- targets so libtiff.so will be built with an explicit dependency
- on libm.so.
-
- * libtiff/Makefile.in: Use softlinks to link libtiff.so.3 to
- libtiff.so.3.5.5.
-
- * libtiff/Makefile.in & configure: Remove all references to the ALPHA
- file, or ALPHA version logic. Added stuff about DIST_POINT in
- place of DIST_TYPE and the alpha release number stuff.
-
-2000-11-22 Frank Warmerdam <warmerdam@pobox.com>
-
- * I have applied a patch from Steffen Moeller <moeller@ebi.ac.uk> to
- the configure script so that it now accepts the --prefix, and
- --exec-prefix directives.
-
-2000-11-13 Frank Warmerdam <warmerda@cs46980-c>
-
- * I have made a variety of modifications in an effort to ensure the
- TIFFLIB_VERSION macro is automatically generated from the RELEASE-DATE
- file which seems to be updated regularly.
-
- o mkversion.c now reads RELEASE-DATE and emits TIFFLIB_VERSION in
- version include file.
- o renamed version.h to tiffvers.h because we now have to install it
- with the public libtiff include files.
- o include tiffvers.h in tiffio.h.
- o updated tif_version.c to use tiffvers.h.
- o Updated Makefile.in accordingly.
-
- * As per http://bugzilla.remotesensing.org/show_bug.cgi?id=25
- I have updated the win32 detection rules in tiffcomp.h.
-
-2000-10-20 Frank Warmerdam <warmerda@cs46980-c>
-
- * tif_getimage.c: Fixed RGBA translation for YCbCr images for which
- the strip/tile width and height aren't multiples of the sampling size.
- See http://bugzilla.remotesensing.org/show_bug.cgi?id=20
- Some patches from Rick LaMont of Dot C Software.
-
- * Modified tif_packbits.c encoder to avoid compressing more
- data than provided if rowsize doesn't factor into provided data
- (such as occurs for YCbCr).
-
-2000-10-19 Frank Warmerdam <warmerda@cs46980-c>
-
- * tools/rgb2ycbcr.c: fixed output strip size to account for vertical
- roundup if rows_per_strip not a multiple of vertical sample size.
-
-2000-10-16 Frank Warmerdam <warmerda@cs46980-c>
-
- * tif_dir.c: Clear TIFF_ISTILED flag in TIFFDefaultDirectory
- as per http://bugzilla.remotesensing.org/show_bug.cgi?id=18
- from vandrove@vc.cvut.cz.
-
- * Modified tif_packbits.c decoding to avoid overrunning the
- output buffer, and to issue a warning if data needs to be
- discarded. See http://bugzilla.remotesensing.org/show_bug.cgi?id=18
-
-2000-10-12 Frank Warmerdam <warmerda@cs46980-c>
-
- * Modified tiff2bw to ensure portions add to 100%, and that
- white is properly recovered.
-
- See bug http://bugzilla.remotesensing.org/show_bug.cgi?id=15
- Patch c/o Stanislav Brabec <utx@penguin.cz>
-
-2000-09-30 Frank Warmerdam <warmerda@cs46980-c>
-
- * Modified TIFFClientOpen() to emit an error on an attempt to
- open a comperessed file for update (O_RDWR/r+) access. This is
- because the compressor/decompressor code gets very confused when
- the mode is O_RDWR, assuming this means writing only. See
- bug http://bugzilla.remotesensing.org/show_bug.cgi?id=13
-
-2000-09-27 Frank Warmerdam <warmerda@cs46980-c>
-
- * Added GNULDdso target an`d switched linux and freebsd to use it.
-
-2000-09-26 Frank Warmerdam <warmerda@cs46980-c>
-
- * Applied patch for 0x0000 sequences in tif_fax3.h's definition
- of EXPAND1D() as per bug 11 (from Roman).
-
-2000-09-25 Frank Warmerdam <warmerda@cs46980-c>
- * Fixed tiffcomp.h to avoid win32 stuff if unix #defined, to improve
- cygwin compatibility.
-
- * Applied patch from Roman Shpount to tif_fax3.c. This seems to
- be a proper fix to the buffer sizing problem. See
- http://bugzilla.remotesensing.org/show_bug.cgi?id=11
-
- * Fixed tif_getimage.c to fix overrun bug with YCbCr images without
- downsampling. http://bugzilla.remotesensing.org/show_bug.cgi?id=10
- Thanks to Nick Lamb <njl98r@ecs.soton.ac.uk> for reporting the
- bug and proving the patch.
-
-2000-09-18 Frank Warmerdam <warmerda@cs46980-c>
-
- * Fixed tif_jpeg.c so avoid destroying the decompressor before
- we are done access data thanks to bug report from:
- Michael Eckstein <eckstein@gepro.cz>.
-
- * Reverted tif_flush change.
-
-2000-09-14 Frank Warmerdam <warmerda@cs46980-c>
-
- * tif_flush.c: Changed so that TIFFFlushData() doesn't return an
- error when TIFF_BEENWRITING is not set. This ensures that the
- directory contents can still be flushed by TIFFFlush().
-
-2000-08-14 Frank Warmerdam <warmerda@rommel.atlsci.com>
-
- * tif_open.c: Don't set MMAP for O_RDWR files.
-
- * tif_open.c: Set STRIPCHOP_DEFAULT for O_RDWR as well as O_RDONLY
- so that files opened for update can be strip chopped too.
-
- * tif_read.c: fixed up bug with files missing rowsperstrip and
- the strips per separation fix done a few weeks ago.
-
-2000-07-17 Frank Warmerdam <warmerda@cs46980-c>
-
- * Tentatively added support for SAMPLEFORMAT_COMPLEXIEEEFP, and
- SAMPLEFORMAT_COMPLEXINT.
-
-2000-07-13 Mike Welles <mike@onshore.com>
-
- * index.html, bugs.html: added bugzilla info.
-
-2000-07-12 Frank Warmerdam <warmerda@rommel.atlsci.com>
-
- * tif_read.c: fix subtle bug with determining the number of
- rows for strips that are the last strip in a separation but
- not the last strip of all in TIFFReadEncodedStrip().
-
- * Applied 16/32 bit fix to tif_fax3.c. Fix supplied by
- Peter Skarpetis <peters@serendipity-software.com.au>
-
-2000-06-15 Frank Warmerdam <warmerda@rommel.atlsci.com>
-
- * Modified tiffio.h logic with regard to including windows.h. It
- won't include it when building with __CYGWIN__.
-
-2000-05-11 Frank Warmerdam <warmerda@cs46980-c>
-
- * README: update to mention www.libtiff.org, don't list Sam's old
- email address.
-
- * configure: Fixed DSO test for Linux as per patch from
- Jan Van Buggenhout <chipzz@Ace.ULYSSIS.Student.KULeuven.Ac.Be>.
-
-2000-04-21 Frank Warmerdam <warmerda@rommel.atlsci.com>
-
- * libtiff/tif_dirread.c: Don't use estimate strip byte count for
- one tile/strip images with an offset, and byte count of zero. These
- could be "unpopulated" images.
-
-2000-04-18 Frank Warmerdam <warmerda@rommel.atlsci.com>
-
- * contrib/addtiffo: Added "averaging" resampling option.
-
- * tools/tiffsplit.c: Copy TIFFTAG_SAMPLEFORMAT.
-
-Tue Apr 18 16:18:08 2000 Frank Warmerdam <warmerda@esabot.atlsci.com>
-
- * tools/Makefile.in: Modified to install properly on SGI.
-
-2000-04-12 Mike Welles <mike@onshore.com>
- * configure: Fixed stupid mistake in libc6 test on Linux
-
-2000-04-04 Mike Welles <mike@onshore.com>
- * tif_win32.c: Applied patch to fix overreads and ovverwrites
- caught by BoundsChecker. From Arvan Pritchard
- <arvan.pritchard@infomatix.co.uk> (untested).
-
- * tif_getimage.c: Applied patch to silence VC6 warnings. From
- Arvan Pritchard <arvan.pritchard@informatix.co.uk>
-
- * tif_lzw.c: Applied patch to silence VC6 warnings. From
- Arvan Pritchard <arvan.pritchard@informatix.co.uk>
-
-2000-03-28 Frank Warmerdam <warmerda@cs46980-c>
-
- * Added contrib/stream (stream io) code submitted by Avi Bleiweiss.
-
-2000-03-28 Frank Warmerdam <warmerda@cs46980-c> *** 3.5.5 release ***
-
- * fax2ps: Fixed mixup of width and height in bounding box statement
- as per submission by Nalin Dahyabhai <nalin@redhat.com>.
-
-2000-03-27 Mike Welles <mike@onshore.com>
-
- * fax2ps: Modified printruns to take uint32 instead of uint16.
- Patch courtesy of Bernt Herd <herd@herdsoft.com>
-
-2000-03-20 Mike Welles <mike@onshore.com>
-
- * configure: added test for libc6 for linux targets. Bug reported by
- Stanislav Brabec <utx@k332.feld.cvut.cz>
-
- * Added 3.5 docs to html/Makefile.in.
- Thanks to Stanislav Brabec <utx@k332.feld.cvut.cz>
-
- * configure: fixed bugs in sed scripts
- (applied sed script s:/@:s;@:;s:/s;;:;: to configure).
- fix submitted to Stanislav Brabec <utx@k332.feld.cvut.cz>
-
- * tools/iptcutil was not in files list, and wasn't being
- added to tar archive. Updated Makefile.in.
-
-2000-03-17 Frank Warmerdam <warmerda@cs46980-c>
-
- * tif_fax3.c: Fixed serious bug introduced during the uint16->uint32
- conversion for the run arrays.
-
-2000-03-03 Frank Warmerdam <warmerda@cs46980-c.mtnk1.on.wave.home.com>
-
- * Set td_sampleformat default to SAMPLEFORMAT_UINT instead of
- SAMPLEFORMAT_VOID in TIFFDefaultDirectory() in tif_dir.c.
-
-2000-03-02 Frank Warmerdam <warmerda@cs46980-c.mtnk1.on.wave.home.com>
-
- * Added "GetDefaulted" support for TIFFTAG_SAMPLEFORMAT in tif_aux.c.
-
- * Patched tif_fax3.c so that dsp->runs is allocated a bit bigger
- to avoid overruns encountered with frle_bug.tif.
-
-Tue Feb 15 22:01:05 2000 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Fixed tools/tiffcmp so that stopondiff testing works.
- Patch care of Joseph Orost <joe@sanskrit.lz.att.com>.
-
-2000-01-28 <warmerda@CS46980-B>
-
- * Modified tif_unix.c to support 2-4GB seeks if USE_64BIT_API is
- set to 1, and added default (off) setting in tiffconf.h. This
- should eventually be set by the configure script somehow.
-
- The original work on all these 2-4GB changes was done by
- Peter Smith (psmith@creo.com).
-
- * Modified tif_win32.c to support 2-4GB seeks.
-
- * tentatively changed toff_t to be unsigned instead of signed to
- facilitate support for 2-4GB files.
-
- * Updated a variety of files to use toff_t. Fixed some mixups
- between toff_t and tsize_t.
-
-Fri Jan 28 10:13:49 2000 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Largely reimplemented contrib/addtiffo to avoid temp files,
- updating the TIFF file in place. Fixed a few other bugs to.
-
- * Set tif_rawdatasize to zero when freeing raw data buffer in
- TIFFWriteDirectory().
-
- * Enabled "REWRITE_HACK" in tif_write.c by default.
-
- * Fix bug in tif_write.c when switching between reading one directory
- and writing to another.
-
- * Made TIFFWriteCheck() public, and added TIFFCreateDirectory()
-
-Wed Jan 5 12:37:48 2000 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Added TIFFmemory(3t) functions to libtiff.def.
-
-Tue Jan 4 13:39:00 2000 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Added libtiff/libtiff.def to TIFFILES distribution list.
-
-Mon Dec 27 12:13:39 EST 1999 Mike Welles <mike@onshore.com>
-
- * Created lzw compression kit, as a new module (libtiff-lzw-compression-kit).
-
- * Altered descriptions in tools to reflect "by default" lzw not supported
-
- * Updated index.html to note lzw compression kit.
-
-Tue Dec 21 14:01:51 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Added fax3sm_winnt.c to distribution list in Makefile.in.
-
-Tue Dec 21 11:04:45 EST 1999 Mike Welles <mike@onshore.com> *** 3.5.4 release ***
-
- * Aadded Pixar tag support. Contributed by Phil Beffery <phil@pixar.com>
-
- * Made one more change to tif_dir.c for removal of LZW compression. Also added notice
- when LZW compression invoked.
-
- * Changed default compression in tools to TIFF_PACKBITS, and changed usage descriptions
- in tools to reflect removal of LZW compression
-
-Mon Dec 20 18:39:02 EST 1999 Mike Welles <mike@onshore.com>
-
- * Fixed bug that caused LZW (non) compression to segfault. Added
- warning about LZW compression removed being removed, and why.
-
- * Added nostrip to install in tools/Makefile.in so that debugging
- symbols are kept.
-
-Tue Dec 7 12:04:47 EST 1999 Mike Welles <mike@onshore.com>
-
- * Added patch from Ivo Penzar <ivo.penzar@infolink-software.com>,
- supporting Adobe ZIP deflate. Untested.
-
-Sat Dec 4 15:47:11 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Made Packbits the default compression in tools/tiff2rgba.c instead
- of LZW.
-
-Tue Nov 30 14:41:43 1999 Frank Warmerdam <warmerda@gdal.velocet.ca> *** 3.5.3. release ***
-
- * Added tif_luv to contrib/djgpp/Makefile.lib.
-
-Tue Nov 30 14:15:32 EST 1999 Mike Welles <mike@onshore.com>
-
- * Added zip creation to relase makefile target
-
- * Added html for TIFFWriteTile.3t man page.
-
-Tue Nov 30 09:20:16 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Added some changes to tif_write.c to support rewriting existing
- fixed sized tiles and strips. Code mods disabled by default, only
- enabled if REWRITE_HACK is defined for now.
-
-Mon Nov 29 11:43:42 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Added TIFFWriteTile.3t man page.
-
-Sun Nov 28 20:36:18 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Added notes on use of makefile.vc in build.html, and fixed
- email subscription address.
-
-199-11-28 Mike Welles <mike@onshore.com>
-
- * Fixed apocalypse-inducing y2k bug in contrib/ras/ras2tiff.c
-
- * Did some casts cleaning up to reduce compiler warnings in tif_fax3.c,
- from Bruce Carmeron <cameron@petris.com> -- modifications of
- changes made by Frank (sun cc still complained on cast).
-
- * Added tiffconf.h to install target per request from Bill
- Radcliffe <billr@corbis.com>: "We need a way for ImageMagick to
- know features have been compiled into the TIFF library in order to
- handle things properly".
-
-Sat Nov 27 16:49:21 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * fixed various VC++ warnings as suggested by Gilles Vollant
- <info@winimage.com>.
-
-Wed Nov 24 12:08:16 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Modified TIFFquery.3t man pages info on TIFFIsByteSwapped() to
- not imply applications are responsible for image data swapping.
-
-1999-11-22 Mike Welles <mike@onshore.com>
- * HTML-ized the man pages, added to html/man
-
- * Removed LZW Compression to comply with Unisys patent extortion.
-
-1999-09-29 Mike Welles <mike@onshore.com>
- * Corrected one remaining 16 -> 32 bit value in tif_fax3.c,
- From Ivo Penzar <ivo.penzar@infolink-software.com.
-
- * Added patch from Ivo Penzar to have TiffAdvanceDirectory handle
- memory mapped files. <ivo.penzar@infolink-software.com>
-
-1999-09-26 Mike Welles <mike@onshore.com> *** 3.5.2 release ***
- * Corrected alpha versioning.
-
- * Removed distinction between alpha and release targets in Makefile.in.
-
- * added release.stamp target, which tags cvs tree, and updates
- "RELEASE-DATE"
-
- * added releasediff target, which diffs tree with source as of
- date in "RELEASE-DATE"
-
- * Ticked up version to 3.5.2 (alpha 01 -- but I think we'll moving
- away from alpha/non-alpha distinctions).
-
- * updated html to reflect release
-
-1999-09-23 <warmerda@CS46980-B>
-
- * Set O_BINARY for tif_unix.c open() ... used on cygwin for instance.
-
- * Added CYGWIN case in configure.
-
-Fri Sep 17 00:13:51 CEST 1999 Mike Welles <mike@onshore.com>
-
- * Applied Francois Dagand's patch to handle fax decompression bug.
- (sizes >= 65536 were failing)
-
-Tue Sep 14 21:31:43 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Applied "a" mode fix to tif_win32.c/TIFFOpen() as suggested
- by Christopher Lawton <clawton@mathworks.com>
-
-Wed Sep 8 08:19:18 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Added IRIX/gcc, and OSF/1 4.x support on behalf of
- Albert Chin-A-Young <china@thewrittenword.com>
-
- * Added TIFFReassignTagToIgnore() API on behalf of
- Bruce Cameron <cameron@petris.com>. Man page still pending.
-
-Wed Aug 25 11:39:07 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Added test target in Makefile, test_pics.sh script and pics/*.rpt
- files to provide for a rudimentary testsuite.
-
- * Added contrib/tags back from old distribution ... fixed up a bit.
-
-1999-08-16 <warmerda@CS46980-B>
-
- * Added simple makefile.vc makefiles for building with MS VC++
- on Windows NT/98/95 in console mode. Stuff in contrib/win* make give
- better solutions for some users.
-
-Mon Aug 16 21:52:11 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * Added addtiffo (add overviews to a TIFF file) in contrib. Didn't
- put it in tools since part of it is in C++.
-
-1999-08-16 Michael L. Welles <mike@kurtz.fake>
-
- * Updated html/index.html with anon CVS instructions.
-
-Mon Aug 16 13:18:41 1999 Frank Warmerdam <warmerda@gdal.velocet.ca>
-
- * pre-remove so link before softlink in LINUXdso action in
- libtiff/Makefile.in to avoid failure on LINUXdso builds other than
- the first.
-
- * Fixed problem with cvtcmap() in tif_getimage.c modifying the
- colormaps owned by the TIFF handle itself when trying to fixup wrong
- (eight bit) colormaps. Corrected by maintaining a private copy of
- the colormap.
-
- * Added TIFFReadRGBATile()/TIFFReadRGBAStrip() support in
- tif_getimage.c.
-
- * CVS Repository placed at remotesensing.org. ChangeLog added.
diff --git a/src/3rdparty/libtiff/HOWTO-RELEASE b/src/3rdparty/libtiff/HOWTO-RELEASE
deleted file mode 100644
index d6035a5c85..0000000000
--- a/src/3rdparty/libtiff/HOWTO-RELEASE
+++ /dev/null
@@ -1,105 +0,0 @@
-HOWTO-RELEASE:
-
-Notes on releasing.
-
-0. Make sure that you have current FSF releases of autoconf, automake,
- and libtool packages installed under a common installation prefix
- and that these tools are in your executable search path prior to
- any other installed versions. Versions delivered with Linux may be
- altered so it is best to install official FSF releases. GNU 'm4'
- 1.4.6 or later is needed in order to avoid bugs in m4. These
- packages may be downloaded from the following ftp locations:
-
- autoconf - ftp://ftp.gnu.org/pub/gnu/autoconf
- automake - ftp://ftp.gnu.org/pub/gnu/automake
- libtool - ftp://ftp.gnu.org/pub/gnu/libtool
-
- Release builds should only be done on a system with a functioning
- and correctly set system clock and on a filesystem which accurately
- records file update times. Use of GNU make is recommended.
-
-1. Commit any unsaved changes.
-
-2. Create html/vX.X.html. Take ChangeLog entries and html-ify in there.
- Easist thing to do is take html/vX.(X-1).html and use it as a template.
- Add that file to the list of EXTRA_DIST files in the html/Makefile.am.
-
-3. Update html/index.html to refer to this new page as the current release.
-
-4. Increment the release version in configure.ac. Put 'alpha' or
- 'beta' after the version, if applicable. For example:
-
- 3.9.1
- or
- 3.9.1beta
-
- Version should be updated in two places: in the second argument of the
- AC_INIT macro and in LIBTIFF_xxx_VERSION variables.
-
-5. Add an entry to Changelog similar to:
-
- * libtiff 3.9.1 released.
-
-6. In the source tree do
-
- ./autogen.sh
-
- This step may be skipped if you have already been using a
- maintainer build with current autoconf, automake, and libtool
- packages. It is only needed when updating tool versions.
-
-7. It is recommended (but not required) to build outside of the source
- tree so that the source tree is kept in a pristine state. This
- also allows sharing the source directory on several networked
- systems. For example:
-
- mkdir libtiff-build
- cd libtiff-build
- /path/to/libtiff/configure --enable-maintainer-mode
-
- otherwise do
-
- ./configure --enable-maintainer-mode
-
-8. In the build tree do
-
- make release
-
- This will update "RELEASE-DATE", "VERSION", and libtiff/tiffvers.h
- in the source tree.
-
-9. In the source tree, verify that the version info in RELEASE-DATE,
- VERSION and libtiff/tiffvers.h is right.
-
-10. In the build tree do
-
- make
- make distcheck
-
- If 'make distcheck' fails, then correct any issues until it
- succeeds.
-
- Two files with names tiff-version.tar.gz and tiff-version.zip will
- be created in the top level build directory.
-
-11. In the source tree do
-
- 'cvs commit'.
-
-12. In the source tree do
-
- cvs tag Release-v3-9-1
-
- (or the appropriate name for the release)
-
-13. Copy release packages from the build tree to the
- ftp.remotesensing.org ftp site.
-
- scp tiff-*.tar.gz tiff-*.zip \
- frankw@upload.osgeo.org:/osgeo/download/libtiff
-
-14. Announce to list, tiff@lists.maptools.org
-
-15. Update libtiff page on freshmeat with new version announcement.
-
-
diff --git a/src/3rdparty/libtiff/README b/src/3rdparty/libtiff/README
deleted file mode 100644
index c0e5521d8a..0000000000
--- a/src/3rdparty/libtiff/README
+++ /dev/null
@@ -1,59 +0,0 @@
-$Header: /cvs/maptools/cvsroot/libtiff/README,v 1.5 2004/10/30 13:44:45 dron Exp $
-
-
-TIFF Software Distribution
---------------------------
-This file is just a placeholder; all the documentation is now in
-HTML in the html directory. To view the documentation point your
-favorite WWW viewer at html/index.html; e.g.
-
- netscape html/index.html
-
-If you don't have an HTML viewer then you can read the HTML source
-or fetch a PostScript version of this documentation from the directory
-
- ftp://ftp.remotesensing.org/pub/libtiff/
-
-If you can't hack either of these options then basically what you
-want to do is:
-
- % ./configure
- % make
- % su
- # make install
-
-More information, email contacts, and mailing list information can be
-found online at http://www.remotesensing.org/libtiff/.
-
-
-Use and Copyright
------------------
-Silicon Graphics has seen fit to allow us to give this work away. It
-is free. There is no support or guarantee of any sort as to its
-operations, correctness, or whatever. If you do anything useful with
-all or parts of it you need to honor the copyright notices. I would
-also be interested in knowing about it and, hopefully, be acknowledged.
-
-The legal way of saying that is:
-
-Copyright (c) 1988-1997 Sam Leffler
-Copyright (c) 1991-1997 Silicon Graphics, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and
-its documentation for any purpose is hereby granted without fee, provided
-that (i) the above copyright notices and this permission notice appear in
-all copies of the software and related documentation, and (ii) the names of
-Sam Leffler and Silicon Graphics may not be used in any advertising or
-publicity relating to the software without the specific, prior written
-permission of Sam Leffler and Silicon Graphics.
-
-THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
diff --git a/src/3rdparty/libtiff/README.vms b/src/3rdparty/libtiff/README.vms
deleted file mode 100644
index 44d9663927..0000000000
--- a/src/3rdparty/libtiff/README.vms
+++ /dev/null
@@ -1,12 +0,0 @@
-Dear OpenVMS user
-to make this library, execute
-$@CONFIGURE
-$@BUILD
-
-Build process should be error and warning free. When process will be finished,
-LIBTIFF$STRATUP.COM file containing all required definitions, will be created.
-Please call it from system startup procedure or individual user procedure LOGIN.COM
-To link software with libtiff, use TIFF:LIBTIFF.OPT
-
-best regards,
-Alexey Chupahin, elvis_75@mail.ru
diff --git a/src/3rdparty/libtiff/RELEASE-DATE b/src/3rdparty/libtiff/RELEASE-DATE
deleted file mode 100644
index 1f15bfe5c4..0000000000
--- a/src/3rdparty/libtiff/RELEASE-DATE
+++ /dev/null
@@ -1 +0,0 @@
-20091104
diff --git a/src/3rdparty/libtiff/SConstruct b/src/3rdparty/libtiff/SConstruct
deleted file mode 100644
index 682246ea06..0000000000
--- a/src/3rdparty/libtiff/SConstruct
+++ /dev/null
@@ -1,171 +0,0 @@
-# $Id: SConstruct,v 1.4 2007/02/24 15:03:47 dron Exp $
-
-# Tag Image File Format (TIFF) Software
-#
-# Copyright (C) 2005, Andrey Kiselev <dron@ak4719.spb.edu>
-#
-# Permission to use, copy, modify, distribute, and sell this software and
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-#
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-#
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-# OF THIS SOFTWARE.
-
-# This file contains rules to build software with the SCons tool
-# (see the http://www.scons.org/ for details on SCons).
-
-import os
-
-env = Environment()
-
-# Read the user supplied options
-opts = Options('libtiff.conf')
-opts.Add(PathOption('PREFIX', \
- 'install architecture-independent files in this directory', \
- '/usr/local', PathOption.PathIsDirCreate))
-opts.Add(BoolOption('ccitt', \
- 'enable support for CCITT Group 3 & 4 algorithms', \
- 'yes'))
-opts.Add(BoolOption('packbits', \
- 'enable support for Macintosh PackBits algorithm', \
- 'yes'))
-opts.Add(BoolOption('lzw', \
- 'enable support for LZW algorithm', \
- 'yes'))
-opts.Add(BoolOption('thunder', \
- 'enable support for ThunderScan 4-bit RLE algorithm', \
- 'yes'))
-opts.Add(BoolOption('next', \
- 'enable support for NeXT 2-bit RLE algorithm', \
- 'yes'))
-opts.Add(BoolOption('logluv', \
- 'enable support for LogLuv high dynamic range encoding', \
- 'yes'))
-opts.Add(BoolOption('strip_chopping', \
- 'support for strip chopping (whether or not to convert single-strip uncompressed images to mutiple strips of ~8Kb to reduce memory usage)', \
- 'yes'))
-opts.Add(BoolOption('extrasample_as_alpha', \
- 'the RGBA interface will treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many packages produce RGBA files but don\'t mark the alpha properly', \
- 'yes'))
-opts.Add(BoolOption('check_ycbcr_subsampling', \
- 'disable picking up YCbCr subsampling info from the JPEG data stream to support files lacking the tag', \
- 'yes'))
-opts.Update(env)
-opts.Save('libtiff.conf', env)
-Help(opts.GenerateHelpText(env))
-
-# Here are our installation paths:
-idir_prefix = '$PREFIX'
-idir_lib = '$PREFIX/lib'
-idir_bin = '$PREFIX/bin'
-idir_inc = '$PREFIX/include'
-idir_doc = '$PREFIX/doc'
-Export([ 'env', 'idir_prefix', 'idir_lib', 'idir_bin', 'idir_inc', 'idir_doc' ])
-
-# Now proceed to system feature checks
-target_cpu, target_vendor, target_kernel, target_os = \
- os.popen("./config/config.guess").readlines()[0].split("-")
-
-def Define(context, key, have):
- import SCons.Conftest
- SCons.Conftest._Have(context, key, have)
-
-def CheckCustomOption(context, name):
- context.Message('Checking is the ' + name + ' option set... ')
- ret = env[name]
- Define(context, name + '_SUPPORT', ret)
- context.Result(ret)
- return ret
-
-def CheckFillorderOption(context):
- context.Message('Checking for the native cpu bit order... ')
- if target_cpu[0] == 'i' and target_cpu[2:] == '86':
- Define(context, 'HOST_FILLORDER', 'FILLORDER_LSB2MSB')
- context.Result('lsb2msb')
- else:
- Define(context, 'HOST_FILLORDER', 'FILLORDER_MSB2LSB')
- context.Result('msb2lsb')
- return 1
-
-def CheckIEEEFPOption(context):
- context.Message('Checking for the IEEE floating point format... ')
- Define(context, 'HAVE_IEEEFP', 1)
- context.Result(1)
- return 1
-
-def CheckOtherOption(context, name):
- context.Message('Checking is the ' + name + ' option set... ')
- ret = env[name]
- Define(context, 'HAVE_' + name, ret)
- context.Result(ret)
- return ret
-
-custom_tests = { \
- 'CheckCustomOption' : CheckCustomOption, \
- 'CheckFillorderOption' : CheckFillorderOption, \
- 'CheckIEEEFPOption' : CheckIEEEFPOption, \
- 'CheckOtherOption' : CheckOtherOption \
- }
-conf = Configure(env, custom_tests = custom_tests, \
- config_h = 'libtiff/tif_config.h')
-
-# Check for standard library
-conf.CheckLib('c')
-if target_os != 'cygwin' \
- and target_os != 'mingw32' \
- and target_os != 'beos' \
- and target_os != 'darwin':
- conf.CheckLib('m')
-
-# Check for system headers
-conf.CheckCHeader('assert.h')
-conf.CheckCHeader('fcntl.h')
-conf.CheckCHeader('io.h')
-conf.CheckCHeader('limits.h')
-conf.CheckCHeader('malloc.h')
-conf.CheckCHeader('search.h')
-conf.CheckCHeader('sys/time.h')
-conf.CheckCHeader('unistd.h')
-
-# Check for standard library functions
-conf.CheckFunc('floor')
-conf.CheckFunc('isascii')
-conf.CheckFunc('memmove')
-conf.CheckFunc('memset')
-conf.CheckFunc('mmap')
-conf.CheckFunc('pow')
-conf.CheckFunc('setmode')
-conf.CheckFunc('sqrt')
-conf.CheckFunc('strchr')
-conf.CheckFunc('strrchr')
-conf.CheckFunc('strstr')
-conf.CheckFunc('strtol')
-
-conf.CheckFillorderOption()
-conf.CheckIEEEFPOption()
-conf.CheckCustomOption('ccitt')
-conf.CheckCustomOption('packbits')
-conf.CheckCustomOption('lzw')
-conf.CheckCustomOption('thunder')
-conf.CheckCustomOption('next')
-conf.CheckCustomOption('logluv')
-conf.CheckOtherOption('strip_chopping')
-conf.CheckOtherOption('extrasample_as_alpha')
-conf.CheckOtherOption('check_ycbcr_subsampling')
-
-env = conf.Finish()
-
-# Ok, now go to build files in the subdirectories
-SConscript(dirs = [ 'libtiff' ], name = 'SConstruct')
diff --git a/src/3rdparty/libtiff/TODO b/src/3rdparty/libtiff/TODO
deleted file mode 100644
index 6c58eb045d..0000000000
--- a/src/3rdparty/libtiff/TODO
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Header: /cvs/maptools/cvsroot/libtiff/TODO,v 1.6 2002/10/10 05:28:43 warmerda Exp $
-
-o gif2tiff segaulting on selected images
-o tiffcmp read data by strip/tile instead of scanline
-o YCbCr sampling support
-o extracate colorspace conversion support
-o look at isolating all codecs from TIFF library
-o JPEG colormode order dependency problem
-o Write documentation on how do extend tags, and how the custom field
- stuff all works.
-
-
diff --git a/src/3rdparty/libtiff/VERSION b/src/3rdparty/libtiff/VERSION
deleted file mode 100644
index 2009c7dfad..0000000000
--- a/src/3rdparty/libtiff/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.9.2
diff --git a/src/3rdparty/libtiff/html/TIFFTechNote2.html b/src/3rdparty/libtiff/html/TIFFTechNote2.html
deleted file mode 100644
index 92bace4660..0000000000
--- a/src/3rdparty/libtiff/html/TIFFTechNote2.html
+++ /dev/null
@@ -1,707 +0,0 @@
-<pre>
-DRAFT TIFF Technical Note #2 17-Mar-95
-============================
-
-This Technical Note describes serious problems that have been found in
-TIFF 6.0's design for embedding JPEG-compressed data in TIFF (Section 22
-of the TIFF 6.0 spec of 3 June 1992). A replacement TIFF/JPEG
-specification is given. Some corrections to Section 21 are also given.
-
-To permit TIFF implementations to continue to read existing files, the 6.0
-JPEG fields and tag values will remain reserved indefinitely. However,
-TIFF writers are strongly discouraged from using the 6.0 JPEG design. It
-is expected that the next full release of the TIFF specification will not
-describe the old design at all, except to note that certain tag numbers
-are reserved. The existing Section 22 will be replaced by the
-specification text given in the second part of this Tech Note.
-
-
-Problems in TIFF 6.0 JPEG
-=========================
-
-Abandoning a published spec is not a step to be taken lightly. This
-section summarizes the reasons that have forced this decision.
-TIFF 6.0's JPEG design suffers from design errors and limitations,
-ambiguities, and unnecessary complexity.
-
-
-Design errors and limitations
------------------------------
-
-The fundamental design error in the existing Section 22 is that JPEG's
-various tables and parameters are broken out as separate fields which the
-TIFF control logic must manage. This is bad software engineering: that
-information should be treated as private to the JPEG codec
-(compressor/decompressor). Worse, the fields themselves are specified
-without sufficient thought for future extension and without regard to
-well-established TIFF conventions. Here are some of the significant
-problems:
-
-* The JPEGxxTable fields do not store the table data directly in the
-IFD/field structure; rather, the fields hold pointers to information
-elsewhere in the file. This requires special-purpose code to be added to
-*every* TIFF-manipulating application, whether it needs to decode JPEG
-image data or not. Even a trivial TIFF editor, for example a program to
-add an ImageDescription field to a TIFF file, must be explicitly aware of
-the internal structure of the JPEG-related tables, or else it will probably
-break the file. Every other auxiliary field in the TIFF spec contains
-data, not pointers, and can be copied or relocated by standard code that
-doesn't know anything about the particular field. This is a crucial
-property of the TIFF format that must not be given up.
-
-* To manipulate these fields, the TIFF control logic is required to know a
-great deal about JPEG details, for example such arcana as how to compute
-the length of a Huffman code table --- the length is not supplied in the
-field structure and can only be found by inspecting the table contents.
-This is again a violation of good software practice. Moreover, it will
-prevent easy adoption of future JPEG extensions that might change these
-low-level details.
-
-* The design neglects the fact that baseline JPEG codecs support only two
-sets of Huffman tables: it specifies a separate table for each color
-component. This implies that encoders must waste space (by storing
-duplicate Huffman tables) or else violate the well-founded TIFF convention
-that prohibits duplicate pointers. Furthermore, baseline decoders must
-test to find out which tables are identical, a waste of time and code
-space.
-
-* The JPEGInterchangeFormat field also violates TIFF's proscription against
-duplicate pointers: the normal strip/tile pointers are expected to point
-into the larger data area pointed to by JPEGInterchangeFormat. All TIFF
-editing applications must be specifically aware of this relationship, since
-they must maintain it or else delete the JPEGInterchangeFormat field. The
-JPEGxxTables fields are also likely to point into the JPEGInterchangeFormat
-area, creating additional pointer relationships that must be maintained.
-
-* The JPEGQTables field is fixed at a byte per table entry; there is no
-way to support 16-bit quantization values. This is a serious impediment
-to extending TIFF to use 12-bit JPEG.
-
-* The 6.0 design cannot support using different quantization tables in
-different strips/tiles of an image (so as to encode some areas at higher
-quality than others). Furthermore, since quantization tables are tied
-one-for-one to color components, the design cannot support table switching
-options that are likely to be added in future JPEG revisions.
-
-
-Ambiguities
------------
-
-Several incompatible interpretations are possible for 6.0's treatment of
-JPEG restart markers:
-
- * It is unclear whether restart markers must be omitted at TIFF segment
- (strip/tile) boundaries, or whether they are optional.
-
- * It is unclear whether the segment size is required to be chosen as
- a multiple of the specified restart interval (if any); perhaps the
- JPEG codec is supposed to be reset at each segment boundary as if
- there were a restart marker there, even if the boundary does not fall
- at a multiple of the nominal restart interval.
-
- * The spec fails to address the question of restart marker numbering:
- do the numbers begin again within each segment, or not?
-
-That last point is particularly nasty. If we make numbering begin again
-within each segment, we give up the ability to impose a TIFF strip/tile
-structure on an existing JPEG datastream with restarts (which was clearly a
-goal of Section 22's authors). But the other choice interferes with random
-access to the image segments: a reader must compute the first restart
-number to be expected within a segment, and must have a way to reset its
-JPEG decoder to expect a nonzero restart number first. This may not even
-be possible with some JPEG chips.
-
-The tile height restriction found on page 104 contradicts Section 15's
-general description of tiles. For an image that is not vertically
-downsampled, page 104 specifies a tile height of one MCU or 8 pixels; but
-Section 15 requires tiles to be a multiple of 16 pixels high.
-
-This Tech Note does not attempt to resolve these ambiguities, so
-implementations that follow the 6.0 design should be aware that
-inter-application compatibility problems are likely to arise.
-
-
-Unnecessary complexity
-----------------------
-
-The 6.0 design creates problems for implementations that need to keep the
-JPEG codec separate from the TIFF control logic --- for example, consider
-using a JPEG chip that was not designed specifically for TIFF. JPEG codecs
-generally want to produce or consume a standard ISO JPEG datastream, not
-just raw compressed data. (If they were to handle raw data, a separate
-out-of-band mechanism would be needed to load tables into the codec.)
-With such a codec, the TIFF control logic must parse JPEG markers emitted
-by the codec to create the TIFF table fields (when writing) or synthesize
-JPEG markers from the TIFF fields to feed the codec (when reading). This
-means that the control logic must know a great deal more about JPEG details
-than we would like. The parsing and reconstruction of the markers also
-represents a fair amount of unnecessary work.
-
-Quite a few implementors have proposed writing "TIFF/JPEG" files in which
-a standard JPEG datastream is simply dumped into the file and pointed to
-by JPEGInterchangeFormat. To avoid parsing the JPEG datastream, they
-suggest not writing the JPEG auxiliary fields (JPEGxxTables etc) nor even
-the basic TIFF strip/tile data pointers. This approach is incompatible
-with implementations that handle the full TIFF 6.0 JPEG design, since they
-will expect to find strip/tile pointers and auxiliary fields. Indeed this
-is arguably not TIFF at all, since *all* TIFF-reading applications expect
-to find strip or tile pointers. A subset implementation that is not
-upward-compatible with the full spec is clearly unacceptable. However,
-the frequency with which this idea has come up makes it clear that
-implementors find the existing Section 22 too complex.
-
-
-Overview of the solution
-========================
-
-To solve these problems, we adopt a new design for embedding
-JPEG-compressed data in TIFF files. The new design uses only complete,
-uninterpreted ISO JPEG datastreams, so it should be much more forgiving of
-extensions to the ISO standard. It should also be far easier to implement
-using unmodified JPEG codecs.
-
-To reduce overhead in multi-segment TIFF files, we allow JPEG overhead
-tables to be stored just once in a JPEGTables auxiliary field. This
-feature does not violate the integrity of the JPEG datastreams, because it
-uses the notions of "tables-only datastreams" and "abbreviated image
-datastreams" as defined by the ISO standard.
-
-To prevent confusion with the old design, the new design is given a new
-Compression tag value, Compression=7. Readers that need to handle
-existing 6.0 JPEG files may read both old and new files, using whatever
-interpretation of the 6.0 spec they did before. Compression tag value 6
-and the field tag numbers defined by 6.0 section 22 will remain reserved
-indefinitely, even though detailed descriptions of them will be dropped
-from future editions of the TIFF specification.
-
-
-Replacement TIFF/JPEG specification
-===================================
-
-[This section of the Tech Note is expected to replace Section 22 in the
-next release of the TIFF specification.]
-
-This section describes TIFF compression scheme 7, a high-performance
-compression method for continuous-tone images.
-
-Introduction
-------------
-
-This TIFF compression method uses the international standard for image
-compression ISO/IEC 10918-1, usually known as "JPEG" (after the original
-name of the standards committee, Joint Photographic Experts Group). JPEG
-is a joint ISO/CCITT standard for compression of continuous-tone images.
-
-The JPEG committee decided that because of the broad scope of the standard,
-no one algorithmic procedure was able to satisfy the requirements of all
-applications. Instead, the JPEG standard became a "toolkit" of multiple
-algorithms and optional capabilities. Individual applications may select
-a subset of the JPEG standard that meets their requirements.
-
-The most important distinction among the JPEG processes is between lossy
-and lossless compression. Lossy compression methods provide high
-compression but allow only approximate reconstruction of the original
-image. JPEG's lossy processes allow the encoder to trade off compressed
-file size against reconstruction fidelity over a wide range. Typically,
-10:1 or more compression of full-color data can be obtained while keeping
-the reconstructed image visually indistinguishable from the original. Much
-higher compression ratios are possible if a low-quality reconstructed image
-is acceptable. Lossless compression provides exact reconstruction of the
-source data, but the achievable compression ratio is much lower than for
-the lossy processes; JPEG's rather simple lossless process typically
-achieves around 2:1 compression of full-color data.
-
-The most widely implemented JPEG subset is the "baseline" JPEG process.
-This provides lossy compression of 8-bit-per-channel data. Optional
-extensions include 12-bit-per-channel data, arithmetic entropy coding for
-better compression, and progressive/hierarchical representations. The
-lossless process is an independent algorithm that has little in
-common with the lossy processes.
-
-It should be noted that the optional arithmetic-coding extension is subject
-to several US and Japanese patents. To avoid patent problems, use of
-arithmetic coding processes in TIFF files intended for inter-application
-interchange is discouraged.
-
-All of the JPEG processes are useful only for "continuous tone" data,
-in which the difference between adjacent pixel values is usually small.
-Low-bit-depth source data is not appropriate for JPEG compression, nor
-are palette-color images good candidates. The JPEG processes work well
-on grayscale and full-color data.
-
-Describing the JPEG compression algorithms in sufficient detail to permit
-implementation would require more space than we have here. Instead, we
-refer the reader to the References section.
-
-
-What data is being compressed?
-------------------------------
-
-In lossy JPEG compression, it is customary to convert color source data
-to YCbCr and then downsample it before JPEG compression. This gives
-2:1 data compression with hardly any visible image degradation, and it
-permits additional space savings within the JPEG compression step proper.
-However, these steps are not considered part of the ISO JPEG standard.
-The ISO standard is "color blind": it accepts data in any color space.
-
-For TIFF purposes, the JPEG compression tag is considered to represent the
-ISO JPEG compression standard only. The ISO standard is applied to the
-same data that would be stored in the TIFF file if no compression were
-used. Therefore, if color conversion or downsampling are used, they must
-be reflected in the regular TIFF fields; these steps are not considered to
-be implicit in the JPEG compression tag value. PhotometricInterpretation
-and related fields shall describe the color space actually stored in the
-file. With the TIFF 6.0 field definitions, downsampling is permissible
-only for YCbCr data, and it must correspond to the YCbCrSubSampling field.
-(Note that the default value for this field is not 1,1; so the default for
-YCbCr is to apply downsampling!) It is likely that future versions of TIFF
-will provide additional PhotometricInterpretation values and a more general
-way of defining subsampling, so as to allow more flexibility in
-JPEG-compressed files. But that issue is not addressed in this Tech Note.
-
-Implementors should note that many popular JPEG codecs
-(compressor/decompressors) provide automatic color conversion and
-downsampling, so that the application may supply full-size RGB data which
-is nonetheless converted to downsampled YCbCr. This is an implementation
-convenience which does not excuse the TIFF control layer from its
-responsibility to know what is really going on. The
-PhotometricInterpretation and subsampling fields written to the file must
-describe what is actually in the file.
-
-A JPEG-compressed TIFF file will typically have PhotometricInterpretation =
-YCbCr and YCbCrSubSampling = [2,1] or [2,2], unless the source data was
-grayscale or CMYK.
-
-
-Basic representation of JPEG-compressed images
-----------------------------------------------
-
-JPEG compression works in either strip-based or tile-based TIFF files.
-Rather than repeating "strip or tile" constantly, we will use the term
-"segment" to mean either a strip or a tile.
-
-When the Compression field has the value 7, each image segment contains
-a complete JPEG datastream which is valid according to the ISO JPEG
-standard (ISO/IEC 10918-1). Any sequential JPEG process can be used,
-including lossless JPEG, but progressive and hierarchical processes are not
-supported. Since JPEG is useful only for continuous-tone images, the
-PhotometricInterpretation of the image shall not be 3 (palette color) nor
-4 (transparency mask). The bit depth of the data is also restricted as
-specified below.
-
-Each image segment in a JPEG-compressed TIFF file shall contain a valid
-JPEG datastream according to the ISO JPEG standard's rules for
-interchange-format or abbreviated-image-format data. The datastream shall
-contain a single JPEG frame storing that segment of the image. The
-required JPEG markers within a segment are:
- SOI (must appear at very beginning of segment)
- SOFn
- SOS (one for each scan, if there is more than one scan)
- EOI (must appear at very end of segment)
-The actual compressed data follows SOS; it may contain RSTn markers if DRI
-is used.
-
-Additional JPEG "tables and miscellaneous" markers may appear between SOI
-and SOFn, between SOFn and SOS, and before each subsequent SOS if there is
-more than one scan. These markers include:
- DQT
- DHT
- DAC (not to appear unless arithmetic coding is used)
- DRI
- APPn (shall be ignored by TIFF readers)
- COM (shall be ignored by TIFF readers)
-DNL markers shall not be used in TIFF files. Readers should abort if any
-other marker type is found, especially the JPEG reserved markers;
-occurrence of such a marker is likely to indicate a JPEG extension.
-
-The tables/miscellaneous markers may appear in any order. Readers are
-cautioned that although the SOFn marker refers to DQT tables, JPEG does not
-require those tables to precede the SOFn, only the SOS. Missing-table
-checks should be made when SOS is reached.
-
-If no JPEGTables field is used, then each image segment shall be a complete
-JPEG interchange datastream. Each segment must define all the tables it
-references. To allow readers to decode segments in any order, no segment
-may rely on tables being carried over from a previous segment.
-
-When a JPEGTables field is used, image segments may omit tables that have
-been specified in the JPEGTables field. Further details appear below.
-
-The SOFn marker shall be of type SOF0 for strict baseline JPEG data, of
-type SOF1 for non-baseline lossy JPEG data, or of type SOF3 for lossless
-JPEG data. (SOF9 or SOF11 would be used for arithmetic coding.) All
-segments of a JPEG-compressed TIFF image shall use the same JPEG
-compression process, in particular the same SOFn type.
-
-The data precision field of the SOFn marker shall agree with the TIFF
-BitsPerSample field. (Note that when PlanarConfiguration=1, this implies
-that all components must have the same BitsPerSample value; when
-PlanarConfiguration=2, different components could have different bit
-depths.) For SOF0 only precision 8 is permitted; for SOF1, precision 8 or
-12 is permitted; for SOF3, precisions 2 to 16 are permitted.
-
-The image dimensions given in the SOFn marker shall agree with the logical
-dimensions of that particular strip or tile. For strip images, the SOFn
-image width shall equal ImageWidth and the height shall equal RowsPerStrip,
-except in the last strip; its SOFn height shall equal the number of rows
-remaining in the ImageLength. (In other words, no padding data is counted
-in the SOFn dimensions.) For tile images, each SOFn shall have width
-TileWidth and height TileHeight; adding and removing any padding needed in
-the edge tiles is the concern of some higher level of the TIFF software.
-(The dimensional rules are slightly different when PlanarConfiguration=2,
-as described below.)
-
-The ISO JPEG standard only permits images up to 65535 pixels in width or
-height, due to 2-byte fields in the SOFn markers. In TIFF, this limits
-the size of an individual JPEG-compressed strip or tile, but the total
-image size can be greater.
-
-The number of components in the JPEG datastream shall equal SamplesPerPixel
-for PlanarConfiguration=1, and shall be 1 for PlanarConfiguration=2. The
-components shall be stored in the same order as they are described at the
-TIFF field level. (This applies both to their order in the SOFn marker,
-and to the order in which they are scanned if multiple JPEG scans are
-used.) The component ID bytes are arbitrary so long as each component
-within an image segment is given a distinct ID. To avoid any possible
-confusion, we require that all segments of a TIFF image use the same ID
-code for a given component.
-
-In PlanarConfiguration 1, the sampling factors given in SOFn markers shall
-agree with the sampling factors defined by the related TIFF fields (or with
-the default values that are specified in the absence of those fields).
-
-When DCT-based JPEG is used in a strip TIFF file, RowsPerStrip is required
-to be a multiple of 8 times the largest vertical sampling factor, i.e., a
-multiple of the height of an interleaved MCU. (For simplicity of
-specification, we require this even if the data is not actually
-interleaved.) For example, if YCbCrSubSampling = [2,2] then RowsPerStrip
-must be a multiple of 16. An exception to this rule is made for
-single-strip images (RowsPerStrip >= ImageLength): the exact value of
-RowsPerStrip is unimportant in that case. This rule ensures that no data
-padding is needed at the bottom of a strip, except perhaps the last strip.
-Any padding required at the right edge of the image, or at the bottom of
-the last strip, is expected to occur internally to the JPEG codec.
-
-When DCT-based JPEG is used in a tiled TIFF file, TileLength is required
-to be a multiple of 8 times the largest vertical sampling factor, i.e.,
-a multiple of the height of an interleaved MCU; and TileWidth is required
-to be a multiple of 8 times the largest horizontal sampling factor, i.e.,
-a multiple of the width of an interleaved MCU. (For simplicity of
-specification, we require this even if the data is not actually
-interleaved.) All edge padding required will therefore occur in the course
-of normal TIFF tile padding; it is not special to JPEG.
-
-Lossless JPEG does not impose these constraints on strip and tile sizes,
-since it is not DCT-based.
-
-Note that within JPEG datastreams, multibyte values appear in the MSB-first
-order specified by the JPEG standard, regardless of the byte ordering of
-the surrounding TIFF file.
-
-
-JPEGTables field
-----------------
-
-The only auxiliary TIFF field added for Compression=7 is the optional
-JPEGTables field. The purpose of JPEGTables is to predefine JPEG
-quantization and/or Huffman tables for subsequent use by JPEG image
-segments. When this is done, these rather bulky tables need not be
-duplicated in each segment, thus saving space and processing time.
-JPEGTables may be used even in a single-segment file, although there is no
-space savings in that case.
-
-JPEGTables:
- Tag = 347 (15B.H)
- Type = UNDEFINED
- N = number of bytes in tables datastream, typically a few hundred
-JPEGTables provides default JPEG quantization and/or Huffman tables which
-are used whenever a segment datastream does not contain its own tables, as
-specified below.
-
-Notice that the JPEGTables field is required to have type code UNDEFINED,
-not type code BYTE. This is to cue readers that expanding individual bytes
-to short or long integers is not appropriate. A TIFF reader will generally
-need to store the field value as an uninterpreted byte sequence until it is
-fed to the JPEG decoder.
-
-Multibyte quantities within the tables follow the ISO JPEG convention of
-MSB-first storage, regardless of the byte ordering of the surrounding TIFF
-file.
-
-When the JPEGTables field is present, it shall contain a valid JPEG
-"abbreviated table specification" datastream. This datastream shall begin
-with SOI and end with EOI. It may contain zero or more JPEG "tables and
-miscellaneous" markers, namely:
- DQT
- DHT
- DAC (not to appear unless arithmetic coding is used)
- DRI
- APPn (shall be ignored by TIFF readers)
- COM (shall be ignored by TIFF readers)
-Since JPEG defines the SOI marker to reset the DAC and DRI state, these two
-markers' values cannot be carried over into any image datastream, and thus
-they are effectively no-ops in the JPEGTables field. To avoid confusion,
-it is recommended that writers not place DAC or DRI markers in JPEGTables.
-However readers must properly skip over them if they appear.
-
-When JPEGTables is present, readers shall load the table specifications
-contained in JPEGTables before processing image segment datastreams.
-Image segments may simply refer to these preloaded tables without defining
-them. An image segment can still define and use its own tables, subject to
-the restrictions below.
-
-An image segment may not redefine any table defined in JPEGTables. (This
-restriction is imposed to allow readers to process image segments in random
-order without having to reload JPEGTables between segments.) Therefore, use
-of JPEGTables divides the available table slots into two groups: "global"
-slots are defined in JPEGTables and may be used but not redefined by
-segments; "local" slots are available for local definition and use in each
-segment. To permit random access, a segment may not reference any local
-tables that it does not itself define.
-
-
-Special considerations for PlanarConfiguration 2
-------------------------------------------------
-
-In PlanarConfiguration 2, each image segment contains data for only one
-color component. To avoid confusing the JPEG codec, we wish the segments
-to look like valid single-channel (i.e., grayscale) JPEG datastreams. This
-means that different rules must be used for the SOFn parameters.
-
-In PlanarConfiguration 2, the dimensions given in the SOFn of a subsampled
-component shall be scaled down by the sampling factors compared to the SOFn
-dimensions that would be used in PlanarConfiguration 1. This is necessary
-to match the actual number of samples stored in that segment, so that the
-JPEG codec doesn't complain about too much or too little data. In strip
-TIFF files the computed dimensions may need to be rounded up to the next
-integer; in tiled files, the restrictions on tile size make this case
-impossible.
-
-Furthermore, all SOFn sampling factors shall be given as 1. (This is
-merely to avoid confusion, since the sampling factors in a single-channel
-JPEG datastream have no real effect.)
-
-Any downsampling will need to happen externally to the JPEG codec, since
-JPEG sampling factors are defined with reference to the full-precision
-component. In PlanarConfiguration 2, the JPEG codec will be working on
-only one component at a time and thus will have no reference component to
-downsample against.
-
-
-Minimum requirements for TIFF/JPEG
-----------------------------------
-
-ISO JPEG is a large and complex standard; most implementations support only
-a subset of it. Here we define a "core" subset of TIFF/JPEG which readers
-must support to claim TIFF/JPEG compatibility. For maximum
-cross-application compatibility, we recommend that writers confine
-themselves to this subset unless there is very good reason to do otherwise.
-
-Use the ISO baseline JPEG process: 8-bit data precision, Huffman coding,
-with no more than 2 DC and 2 AC Huffman tables. Note that this implies
-BitsPerSample = 8 for each component. We recommend deviating from baseline
-JPEG only if 12-bit data precision or lossless coding is required.
-
-Use no subsampling (all JPEG sampling factors = 1) for color spaces other
-than YCbCr. (This is, in fact, required with the TIFF 6.0 field
-definitions, but may not be so in future revisions.) For YCbCr, use one of
-the following choices:
- YCbCrSubSampling field JPEG sampling factors
- 1,1 1h1v, 1h1v, 1h1v
- 2,1 2h1v, 1h1v, 1h1v
- 2,2 (default value) 2h2v, 1h1v, 1h1v
-We recommend that RGB source data be converted to YCbCr for best compression
-results. Other source data colorspaces should probably be left alone.
-Minimal readers need not support JPEG images with colorspaces other than
-YCbCr and grayscale (PhotometricInterpretation = 6 or 1).
-
-A minimal reader also need not support JPEG YCbCr images with nondefault
-values of YCbCrCoefficients or YCbCrPositioning, nor with values of
-ReferenceBlackWhite other than [0,255,128,255,128,255]. (These values
-correspond to the RGB<=>YCbCr conversion specified by JFIF, which is widely
-implemented in JPEG codecs.)
-
-Writers are reminded that a ReferenceBlackWhite field *must* be included
-when PhotometricInterpretation is YCbCr, because the default
-ReferenceBlackWhite values are inappropriate for YCbCr.
-
-If any subsampling is used, PlanarConfiguration=1 is preferred to avoid the
-possibly-confusing requirements of PlanarConfiguration=2. In any case,
-readers are not required to support PlanarConfiguration=2.
-
-If possible, use a single interleaved scan in each image segment. This is
-not legal JPEG if there are more than 4 SamplesPerPixel or if the sampling
-factors are such that more than 10 blocks would be needed per MCU; in that
-case, use a separate scan for each component. (The recommended color
-spaces and sampling factors will not run into that restriction, so a
-minimal reader need not support more than one scan per segment.)
-
-To claim TIFF/JPEG compatibility, readers shall support multiple-strip TIFF
-files and the optional JPEGTables field; it is not acceptable to read only
-single-datastream files. Support for tiled TIFF files is strongly
-recommended but not required.
-
-
-Other recommendations for implementors
---------------------------------------
-
-The TIFF tag Compression=7 guarantees only that the compressed data is
-represented as ISO JPEG datastreams. Since JPEG is a large and evolving
-standard, readers should apply careful error checking to the JPEG markers
-to ensure that the compression process is within their capabilities. In
-particular, to avoid being confused by future extensions to the JPEG
-standard, it is important to abort if unknown marker codes are seen.
-
-The point of requiring that all image segments use the same JPEG process is
-to ensure that a reader need check only one segment to determine whether it
-can handle the image. For example, consider a TIFF reader that has access
-to fast but restricted JPEG hardware, as well as a slower, more general
-software implementation. It is desirable to check only one image segment
-to find out whether the fast hardware can be used. Thus, writers should
-try to ensure that all segments of an image look as much "alike" as
-possible: there should be no variation in scan layout, use of options such
-as DRI, etc. Ideally, segments will be processed identically except
-perhaps for using different local quantization or entropy-coding tables.
-
-Writers should avoid including "noise" JPEG markers (COM and APPn markers).
-Standard TIFF fields provide a better way to transport any non-image data.
-Some JPEG codecs may change behavior if they see an APPn marker they
-think they understand; since the TIFF spec requires these markers to be
-ignored, this behavior is undesirable.
-
-It is possible to convert an interchange-JPEG file (e.g., a JFIF file) to
-TIFF simply by dropping the interchange datastream into a single strip.
-(However, designers are reminded that the TIFF spec discourages huge
-strips; splitting the image is somewhat more work but may give better
-results.) Conversion from TIFF to interchange JPEG is more complex. A
-strip-based TIFF/JPEG file can be converted fairly easily if all strips use
-identical JPEG tables and no RSTn markers: just delete the overhead markers
-and insert RSTn markers between strips. Converting tiled images is harder,
-since the data will usually not be in the right order (unless the tiles are
-only one MCU high). This can still be done losslessly, but it will require
-undoing and redoing the entropy coding so that the DC coefficient
-differences can be updated.
-
-There is no default value for JPEGTables: standard TIFF files must define all
-tables that they reference. For some closed systems in which many files will
-have identical tables, it might make sense to define a default JPEGTables
-value to avoid actually storing the tables. Or even better, invent a
-private field selecting one of N default JPEGTables settings, so as to allow
-for future expansion. Either of these must be regarded as a private
-extension that will render the files unreadable by other applications.
-
-
-References
-----------
-
-[1] Wallace, Gregory K. "The JPEG Still Picture Compression Standard",
-Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
-
-This is the best short technical introduction to the JPEG algorithms.
-It is a good overview but does not provide sufficiently detailed
-information to write an implementation.
-
-[2] Pennebaker, William B. and Mitchell, Joan L. "JPEG Still Image Data
-Compression Standard", Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.
-638pp.
-
-This textbook is by far the most complete exposition of JPEG in existence.
-It includes the full text of the ISO JPEG standards (DIS 10918-1 and draft
-DIS 10918-2). No would-be JPEG implementor should be without it.
-
-[3] ISO/IEC IS 10918-1, "Digital Compression and Coding of Continuous-tone
-Still Images, Part 1: Requirements and guidelines", February 1994.
-ISO/IEC DIS 10918-2, "Digital Compression and Coding of Continuous-tone
-Still Images, Part 2: Compliance testing", final approval expected 1994.
-
-These are the official standards documents. Note that the Pennebaker and
-Mitchell textbook is likely to be cheaper and more useful than the official
-standards.
-
-
-Changes to Section 21: YCbCr Images
-===================================
-
-[This section of the Tech Note clarifies section 21 to make clear the
-interpretation of image dimensions in a subsampled image. Furthermore,
-the section is changed to allow the original image dimensions not to be
-multiples of the sampling factors. This change is necessary to support use
-of JPEG compression on odd-size images.]
-
-Add the following paragraphs to the Section 21 introduction (p. 89),
-just after the paragraph beginning "When a Class Y image is subsampled":
-
- In a subsampled image, it is understood that all TIFF image
- dimensions are measured in terms of the highest-resolution
- (luminance) component. In particular, ImageWidth, ImageLength,
- RowsPerStrip, TileWidth, TileLength, XResolution, and YResolution
- are measured in luminance samples.
-
- RowsPerStrip, TileWidth, and TileLength are constrained so that
- there are an integral number of samples of each component in a
- complete strip or tile. However, ImageWidth/ImageLength are not
- constrained. If an odd-size image is to be converted to subsampled
- format, the writer should pad the source data to a multiple of the
- sampling factors by replication of the last column and/or row, then
- downsample. The number of luminance samples actually stored in the
- file will be a multiple of the sampling factors. Conversely,
- readers must ignore any extra data (outside the specified image
- dimensions) after upsampling.
-
- When PlanarConfiguration=2, each strip or tile covers the same
- image area despite subsampling; that is, the total number of strips
- or tiles in the image is the same for each component. Therefore
- strips or tiles of the subsampled components contain fewer samples
- than strips or tiles of the luminance component.
-
- If there are extra samples per pixel (see field ExtraSamples),
- these data channels have the same number of samples as the
- luminance component.
-
-Rewrite the YCbCrSubSampling field description (pp 91-92) as follows
-(largely to eliminate possibly-misleading references to
-ImageWidth/ImageLength of the subsampled components):
-
- (first paragraph unchanged)
-
- The two elements of this field are defined as follows:
-
- Short 0: ChromaSubsampleHoriz:
-
- 1 = there are equal numbers of luma and chroma samples horizontally.
-
- 2 = there are twice as many luma samples as chroma samples
- horizontally.
-
- 4 = there are four times as many luma samples as chroma samples
- horizontally.
-
- Short 1: ChromaSubsampleVert:
-
- 1 = there are equal numbers of luma and chroma samples vertically.
-
- 2 = there are twice as many luma samples as chroma samples
- vertically.
-
- 4 = there are four times as many luma samples as chroma samples
- vertically.
-
- ChromaSubsampleVert shall always be less than or equal to
- ChromaSubsampleHoriz. Note that Cb and Cr have the same sampling
- ratios.
-
- In a strip TIFF file, RowsPerStrip is required to be an integer
- multiple of ChromaSubSampleVert (unless RowsPerStrip >=
- ImageLength, in which case its exact value is unimportant).
- If ImageWidth and ImageLength are not multiples of
- ChromaSubsampleHoriz and ChromaSubsampleVert respectively, then the
- source data shall be padded to the next integer multiple of these
- values before downsampling.
-
- In a tiled TIFF file, TileWidth must be an integer multiple of
- ChromaSubsampleHoriz and TileLength must be an integer multiple of
- ChromaSubsampleVert. Padding will occur to tile boundaries.
-
- The default values of this field are [ 2,2 ]. Thus, YCbCr data is
- downsampled by default!
-</pre>
diff --git a/src/3rdparty/libtiff/html/addingtags.html b/src/3rdparty/libtiff/html/addingtags.html
deleted file mode 100644
index 452821c2d0..0000000000
--- a/src/3rdparty/libtiff/html/addingtags.html
+++ /dev/null
@@ -1,292 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Modifying The TIFF Library
-</TITLE>
-</HEAD>
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<H1>
-Defining New TIFF Tags
-</H1>
-
-Libtiff has built-in knowledge of all the standard TIFF tags, as
-well as extentions. The following describes how to add knowledge of
-new tags as builtins to libtiff, or how to application specific tags can
-be used by applications without modifying libtiff.
-<p>
-
-<h2>TIFFFieldInfo</h2>
-
-How libtiff manages specific tags is primarily controlled by the
-definition for that tag value stored internally as a TIFFFieldInfo structure.
-This structure looks like this:
-<p>
-
-<pre>
-typedef struct {
- ttag_t field_tag; /* field's tag */
- short field_readcount; /* read count/TIFF_VARIABLE/TIFF_SPP */
- short field_writecount; /* write count/TIFF_VARIABLE */
- TIFFDataType field_type; /* type of associated data */
- unsigned short field_bit; /* bit in fieldsset bit vector */
- unsigned char field_oktochange;/* if true, can change while writing */
- unsigned char field_passcount;/* if true, pass dir count on set */
- char *field_name; /* ASCII name */
-} TIFFFieldInfo;
-</pre>
-
-<ul>
-<li> <b>field_tag</b>: the tag number. For instance 277 for the
-SamplesPerPixel tag. Builtin tags will generally have a #define in
-tiff.h for each known tag. <p>
-
-<li> <b>field_readcount</b>: The number of values which should be read.
-The special value TIFF_VARIABLE (-1) indicates that a variable number of
-values may be read. The special value TIFFTAG_SPP (-2) indicates that there
-should be one value for each sample as defined by TIFFTAG_SAMPLESPERPIXEL.
-The special value TIFF_VARIABLE2 (-3) is presumably similar to TIFF_VARIABLE
-though I am not sure what the distinction in behaviour is. This field
-is TIFF_VARIABLE for variable length ascii fields.<p>
-
-<li> <b>field_writecount</b>: The number of values which should be written.
-Generally the same as field_readcount. A few built-in exceptions exist, but
-I haven't analysed why they differ. <p>
-
-<li> <b>field_type</b>: Type of the field. One of TIFF_BYTE, TIFF_ASCII,
-TIFF_SHORT, TIFF_LONG, TIFF_RATIONAL, TIFF_SBYTE, TIFF_UNDEFINED,
-TIFF_SSHORT, TIFF_SLONG, TIFF_SRATIONAL, TIFF_FLOAT, TIFF_DOUBLE or
-TIFF_IFD. Note that some fields can support more than one type (for
-instance short and long). These fields should have multiple TIFFFieldInfos.
-<p>
-
-<li> <b>field_bit</b>: Built-in tags stored in special fields in the
-TIFF structure have assigned field numbers to distinguish them (ie.
-FIELD_SAMPLESPERPIXEL). New tags should generally just use
-FIELD_CUSTOM indicating they are stored in the generic tag list.<p>
-
-<li> <b>field_oktochange</b>: TRUE if it is OK to change this tag value
-while an image is being written. FALSE for stuff that must be set once
-and then left unchanged (like ImageWidth, or PhotometricInterpretation for
-instance).<p>
-
-<li> <b>field_passcount</b>: If TRUE, then the count value must be passed
-in TIFFSetField(), and TIFFGetField(), otherwise the count is not required.
-This should generally be TRUE for non-ascii variable count tags unless
-the count is implicit (such as with the colormap).<p>
-
-<li> <b>field_name</b>: A name for the tag. Normally mixed case (studly caps)
-like "StripByteCounts" and relatively short. <p>
-
-</ul>
-
-A TIFFFieldInfo definition exists for each built-in tag in the tif_dirinfo.c
-file. Some tags which support multiple data types have more than one
-definition, one per data type supported. <p>
-
-Various functions exist for getting the internal TIFFFieldInfo definitions,
-including _TIFFFindFieldInfo(), and _TIFFFindFieldInfoByName(). See
-tif_dirinfo.c for details. There must be some mechanism to get the whole
-list, though I don't see it off hand.<p>
-
-<h2>Default Tag Auto-registration</h2>
-
-In libtiff 3.6.0 a new mechanism was introduced allowing libtiff to
-read unrecognised tags automatically. When an unknown tags is encountered,
-it is automatically internally defined with a default name and a type
-derived from the tag value in the file. Applications only need to predefine
-application specific tags if they need to be able to set them in a file, or
-if particular calling conventions are desired for TIFFSetField() and
-TIFFGetField().<p>
-
-When tags are autodefined like this the <b>field_readcount</b> and
-<b>field_writecount</b> values are always TIFF_VARIABLE. The
-<b>field_passcount</b> is always TRUE, and the <b>field_bit</b> is
-FIELD_CUSTOM. The field name will be "Tag %d" where the %d is the tag
-number.<p>
-
-<h2>Defining Application Tags</h2>
-
-For various reasons, it is common for applications to want to define
-their own tags to store information outside the core TIFF specification.
-This is done by calling TIFFMergeFieldInfo() with one or more TIFFFieldInfos.
-<p>
-
-The libgeotiff library provides geospatial information extentions within
-a TIFF file. First, a set of TIFFFieldInfo's is prepared with information
-on the new tags:<p>
-
-<pre>
-static const TIFFFieldInfo xtiffFieldInfo[] = {
-
- /* XXX Insert Your tags here */
- { TIFFTAG_GEOPIXELSCALE, -1,-1, TIFF_DOUBLE, FIELD_CUSTOM,
- TRUE, TRUE, "GeoPixelScale" },
- { TIFFTAG_GEOTRANSMATRIX, -1,-1, TIFF_DOUBLE, FIELD_CUSTOM,
- TRUE, TRUE, "GeoTransformationMatrix" },
- { TIFFTAG_GEOTIEPOINTS, -1,-1, TIFF_DOUBLE, FIELD_CUSTOM,
- TRUE, TRUE, "GeoTiePoints" },
- { TIFFTAG_GEOKEYDIRECTORY, -1,-1, TIFF_SHORT, FIELD_CUSTOM,
- TRUE, TRUE, "GeoKeyDirectory" },
- { TIFFTAG_GEODOUBLEPARAMS, -1,-1, TIFF_DOUBLE, FIELD_CUSTOM,
- TRUE, TRUE, "GeoDoubleParams" },
- { TIFFTAG_GEOASCIIPARAMS, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
- TRUE, FALSE, "GeoASCIIParams" }
-};
-</pre>
-
-In order to define the tags, we call TIFFMergeFieldInfo() on the
-desired TIFF handle with the list of TIFFFieldInfos.<p>
-
-<pre>
-#define N(a) (sizeof (a) / sizeof (a[0]))
-
- /* Install the extended Tag field info */
- TIFFMergeFieldInfo(tif, xtiffFieldInfo, N(xtiffFieldInfo));
-</pre>
-
-The tags need to be defined for each TIFF file opened - and when reading
-they should be defined before the tags of the file are read, yet a valid
-TIFF * is needed to merge the tags against. In order to get them
-registered at the appropriate part of the setup process, it is necessary
-to register our merge function as an extender callback with libtiff.
-This is done with TIFFSetTagExtender(). We also keep track of the
-previous tag extender (if any) so that we can call it from our extender
-allowing a chain of customizations to take effect. <P>
-
-<pre>
-static TIFFExtendProc _ParentExtender = NULL;
-
-static
-void _XTIFFInitialize(void)
-{
- static int first_time=1;
-
- if (! first_time) return; /* Been there. Done that. */
- first_time = 0;
-
- /* Grab the inherited method and install */
- _ParentExtender = TIFFSetTagExtender(_XTIFFDefaultDirectory);
-}
-</pre>
-
-The extender callback is looks like this. It merges in our new fields
-and then calls the next extender if there is one in effect.<p>
-
-<pre>
-static void
-_XTIFFDefaultDirectory(TIFF *tif)
-{
- /* Install the extended Tag field info */
- TIFFMergeFieldInfo(tif, xtiffFieldInfo, N(xtiffFieldInfo));
-
- /* Since an XTIFF client module may have overridden
- * the default directory method, we call it now to
- * allow it to set up the rest of its own methods.
- */
-
- if (_ParentExtender)
- (*_ParentExtender)(tif);
-}
-</pre>
-
-The above approach ensures that our new definitions are used when reading
-or writing any TIFF file. However, since on reading we already have
-default definitions for tags, it is usually not critical to pre-define them.
-If tag definitions are only required for writing custom tags, you can just
-call TIFFMergeFieldInfo() before setting new tags. The whole extender
-architecture can then be avoided.<p>
-
-<A NAME=AddingTags><P><H2>Adding New Builtin Tags</H2></A>
-
-A similar approach is taken to the above. However, the TIFFFieldInfo
-should be added to the tiffFieldInfo[] list in tif_dirinfo.c. Ensure that
-new tags are added in sorted order by the tag number.<p>
-
-Normally new built-in tags should be defined with FIELD_CUSTOM; however, if
-it is desirable for the tag value to have it's own field in the TIFFDirectory
-structure, then you will need to #define a new FIELD_ value for it, and
-add appropriate handling as follows:
-
-
-<OL>
-<LI>Define the tag in <B>tiff.h</B>.
-<LI>Add a field to the directory structure in <B>tif_dir.h</B>
- and define a <TT>FIELD_*</TT> bit (also update the definition of
- <TT>FIELD_CODEC</TT> to reflect your addition).
-<LI>Add an entry in the <TT>TIFFFieldInfo</TT> array defined at the top of
- <B>tif_dirinfo.c</B>.
- Note that you must keep this array sorted by tag
- number and that the widest variant entry for a tag should come
- first (e.g. <TT>LONG</TT> before <TT>SHORT</TT>).
-<LI>Add entries in <TT>_TIFFVSetField()</TT> and <TT>_TIFFVGetField()</TT>
- for the new tag.
-<LI>(<I>optional</I>) If the value associated with the tag is not a scalar value
- (e.g. the array for <TT>TransferFunction</TT>) and requires
- special processing,
- then add the appropriate code to <TT>TIFFReadDirectory()</TT> and
- <TT>TIFFWriteDirectory()</TT>. You're best off finding a similar tag and
- cribbing code.
-<LI>Add support to <TT>TIFFPrintDirectory()</TT> in <B>tif_print.c</B>
- to print the tag's value.
-</OL>
-
-<P>
-If you want to maintain portability, beware of making assumptions
-about data types. Use the typedefs (<TT>uint16</TT>, etc. when dealing with
-data on disk and <TT>t*_t</TT> when stuff is in memory) and be careful about
-passing items through printf or similar vararg interfaces.
-
-<A NAME=AddingCODECTags><P><H2>Adding New Codec-private Tags</H2></A>
-
-To add tags that are meaningful <EM>only when a particular compression
-algorithm is used</EM> follow these steps:
-
-<OL>
-<LI>Define the tag in <B>tiff.h</B>.
-<LI>Allocate storage for the tag values in the private state block of
- the codec.
-<LI>Insure the state block is created when the codec is initialized.
-<LI>At <TT>TIFFInitfoo</TT> time override the method pointers in the
- TIFF structure
- for getting, setting and printing tag values. For example,
-<PRE>
- sp->vgetparent = tif->tif_vgetfield;
- tif->tif_vgetfield = fooVGetField; /* hook for codec tags */
- sp->vsetparent = tif->tif_vsetfield;
- tif->tif_vsetfield = fooVSetField; /* hook for codec tags */
- tif->tif_printdir = fooPrintDir; /* hook for codec tags */
-</PRE>
- (Actually you may decide not to override the
- <TT>tif_printdir</TT> method, but rather just specify it).
-<LI>Create a private <TT>TIFFFieldInfo</TT> array for your tags and
- merge them into the core tags at initialization time using
- <TT>_TIFFMergeFieldInfo</TT>; e.g.
-<PRE>
- _TIFFMergeFieldInfo(tif, fooFieldInfo, N(fooFieldInfo));
-</PRE>
- (where <TT>N</TT> is a macro used liberaly throughout the distributed code).
-<LI>Fill in the get and set routines. Be sure to call the parent method
- for tags that you are not handled directly. Also be sure to set the
- <TT>FIELD_*</TT> bits for tags that are to be written to the file. Note that
- you can create ``pseudo-tags'' by defining tags that are processed
- exclusively in the get/set routines and never written to file (see
- the handling of <TT>TIFFTAG_FAXMODE</TT> in <B>tif_fax3.c</B>
- for an example of this).
-<LI>Fill in the print routine, if appropriate.
-</OL>
-
-Note that space has been allocated in the <TT>FIELD_*</TT> bit space for
-codec-private tags. Define your bits as <TT>FIELD_CODEC+&lt;offset&gt;</TT> to
-keep them away from the core tags. If you need more tags than there
-is room for, just increase <TT>FIELD_SETLONGS</TT> at the top of
-<B>tiffiop.h</B>.
-
-<HR>
-
-Last updated: $Date: 2004/09/10 14:43:18 $
-
-</BODY>
-
-</HTML>
diff --git a/src/3rdparty/libtiff/html/bugs.html b/src/3rdparty/libtiff/html/bugs.html
deleted file mode 100644
index dd17c73ebf..0000000000
--- a/src/3rdparty/libtiff/html/bugs.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Bugs and the TIFF Mailing List</TITLE>
-</HEAD>
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-<H1>
-<IMG SRC=images/cover.jpg WIDTH=110 HEIGHT=110 ALIGN=left BORDER=1 HSPACE=6>
-Bugs, Bugzilla, and the TIFF Mailing List
-</H1>
-
-<P>
-This software is free. Please let us know when you find a problem or
-fix a bug.
-
-<P>
-Thanks to <A HREF=http://www.maptools.org/>MapTools.org</a>, libtiff now uses
-bugzilla to track bugs. All bugs filed in the older bugzilla at
-bugzilla.remotesensing.org (pre April 2008) have unfortunately been lost.
-<P>
-If you think you've discovered a bug, please first check to see if it is
-already known by looking at the list of already reported bugs. You can do so
-by visiting the buglist at
-<A HREF=http://bugzilla.maptools.org/buglist.cgi?product=libtiff>http://bugzilla.maptools.org/buglist.cgi?product=libtiff</A>. Also verify that
-the problem is still reproducable with the current development software
-from CVS.
-<P>
-If you'd like to enter a new bug, you can do so at
-<A HREF=http://bugzilla.maptools.org/enter_bug.cgi?product=libtiff>http://bugzilla.maptools.org/enter_bug.cgi?product=libtiff</A>.
-<P>
-If you'd like to inform us about some kind of security issue that should not
-be disclosed for a period of time, then you can contact maintainers directly.
-Send a copies of your report to the following people: Frank Warmerdam
-<a href="mailto:warmerdam@pobox.com">&lt;warmerdam@pobox.com&gt;</a>,
-Andrey Kiselev
-<a href="mailto:dron@ak4719.spb.edu">&lt;dron@ak4719.spb.edu&gt;</a>.
-<P>
-
-Of course, reporting bugs is no substitute for discussion. The
-<a href="mailto:tiff@lists.maptools.org">tiff@lists.maptools.org</a> mailing
-list is for users of this software, and discussion TIFF issues in general.
-It is managed with the Mailman software, and the web interface for subscribing
-and managing your access to the list is at:<p>
-
- <a href="http://lists.maptools.org/mailman/listinfo/tiff">http://lists.maptools.org/mailman/listinfo/tiff</a><P>
-
-Posts to the list are only accepted from members of the list in order
-to limit the amount of spam propagated. Also, to be approved as a member
-you will need to email the list administrator with a brief description of
-why you are interested in TIFF so we can weed out spammers.<p>
-
-A <A HREF="http://www.awaresystems.be/imaging/tiff/tml.html">Long Term
-Archive</a> including recent messages, and most messages back to 1993,
-with search capabilities is available, and
-has been prepared and hosted by <a href="http://www.awaresystems.be">AWare
-Systems</a>. <p>
-
-
-<HR>
-
-Last updated: $Date: 2008/09/03 08:04:26 $
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/build.html b/src/3rdparty/libtiff/html/build.html
deleted file mode 100644
index e0b21575c0..0000000000
--- a/src/3rdparty/libtiff/html/build.html
+++ /dev/null
@@ -1,880 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta name="generator" content=
-"HTML Tidy for Solaris (vers 12 April 2005), see www.w3.org">
-<title>Building the TIFF Software Distribution</title>
-</head>
-<body bgcolor="white">
-<h1><font face="Arial, Helvetica, Sans"><img src=
-"images/cramps.gif" width="159" height="203" align="left" border=
-"1" hspace="6"> Building the Software Distribution</font></h1>
-<ul>
-<li><a href="#UNIX">Building on a UNIX system</a>.</li>
-<li><a href="#MacMPW">Building on a Macintosh system with
-MPW</a>.</li>
-<li><a href="#MacCW">Building on a Macintosh system with
-CodeWarrior</a>.</li>
-<li><a href="#PC">Building on an MS-DOS or Windows system</a>.</li>
-<li><a href="#DJGPP">Building on MS-DOS with the DJGPP v2
-compiler</a>.</li>
-<li><a href="#VMS">Building on a VMS system</a>.</li>
-<li><a href="#Acorn">Building on an Acorn RISC OS system</a>.</li>
-<li><a href="#Other">Building the Software on Other
-Systems</a></li>
-</ul>
-<br clear="left">
-This chapter contains step-by-step instructions on how to configure
-and build the TIFF software distribution. The software is most
-easily built on a UNIX system, but with a little bit of work it can
-easily be built and used on other non-UNIX platforms. <a name=
-"UNIX" id="UNIX"></a>
-<hr>
-<h2>Building on a UNIX System</h2>
-To build the software on a UNIX system you need to first run the
-configure shell script that is located in the top level of the
-source directory. This script probes the target system for
-necessary tools and functions and constructs a build environment in
-which the software may be compiled. Once configuration is done, you
-simply run <tt>make</tt> (or <tt>gmake</tt>) to build the software
-and then <tt>make install</tt> to do the installation; for example:
-<div style="margin-left: 2em">
-<pre>
-hyla% <b>cd tiff-v3.4beta099</b>
-hyla% <b>./configure</b>
- <i>...lots of messages...</i>
-hyla% <b>make</b>
- <i>...lots of messages...</i>
-hyla# <b>make install</b>
-</pre></div>
-Supplied makefiles are depend on GNU <tt>make</tt> utility, so you
-will need the one. Depending on your installation <b>make</b>
-command may invoke standard system <tt>make</tt> and <b>gmake</b>
-invoke GNU make. In this case you should use former. If you don't
-have <tt>make</tt> at all, but only <tt>gmake</tt>, you should
-export environment variable <tt>MAKE=gmake</tt> before
-<b>./configure</b>.
-<p>In general, the software is designed such that the following
-should be ``<i>make-able</i>'' in each directory:</p>
-<div style="margin-left: 2em">
-<pre>
-make [all] build stuff
-make install build&amp;install stuff
-make clean remove .o files, executables and cruft
-make distclean remove everything, that can be recreated
-</pre></div>
-Note that after running "<tt>make distclean</tt>" the
-<tt>configure</tt> script must be run again to create the Makefiles
-and other make-related files. <a name="BuildTrees" id=
-"BuildTrees"></a>
-<hr width="65%" align="right">
-<h3>Build Trees</h3>
-There are two schemes for configuring and building the software. If
-you intend to build the software for only one target system, you
-can configure the software so that it is built in the same
-directories as the source code.
-<div style="margin-left: 2em">
-<pre>
-hyla% <b>cd tiff-v3.4beta099</b>
-hyla% <b>ls</b>
-COPYRIGHT VERSION config.sub dist man
-Makefile.in config.guess configure html port
-README config.site contrib libtiff tools
-hyla% <b>./configure</b>
-</pre></div>
-<p>Otherwise, you can configure a build tree that is parallel to
-the source tree hierarchy but which contains only configured files
-and files created during the build procedure.</p>
-<div style="margin-left: 2em">
-<pre>
-hyla% <b>cd tiff-v3.4beta099</b>
-hyla% <b>mkdir obj obj/mycpu</b>
-hyla% <b>cd obj/mycpu</b>
-hyla% <b>../../configure</b>
-</pre></div>
-This second scheme is useful for:
-<ul>
-<li>building multiple targets from a single source tree</li>
-<li>building from a read-only source tree (e.g. if you receive the
-distribution on CD-ROM)</li>
-</ul>
-<a name="ConfigOptions" id="ConfigOptions"></a>
-<hr width="65%" align="right">
-<h3>Configuration Options</h3>
-The configuration process is critical to the proper compilation,
-installation, and operation of the software. The configure script
-runs a series of tests to decide whether or not the target system
-supports required functionality and, if it does not, whether it can
-emulate or workaround the missing functions. This procedure is
-fairly complicated and, due to the nonstandard nature of most UNIX
-systems, prone to error. The first time that you configure the
-software for use you should check the output from the configure
-script and look for anything that does not make sense for your
-system.
-<p>A second function of the configure script is to set the default
-configuration parameters for the software. Of particular note are
-the directories where the software is to be installed. By default
-the software is installed in the <b>/usr/local</b> hierarchy. To
-change this behaviour the appropriate parameters can be specified
-on the command line to configure. Run <b>./configure --help</b> to
-get a list of possible options. Installation related options are
-shown below.</p>
-<pre>
-<tt>
-Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [/usr/local]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
-
-By default, `make install' will install all the files in
-`/usr/local/bin', `/usr/local/lib' etc. You can specify
-an installation prefix other than `/usr/local' using `--prefix',
-for instance `--prefix=$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --infodir=DIR info documentation [PREFIX/info]
- --mandir=DIR man documentation [PREFIX/man]
-
-Program names:
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
-</tt>
-</pre>
-<a name="Packages" id="Packages"></a>
-<hr width="65%" align="right">
-<h3>Configuring Optional Packages/Support</h3>
-The TIFF software comes with several packages that are installed
-only as needed, or only if specifically configured at the time the
-configure script is run. Packages can be configured via the
-<b>configure</b> script commandline parameters.
-<dl>
-<dt><i>Static/Shared Objects Support</i></dt>
-<dd><tt>--enable-shared[=PKGS]&nbsp;&nbsp;&nbsp;&nbsp;build shared
-libraries [default=yes]<br>
---enable-static[=PKGS]&nbsp;&nbsp;&nbsp;&nbsp;build static
-libraries [default=yes]</tt>
-<p>These options control whether or not to configure the software
-to build a shared and static binaries for the TIFF library. Use of
-shared libraries can significantly reduce the disk space needed for
-users of the TIFF software. If shared libarries are not used then
-the code is statically linked into each application that uses it.
-By default both types of binaries is configured.</p>
-<p><tt>--enable-rpath&nbsp;&nbsp;&nbsp;&nbsp;Enable runtime linker
-paths (-R libtool option)</tt></p>
-<p>Add library directories (see other options below) to the TIFF
-library run-time linker path.</p>
-</dd>
-<dt><i>JPEG Support</i></dt>
-<dd><tt>--disable-jpeg&nbsp;&nbsp;&nbsp;&nbsp;disable IJG JPEG
-library usage (required for JPEG compression, enabled by default)
---with-jpeg-include-dir=DIR&nbsp;&nbsp;&nbsp;&nbsp;location of IJG
-JPEG library headers
---with-jpeg-lib-dir=DIR&nbsp;&nbsp;&nbsp;&nbsp;location of IJG JPEG
-library binary)</tt></dd>
-<dd>The <tt>JPEG</tt> package enables support for the handling of
-TIFF images with JPEG-encoded data. Support for JPEG-encoded data
-requires the Independent JPEG Group (IJG) <tt>libjpeg</tt>
-distribution; this software is available at <a href=
-"ftp://ftp.uu.net/graphics/jpeg/">ftp.uu.net:/graphics/jpeg/</a>.
-<b>configure</b> script automatically tries to search the working
-IJG JPEG installation. If it fails to find library, JPEG support
-will be automatically disabled.If you want specify the exact paths
-to library binary and headers, use above switches for that.</dd>
-<dt><i>ZIP Support</i></dt>
-<dd>The <tt>ZIP</tt> support enables support for the handling of
-TIFF images with deflate-encoded data. Support for deflate-encoded
-data requires the freely available <tt>zlib</tt> distribution
-written by Jean-loup Gailly and Mark Adler; this software is
-available at <a href=
-"ftp://ftp.uu.net/pub/archiving/zip/zlib/">ftp.uu.net:/pub/archiving/zip/zlib/</a>
-(or try <a href=
-"ftp://quest.jpl.nasa.gov/beta/zlib/">quest.jpl.nasa.gov:/beta/zlib/</a>).
-If ZIP support is enabled the <tt>DIRS_LIBINC</tt> and
-<tt>DIR_GZLIB</tt> parameters should also be set (see below). By
-default this package is not configured.</dd>
-</dl>
-<a name="Sample" id="Sample"></a>
-<hr width="65%" align="right">
-<h3>A Sample Configuration Session</h3>
-This section shows a sample configuration session and describes the
-work done. The session is shown indented in a <tt>fixed width
-font</tt> with user-supplied input in a <tt><b>bold font</b></tt>.
-Comments are shown in a normal or <i>italic</i> font. This session
-was collected on a 486 machine running BSDI 1.1.
-<div style="margin-left: 2em">
-<pre>
-<tt>
-wullbrandt% <b>mkdir tiff</b>
-wullbrandt% <b>cd tiff</b>
-wullbrandt% <b>ln -s /hosts/oxford/usr/people/sam/tiff src</b>
-</tt>
-</pre></div>
-A build tree separate from the source tree is used here. In fact,
-in this case the distribution is accessed from a read-only
-NFS-mounted filesystem.
-<div style="margin-left: 2em">
-<pre>
-<tt>
-wullbrandt% <b>src/configure</b>
-Configuring TIFF Software v3.4beta015.
-
-Reading site-wide parameters from ../tiff-v3.4beta015/config.site.
-Reading local parameters from config.local.
-Gosh, aren't you lucky to have a i386-unknown-bsdi1.1 system!
-</tt>
-</pre></div>
-Note that configure announces the distribution version and the
-deduced target configuration (<tt>i386-unknown-bsdi1.1</tt> here).
-<div style="margin-left: 2em">
-<pre>
-<tt>
-Using /usr/local/bin/gcc for a C compiler (set CC to override).
-Looks like /usr/local/bin/gcc supports the -g option.
-Using " -g" for C compiler options.
-</tt>
-</pre></div>
-configure checked the normal shell search path for potential ANSI C
-compilers. The compiler is selected according to it properly
-compiling a small ANSI C test program. A specific compiler may be
-requested by setting the <tt>CC</tt> environment variable to the
-appropriate pathname, by supplying the parameter on the command
-line, e.g. <tt>-with-CC=gcc</tt>, or by setting <tt>CC</tt> in a
-configuration file.
-<p><img src="images/info.gif" align="left" hspace="10"> <em>Note
-that an ANSI C compiler is required to build the software. If a C
-compiler requires options to enable ANSI C compilation, they can be
-specified with the <tt>ENVOPTS</tt> parameter.</em></p>
-<p>Once a compiler is selected configure checks to see if the
-compiler accepts a -g option to enable the generation of debugging
-symbols, and if the compiler includes an ANSI C preprocessor.</p>
-<div style="margin-left: 2em">
-<pre>
-<tt>
-Using /usr/ucb/make to configure the software.
-</tt>
-</pre></div>
-Next various system-specific libraries that may or may not be
-needed are checked for (none are needed in this case). If your
-system requires a library that is not automatically included it can
-be specified by setting the <tt>MACHDEPLIBS</tt> parameter.
-<p><i>Creating port.h.</i> The <b>port.h</b> file is included by
-all the C code in the library (but not the tools). It includes
-definitions for functions and type definitions that are missing
-from system include files, <tt>#defines</tt> to enable or disable
-system-specific functionality, and other odds and ends.</p>
-<div style="margin-left: 2em">
-<pre>
-<tt>
-Creating libtiff/port.h with necessary definitions.
-... using LSB2MSB bit order for your i386 cpu
-... using big-endian byte order for your i386 cpu
-... configure use of mmap for memory-mapped files
-... O_RDONLY is in &lt;fcntl.h&gt;
-... using double for promoted floating point parameters
-... enabling use of inline functions
-Done creating libtiff/port.h.
-</tt>
-</pre></div>
-This file can take a long time to create so configure generates the
-file only when it is needed, either because the file does not exist
-or because a different target or compiler is to be used. Note that
-running "<tt>make distclean</tt>" in the top-level directory of the
-build tree will remove the <b>port.h</b> file (along with all the
-other files generated by configure).
-<p><i>Selecting emulated library functions.</i> Certain library
-functions used by the tools are not present on all systems and can
-be emulated using other system functionality. configure checks for
-the presence of such functions and if they are missing, will
-configure emulation code from the <b>port</b> directory to use
-instead. Building the TIFF software on unsupported systems may
-require adding to the code to the <b>port</b> directory.</p>
-<div style="margin-left: 2em">
-<pre>
-<tt>
-Checking system libraries for functionality to emulate.
-Done checking system libraries.
-</tt>
-</pre></div>
-If a routine must be emulated and configure does not automatically
-check for it, the routine name can be specified using the
-<tt>PORTFUNCS</tt> parameter. To add emulation support for a new
-function <tt>foo</tt>, create a file <b>port/foo.c</b> that
-contains the emulation code and then set <tt>PORTFUNCS=foo</tt> in
-a configuration file or modify the configure script to
-automatically check for the missing function.
-<div style="margin-left: 2em">
-<pre>
-<tt>
-Checking for Dynamic Shared Object (DSO) support.
-Done checking for DSO support.
-</tt>
-</pre></div>
-If the <tt>DSO</tt> package is enabled (<tt>DSO=auto</tt> or
-<tt>DSO=yes</tt>), then configure will verify the system and
-compiler are capable of constructing SVR4-style DSO's in the
-expected way. Note that while a system may support DSO's the
-compiler may not be capable of generating the required
-position-independent code and/or the compiler may not pass the
-needed options through to the loader.
-<p><i>Selecting utility programs.</i> configure locates various
-system utility programs that are used during installation of the
-software.</p>
-<div style="margin-left: 2em">
-<pre>
-<tt>
-Selecting programs used during installation.
-Looks like mv supports the -f option to force a move.
-Looks like /bin/ln supports the -s option to create a symbolic link.
-Done selecting programs.
-</tt>
-</pre></div>
-<p><i>Selecting default configuration parameters.</i> The remainder
-of the work done by configure involves setting up configuration
-parameters that control the placement and setup of files during the
-installation procedure.</p>
-<div style="margin-left: 2em">
-<pre>
-<tt>
-Selecting default TIFF configuration parameters.
-
-Looks like manual pages go in /usr/contrib/man.
-Looks like manual pages should be installed with bsd-nroff-gzip-0.gz.
-
-TIFF configuration parameters are:
-
-[ 1] Directory for tools: /usr/contrib/bin
-[ 2] Directory for libraries: /usr/contrib/lib
-[ 3] Directory for include files: /usr/contrib/include
-[ 4] Directory for manual pages: /usr/contrib/man
-[ 5] Manual page installation scheme: bsd-nroff-gzip-0.gz
-
-Are these ok [yes]?
-</tt>
-</pre></div>
-At this point you can interactively modify any of the displayed
-parameters. Hitting a carriage return or typing <tt>yes</tt> will
-accept the current parameters. Typing one of the number displayed
-along the left hand side causes configure to prompt for a new value
-of the specified parameter. Typing anything else causes configure
-to prompt for a new value <em>for each parameter</em>. In general
-hitting carriage return will accept the current value and typing
-anything that is unacceptable will cause a help message to be
-displayed. A description of each of the configuration parameters is
-given below.
-<p>Once acceptable parameters are setup configure will generate all
-the files that depend on these parameters. Note that certain files
-may or may not be created based on the configuration of optional
-packages and/or the functions supported by target system.</p>
-<div style="margin-left: 2em">
-<pre>
-<tt>
-Creating Makefile from ../tiff-v3.4beta015/Makefile.in
-Creating libtiff/Makefile from ../tiff-v3.4beta015/libtiff/Makefile.in
-Creating man/Makefile from ../tiff-v3.4beta015/man/Makefile.in
-Creating tools/Makefile from ../tiff-v3.4beta015/tools/Makefile.in
-Creating port/install.sh from ../tiff-v3.4beta015/port/install.sh.in
-Done.
-</tt>
-</pre></div>
-<a name="DSOSupport" id="DSOSupport"></a>
-<hr>
-<h3>Shared Library Support</h3>
-It is desirable to make the TIFF library be a shared object on
-systems that have support for shared libraries. Unfortunately the
-rules to use to build a shared library vary between operating
-systems and even compilers. The distributed software includes
-support for building a shared version of the library on a number of
-different systems. This support is split between rules in the file
-<b>libtiff/Makefile.in</b> that construct the shared library and
-checks done by the <tt>configure</tt> script to verify that the
-expected rules are supported by compilation tools for the target
-system.
-<p>To add new support for building a shared library both these
-files must be updated. In the configure script search for the
-section where the autoconfiguration setting of the <tt>DSO</tt>
-parameter is handled and add a new case for the target system that
-sets the <tt>DSOSUF</tt>, <tt>DSOLD</tt>, <tt>DSOOPTS</tt>, and
-<tt>LIBCOPTS</tt> options as appropriate for the system.
-<tt>DSOSUF</tt> specifies the filename suffix used for the shared
-library (e.g. ``.so'' for Dynamic Shared Objects on most SVR4-based
-systems). <tt>DSOLD</tt> specifies the program to use to build the
-shared library from a compiled object file; typically ``${LD}''
-though on some systems it is better to use the C compiler directly
-so system-dependent options and libraries are automatically
-supplied. <tt>DSOOPTS</tt> are options that must be specified to
-<tt>DSOLD</tt> when building the shared library. <tt>LIBCOPTS</tt>
-are options to pass to the C compiler when constructing a
-relocatable object file to include in a shared library; e.g. ``-K
-PIC'' on a Sun system. The <tt>DSO</tt> parameter must also be set
-to a unique label that identifies the target system and compilation
-tools. This label is used to select a target in
-<b>libtiff/Makefile.in</b> to do the actual work in building the
-shared library. Finally, to complete support for the shared library
-added the appropriate rules to <b>libtiff/Makefile.in</b> under the
-target specified in the <tt>configure</tt> script. <a name="PC" id=
-"PC"></a></p>
-<hr>
-<h2>Building the Software under Windows 95/98/NT/2000 with MS
-VC++</h2>
-With Microsoft Visual C++ installed, and properly configured for
-commandline use (you will likely need to source VCVARS32.BAT in
-AUTOEXEC.bAT or somewhere similar) you should be able to use the
-provided <tt>makefile.vc</tt>.
-<p>The source package is delivered using Unix line termination
-conventions, which work with MSVC but do not work with Windows
-'notepad'. If you use unzip from the <a href=
-"http://www.info-zip.org/pub/infozip/">Info-Zip</a> package, you
-can extract the files using Windows normal line termination
-conventions with a command similar to:</p>
-<pre>
- unzip -aa -a tiff-3.7.4.zip
-</pre>
-<p>By default libtiff expects that a pre-built zlib and jpeg
-library are provided by the user. If this is not the case, then you
-may edit libtiff\tiffconf.h using a text editor (e.g. notepad) and
-comment out the entries for JPEG_SUPPORT, PIXARLOG_SUPPORT, and
-ZIP_SUPPORT. Ignore the comment at the top of the file which says
-that it has no influence on the build, because the statement is not
-true for Windows. However, by taking this approach, libtiff will
-not be able to open some TIFF files.</p>
-<p>To build using the provided makefile.vc you may use:</p>
-<pre>
- C:\tiff-3.7.4&gt; nmake /f makefile.vc clean
- C:\tiff-3.7.4&gt; nmake /f makefile.vc
-
- or (the hard way)
-
- C:\tiff-3.7.4&gt; cd port
- C:\tiff-3.7.4\port&gt; nmake /f makefile.vc clean
- C:\tiff-3.7.4\port&gt; nmake /f makefile.vc
- C:\tiff-3.7.4&gt; cd ../libtiff
- C:\tiff-3.7.4\libtiff&gt; nmake /f makefile.vc clean
- C:\tiff-3.7.4\libtiff&gt; nmake /f makefile.vc
- C:\tiff-3.7.4\libtiff&gt; cd ..\tools
- C:\tiff-3.7.4\tools&gt; nmake /f makefile.vc clean
- C:\tiff-3.7.4\tools&gt; nmake /f makefile.vc
-</pre>
-<p>This will build the library file
-<tt>libtiff\libtiff\libtiff.lib</tt>. This can be used in Win32
-programs. You may want to adjust the build options before start
-compiling. All parameters contained in the <tt>nmake.opt</tt>
-file.This is a plain text file you can open with your favorite text
-editor.</p>
-<p>The makefile also builds a DLL (libtiff.dll) with an associated
-import library (libtiff_i.lib). Any builds using libtiff will need
-to include the LIBTIFF\LIBTIFF directory in the include path.</p>
-<p>The <tt>libtiff\tools\makefile.vc</tt> should build .exe's for
-all the standard TIFF tool programs.</p>
-<p><a name="DJGPP" id="DJGPP"></a></p>
-<hr>
-<h2>Building the Software under MS/DOS with the DJGPP v2
-compiler</h2>
-[<i>From the file <b>contrib/dosdjgpp/README</b>.</i>]
-<p>The directory <b>contrib/dosdjgpp</b> contains the files
-necessary to build the library and tools with the DJGPP v2 compiler
-under MSDOS.</p>
-<p>All you have to do is copy the files in the directory into the
-respective directories and run make. If you want, you can use the
-<b>conf.bat</b> script to do that for you, make sure that the file
-is stored with MSDOS text EOL-convention (CR/LF), otherwise the
-<b>command.com</b> will not do anything.</p>
-<p>Note that you probably will not be able to build the library
-with the v1.x versions of djgpp, due to two problems. First, the
-top makefile calls a sub-make for each directory and you are likely
-to run out of memory, since each recursive invocation of a djgpp
-v1.x program requires about 130k, to avoid that, you can enter the
-directories manually and call make (well, there are only two dirs).
-The 2nd problem is that djgpp 1.x doesn't call the coff2exe
-(stubify) program when creating an executable. This means that all
-programs compiled are not converted to exe and consequently are not
-available for calling directly. For the tools directory, you can
-just call coff2exe for each program after make finishes, but in the
-libtiff directory, a few programs are created during the make
-process that have to be called for make to continue (e.g.
-mkg3states). Make will probably report an error at each such stage.
-To fix that, either add a coff2exe call before each program is
-called or call coff2exe manually and rerun make (there 2-3 such
-programs). <a name="MacMPW" id="MacMPW"></a></p>
-<hr>
-<h2>Building the Software on a Macintosh with MPW</h2>
-The directory <b>contrib/mac-mpw</b> contains support for compiling
-the library and tools under the MPW Shell on a Macintosh system.
-This support was contributed by Niles Ritter (<a href=
-"mailto:ndr@tazboy.jpl.nasa.gov">ndr@tazboy.jpl.nasa.gov</a>).
-<p>[<i>From the file <b>contrib/mac-mpw/README</b>.</i>]</p>
-<p>This directory contains all of the utilities and makefile source
-to build the LIBTIFF library and tools from the MPW Shell. The file
-BUILD.mpw in this directory is an executable script which uses all
-of these files to create the MPW makefiles and run them.</p>
-<p>The &lt;file&gt;.make files are not MPW makefiles as such, but
-are when run through the "mactrans" program, which turns the ascii
-"%nn" metacharacters into the standard weird MPW make
-characters.</p>
-<p>This translation trick is necessary to protect the files when
-they are put into unix tarfiles, which tend to mangle the special
-characters. <a name="MacCW" id="MacCW"></a></p>
-<hr>
-<h2>Building the Software on a Macintosh with CodeWarrior</h2>
-The directory <b>contrib/mac-cw</b> contains support for compiling
-the library and tools with MetroWerks CodeWarrior 6.1 on a
-Macintosh system. This support was contributed by Niles Ritter
-(<a href=
-"mailto:ndr@tazboy.jpl.nasa.gov">ndr@tazboy.jpl.nasa.gov</a>).
-<p>[<i>From the file <b>contrib/mac-cw/README</b>.</i>] In this
-directory you will find a Makefile.script Applescript file, which
-should be run in order to build the libtiff code using MetroWerks
-CodeWarrior. Refer to the "metrowerks.note" instructions on
-building the library for 68k and PowerPC native code, as well as
-building some of the libtiff tools, which are rather unix-like, but
-at least give an example of how to link everything together.
-<a name="VMS" id="VMS"></a></p>
-<hr>
-<h2>Building the Software on a VMS System</h2>
-The VMS port was done by Karsten Spang (<a href=
-"mailto:krs@kampsax.dk">krs@kampsax.dk</a>), who also "sort of"
-maintains it. The VMS specific files are not in the main
-directories. Instead they are placed under
-<tt>[.CONTRIB.VMS...]</tt> in the distribution tree. Installation:
-It is assumed that you have unpacked the tar file into a VMS
-directory tree, in this text called DISK:[TIFF].
-<ol>
-<li>Move the VMS specific files to their proper directories.
-<pre>
-$ SET DEFAULT DISK:[TIFF.CONTRIB.VMS]
-$ RENAME [.LIBTIFF]*.* [-.-.LIBTIFF]
-$ RENAME [.TOOLS]*.* [-.-.TOOLS]
-</pre></li>
-<li>Compile the library.
-<pre>
-$ SET DEFAULT DISK:[TIFF.LIBTIFF]
-$ @MAKEVMS
-</pre></li>
-<li>Compile the tools.
-<pre>
-$ SET DEFAULT DISK:[TIFF.TOOLS]
-$ @MAKEVMS
-</pre></li>
-<li>Define the programs.
-<pre>
-$ DEFINE TIFFSHR DISK:[TIFF.LIBTIFF]TIFFSHR
-$ FAX2PS :==$DISK:[TIFF.TOOLS]FAX2PS
-$ FAX2TIFF :==$DISK:[TIFF.TOOLS]FAX2TIFF
-$ GIF2TIFF :==$DISK:[TIFF.TOOLS]GIF2TIFF
-$ PAL2RGB :==$DISK:[TIFF.TOOLS]PAL2RGB
-$ PPM2TIFF :==$DISK:[TIFF.TOOLS]PPM2TIFF
-$ RAS2TIFF :==$DISK:[TIFF.TOOLS]RAS2TIFF
-$ RGB2YCBCR :==$DISK:[TIFF.TOOLS]RGB2YCBCR
-$ THUMBNAIL :==$DISK:[TIFF.TOOLS]THUMBNAIL
-$ TIFF2BW :==$DISK:[TIFF.TOOLS]TIFF2BW
-$ TIFF2PS :==$DISK:[TIFF.TOOLS]TIFF2PS
-$ TIFFCMP :==$DISK:[TIFF.TOOLS]TIFFCMP
-$ TIFFCP :==$DISK:[TIFF.TOOLS]TIFFCP
-$ TIFFDITHER:==$DISK:[TIFF.TOOLS]TIFFDITHER
-$ TIFFDUMP :==$DISK:[TIFF.TOOLS]TIFFDUMP
-$ TIFFINFO :==$DISK:[TIFF.TOOLS]TIFFINFO
-$ TIFFMEDIAN:==$DISK:[TIFF.TOOLS]TIFFMEDIAN
-$ TIFFSPLIT :==$DISK:[TIFF.TOOLS]TIFFSPLIT
-$ YCBCR :==$DISK:[TIFF.TOOLS]YCBCR
-</pre></li>
-</ol>
-You will want to add these lines to your <tt>LOGIN.COM</tt> file,
-after changing the name of the directory that you have used on your
-machine.
-<p>This release has been tested on OpenVMS/VAX 5.5-2, using VAX C
-3.2. A previous release was tested under OpenVMS/AXP ?.? using DEC
-C ?.?, it is believed that this release as well works on AXP. The
-code contains some GNU C specific things. This does *not* imply,
-however, that the VAX/GCC configuration has been tested, *it has
-not*.</p>
-<p>The command procedures (<tt>MAKEVMS.COM</tt>) for building the
-library and tools, is believed to choose the correct options for
-the VAX and AXP cases automatically.</p>
-<p>On the AXP, IEEE floating point is used by default. If you want
-VAX floating point, remove the <tt>/FLOAT=IEEE_FLOAT</tt>
-qualifier, and change <tt>HAVE_IEEEFP=1</tt> to
-<tt>HAVE_IEEEFP=0</tt> in the <tt>MAKEVMS.COM</tt> files in both
-the <b>libtiff</b> and <b>tools</b> directories.</p>
-<h3>Compiling your own program on a VMS system:</h3>
-When compiling a source file in which you <tt>"#include
-&lt;tiffio.h&gt;"</tt>, use the following command
-<pre>
- $ CC/INCLUDE=DISK:[TIFF.LIBTIFF]
-</pre>
-This ensures that the header file is found. On the AXP, also add
-<tt>/FLOAT=IEEE_FLOAT</tt> (if used when building the library).
-<h3>Linking your own program to the TIFF library on a VMS
-system:</h3>
-You can link to the library in two ways: Either using the shareable
-library, or using the object library. On the VAX these
-possibilities are:
-<ol>
-<li>Using the shareable TIFF library.
-<pre>
-$ LINK MY_PROGRAM,DISK:[TIFF.LIBTIFF]TIFF/OPTIONS,SYS$INPUT:/OPTIONS
- SYS$SHARE:VAXCRTL/SHAREABLE
-</pre></li>
-<li>Using the TIFF object library.
-<pre>
-$ LINK MY_PROGRAM, -
- DISK:[TIFF.LIBTIFF]TIFF/LIBRARY/INCLUDE=(TIF_FAX3SM,TIF_CODEC), -
- SYS$INPUT:/OPTIONS
- SYS$SHARE:VAXCRTL/SHAREABLE
-</pre></li>
-</ol>
-On AXP (and possibly also using DEC C on VAX) the corresponding
-commands are
-<ol>
-<li>Using the shareable TIFF library.
-<pre>
-$ LINK MY_PROGRAM,DISK:[TIFF.LIBTIFF]TIFF/OPTIONS
-</pre></li>
-<li>Using the TIFF object library.
-<pre>
-$ LINK MY_PROGRAM,DISK:[TIFF.LIBTIFF]TIFF/LIBRARY
-</pre></li>
-</ol>
-Method 1 uses the shortest link time and smallest <tt>.EXE</tt>
-files, but it requires that <tt>TIFFSHR</tt> is defined as above at
-link time and <strong>at run time</strong>. Using the compilation
-procedure above, the tools are linked in this way.
-<p>Method 2 gives somewhat longer link time and larger
-<tt>.EXE</tt> files, but does not require <tt>TIFFSHR</tt> to be
-defined. This method is recommended if you want to run your program
-on another machine, and for some reason don't want to have the
-library on that machine. If you plan to have more than one program
-(including the tools) on the machine, it is recommended that you
-copy the library to the other machine and use method 1. <a name=
-"Acorn" id="Acorn"></a></p>
-<hr>
-<h2>Building the Software on an Acorn RISC OS system</h2>
-The directory <b>contrib/acorn</b> contains support for compiling
-the library under Acorn C/C++ under Acorn's RISC OS 3.10 or above.
-Subsequent pathnames will use the Acorn format: The full-stop or
-period character is a pathname delimeter, and the slash character
-is not interpreted; the reverse position from Unix. Thus
-"libtiff/tif_acorn.c" becomes "libtiff.tif_acorn/c".
-<p>This support was contributed by Peter Greenham. (<a href=
-"mailto:peter@enlarion.demon.co.uk">peter@enlarion.demon.co.uk</a>).</p>
-<h3>Installing LibTIFF:</h3>
-<p>LIBTIFF uses several files which have names longer than the
-normal RISC OS maximum of ten characters. This complicates matters.
-Maybe one day Acorn will address the problem and implement long
-filenames properly. Until then this gets messy, especially as I'm
-trying to do this with obeyfiles and not have to include binaries
-in this distribution.</p>
-<p>First of all, ensure you have Truncate configured on (type
-<tt>*Configure Truncate On</tt>)</p>
-<p>Although it is, of course, preferable to have long filenames,
-LIBTIFF can be installed with short filenames, and it will compile
-and link without problems. However, <i>getting</i> it there is more
-problematic. <b>contrib.acorn.install</b> is an installation
-obeyfile which will create a normal Acorn-style library from the
-source (ie: with c, h and o folders etc.), but needs the
-distribution library to have been unpacked into a location which is
-capable of supporting long filenames, even if only temporarily.</p>
-<p>My recommendation, until Acorn address this problem properly, is
-to use Jason Tribbeck's <a href=
-"ftp://ftp.demon.co.uk/pub/mirrors/hensa/micros/arch/riscos/c/c020/longfiles.arc">
-LongFilenames</a>, or any other working system that gives you long
-filenames, like a nearby NFS server for instance.</p>
-<p>If you are using Longfilenames, even if only temporarily to
-install LIBTIFF, unpack the TAR into a RAMDisc which has been
-longfilenamed (ie: <tt>*addlongfs ram</tt>) and then install from
-there to the hard disk. Unfortunately Longfilenames seems a bit
-unhappy about copying a bunch of long-named files across the same
-filing system, but is happy going between systems. You'll need to
-create a ramdisk of about 2Mb.</p>
-<p>Now you can run the installation script I've supplied (in
-contrib.acorn), which will automate the process of installing
-LIBTIFF as an Acorn-style library. The syntax is as follows:</p>
-<p><tt>install &lt;source_dir&gt; &lt;dest_dir&gt;</tt></p>
-<p>Install will then create &lt;dest_dir&gt; and put the library in
-there. For example, having used LongFilenames on the RAMDisk and
-unpacked the library into there, you can then type:</p>
-<p><tt>Obey RAM::RamDisc0.$.contrib.acorn.install RAM::RamDisc0.$
-ADFS::4.$.LIBTIFF</tt></p>
-<p>It doesn't matter if the destination location can cope with long
-filenames or not. The filenames will be truncated if necessary
-(*Configure Truncate On if you get errors) and all will be
-well.</p>
-<h3>Compiling LibTIFF:</h3>
-<p>Once the LibTIFF folder has been created and the files put
-inside, making the library should be just a matter of running
-'<b>SetVars</b>' to set the appropriate system variables, then
-running '<b>Makefile</b>'.</p>
-<p><b>OSLib</b></p>
-<p><a href=
-"ftp://ftp.acorn.co.uk/pub/riscos/releases/oslib/oslib.arc">OSLib</a>
-is a comprehensive API for RISC OS machines, written by Jonathan
-Coxhead of Acorn Computers (although OSLib is not an official Acorn
-product). Using the OSLib SWI veneers produces code which is more
-compact and more efficient than code written using _kernel_swi or
-_swi. The Acorn port of LibTIFF can take advantage of this if
-present. Edit the Makefile and go to the Static dependencies
-section. The first entry is:</p>
-<pre>
-# Static dependencies:
-@.o.tif_acorn: @.c.tif_acorn
- cc $(ccflags) -o @.o.tif_acorn @.c.tif_acorn
-</pre>
-<p>Change the cc line to:</p>
-<pre>
- cc $(ccflags) -DINCLUDE_OSLIB -o @.o.tif_acorn @.c.tif_acorn
-</pre>
-<p>Remember, however, that OSLib is only <i>recommended</i> for
-efficiency's sake. It is not required. <a name="Other" id=
-"Other"></a></p>
-<hr>
-<h2>Building the Software on Other Systems</h2>
-This section contains information that might be useful if you are
-working on a non-UNIX system that is not directly supported. All
-library-related files described below are located in the
-<b>libtiff</b> directory.
-<p>The library requires two files that are generated
-<i>on-the-fly</i>. The file <b>tif_fax3sm.c</b> has the state
-tables for the Group 3 and Group 4 decoders. This file is generated
-by the <tt>mkg3states</tt> program on a UNIX system; for
-example,</p>
-<div style="margin-left: 2em">
-<pre>
-<tt>
-cd libtiff
-cc -o mkg3states mkg3states.c
-rm -f tif_fax3sm.c
-./mkg3states -c const tif_fax3sm.c
-</tt>
-</pre></div>
-The <tt>-c</tt> option can be used to control whether or not the
-resutling tables are generated with a <tt>const</tt> declaration.
-The <tt>-s</tt> option can be used to specify a C storage class for
-the table declarations. The <tt>-b</tt> option can be used to force
-data values to be explicitly bracketed with ``{}'' (apparently
-needed for some MS-Windows compilers); otherwise the structures are
-emitted in as compact a format as possible. Consult the source code
-for this program if you have questions.
-<p>The second file required to build the library, <b>version.h</b>,
-contains the version information returned by the
-<tt>TIFFGetVersion</tt> routine. This file is built on most systems
-using the <tt>mkversion</tt> program and the contents of the
-<tt>VERSION</tt> and <tt>tiff.alpha</tt> files; for example,</p>
-<div style="margin-left: 2em">
-<pre>
-cd libtiff
-cc -o mkversion mkversion.c
-rm -f version.h
-./mkversion -v ../VERSION -a ../dist/tiff.alpha version.h
-</pre></div>
-<p>Otherwise, when building the library on a non-UNIX system be
-sure to consult the files <b>tiffcomp.h</b> and <b>tiffconf.h</b>.
-The former contains system compatibility definitions while the
-latter is provided so that the software configuration can be
-controlled on systems that do not support the make facility for
-building the software.</p>
-<p>Systems without a 32-bit compiler may not be able to handle some
-of the codecs in the library; especially the Group 3 and 4 decoder.
-If you encounter problems try disabling support for a particular
-codec; consult the <a href=
-"internals.html#Config">documentation</a>.</p>
-<p>Programs in the tools directory are written to assume an ANSI C
-compilation environment. There may be a few POSIX'isms as well. The
-code in the <b>port</b> directory is provided to emulate routines
-that may be missing on some systems. On UNIX systems the
-<tt>configure</tt> script automatically figures out which routines
-are not present on a system and enables the use of the equivalent
-emulation routines from the <b>port</b> directory. It may be
-necessary to manually do this work on a non-UNIX system. <a name=
-"Testing" id="Testing"></a></p>
-<hr>
-<h2>Checking out the Software</h2>
-<p>Assuming you have working versions of <tt>tiffgt</tt> and
-<tt>tiffsv</tt>, you can just use them to view any of the sample
-images available for testing (see the <a href="images.html">section
-on obtaining the test images</a>). Otherwise, you can do a cursory
-check of the library with the <tt>tiffcp</tt> and <tt>tiffcmp</tt>
-programs. For example,</p>
-<div style="margin-left: 2em">
-<pre>
-tiffcp -lzw cramps.tif x.tif
-tiffcmp cramps.tif x.tif
-</pre></div>
-<p>(<tt>tiffcmp</tt> should be silent if the files compare
-correctly). <a name="TOC" id="TOC"></a></p>
-<hr>
-<h2>Table of Contents</h2>
-The following files makup the core library:
-<pre>
-libtiff/tiff.h TIFF spec definitions
-libtiff/tiffcomp.h non-UNIX OS-compatibility definitions
-libtiff/tiffconf.h non-UNIX configuration definitions
-libtiff/tiffio.h public TIFF library definitions
-libtiff/tiffiop.h private TIFF library definitions
-libtiff/t4.h CCITT Group 3/4 code tables+definitions
-libtiff/tif_dir.h private defs for TIFF directory handling
-libtiff/tif_fax3.h CCITT Group 3/4-related definitions
-libtiff/tif_predict.h private defs for Predictor tag support
-libtiff/uvcode.h LogL/LogLuv codec-specific definitions
-libtiff/version.h version string (generated by Makefile)
-
-libtiff/tif_acorn.c Acorn-related OS support
-libtiff/tif_apple.c Apple-related OS support
-libtiff/tif_atari.c Atari-related OS support
-libtiff/tif_aux.c auxilary directory-related functions
-libtiff/tif_close.c close an open TIFF file
-libtiff/tif_codec.c configuration table of builtin codecs
-libtiff/tif_compress.c compression scheme support
-libtiff/tif_dir.c directory tag interface code
-libtiff/tif_dirinfo.c directory known tag support code
-libtiff/tif_dirread.c directory reading code
-libtiff/tif_dirwrite.c directory writing code
-libtiff/tif_dumpmode.c "no" compression codec
-libtiff/tif_error.c library error handler
-libtiff/tif_fax3.c CCITT Group 3 and 4 codec
-libtiff/tif_fax3sm.c G3/G4 state tables (generated by mkg3states)
-libtiff/tif_flush.c i/o and directory state flushing
-libtiff/tif_getimage.c TIFFRGBAImage support
-libtiff/tif_jpeg.c JPEG codec (interface to the IJG distribution)
-libtiff/tif_luv.c SGI LogL/LogLuv codec
-libtiff/tif_lzw.c LZW codec
-libtiff/tif_msdos.c MSDOS-related OS support
-libtiff/tif_next.c NeXT 2-bit scheme codec (decoding only)
-libtiff/tif_open.c open and simply query code
-libtiff/tif_packbits.c Packbits codec
-libtiff/tif_pixarlog.c Pixar codec
-libtiff/tif_predict.c Predictor tag support
-libtiff/tif_print.c directory printing support
-libtiff/tif_read.c image data reading support
-libtiff/tif_strip.c some strip-related code
-libtiff/tif_swab.c byte and bit swapping support
-libtiff/tif_thunder.c Thunderscan codec (decoding only)
-libtiff/tif_tile.c some tile-related code
-libtiff/tif_unix.c UNIX-related OS support
-libtiff/tif_version.c library version support
-libtiff/tif_vms.c VMS-related OS support
-libtiff/tif_warning.c library warning handler
-libtiff/tif_win3.c Windows-3.1-related OS support
-libtiff/tif_win32.c Win32 (95/98/NT) related OS support
-libtiff/tif_write.c image data writing support
-libtiff/tif_zip.c Deflate codec
-
-libtiff/mkg3states.c program to generate G3/G4 decoder state tables
-libtiff/mkspans.c program to generate black-white span tables
-libtiff/mkversion.c program to generate libtiff/version.h.
-</pre>
-<hr>
-Last updated: $Date: 2005/12/24 22:25:05 $
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/contrib.html b/src/3rdparty/libtiff/html/contrib.html
deleted file mode 100644
index d138900a8b..0000000000
--- a/src/3rdparty/libtiff/html/contrib.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Contributed TIFF Software
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-<H1>
-<IMG SRC=images/smallliz.jpg WIDTH=144 HEIGHT=108 ALIGN=left BORDER=1 HSPACE=6>
-Contributed TIFF Software
-</H1>
-
-
-<P>
-The <B>contrib</B> directory has contributed software that
-uses the TIFF library or which is associated with the library
-(typically glue and guidance for ports to non-UNIX platforms, or tools that
-aren't directly TIFF related).
-
-<BR CLEAR=left>
-
-<P>
-<TABLE BORDER CELLPADDING=3>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/vms</B>
-</TD>
-<TD>
-scripts and files from Karsten Spang for building
- the library and tools under VMS
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/dbs</B>
-</TD>
-<TD>
-various tools from Dan & Chris Sears, including a simple X-based viewer
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/ras</B>
-</TD>
-<TD>
-two programs by Patrick Naughton for converting
- between Sun rasterfile format and TIFF (these
- require <TT>libpixrect.a</TT>, as opposed to the one in
- tools that doesn't)
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/mac-mpw</B><br>
-<B>contrib/mac-cw</B>
-</TD>
-<TD>
-scripts and files from Niles Ritter for building
-the library and tools under Macintosh/MPW C and
-code warrior.
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/acorn</B>
-</TD>
-<TD>
-scripts and files from Peter Greenham for building
- the library and tools on an Acorn RISC OS system.
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/win32</B>
-</TD>
-<TD>
-scripts and files from Scott Wagner for building
-the library under Windows NT and Windows 95. (The makefile.vc in the
-libtiff/libtiff directory may be sufficient for most users.)
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/win_dib</B>
-</TD>
-<TD>
-two separate implementations of TIFF to DIB code suitable for any Win32
-platform. Contributed by Mark James, and Philippe Tenenhaus.
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/ojpeg</B>
-</TD>
-<TD>
-Patch for IJG JPEG library related to support for some Old JPEG in TIFF files.
-Contributed by Scott Marovich.
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/dosdjgpp</B>
-</TD>
-<TD>
-scripts and files from Alexander Lehmann for building
- the library under MSDOS with the DJGPP v2 compiler.
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/tags</B>
-</TD>
-<TD>
-scripts and files from Niles Ritter for adding private
- tag support at runtime, without changing libtiff.
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/mfs</B>
-</TD>
-<TD>
-code from Mike Johnson to read+write images in memory
-without modifying the library
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/pds</B>
-</TD>
-<TD>
-various routines from Conrad Poelman; a TIFF image iterator and
- code to support ``private sub-directories''
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/iptcutil</B>
-</TD>
-
-<TD>
-
-A utility by <A HREF=mailto:billr@corbis.com>Bill Radcliffe</a> to
-convert an extracted IPTC Newsphoto caption from a binary blob to
-ASCII text, and vice versa. IPTC binary blobs can be extracted from
-images via the <A
-HREF=http://www.ImageMagick.org/>ImageMagick</a> convert(1)
-utility.
-
-
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/addtiffo</B>
-</TD>
-
-<TD>
-
-A utility (and supporting subroutine) for building
-one or more reduce resolution
-overviews to an existing TIFF file. Supplied by
-<a href="http://pobox.com/~warmerdam">Frank Warmerdam</a>.
-
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<B>contrib/stream</B>
-</TD>
-
-<TD>
-
-A class (TiffStream) for accessing TIFF files through a C++ stream
-interface. Supplied by <a href="mailto:avi@shutterfly.com">Avi Bleiweiss</a>.
-
-</TD>
-</TR>
-
-</TABLE>
-
-<P>
-Questions regarding these packages are usually best directed toward
-their authors.
-
-<P>
-<HR>
-
-Last updated: $Date: 2006/01/03 01:42:30 $
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/document.html b/src/3rdparty/libtiff/html/document.html
deleted file mode 100644
index 12f138f5aa..0000000000
--- a/src/3rdparty/libtiff/html/document.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-TIFF Documentation
-</TITLE>
-</HEAD>
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-<H1>
-<IMG SRC=images/jim.gif WIDTH=139 HEIGHT=170 ALIGN=left BORDER=1 HSPACE=6>
-TIFF Documentation
-</H1>
-
-<P>
-A copy of the 6.0 specification is available from Adobe at
-<A HREF="http://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf">http://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf</A>, or from the libtiff
-ftp site at <a href="ftp://ftp.remotesensing.org/pub/libtiff/doc/TIFF6.pdf">
-ftp://ftp.remotesensing.org/pub/libtiff/doc/TIFF6.pdf</A>.<p>
-
-<P>
-Draft <a href="TIFFTechNote2.html">TIFF Technical Note #2</A> covers problems
-with the TIFF 6.0 design for embedding JPEG-compressed data in TIFF, and
-describes an alternative. <p>
-
-Other Adobe information on TIFF can be retrieved from:
-
-<A HREF="http://partners.adobe.com/public/developer/tiff/index.html">
-http://partners.adobe.com/public/developer/tiff/index.html</A>
-
-<P>
-Joris Van Damme maintains a list of known tags and their descriptions and
-definitions. It is available online at
-<A HREF="http://www.awaresystems.be/imaging/tiff/tifftags.html">
-http://www.awaresystems.be/imaging/tiff/tifftags.html</A>
-
-<P>
-There is a FAQ, related both to TIFF format and libtiff library:
-<A HREF="http://www.awaresystems.be/imaging/tiff/faq.html">
-http://www.awaresystems.be/imaging/tiff/faq.html</A>
-
-<HR>
-
-<ADDRESS>
- Last updated: $Date: 2009-08-20 22:31:00 $
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/images.html b/src/3rdparty/libtiff/html/images.html
deleted file mode 100644
index 150ed0c42a..0000000000
--- a/src/3rdparty/libtiff/html/images.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-TIFF Test Images
-</TITLE>
-</HEAD>
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-<H1>
-<IMG SRC=images/bali.jpg WIDTH=158 HEIGHT=107 ALIGN=left BORDER=1 HSPACE=6>
-TIFF Test Images
-</H1>
-
-<P>
-Test images are available for most formats supported by the library.
-Most of the images included in the test kit are also part of this
-documentation (albeit in TIFF rather than GIF or JFIF).
-The images are kept in a separate archive that should be located in
-the same directory as this software.
-
-<BR CLEAR=left>
-
-<P>
-The latest archive of test images is located at
-<A HREF="ftp://ftp.remotesensing.org/pub/libtiff/pics-3.8.0.tar.gz">
-ftp://ftp.remotesensing.org/pub/libtiff/pics-3.8.0.tar.gz</A>
-
-<P>
-There are two other good sources for TIFF test images:
-the contributed software <B>contrib/dbs</B> includes several
-programs that generate test images suitable for debugging, and
-the <TT>tiffcp</TT> program can be used to generate a variety
-of images with different storage characteristics.
-
-<P>
-<HR>
-
-Last updated: $Date: 2006/01/02 23:50:44 $
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/images/back.gif b/src/3rdparty/libtiff/html/images/back.gif
deleted file mode 100644
index 11d0c35f46..0000000000
--- a/src/3rdparty/libtiff/html/images/back.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/bali.jpg b/src/3rdparty/libtiff/html/images/bali.jpg
deleted file mode 100644
index 1f5c146dd5..0000000000
--- a/src/3rdparty/libtiff/html/images/bali.jpg
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/cat.gif b/src/3rdparty/libtiff/html/images/cat.gif
deleted file mode 100644
index 5bd3fac1e2..0000000000
--- a/src/3rdparty/libtiff/html/images/cat.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/cover.jpg b/src/3rdparty/libtiff/html/images/cover.jpg
deleted file mode 100644
index 8698cfb064..0000000000
--- a/src/3rdparty/libtiff/html/images/cover.jpg
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/cramps.gif b/src/3rdparty/libtiff/html/images/cramps.gif
deleted file mode 100644
index 9153f9ae28..0000000000
--- a/src/3rdparty/libtiff/html/images/cramps.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/dave.gif b/src/3rdparty/libtiff/html/images/dave.gif
deleted file mode 100644
index c36d447772..0000000000
--- a/src/3rdparty/libtiff/html/images/dave.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/info.gif b/src/3rdparty/libtiff/html/images/info.gif
deleted file mode 100644
index 783d63153e..0000000000
--- a/src/3rdparty/libtiff/html/images/info.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/jello.jpg b/src/3rdparty/libtiff/html/images/jello.jpg
deleted file mode 100644
index df99e663ef..0000000000
--- a/src/3rdparty/libtiff/html/images/jello.jpg
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/jim.gif b/src/3rdparty/libtiff/html/images/jim.gif
deleted file mode 100644
index 9a18a031fa..0000000000
--- a/src/3rdparty/libtiff/html/images/jim.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/note.gif b/src/3rdparty/libtiff/html/images/note.gif
deleted file mode 100644
index 7177d68a19..0000000000
--- a/src/3rdparty/libtiff/html/images/note.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/oxford.gif b/src/3rdparty/libtiff/html/images/oxford.gif
deleted file mode 100644
index dd4b86e186..0000000000
--- a/src/3rdparty/libtiff/html/images/oxford.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/quad.jpg b/src/3rdparty/libtiff/html/images/quad.jpg
deleted file mode 100644
index 4b7df170be..0000000000
--- a/src/3rdparty/libtiff/html/images/quad.jpg
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/ring.gif b/src/3rdparty/libtiff/html/images/ring.gif
deleted file mode 100644
index 2a614f4929..0000000000
--- a/src/3rdparty/libtiff/html/images/ring.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/smallliz.jpg b/src/3rdparty/libtiff/html/images/smallliz.jpg
deleted file mode 100644
index 8eb827f8ad..0000000000
--- a/src/3rdparty/libtiff/html/images/smallliz.jpg
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/strike.gif b/src/3rdparty/libtiff/html/images/strike.gif
deleted file mode 100644
index 0709d19867..0000000000
--- a/src/3rdparty/libtiff/html/images/strike.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/images/warning.gif b/src/3rdparty/libtiff/html/images/warning.gif
deleted file mode 100644
index f51eb4b1a7..0000000000
--- a/src/3rdparty/libtiff/html/images/warning.gif
+++ /dev/null
Binary files differ
diff --git a/src/3rdparty/libtiff/html/index.html b/src/3rdparty/libtiff/html/index.html
deleted file mode 100644
index e43a708640..0000000000
--- a/src/3rdparty/libtiff/html/index.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
-<head>
- <title>LibTIFF - TIFF Library and Utilities</title>
- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
- <meta http-equiv="content-language" content="en">
- <style type="text/css">
- <!--
- th {text-align: left; vertical-align: top; padding-right: 1em; white-space: nowrap}
- -->
- </style>
-</head>
-<body lang="en" text="#000000" bgcolor="#ffffff" link="#0000ff" alink="#0000ff" vlink="#0000ff">
- <h1>LibTIFF - TIFF Library and Utilities</h1>
- <hr>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <th>Home Page</th>
- <td><a href="http://www.remotesensing.org/libtiff/" title="Home of the LibTIFF software">http://www.remotesensing.org/libtiff/</a></td>
- </tr>
- <tr>
- <th>Home Page Mirror</th>
- <td><a href="http://libtiff.maptools.org/" title="Mirror of the LibTIFF software">http://libtiff.maptools.org/</a></td>
- </tr>
- <tr>
- <th>Latest Stable Release</th>
- <td><a href="v3.9.2.html">v3.9.2</a></td>
- </tr>
- <tr>
- <th>Master Download Site</th>
- <td><a href="ftp://ftp.remotesensing.org/pub/libtiff">ftp.remotesensing.org</a>, directory pub/libtiff</td>
- </tr>
- <tr>
- <th>Mirror Download Site</th>
- <td><a href="http://libtiff.maptools.org/dl/">http://libtiff.maptools.org/dl/</a></td>
- </tr>
- <tr>
- <th>Windows Binaries</th>
- <td><a href="http://gnuwin32.sourceforge.net/packages/libtiff.htm">GnuWin32 Project</a></td>
- </tr>
- <tr>
- <th>Mailing List</th>
- <td><a href="mailto:tiff@lists.maptools.org">tiff@lists.maptools.org</a>,
- <a href="http://lists.maptools.org/mailman/listinfo/tiff/">Subscription</a>,
- <a href="http://www.awaresystems.be/imaging/tiff/tml.html">Archive</a>.
- Please, read the <a href="http://www.awaresystems.be/imaging/tiff/faq.html">TIFF FAQ</a>
- before asking questions.</td>
- </tr>
- <tr>
- <th>Anonymous CVS</th>
- <td><tt>export CVSROOT=:pserver:cvsanon@cvs.maptools.org:/cvs/maptools/cvsroot<br>
- cvs login</tt><br>
- (use empty password)<br>
- <tt>cvs checkout -r branch-3-9 libtiff<br></tt>
- to get stable libtiff branch, or<br>
- <tt>cvs checkout libtiff</tt><br>
- to get bleeding edge development version of libtiff from CVS HEAD.</td>
- </tr>
- </table>
- <hr>
- <p>
- This software provides support for the <i>Tag Image File Format</i> (TIFF),
- a widely used format for storing image data. The latest version of
- the TIFF specification is <a href="document.html">available on-line</a>
- in several different formats.
- </p>
- <p>
- Included in this software distribution is a library, libtiff, for reading
- and writing TIFF, a small collection of tools for doing simple
- manipulations of TIFF images, and documentation on the
- library and tools. Libtiff is a portable software, it was built and
- tested on various systems: UNIX flavors (Linux, BSD, Solaris, MacOS X),
- Windows, OpenVMS. It should be possible to port libtiff and additional
- tools on other OSes.
- </p>
- <p>
- The library, along with associated tool programs, should handle most of
- your needs for reading and writing TIFF images on 32- and 64-bit
- machines. This software can also be used on older 16-bit systems
- though it may require some effort and you may need to leave out some of
- the compression support.
- </p>
- <p>
- The software was originally authored and maintained by Sam Leffler.
- While he keeps a fatherly eye on the mailing list, he is no longer
- responsible for day to day maintenance.
- </p>
- <p>
- Questions should be sent to the TIFF mailing list:
- <a href="mailto:tiff@lists.maptools.org">tiff@lists.maptools.org</a>, with
- a subscription interface at
- <a href="http://lists.maptools.org/mailman/listinfo/tiff">http://lists.maptools.org/mailman/listinfo/tiff</a>.
- </p>
- <p>
- The persons responsible for putting up this site and putting together
- versions &gt;= 3.5.1 are
- <a href="http://pobox.com/~warmerdam">Frank Warmerdam</a>,
- <a href="mailto:dron@ak4719.spb.edu">Andrey Kiselev</a>, Bob Friesenhahn,
-Joris Van Damme and Lee Howard.
- </p>
- <p>
- The following sections are included in this documentation:
- </p>
- <ul>
- <li><a href="support.html">TIFF 6.0 specification coverage</a></li>
- <li><a href="libtiff.html">Using the TIFF Library</a></li>
- <li><a href="internals.html">Modifying the TIFF Library</a>
- and <a href="addingtags.html">Adding New Tags</a></li>
- <li><a href="tools.html">TIFF tools overview</a></li>
- <li><a href="contrib.html">Contributed software</a></li>
- <li><a href="document.html">TIFF documentation</a></li>
- <li><a href="build.html">Building the software distribution</a></li>
- <li><a href="bugs.html">Bugs, Bugzilla, and the TIFF mailing list</a></li>
- <li><a href="images.html">Test images</a></li>
- <li><a href="misc.html">Acknowledgements and copyright issues</a></li>
- <li><a href="man/index.html">Man Pages</a></li>
- </ul>
- <hr>
- <p>
- Last updated $Date: 2009-08-28 16:24:13 $.
- </p>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/internals.html b/src/3rdparty/libtiff/html/internals.html
deleted file mode 100644
index 3cc9673125..0000000000
--- a/src/3rdparty/libtiff/html/internals.html
+++ /dev/null
@@ -1,572 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Modifying The TIFF Library
-</TITLE>
-</HEAD>
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-<H1>
-<IMG SRC=images/dave.gif WIDTH=107 HEIGHT=148 BORDER=2 ALIGN=left HSPACE=6>
-Modifying The TIFF Library
-</H1>
-
-
-<P>
-This chapter provides information about the internal structure of
-the library, how to control the configuration when building it, and
-how to add new support to the library.
-The following sections are found in this chapter:
-
-<UL>
-<LI><A HREF=#Config>Library Configuration</A>
-<LI><A HREF=#Portability>General Portability Comments</A>
-<LI><A HREF="#Types">Types and Portability</A>
-<LI><A HREF="addingtags.html">Adding New Tags</A>
-<LI><A HREF=#AddingCODECS>Adding New Builtin Codecs</A>
-<LI><A HREF="addingtags.html#AddingCODECTags">Adding New Codec-private Tags</A>
-<LI><A HREF=#Other>Other Comments</A>
-</UL>
-
-
-<A NAME="Config"><P><HR WIDTH=65% ALIGN=right><H3>Library Configuration</H3></A>
-
-Information on compiling the library is given
-<A HREF=build.html>elsewhere in this documentation</A>.
-This section describes the low-level mechanisms used to control
-the optional parts of the library that are configured at build
-time. Control is based on
-a collection of C defines that are specified either on the compiler
-command line or in a configuration file such as <TT>port.h</TT>
-(as generated by the <TT>configure</TT> script for UNIX systems)
-or <B>tiffconf.h</B>.
-
-<P>
-Configuration defines are split into three areas:
-<UL>
-<LI>those that control which compression schemes are
- configured as part of the builtin codecs,
-<LI>those that control support for groups of tags that
- are considered optional, and
-<LI>those that control operating system or machine-specific support.
-</UL>
-
-<P>
-If the define <TT>COMPRESSION_SUPPORT</TT> is <STRONG>not defined</STRONG>
-then a default set of compression schemes is automatically
-configured:
-<UL>
-<LI>CCITT Group 3 and 4 algorithms (compression codes 2, 3, 4, and 32771),
-<LI>the Macintosh PackBits algorithm (compression 32773),
-<LI>a 4-bit run-length encoding scheme from ThunderScan (compression 32809),
-<LI>a 2-bit encoding scheme used by NeXT (compression 32766), and
-<LI>two experimental schemes intended for images with high dynamic range
-(compression 34676 and 34677).
-</UL>
-
-<P>
-
-To override the default compression behaviour define
-<TT>COMPRESSION_SUPPORT</TT> and then one or more additional defines
-to enable configuration of the appropriate codecs (see the table
-below); e.g.
-
-<UL><PRE>
-#define COMPRESSION_SUPPORT
-#define CCITT_SUPPORT
-#define PACKBITS_SUPPORT
-</PRE></UL>
-
-Several other compression schemes are configured separately from
-the default set because they depend on ancillary software
-packages that are not distributed with <TT>libtiff</TT>.
-
-<P>
-Support for JPEG compression is controlled by <TT>JPEG_SUPPORT</TT>.
-The JPEG codec that comes with <TT>libtiff</TT> is designed for
-use with release 5 or later of the Independent JPEG Group's freely
-available software distribution.
-This software can be retrieved from the directory
-<A HREF=ftp://ftp.uu.net/graphics/jpeg>ftp.uu.net:/graphics/jpeg/</A>.
-
-
-<P>
-<IMG SRC="images/info.gif" ALT="NOTE: " ALIGN=left HSPACE=8>
-<EM>Enabling JPEG support automatically enables support for
-the TIFF 6.0 colorimetry and YCbCr-related tags.</EM>
-
-<P>
-Experimental support for the deflate algorithm is controlled by
-<TT>DEFLATE_SUPPORT</TT>.
-The deflate codec that comes with <TT>libtiff</TT> is designed
-for use with version 0.99 or later of the freely available
-<TT>libz</TT> library written by Jean-loup Gailly and Mark Adler.
-The data format used by this library is described
-in the files
-<A HREF=ftp://ftp.uu.net/pub/archiving/zip/doc/zlib-3.1.doc>zlib-3.1.doc</A>,
-and
-<A HREF=ftp://ftp.uu.net/pub/archiving/zip/doc/deflate-1.1.doc>deflate-1.1.doc</A>,
-available in the directory
-<A HREF=ftp://ftp.uu.net/pub/archiving/zip/doc>ftp.uu.net:/pub/archiving/zip/doc</A>.</EM>
-The library can be retried from the directory
-<A HREF=ftp://ftp.uu.net/pub/archiving/zip/zlib/>ftp.uu.net:/pub/archiving/zip/zlib/</A>
-(or try <A HREF=ftp://quest.jpl.nasa.gov/beta/zlib/>quest.jpl.nasa.gov:/beta/zlib/</A>).
-
-<P>
-<IMG SRC="images/warning.gif" ALT="NOTE: " ALIGN=left HSPACE=8 VSPACE=6>
-<EM>The deflate algorithm is experimental. Do not expect
-to exchange files using this compression scheme;
-it is included only because the similar, and more common,
-LZW algorithm is claimed to be governed by licensing restrictions.</EM>
-
-
-<P>
-By default <B>tiffconf.h</B> defines
-<TT>COLORIMETRY_SUPPORT</TT>,
-<TT>YCBCR_SUPPORT</TT>,
-and
-<TT>CMYK_SUPPORT</TT>.
-
-<P>
-<TABLE BORDER CELLPADDING=3>
-
-<TR><TH ALIGN=left>Define</TH><TH ALIGN=left>Description</TH></TR>
-
-<TR>
-<TD VALIGN=top><TT>CCITT_SUPPORT</TT></TD>
-<TD>CCITT Group 3 and 4 algorithms (compression codes 2, 3, 4,
- and 32771)</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>PACKBITS_SUPPORT</TT></TD>
-<TD>Macintosh PackBits algorithm (compression 32773)</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>LZW_SUPPORT</TT></TD>
-<TD>Lempel-Ziv & Welch (LZW) algorithm (compression 5)</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>THUNDER_SUPPORT</TT></TD>
-<TD>4-bit
-run-length encoding scheme from ThunderScan (compression 32809)</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>NEXT_SUPPORT</TT></TD>
-<TD>2-bit encoding scheme used by NeXT (compression 32766)</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>OJPEG_SUPPORT</TT></TD>
-<TD>obsolete JPEG scheme defined in the 6.0 spec (compression 6)</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>JPEG_SUPPORT</TT></TD>
-<TD>current JPEG scheme defined in TTN2 (compression 7)</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>ZIP_SUPPORT</TT></TD>
-<TD>experimental Deflate scheme (compression 32946)</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>PIXARLOG_SUPPORT</TT></TD>
-<TD>Pixar's compression scheme for high-resolution color images (compression 32909)</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>SGILOG_SUPPORT</TT></TD>
-<TD>SGI's compression scheme for high-resolution color images (compression 34676 and 34677)</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>COLORIMETRY_SUPPORT</TT></TD>
-<TD>support for the TIFF 6.0 colorimetry tags</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>YCBCR_SUPPORT</TT></TD>
-<TD>support for the TIFF 6.0 YCbCr-related tags</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>CMYK_SUPPORT</TT></TD>
-<TD>support for the TIFF 6.0 CMYK-related tags</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>ICC_SUPPORT</TT></TD>
-<TD>support for the ICC Profile tag; see
-<I>The ICC Profile Format Specification</I>,
-Annex B.3 "Embedding ICC Profiles in TIFF Files";
-available at
-<A HREF=http://www.color.org>http://www.color.org</A>
-</TD>
-</TR>
-
-</TABLE>
-
-
-<A NAME="Portability"><P><HR WIDTH=65% ALIGN=right><H3>General Portability Comments</H3></A>
-
-This software is developed on Silicon Graphics UNIX
-systems (big-endian, MIPS CPU, 32-bit ints,
-IEEE floating point).
-The <TT>configure</TT> shell script generates the appropriate
-include files and make files for UNIX systems.
-Makefiles exist for non-UNIX platforms that the
-code runs on -- this work has mostly been done by other people.
-
-<P>
-In general, the code is guaranteed to work only on SGI machines.
-In practice it is highly portable to any 32-bit or 64-bit system and much
-work has been done to insure portability to 16-bit systems.
-If you encounter portability problems please return fixes so
-that future distributions can be improved.
-
-<P>
-The software is written to assume an ANSI C compilation environment.
-If your compiler does not support ANSI function prototypes, <TT>const</TT>,
-and <TT>&lt;stdarg.h&gt;</TT> then you will have to make modifications to the
-software. In the past I have tried to support compilers without <TT>const</TT>
-and systems without <TT>&lt;stdarg.h&gt;</TT>, but I am
-<EM>no longer interested in these
-antiquated environments</EM>. With the general availability of
-the freely available GCC compiler, I
-see no reason to incorporate modifications to the software for these
-purposes.
-
-<P>
-An effort has been made to isolate as many of the
-operating system-dependencies
-as possible in two files: <B>tiffcomp.h</B> and
-<B>libtiff/tif_&lt;os&gt;.c</B>. The latter file contains
-operating system-specific routines to do I/O and I/O-related operations.
-The UNIX (<B>tif_unix.c</B>),
-Macintosh (<B>tif_apple.c</B>),
-and VMS (<B>tif_vms.c</B>)
-code has had the most use;
-the MS/DOS support (<B>tif_msdos.c</B>) assumes
-some level of UNIX system call emulation (i.e.
-<TT>open</TT>,
-<TT>read</TT>,
-<TT>write</TT>,
-<TT>fstat</TT>,
-<TT>malloc</TT>,
-<TT>free</TT>).
-
-<P>
-Native CPU byte order is determined on the fly by
-the library and does not need to be specified.
-The <TT>HOST_FILLORDER</TT> and <TT>HOST_BIGENDIAN</TT>
-definitions are not currently used, but may be employed by
-codecs for optimization purposes.
-
-<P>
-The following defines control general portability:
-
-<P>
-<TABLE BORDER CELLPADDING=3 WIDTH=100%>
-
-<TR>
-<TD VALIGN=top><TT>BSDTYPES</TT></TD>
-<TD>Define this if your system does NOT define the
- usual BSD typedefs: <TT>u_char</TT>,
- <TT>u_short</TT>, <TT>u_int</TT>, <TT>u_long</TT>.</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>HAVE_IEEEFP</TT></TD>
-<TD>Define this as 0 or 1 according to the floating point
- format suported by the machine. If your machine does
- not support IEEE floating point then you will need to
- add support to tif_machdep.c to convert between the
- native format and IEEE format.</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>HAVE_MMAP</TT></TD>
-<TD>Define this if there is <I>mmap-style</I> support for
-mapping files into memory (used only to read data).</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>HOST_FILLORDER</TT></TD>
-<TD>Define the native CPU bit order: one of <TT>FILLORDER_MSB2LSB</TT>
- or <TT>FILLORDER_LSB2MSB</TT></TD>
-</TR>
-
-<TR>
-<TD VALIGN=top><TT>HOST_BIGENDIAN</TT></TD>
-<TD>Define the native CPU byte order: 1 if big-endian (Motorola)
- or 0 if little-endian (Intel); this may be used
- in codecs to optimize code</TD>
-</TR>
-</TABLE>
-
-<P>
-On UNIX systems <TT>HAVE_MMAP</TT> is defined through the running of
-the <TT>configure</TT> script; otherwise support for memory-mapped
-files is disabled.
-Note that <B>tiffcomp.h</B> defines <TT>HAVE_IEEEFP</TT> to be
-1 (<TT>BSDTYPES</TT> is not defined).
-
-
-<A NAME="Types"><P><HR WIDTH=65% ALIGN=right><H3>Types and Portability</H3></A>
-
-The software makes extensive use of C typedefs to promote portability.
-Two sets of typedefs are used, one for communication with clients
-of the library and one for internal data structures and parsing of the
-TIFF format. There are interactions between these two to be careful
-of, but for the most part you should be able to deal with portability
-purely by fiddling with the following machine-dependent typedefs:
-
-
-<P>
-<TABLE BORDER CELLPADDING=3 WIDTH=100%>
-
-<TR>
-<TD>uint8</TD>
-<TD>8-bit unsigned integer</TD>
-<TD>tiff.h</TD>
-</TR>
-
-<TR>
-<TD>int8</TD>
-<TD>8-bit signed integer</TD>
-<TD>tiff.h</TD>
-</TR>
-
-<TR>
-<TD>uint16</TD>
-<TD>16-bit unsigned integer</TD>
-<TD>tiff.h</TD>
-</TR>
-
-<TR>
-<TD>int16</TD>
-<TD>16-bit signed integer</TD>
-<TD>tiff.h</TD>
-</TR>
-
-<TR>
-<TD>uint32</TD>
-<TD>32-bit unsigned integer</TD>
-<TD>tiff.h</TD>
-</TR>
-
-<TR>
-<TD>int32</TD>
-<TD>32-bit signed integer</TD>
-<TD>tiff.h</TD>
-</TR>
-
-<TR>
-<TD>dblparam_t</TD>
-<TD>promoted type for floats</TD>
-<TD>tiffcomp.h</TD>
-</TR>
-
-</TABLE>
-
-<P>
-(to clarify <TT>dblparam_t</TT>, it is the type that float parameters are
-promoted to when passed by value in a function call.)
-
-<P>
-The following typedefs are used throughout the library and interfaces
-to refer to certain objects whose size is dependent on the TIFF image
-structure:
-
-
-<P>
-<TABLE BORDER CELLPADDING=3 WIDTH=100%>
-
-<TR>
-<TD WIDTH=25%>typedef unsigned int ttag_t;</TD> <TD>directory tag</TD>
-</TR>
-
-<TR>
-<TD>typedef uint16 tdir_t;</TD> <TD>directory index</TD>
-</TR>
-
-<TR>
-<TD>typedef uint16 tsample_t;</TD> <TD>sample number</TD>
-</TR>
-
-<TR>
-<TD>typedef uint32 tstrip_t;</TD> <TD>strip number</TD>
-</TR>
-
-<TR>
-<TD>typedef uint32 ttile_t;</TD> <TD>tile number</TD>
-</TR>
-
-<TR>
-<TD>typedef int32 tsize_t;</TD> <TD>i/o size in bytes</TD>
-</TR>
-
-<TR>
-<TD>typedef void* tdata_t;</TD> <TD>image data ref</TD>
-</TR>
-
-<TR>
-<TD>typedef void* thandle_t;</TD> <TD>client data handle</TD>
-</TR>
-
-<TR>
-<TD>typedef int32 toff_t;</TD> <TD>file offset (should be off_t)</TD>
-</TR>
-
-<TR>
-<TD>typedef unsigned char* tidata_t;</TD> <TD>internal image data</TD>
-</TR>
-
-</TABLE>
-
-<P>
-Note that <TT>tstrip_t</TT>, <TT>ttile_t</TT>, and <TT>tsize_t</TT>
-are constrained to be
-no more than 32-bit quantities by 32-bit fields they are stored
-in in the TIFF image. Likewise <TT>tsample_t</TT> is limited by the 16-bit
-field used to store the <TT>SamplesPerPixel</TT> tag. <TT>tdir_t</TT>
-constrains
-the maximum number of IFDs that may appear in an image and may
-be an arbitrary size (without penalty). <TT>ttag_t</TT> must be either
-<TT>int</TT>, <TT>unsigned int</TT>, pointer, or <TT>double</TT>
-because the library uses a varargs
-interface and ANSI C restricts the type of the parameter before an
-ellipsis to be a promoted type. <TT>toff_t</TT> is defined as
-<TT>int32</TT> because
-TIFF file offsets are (unsigned) 32-bit quantities. A signed
-value is used because some interfaces return -1 on error (sigh).
-Finally, note that <TT>tidata_t</TT> is used internally to the library to
-manipulate internal data. User-specified data references are
-passed as opaque handles and only cast at the lowest layers where
-their type is presumed.
-
-
-<P><HR WIDTH=65% ALIGN=right><H3>General Comments</H3></A>
-
-The library is designed to hide as much of the details of TIFF from
-applications as
-possible. In particular, TIFF directories are read in their entirety
-into an internal format. Only the tags known by the library are
-available to a user and certain tag data may be maintained that a user
-does not care about (e.g. transfer function tables).
-
-<A NAME=AddingCODECS><P><HR WIDTH=65% ALIGN=right><H3>Adding New Builtin Codecs</H3></A>
-
-To add builtin support for a new compression algorithm, you can either
-use the "tag-extension" trick to override the handling of the
-TIFF Compression tag (see <A HREF=addingtags.html>Adding New Tags</A>),
-or do the following to add support directly to the core library:
-
-<OL>
-<LI>Define the tag value in <B>tiff.h</B>.
-<LI>Edit the file <B>tif_codec.c</B> to add an entry to the
- _TIFFBuiltinCODECS array (see how other algorithms are handled).
-<LI>Add the appropriate function prototype declaration to
- <B>tiffiop.h</B> (close to the bottom).
-<LI>Create a file with the compression scheme code, by convention files
- are named <B>tif_*.c</B> (except perhaps on some systems where the
- tif_ prefix pushes some filenames over 14 chars.
-<LI>Edit <B>Makefile.in</B> (and any other Makefiles)
- to include the new source file.
-</OL>
-
-<P>
-A codec, say <TT>foo</TT>, can have many different entry points:
-
-<PRE>
-TIFFInitfoo(tif, scheme)/* initialize scheme and setup entry points in tif */
-fooSetupDecode(tif) /* called once per IFD after tags has been frozen */
-fooPreDecode(tif, sample)/* called once per strip/tile, after data is read,
- but before the first row is decoded */
-fooDecode*(tif, bp, cc, sample)/* decode cc bytes of data into the buffer */
- fooDecodeRow(...) /* called to decode a single scanline */
- fooDecodeStrip(...) /* called to decode an entire strip */
- fooDecodeTile(...) /* called to decode an entire tile */
-fooSetupEncode(tif) /* called once per IFD after tags has been frozen */
-fooPreEncode(tif, sample)/* called once per strip/tile, before the first row in
- a strip/tile is encoded */
-fooEncode*(tif, bp, cc, sample)/* encode cc bytes of user data (bp) */
- fooEncodeRow(...) /* called to decode a single scanline */
- fooEncodeStrip(...) /* called to decode an entire strip */
- fooEncodeTile(...) /* called to decode an entire tile */
-fooPostEncode(tif) /* called once per strip/tile, just before data is written */
-fooSeek(tif, row) /* seek forwards row scanlines from the beginning
- of a strip (row will always be &gt;0 and &lt;rows/strip */
-fooCleanup(tif) /* called when compression scheme is replaced by user */
-</PRE>
-
-<P>
-Note that the encoding and decoding variants are only needed when
-a compression algorithm is dependent on the structure of the data.
-For example, Group 3 2D encoding and decoding maintains a reference
-scanline. The sample parameter identifies which sample is to be
-encoded or decoded if the image is organized with <TT>PlanarConfig</TT>=2
-(separate planes). This is important for algorithms such as JPEG.
-If <TT>PlanarConfig</TT>=1 (interleaved), then sample will always be 0.
-
-<A NAME=Other><P><HR WIDTH=65% ALIGN=right><H3>Other Comments</H3></A>
-
-The library handles most I/O buffering. There are two data buffers
-when decoding data: a raw data buffer that holds all the data in a
-strip, and a user-supplied scanline buffer that compression schemes
-place decoded data into. When encoding data the data in the
-user-supplied scanline buffer is encoded into the raw data buffer (from
-where it is written). Decoding routines should never have to explicitly
-read data -- a full strip/tile's worth of raw data is read and scanlines
-never cross strip boundaries. Encoding routines must be cognizant of
-the raw data buffer size and call <TT>TIFFFlushData1()</TT> when necessary.
-Note that any pending data is automatically flushed when a new strip/tile is
-started, so there's no need do that in the tif_postencode routine (if
-one exists). Bit order is automatically handled by the library when
-a raw strip or tile is filled. If the decoded samples are interpreted
-by the decoding routine before they are passed back to the user, then
-the decoding logic must handle byte-swapping by overriding the
-<TT>tif_postdecode</TT>
-routine (set it to <TT>TIFFNoPostDecode</TT>) and doing the required work
-internally. For an example of doing this look at the horizontal
-differencing code in the routines in <B>tif_predict.c</B>.
-
-<P>
-The variables <TT>tif_rawcc</TT>, <TT>tif_rawdata</TT>, and
-<TT>tif_rawcp</TT> in a <TT>TIFF</TT> structure
-are associated with the raw data buffer. <TT>tif_rawcc</TT> must be non-zero
-for the library to automatically flush data. The variable
-<TT>tif_scanlinesize</TT> is the size a user's scanline buffer should be. The
-variable <TT>tif_tilesize</TT> is the size of a tile for tiled images. This
-should not normally be used by compression routines, except where it
-relates to the compression algorithm. That is, the <TT>cc</TT> parameter to the
-<TT>tif_decode*</TT> and <TT>tif_encode*</TT>
-routines should be used in terminating
-decompression/compression. This ensures these routines can be used,
-for example, to decode/encode entire strips of data.
-
-<P>
-In general, if you have a new compression algorithm to add, work from
-the code for an existing routine. In particular,
-<B>tif_dumpmode.c</B>
-has the trivial code for the "nil" compression scheme,
-<B>tif_packbits.c</B> is a
-simple byte-oriented scheme that has to watch out for buffer
-boundaries, and <B>tif_lzw.c</B> has the LZW scheme that has the most
-complexity -- it tracks the buffer boundary at a bit level.
-Of course, using a private compression scheme (or private tags) limits
-the portability of your TIFF files.
-
-<P>
-<HR>
-
-Last updated: $Date: 2004/09/10 14:47:31 $
-
-</BODY>
-
-</HTML>
diff --git a/src/3rdparty/libtiff/html/intro.html b/src/3rdparty/libtiff/html/intro.html
deleted file mode 100644
index 61c01d4a2d..0000000000
--- a/src/3rdparty/libtiff/html/intro.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Introduction to the TIFF Documentation
-</TITLE>
-</HEAD>
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-<H1>
-<IMG SRC=images/strike.gif WIDTH=128 HEIGHT=100 ALIGN=left HSPACE=6>
-Introduction to the TIFF Documentation
-</H1>
-
-
-<P>
-The following definitions are used throughout this documentation.
-They are consistent with the terminology used in the TIFF 6.0 specification.
-
-<DL>
-<DT><I>Sample</I>
-<DD>The unit of information stored in an image; often called a
- channel elsewhere. Sample values are numbers, usually unsigned
- integers, but possibly in some other format if the SampleFormat
- tag is specified in a TIFF
-<DT><I>Pixel</I>
-<DD>A collection of one or more samples that go together.
-<DT><I>Row</I>
-<DD>An Nx1 rectangular collection of pixels.
-<DT><I>Tile</I>
-<DD>An NxM rectangular organization of data (or pixels).
-<DT><I>Strip</I>
-<DD>A tile whose width is the full image width.
-<DT><I>Compression</I>
-<DD>A scheme by which pixel or sample data are stored in
- an encoded form, specifically with the intent of reducing the
- storage cost.
-<DT><I>Codec</I>
-<DD>Software that implements the decoding and encoding algorithms
- of a compression scheme.
-</UL>
-
-<P>
-In order to better understand how TIFF works (and consequently this
-software) it is important to recognize the distinction between the
-physical organization of image data as it is stored in a TIFF and how
-the data is interpreted and manipulated as pixels in an image. TIFF
-supports a wide variety of storage and data compression schemes that
-can be used to optimize retrieval time and/or minimize storage space.
-These on-disk formats are independent of the image characteristics; it
-is the responsibility of the TIFF reader to process the on-disk storage
-into an in-memory format suitable for an application. Furthermore, it
-is the responsibility of the application to properly interpret the
-visual characteristics of the image data. TIFF defines a framework for
-specifying the on-disk storage format and image characteristics with
-few restrictions. This permits significant complexity that can be
-daunting. Good applications that handle TIFF work by handling as wide
-a range of storage formats as possible, while constraining the
-acceptable image characteristics to those that make sense for the
-application.
-
-
-<P>
-<HR>
-
-Last updated: $Date: 1999/08/09 20:21:21 $
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/libtiff.html b/src/3rdparty/libtiff/html/libtiff.html
deleted file mode 100644
index 6a2c42e607..0000000000
--- a/src/3rdparty/libtiff/html/libtiff.html
+++ /dev/null
@@ -1,747 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
-<head>
- <title>Using The TIFF Library</title>
- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
- <meta http-equiv="content-language" content="en">
- <style type="text/css">
- <!--
- th {text-align: left; vertical-align: top; font-style: italic; font-weight: normal}
- -->
- </style>
-</head>
-<body lang="en" text="#000000" bgcolor="#ffffff" link="#0000ff" alink="#0000ff" vlink="#0000ff">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td style="padding-left: 1em; padding-right: 1em"><img src="images/cat.gif" width="113" height="146" alt=""></td>
- <td>
- <h1>Using The TIFF Library</h1>
- <p>
- <tt>libtiff</tt> is a set of C functions (a library) that support
- the manipulation of TIFF image files.
- The library requires an ANSI C compilation environment for building
- and presumes an ANSI C environment for use.
- </p>
- </td>
- </tr>
- </table>
- <br>
- <p>
- <tt>libtiff</tt>
- provides interfaces to image data at several layers of abstraction (and cost).
- At the highest level image data can be read into an 8-bit/sample,
- ABGR pixel raster format without regard for the underlying data organization,
- colorspace, or compression scheme. Below this high-level interface
- the library provides scanline-, strip-, and tile-oriented interfaces that
- return data decompressed but otherwise untransformed. These interfaces
- require that the application first identify the organization of stored
- data and select either a strip-based or tile-based API for manipulating
- data. At the lowest level the library
- provides access to the raw uncompressed strips or tiles,
- returning the data exactly as it appears in the file.
- </p>
- <p>
- The material presented in this chapter is a basic introduction
- to the capabilities of the library; it is not an attempt to describe
- everything a developer needs to know about the library or about TIFF.
- Detailed information on the interfaces to the library are given in
- the <a href="http://www.remotesensing.org/libtiff/man/index.html">UNIX
- manual pages</a> that accompany this software.
- </p>
- <p>
- Michael Still has also written a useful introduction to libtiff for the
- IBM DeveloperWorks site available at
- <a href="http://www.ibm.com/developerworks/linux/library/l-libtiff">http://www.ibm.com/developerworks/linux/library/l-libtiff</a>.
- </p>
- <p>
- The following sections are found in this chapter:
- </p>
- <ul>
- <li><a href="#version">How to tell which version you have</a></li>
- <li><a href="#typedefs">Library Datatypes</a></li>
- <li><a href="#mman">Memory Management</a></li>
- <li><a href="#errors">Error Handling</a></li>
- <li><a href="#fio">Basic File Handling</a></li>
- <li><a href="#dirs">TIFF Directories</a></li>
- <li><a href="#tags">TIFF Tags</a></li>
- <li><a href="#compression">TIFF Compression Schemes</a></li>
- <li><a href="#byteorder">Byte Order</a></li>
- <li><a href="#dataplacement">Data Placement</a></li>
- <li><a href="#tiffrgbaimage">TIFFRGBAImage Support</a></li>
- <li><a href="#scanlines">Scanline-based Image I/O</a></li>
- <li><a href="#strips">Strip-oriented Image I/O</a></li>
- <li><a href="#tiles">Tile-oriented Image I/O</a></li>
- <li><a href="#other">Other Stuff</a></li>
- </ul>
- <hr>
- <h2 id="version">How to tell which version you have</h2>
- <p>
- The software version can be found by looking at the file named
- <tt>VERSION</tt>
- that is located at the top of the source tree; the precise alpha number
- is given in the file <tt>dist/tiff.alpha</tt>.
- If you have need to refer to this
- specific software, you should identify it as:
- </p>
- <p style="margin-left: 40px">
- <tt>TIFF &lt;<i>version</i>&gt; &lt;<i>alpha</i>&gt;</tt>
- </p>
- <p>
- where <tt>&lt;<i>version</i>&gt;</tt> is whatever you get from
- <tt>"cat VERSION"</tt> and <tt>&lt;<i>alpha</i>&gt;</tt> is
- what you get from <tt>"cat dist/tiff.alpha"</tt>.
- </p>
- <p>
- Within an application that uses <tt>libtiff</tt> the <tt>TIFFGetVersion</tt>
- routine will return a pointer to a string that contains software version
- information.
- The library include file <tt>&lt;tiffio.h&gt;</tt> contains a C pre-processor
- define <tt>TIFFLIB_VERSION</tt> that can be used to check library
- version compatiblity at compile time.
- </p>
- <hr>
- <h2 id="typedefs">Library Datatypes</h2>
- <p>
- <tt>libtiff</tt> defines a portable programming interface through the
- use of a set of C type definitions.
- These definitions, defined in in the files <b>tiff.h</b> and
- <b>tiffio.h</b>,
- isolate the <tt>libtiff</tt> API from the characteristics
- of the underlying machine.
- To insure portable code and correct operation, applications that use
- <tt>libtiff</tt> should use the typedefs and follow the function
- prototypes for the library API.
- </p>
- <hr>
- <h2 id="mman">Memory Management</h2>
- <p>
- <tt>libtiff</tt> uses a machine-specific set of routines for managing
- dynamically allocated memory.
- <tt>_TIFFmalloc</tt>, <tt>_TIFFrealloc</tt>, and <tt>_TIFFfree</tt>
- mimic the normal ANSI C routines.
- Any dynamically allocated memory that is to be passed into the library
- should be allocated using these interfaces in order to insure pointer
- compatibility on machines with a segmented architecture.
- (On 32-bit UNIX systems these routines just call the normal <tt>malloc</tt>,
- <tt>realloc</tt>, and <tt>free</tt> routines in the C library.)
- </p>
- <p>
- To deal with segmented pointer issues <tt>libtiff</tt> also provides
- <tt>_TIFFmemcpy</tt>, <tt>_TIFFmemset</tt>, and <tt>_TIFFmemmove</tt>
- routines that mimic the equivalent ANSI C routines, but that are
- intended for use with memory allocated through <tt>_TIFFmalloc</tt>
- and <tt>_TIFFrealloc</tt>.
- </p>
- <hr>
- <h2 id="errors">Error Handling</h2>
- <p>
- <tt>libtiff</tt> handles most errors by returning an invalid/erroneous
- value when returning from a function call.
- Various diagnostic messages may also be generated by the library.
- All error messages are directed to a single global error handler
- routine that can be specified with a call to <tt>TIFFSetErrorHandler</tt>.
- Likewise warning messages are directed to a single handler routine
- that can be specified with a call to <tt>TIFFSetWarningHandler</tt>
- </p>
- <hr>
- <h2 id="fio">Basic File Handling</h2>
- <p>
- The library is modeled after the normal UNIX stdio library.
- For example, to read from an existing TIFF image the
- file must first be opened:
- </p>
- <p style="margin-left: 40px">
- <tt>#include "tiffio.h"<br>
- main()<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen("foo.tif", "r");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;... do stuff ...<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFFClose(tif);<br>
- }</tt>
- </p>
- <p>
- The handle returned by <tt>TIFFOpen</tt> is <i>opaque</i>, that is
- the application is not permitted to know about its contents.
- All subsequent library calls for this file must pass the handle
- as an argument.
- </p>
- <p>
- To create or overwrite a TIFF image the file is also opened, but with
- a <tt>"w"</tt> argument:
- <p>
- <p style="margin-left: 40px">
- <tt>#include "tiffio.h"<br>
- main()<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen("foo.tif", "w");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;... do stuff ...<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFFClose(tif);<br>
- }</tt>
- </p>
- <p>
- If the file already exists it is first truncated to zero length.
- </p>
- <table>
- <tr>
- <td valign=top><img src="images/warning.gif" width="40" height="40" alt=""></td>
- <td><i>Note that unlike the stdio library TIFF image files may not be
- opened for both reading and writing;
- there is no support for altering the contents of a TIFF file.</i></td>
- </tr>
- </table>
- <p>
- <tt>libtiff</tt> buffers much information associated with writing a
- valid TIFF image. Consequently, when writing a TIFF image it is necessary
- to always call <tt>TIFFClose</tt> or <tt>TIFFFlush</tt> to flush any
- buffered information to a file. Note that if you call <tt>TIFFClose</tt>
- you do not need to call <tt>TIFFFlush</tt>.
- </p>
- <hr>
- <h2 id="dirs">TIFF Directories</h2>
- <p>
- TIFF supports the storage of multiple images in a single file.
- Each image has an associated data structure termed a <i>directory</i>
- that houses all the information about the format and content of the
- image data.
- Images in a file are usually related but they do not need to be; it
- is perfectly alright to store a color image together with a black and
- white image.
- Note however that while images may be related their directories are
- not.
- That is, each directory stands on its own; their is no need to read
- an unrelated directory in order to properly interpret the contents
- of an image.
- </p>
- <p>
- <tt>libtiff</tt> provides several routines for reading and writing
- directories. In normal use there is no need to explicitly
- read or write a directory: the library automatically reads the first
- directory in a file when opened for reading, and directory information
- to be written is automatically accumulated and written when writing
- (assuming <tt>TIFFClose</tt> or <tt>TIFFFlush</tt> are called).
- </p>
- <p>
- For a file open for reading the <tt>TIFFSetDirectory</tt> routine can
- be used to select an arbitrary directory; directories are referenced by
- number with the numbering starting at 0. Otherwise the
- <tt>TIFFReadDirectory</tt> and <tt>TIFFWriteDirectory</tt> routines can
- be used for sequential access to directories.
- For example, to count the number of directories in a file the following
- code might be used:
- </p>
- <p style="margin-left: 40px">
- <tt>#include "tiffio.h"<br>
- main(int argc, char* argv[])<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen(argv[1], "r");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;if (tif) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;int dircount = 0;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;do {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dircount++;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;} while (TIFFReadDirectory(tif));<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;printf("%d directories in %s\n", dircount, argv[1]);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFClose(tif);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;}<br>
- &nbsp;&nbsp;&nbsp;&nbsp;exit(0);<br>
- }</tt>
- </p>
- <p>
- Finally, note that there are several routines for querying the
- directory status of an open file:
- <tt>TIFFCurrentDirectory</tt> returns the index of the current
- directory and
- <tt>TIFFLastDirectory</tt> returns an indication of whether the
- current directory is the last directory in a file.
- There is also a routine, <tt>TIFFPrintDirectory</tt>, that can
- be called to print a formatted description of the contents of
- the current directory; consult the manual page for complete details.
- </p>
- <hr>
- <h2 id="tags">TIFF Tags</h2>
- <p>
- Image-related information such as the image width and height, number
- of samples, orientation, colorimetric information, etc.
- are stored in each image
- directory in <i>fields</i> or <i>tags</i>.
- Tags are identified by a number that is usually a value registered
- with the Aldus (now Adobe) Corporation.
- Beware however that some vendors write
- TIFF images with tags that are unregistered; in this case interpreting
- their contents is usually a waste of time.
- </p>
- <p>
- <tt>libtiff</tt> reads the contents of a directory all at once
- and converts the on-disk information to an appropriate in-memory
- form. While the TIFF specification permits an arbitrary set of
- tags to be defined and used in a file, the library only understands
- a limited set of tags.
- Any unknown tags that are encountered in a file are ignored.
- There is a mechanism to extend the set of tags the library handles
- without modifying the library itself;
- this is described <a href="addingtags.html">elsewhere</a>.
- </p>
- <p>
- <tt>libtiff</tt> provides two interfaces for getting and setting tag
- values: <tt>TIFFGetField</tt> and <tt>TIFFSetField</tt>.
- These routines use a variable argument list-style interface to pass
- parameters of different type through a single function interface.
- The <i>get interface</i> takes one or more pointers to memory locations
- where the tag values are to be returned and also returns one or
- zero according to whether the requested tag is defined in the directory.
- The <i>set interface</i> takes the tag values either by-reference or
- by-value.
- The TIFF specification defines
- <i>default values</i> for some tags.
- To get the value of a tag, or its default value if it is undefined,
- the <tt>TIFFGetFieldDefaulted</tt> interface may be used.
- </p>
- <p>
- The manual pages for the tag get and set routines specifiy the exact data types
- and calling conventions required for each tag supported by the library.
- </p>
- <hr>
- <h2 id="compression">TIFF Compression Schemes</h2>
- <p>
- <tt>libtiff</tt> includes support for a wide variety of
- data compression schemes.
- In normal operation a compression scheme is automatically used when
- the TIFF <tt>Compression</tt> tag is set, either by opening a file
- for reading, or by setting the tag when writing.
- </p>
- <p>
- Compression schemes are implemented by software modules termed <i>codecs</i>
- that implement decoder and encoder routines that hook into the
- core library i/o support.
- Codecs other than those bundled with the library can be registered
- for use with the <tt>TIFFRegisterCODEC</tt> routine.
- This interface can also be used to override the core-library
- implementation for a compression scheme.
- </p>
- <hr>
- <h2 id="byteorder">Byte Order</h2>
- <p>
- The TIFF specification says, and has always said, that
- <em>a correct TIFF
- reader must handle images in big-endian and little-endian byte order</em>.
- <tt>libtiff</tt> conforms in this respect.
- Consequently there is no means to force a specific
- byte order for the data written to a TIFF image file (data is
- written in the native order of the host CPU unless appending to
- an existing file, in which case it is written in the byte order
- specified in the file).
- </p>
- <hr>
- <h2 id="dataplacement">Data Placement</h2>
- <p>
- The TIFF specification requires that all information except an
- 8-byte header can be placed anywhere in a file.
- In particular, it is perfectly legitimate for directory information
- to be written after the image data itself.
- Consequently TIFF is inherently not suitable for passing through a
- stream-oriented mechanism such as UNIX pipes.
- Software that require that data be organized in a file in a particular
- order (e.g. directory information before image data) does not
- correctly support TIFF.
- <tt>libtiff</tt> provides no mechanism for controlling the placement
- of data in a file; image data is typically written before directory
- information.
- </p>
- <hr>
- <h2 id="tiffrgbaimage">TIFFRGBAImage Support</h2>
- <p>
- <tt>libtiff</tt> provides a high-level interface for reading image
- data from a TIFF file. This interface handles the details of
- data organization and format for a wide variety of TIFF files;
- at least the large majority of those files that one would normally
- encounter. Image data is, by default, returned as ABGR
- pixels packed into 32-bit words (8 bits per sample). Rectangular
- rasters can be read or data can be intercepted at an intermediate
- level and packed into memory in a format more suitable to the
- application.
- The library handles all the details of the format of data stored on
- disk and, in most cases, if any colorspace conversions are required:
- bilevel to RGB, greyscale to RGB, CMYK to RGB, YCbCr to RGB, 16-bit
- samples to 8-bit samples, associated/unassociated alpha, etc.
- </p>
- <p>
- There are two ways to read image data using this interface. If
- all the data is to be stored in memory and manipulated at once,
- then the routine <tt>TIFFReadRGBAImage</tt> can be used:
- </p>
- <p>
- <p style="margin-left: 40px">
- <tt>#include "tiffio.h"<br>
- main(int argc, char* argv[])<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen(argv[1], "r");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;if (tif) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32 w, h;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;size_t npixels;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32* raster;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &amp;w);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &amp;h);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;npixels = w * h;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;raster = (uint32*) _TIFFmalloc(npixels * sizeof (uint32));<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if (raster != NULL) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if (TIFFReadRGBAImage(tif, w, h, raster, 0)) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...process raster data...<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_TIFFfree(raster);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFClose(tif);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;}<br>
- &nbsp;&nbsp;&nbsp;&nbsp;exit(0);<br>
- }</tt>
- </p>
- <p>
- Note above that <tt>_TIFFmalloc</tt> is used to allocate memory for
- the raster passed to <tt>TIFFReadRGBAImage</tt>; this is important
- to insure the ``appropriate type of memory'' is passed on machines
- with segmented architectures.
- </p>
- <p>
- Alternatively, <tt>TIFFReadRGBAImage</tt> can be replaced with a
- more low-level interface that permits an application to have more
- control over this reading procedure. The equivalent to the above
- is:
- </p>
- <p style="margin-left: 40px">
- <tt>#include "tiffio.h"<br>
- main(int argc, char* argv[])<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen(argv[1], "r");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;if (tif) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFRGBAImage img;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;char emsg[1024];<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if (TIFFRGBAImageBegin(&amp;img, tif, 0, emsg)) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;size_t npixels;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32* raster;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;npixels = img.width * img.height;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;raster = (uint32*) _TIFFmalloc(npixels * sizeof (uint32));<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if (raster != NULL) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if (TIFFRGBAImageGet(&amp;img, raster, img.width, img.height)) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...process raster data...<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_TIFFfree(raster);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFRGBAImageEnd(&amp;img);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;} else<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFError(argv[1], emsg);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFClose(tif);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;}<br>
- &nbsp;&nbsp;&nbsp;&nbsp;exit(0);<br>
- }</tt>
- </p>
- <p>
- However this usage does not take advantage of the more fine-grained
- control that's possible. That is, by using this interface it is
- possible to:
- </p>
- <ul>
- <li>repeatedly fetch (and manipulate) an image without opening
- and closing the file</li>
- <li>interpose a method for packing raster pixel data according to
- application-specific needs (or write the data at all)</li>
- <li>interpose methods that handle TIFF formats that are not already
- handled by the core library</li>
- </ul>
- <p>
- The first item means that, for example, image viewers that want to
- handle multiple files can cache decoding information in order to
- speedup the work required to display a TIFF image.
- </p>
- <p>
- The second item is the main reason for this interface. By interposing
- a "put method" (the routine that is called to pack pixel data in
- the raster) it is possible share the core logic that understands how
- to deal with TIFF while packing the resultant pixels in a format that
- is optimized for the application. This alternate format might be very
- different than the 8-bit per sample ABGR format the library writes by
- default. For example, if the application is going to display the image
- on an 8-bit colormap display the put routine might take the data and
- convert it on-the-fly to the best colormap indices for display.
- </p>
- <p>
- The last item permits an application to extend the library
- without modifying the core code.
- By overriding the code provided an application might add support
- for some esoteric flavor of TIFF that it needs, or it might
- substitute a packing routine that is able to do optimizations
- using application/environment-specific information.
- </p>
- <p>
- The TIFF image viewer found in <b>tools/sgigt.c</b> is an example
- of an application that makes use of the <tt>TIFFRGBAImage</tt>
- support.
- </p>
- <hr>
- <h2 id="scanlines">Scanline-based Image I/O</h2>
- <p>
- The simplest interface provided by <tt>libtiff</tt> is a
- scanline-oriented interface that can be used to read TIFF
- images that have their image data organized in strips
- (trying to use this interface to read data written in tiles
- will produce errors.)
- A scanline is a one pixel high row of image data whose width
- is the width of the image.
- Data is returned packed if the image data is stored with samples
- packed together, or as arrays of separate samples if the data
- is stored with samples separated.
- The major limitation of the scanline-oriented interface, other
- than the need to first identify an existing file as having a
- suitable organization, is that random access to individual
- scanlines can only be provided when data is not stored in a
- compressed format, or when the number of rows in a strip
- of image data is set to one (<tt>RowsPerStrip</tt> is one).
- </p>
- <p>
- Two routines are provided for scanline-based i/o:
- <tt>TIFFReadScanline</tt>
- and
- <tt>TIFFWriteScanline</tt>.
- For example, to read the contents of a file that
- is assumed to be organized in strips, the following might be used:
- </p>
- <p style="margin-left: 40px">
- <tt>#include "tiffio.h"<br>
- main()<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen("myfile.tif", "r");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;if (tif) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32 imagelength;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tdata_t buf;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32 row;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &amp;imagelength);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;buf = _TIFFmalloc(TIFFScanlineSize(tif));<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (row = 0; row &lt; imagelength; row++)<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffreadscanline(tif, buf, row);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_tifffree(buf);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffclose(tif);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;}<br>
- }</tt>
- </p>
- <p>
- <tt>TIFFScanlineSize</tt> returns the number of bytes in
- a decoded scanline, as returned by <tt>TIFFReadScanline</tt>.
- Note however that if the file had been create with samples
- written in separate planes, then the above code would only
- read data that contained the first sample of each pixel;
- to handle either case one might use the following instead:
- </p>
- <p style="margin-left: 40px">
- <tt>#include "tiffio.h"<br>
- main()<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen("myfile.tif", "r");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;if (tif) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32 imagelength;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tdata_t buf;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32 row;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &amp;imagelength);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &amp;config);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;buf = _TIFFmalloc(TIFFScanlineSize(tif));<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if (config == PLANARCONFIG_CONTIG) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (row = 0; row &lt; imagelength; row++)<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffreadscanline(tif, buf, row);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;} else if (config == planarconfig_separate) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint16 s, nsamples;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffgetfield(tif, tifftag_samplesperpixel, &amp;nsamples);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (s = 0; s &lt; nsamples; s++)<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (row = 0; row &lt; imagelength; row++)<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffreadscanline(tif, buf, row, s);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_tifffree(buf);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffclose(tif);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;}<br>
- }</tt>
- </p>
- <p>
- Beware however that if the following code were used instead to
- read data in the case <tt>PLANARCONFIG_SEPARATE</tt>,...
- </p>
- <p style="margin-left: 40px">
- <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (row = 0; row &lt; imagelength; row++)<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (s = 0; s &lt; nsamples; s++)<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffreadscanline(tif, buf, row, s);</tt>
- </p>
- <p>
- ...then problems would arise if <tt>RowsPerStrip</tt> was not one
- because the order in which scanlines are requested would require
- random access to data within strips (something that is not supported
- by the library when strips are compressed).
- </p>
- <hr>
- <h2 id="strips">Strip-oriented Image I/O</h2>
- <p>
- The strip-oriented interfaces provided by the library provide
- access to entire strips of data. Unlike the scanline-oriented
- calls, data can be read or written compressed or uncompressed.
- Accessing data at a strip (or tile) level is often desirable
- because there are no complications with regard to random access
- to data within strips.
- </p>
- <p>
- A simple example of reading an image by strips is:
- </p>
- <p style="margin-left: 40px">
- <tt>#include "tiffio.h"<br>
- main()<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen("myfile.tif", "r");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;if (tif) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tdata_t buf;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tstrip_t strip;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;buf = _TIFFmalloc(TIFFStripSize(tif));<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (strip = 0; strip &lt; tiffnumberofstrips(tif); strip++)<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffreadencodedstrip(tif, strip, buf, (tsize_t) -1);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_tifffree(buf);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffclose(tif);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;}<br>
- }</tt>
- </p>
- <p>
- Notice how a strip size of <tt>-1</tt> is used; <tt>TIFFReadEncodedStrip</tt>
- will calculate the appropriate size in this case.
- </p>
- <p>
- The above code reads strips in the order in which the
- data is physically stored in the file. If multiple samples
- are present and data is stored with <tt>PLANARCONFIG_SEPARATE</tt>
- then all the strips of data holding the first sample will be
- read, followed by strips for the second sample, etc.
- </p>
- <p>
- Finally, note that the last strip of data in an image may have fewer
- rows in it than specified by the <tt>RowsPerStrip</tt> tag. A
- reader should not assume that each decoded strip contains a full
- set of rows in it.
- </p>
- <p>
- The following is an example of how to read raw strips of data from
- a file:
- </p>
- <p style="margin-left: 40px">
- <tt>#include "tiffio.h"<br>
- main()<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen("myfile.tif", "r");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;if (tif) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tdata_t buf;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tstrip_t strip;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32* bc;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32 stripsize;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &amp;bc);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stripsize = bc[0];<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;buf = _TIFFmalloc(stripsize);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (strip = 0; strip &lt; tiffnumberofstrips(tif); strip++) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if (bc[strip] &gt; stripsize) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;buf = _TIFFrealloc(buf, bc[strip]);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;stripsize = bc[strip];<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFReadRawStrip(tif, strip, buf, bc[strip]);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_TIFFfree(buf);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFClose(tif);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;}<br>
- }</tt>
- </p>
- <p>
- As above the strips are read in the order in which they are
- physically stored in the file; this may be different from the
- logical ordering expected by an application.
- </p>
- <hr>
- <h2 id="tiles">Tile-oriented Image I/O</h2>
- <p>
- Tiles of data may be read and written in a manner similar to strips.
- With this interface, an image is
- broken up into a set of rectangular areas that may have dimensions
- less than the image width and height. All the tiles
- in an image have the same size, and the tile width and length must each
- be a multiple of 16 pixels. Tiles are ordered left-to-right and
- top-to-bottom in an image. As for scanlines, samples can be packed
- contiguously or separately. When separated, all the tiles for a sample
- are colocated in the file. That is, all the tiles for sample 0 appear
- before the tiles for sample 1, etc.
- </p>
- <p>
- Tiles and strips may also be extended in a z dimension to form
- volumes. Data volumes are organized as "slices". That is, all the
- data for a slice is colocated. Volumes whose data is organized in
- tiles can also have a tile depth so that data can be organized in
- cubes.
- </p>
- <p>
- There are actually two interfaces for tiles.
- One interface is similar to scanlines, to read a tiled image,
- code of the following sort might be used:
- </p>
- <p style="margin-left: 40px">
- <tt>main()<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen("myfile.tif", "r");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;if (tif) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32 imageWidth, imageLength;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32 tileWidth, tileLength;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32 x, y;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tdata_t buf;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &amp;imageWidth);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &amp;imageLength);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFGetField(tif, TIFFTAG_TILEWIDTH, &amp;tileWidth);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TIFFGetField(tif, TIFFTAG_TILELENGTH, &amp;tileLength);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;buf = _TIFFmalloc(TIFFTileSize(tif));<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (y = 0; y &lt; imagelength; y += tilelength)<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (x = 0; x &lt; imagewidth; x += tilewidth)<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffreadtile(tif, buf, x, y, 0);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_tifffree(buf);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffclose(tif);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;}<br>
- }</tt>
- </p>
- <p>
- (once again, we assume samples are packed contiguously.)
- </p>
- <p>
- Alternatively a direct interface to the low-level data is provided
- a la strips. Tiles can be read with
- <tt>TIFFReadEncodedTile</tt> or <tt>TIFFReadRawTile</tt>,
- and written with <tt>TIFFWriteEncodedTile</tt> or
- <tt>TIFFWriteRawTile</tt>. For example, to read all the tiles in an image:
- </p>
- <p style="margin-left: 40px">
- <tt>#include "tiffio.h"<br>
- main()<br>
- {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;TIFF* tif = TIFFOpen("myfile.tif", "r");<br>
- &nbsp;&nbsp;&nbsp;&nbsp;if (tif) {<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tdata_t buf;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ttile_t tile;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;buf = _TIFFmalloc(TIFFTileSize(tif));<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (tile = 0; tile &lt; tiffnumberoftiles(tif); tile++)<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffreadencodedtile(tif, tile, buf, (tsize_t) -1);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_tifffree(buf);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;tiffclose(tif);<br>
- &nbsp;&nbsp;&nbsp;&nbsp;}<br>
- }</tt>
- </p>
- <hr>
- <h2 id="other">Other Stuff</h2>
- <p>
- Some other stuff will almost certainly go here...
- </p>
- <hr>
- <p>
- Last updated: $Date: 2005/12/28 06:53:18 $
- </p>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFClose.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFClose.3tiff.html
deleted file mode 100644
index 42e3ba8970..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFClose.3tiff.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFClose</title>
-</head>
-<body>
-
-<h1 align=center>TIFFClose</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFClose &minus; close a previously opened
-<small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>void TIFFClose(TIFF *</b><i>tif</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFClose</i> closes a file that was previously opened
-with <b>TIFFOpen</b>(3TIFF). Any buffered data are flushed
-to the file, including the contents of the current directory
-(if modified); and all resources are reclaimed.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the routine. Likewise,
-warning messages are directed to the
-<b>TIFFWarning</b>(3TIFF) routine.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>libtiff</b>(3TIFF), <b>TIFFOpen</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFDataWidth.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFDataWidth.3tiff.html
deleted file mode 100644
index 237296e18d..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFDataWidth.3tiff.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFDataWidth</title>
-</head>
-<body>
-
-<h1 align=center>TIFFDataWidth</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFDataWidth &minus; Get the size of TIFF data types</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFDataWidth(TIFFDataType</b>
-<i>type</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFDataWidth</i> returns a size of <i>type</i> in
-bytes. Currently following data types are supported:<i><br>
-TIFF_BYTE<br>
-TIFF_ASCII<br>
-TIFF_SBYTE<br>
-TIFF_UNDEFINED<br>
-TIFF_SHORT<br>
-TIFF_SSHORT<br>
-TIFF_LONG<br>
-TIFF_SLONG<br>
-TIFF_FLOAT<br>
-TIFF_IFD<br>
-TIFF_RATIONAL<br>
-TIFF_SRATIONAL<br>
-TIFF_DOUBLE</i></p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFDataWidth</i> returns a number of bytes occupied
-by the item of given type. 0 returned when uknown data type
-supplied.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>libtiff</b>(3TIFF),</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFError.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFError.3tiff.html
deleted file mode 100644
index 5d39a139ec..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFError.3tiff.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFError</title>
-</head>
-<body>
-
-<h1 align=center>TIFFError</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFError, TIFFSetErrorHandler &minus; library error
-handling interface</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>void TIFFError(const char *</b><i>module</i><b>, const
-char *</b><i>fmt</i><b>,</b> <i>...</i><b>)</b></p>
-<!-- INDENTATION -->
-<p><b>#include &lt;stdarg.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>typedef void (*TIFFErrorHandler)(const char
-*</b><i>module</i><b>, const char *</b><i>fmt</i><b>,
-va_list</b> <i>ap</i><b>);<br>
-TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler
-handler);</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFError</i> invokes the library-wide error handling
-function to (normally) write an error message to the
-<b>stderr</b>. The <i>fmt</i> parameter is a
-<i>printf</i>(3S) format string, and any number arguments
-can be supplied. The <i>module</i> parameter, if non-zero,
-is printed before the message; it typically is used to
-identify the software module in which an error is
-detected.</p>
-<!-- INDENTATION -->
-<p>Applications that desire to capture control in the event
-of an error should use <i>TIFFSetErrorHandler</i> to
-override the default error handler. A <small>NULL</small>
-(0) error handling function may be installed to suppress
-error messages.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFSetErrorHandler</i> returns a reference to the
-previous error handling function.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFWarning</b>(3TIFF), <b>libtiff</b>(3TIFF),
-<b>printf</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFFlush.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFFlush.3tiff.html
deleted file mode 100644
index f32ccd3da7..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFFlush.3tiff.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFFlush</title>
-</head>
-<body>
-
-<h1 align=center>TIFFFlush</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFFlush, TIFFFlushData &minus; flush pending writes to
-an open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFFlush(TIFF *</b><i>tif</i><b>)<br>
-int TIFFFlushData(TIFF *</b><i>tif</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFFlush</i> causes any pending writes for the
-specified file (including writes for the current directory)
-to be done. In normal operation this call is never needed
-&minus; the library automatically does any flushing
-required.</p>
-<!-- INDENTATION -->
-<p><i>TIFFFlushData</i> flushes any pending image data for
-the specified file to be written out; directory-related data
-are not flushed. In normal operation this call is never
-needed &minus; the library automatically does any flushing
-required.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>0 is returned if an error is encountered, otherwise 1 is
-returned.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF),
-<b>TIFFWriteEncodedStrip</b>(3TIFF),
-<b>TIFFWriteEncodedTile</b>(3TIFF),
-<b>TIFFWriteRawStrip</b>(3TIFF),
-<b>TIFFWriteRawTile</b>(3TIFF),
-<b>TIFFWriteScanline</b>(3TIFF), <b>TIFFWriteTile</b>(3TIFF)
-<b>libtiff</b>(3TIFF),</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFGetField.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFGetField.3tiff.html
deleted file mode 100644
index e644b1d412..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFGetField.3tiff.html
+++ /dev/null
@@ -1,1446 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFGetField</title>
-</head>
-<body>
-
-<h1 align=center>TIFFGetField</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#AUTOREGISTERED TAGS">AUTOREGISTERED TAGS</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFGetField, TIFFVGetField &minus; get the value(s) of a
-tag in an open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFGetField(TIFF *</b><i>tif</i><b>, ttag_t</b>
-<i>tag</i><b>,</b> <i>...</i><b>)</b></p>
-<!-- INDENTATION -->
-<p><b>#include &lt;stdarg.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFVGetField(TIFF *</b><i>tif</i><b>, ttag_t</b>
-<i>tag</i><b>, va_list</b> <i>ap</i><b>)<br>
-int TIFFGetFieldDefaulted(TIFF *</b><i>tif</i><b>,
-ttag_t</b> <i>tag</i><b>,</b> <i>...</i><b>)<br>
-int TIFFVGetFieldDefaulted(TIFF *</b><i>tif</i><b>,
-ttag_t</b> <i>tag</i><b>, va_list</b> <i>ap</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFGetField</i> returns the value of a tag or
-pseudo-tag associated with the the current directory of the
-opened <small>TIFF</small> file <i>tif</i>. (A
-<i>pseudo-tag</i> is a parameter that is used to control the
-operation of the <small>TIFF</small> library but whose value
-is not read or written to the underlying file.) The file
-must have been previously opened with
-<i>TIFFOpen</i>(3TIFF). The tag is identified by <i>tag</i>,
-one of the values defined in the include file <b>tiff.h</b>
-(see also the table below). The type and number of values
-returned is dependent on the tag being requested. The
-programming interface uses a variable argument list as
-prescribed by the <i>stdarg</i>(3) interface. The returned
-values should only be interpreted if <i>TIFFGetField</i>
-returns 1.</p>
-<!-- INDENTATION -->
-<p><i>TIFFVGetField</i> is functionally equivalent to
-<i>TIFFGetField</i> except that it takes a pointer to a
-variable argument list. <i>TIFFVGetField</i> is useful for
-layering interfaces on top of the functionality provided by
-<i>TIFFGetField</i>.</p>
-<!-- INDENTATION -->
-<p><i>TIFFGetFieldDefaulted</i> and
-<i>TIFFVGetFieldDefaulted</i> are identical to
-<i>TIFFGetField</i> and <i>TIFFVGetField</i>, except that if
-a tag is not defined in the current directory and it has a
-default value, then the default value is returned.</p>
-<!-- INDENTATION -->
-<p>The tags understood by <i>libtiff(3TIFF),</i> the number
-of parameter values, and the types for the returned values
-are shown below. The data types are specified as in C and
-correspond to the types used to specify tag values to
-<i>TIFFSetField</i>(3TIFF). Remember that
-<i>TIFFGetField</i> returns parameter values, so all the
-listed data types are pointers to storage where values
-should be returned. Consult the <small>TIFF</small>
-specification (or relevant industry specification) for
-information on the meaning of each tag and their possible
-values.</p></td>
-</table>
-<!-- TABS -->
-
-<p><i>Tag Name Count Types Notes</i></p>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_ARTIST</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_BADFAXLINES</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_BITSPERSAMPLE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_CLEANFAXDATA</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_COLORMAP</p>
-</td>
-<td width="8%">
-
-<p>3</p>
-</td>
-<td width="23%">
-
-<p>uint16**</p>
-</td>
-<td width="17%">
-
-<p>1&lt;&lt;BitsPerSample arrays</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_COMPRESSION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_CONSECUTIVEBADFAXLINES</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_COPYRIGHT</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_DATATYPE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_DATETIME</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_DOCUMENTNAME</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_DOTRANGE</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_EXTRASAMPLES</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint16*,uint16**</p>
-</td>
-<td width="17%">
-
-<p>count &amp; types array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_FAXFILLFUNC</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>TIFFFaxFillFunc*</p>
-</td>
-<td width="17%">
-
-<p>G3/G4 compression pseudo-tag</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_FAXMODE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>int*</p>
-</td>
-<td width="17%">
-
-<p>G3/G4 compression pseudo-tag</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_FILLORDER</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_GROUP3OPTIONS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_GROUP4OPTIONS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_HALFTONEHINTS</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_HOSTCOMPUTER</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_ICCPROFILE</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint32*,void**</p>
-</td>
-<td width="17%">
-
-<p>count, profile data</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_IMAGEDEPTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_IMAGEDESCRIPTION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_IMAGELENGTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_IMAGEWIDTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_INKNAMES</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_INKSET</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_JPEGCOLORMODE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>int*</p>
-</td>
-<td width="17%">
-
-<p>JPEG pseudo-tag</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_JPEGQUALITY</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>int*</p>
-</td>
-<td width="17%">
-
-<p>JPEG pseudo-tag</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_JPEGTABLES</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint32*,void**</p>
-</td>
-<td width="17%">
-
-<p>count &amp; tables</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_JPEGTABLESMODE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>int*</p>
-</td>
-<td width="17%">
-
-<p>JPEG pseudo-tag</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_MAKE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_MATTEING</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_MAXSAMPLEVALUE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_MINSAMPLEVALUE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_MODEL</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_ORIENTATION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PAGENAME</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PAGENUMBER</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PHOTOMETRIC</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PHOTOSHOP</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint32*,void**</p>
-</td>
-<td width="17%">
-
-<p>count, data</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PLANARCONFIG</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PREDICTOR</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PRIMARYCHROMATICITIES</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>float**</p>
-</td>
-<td width="17%">
-
-<p>6-entry array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_REFERENCEBLACKWHITE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>float**</p>
-</td>
-<td width="17%">
-
-<p>2*SamplesPerPixel array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_RESOLUTIONUNIT</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_RICHTIFFIPTC</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint32*,void**</p>
-</td>
-<td width="17%">
-
-<p>count, data</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_ROWSPERSTRIP</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SAMPLEFORMAT</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SAMPLESPERPIXEL</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SMAXSAMPLEVALUE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>double*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SMINSAMPLEVALUE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>double*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SOFTWARE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_STONITS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>double**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_STRIPBYTECOUNTS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_STRIPOFFSETS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SUBFILETYPE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SUBIFD</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint16*,uint32**</p>
-</td>
-<td width="17%">
-
-<p>count &amp; offsets array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TARGETPRINTER</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>char**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_THRESHHOLDING</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TILEBYTECOUNTS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TILEDEPTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TILELENGTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TILEOFFSETS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32**</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TILEWIDTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint32*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TRANSFERFUNCTION</p>
-</td>
-<td width="8%">
-
-<p>1 or 3&dagger;</p>
-</td>
-<td width="23%"></td>
-<td width="17%">
-
-<p>uint16**1&lt;&lt;BitsPerSample entry arrays</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_WHITEPOINT</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>float**</p>
-</td>
-<td width="17%">
-
-<p>2-entry array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_XMLPACKET</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint32*,void**</p>
-</td>
-<td width="17%">
-
-<p>count, data</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_XPOSITION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>float*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_XRESOLUTION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>float*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_YCBCRCOEFFICIENTS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>float**</p>
-</td>
-<td width="17%">
-
-<p>3-entry array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_YCBCRPOSITIONING</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_YCBCRSUBSAMPLING</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="23%">
-
-<p>uint16*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_YPOSITION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>float*</p>
-</td>
-<td width="17%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_YRESOLUTION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="23%">
-
-<p>float*&Dagger;</p>
-</td>
-<td width="17%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>&dagger; If <i>SamplesPerPixel</i> is one, then a single
-array is returned; otherwise three arrays are returned.<br>
-&Dagger; The contents of this field are quite complex. See
-<i>The ICC Profile Format Specification</i>, Annex B.3
-&quot;Embedding ICC Profiles in TIFF Files&quot; (available
-at http://www.color.org) for an explanation.</p>
-</td>
-</table>
-<a name="AUTOREGISTERED TAGS"></a>
-<h2>AUTOREGISTERED TAGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>If you can&rsquo;t find the tag in the table above that
-means this is unsupported tag. But you still be able to read
-it&rsquo;s value if you know the data type of that tag. For
-example, if you want to read the LONG value from the tag
-33424 and ASCII string from the tag 36867 you can use the
-following code:</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>uint16 count;
-void *data;
-
-TIFFGetField(tiff, 33424, &amp;count, &amp;data);
-printf(&quot;Tag %d: %d, count %d0, 33424, *(uint32 *)data, count);
-TIFFGetField(tiff, 36867, &amp;count, &amp;data);
-printf(&quot;Tag %d: %s, count %d0, 36867, (char *)data, count);
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>is not supported by <b>libtiff(3TIFF),</b> library</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>1 is returned if the tag is defined in the current
-directory; otherwise a 0 is returned.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>Unknown field, tag 0x%x</b>. An unknown tag was
-supplied.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF), <b>TIFFSetField</b>(3TIFF),
-<b>TIFFSetDirectory</b>(3TIFF),
-<b>TIFFReadDirectory</b>(3TIFF),
-<b>TIFFWriteDirectory</b>(3TIFF) <b>libtiff</b>(3TIFF),</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFOpen.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFOpen.3tiff.html
deleted file mode 100644
index 6bc85d84e0..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFOpen.3tiff.html
+++ /dev/null
@@ -1,421 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFOpen</title>
-</head>
-<body>
-
-<h1 align=center>TIFFOpen</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#BYTE ORDER">BYTE ORDER</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFOpen, TIFFFdOpen, TIFFClientOpen &minus; open a
-<small>TIFF</small> file for reading or writing</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>TIFF* TIFFOpen(const char *</b><i>filename</i><b>,
-const char *</b><i>mode</i><b>)<br>
-TIFF* TIFFFdOpen(const int</b> <i>fd</i><b>, const char
-*</b><i>filename</i><b>, const char
-*</b><i>mode</i><b>)</b></p>
-<!-- INDENTATION -->
-<p><b>typedef tsize_t (*TIFFReadWriteProc)(thandle_t,
-tdata_t, tsize_t);<br>
-typedef toff_t (*TIFFSeekProc)(thandle_t, toff_t, int);<br>
-typedef int (*TIFFCloseProc)(thandle_t);<br>
-typedef toff_t (*TIFFSizeProc)(thandle_t);<br>
-typedef int (*TIFFMapFileProc)(thandle_t, tdata_t*,
-toff_t*);<br>
-typedef void (*TIFFUnmapFileProc)(thandle_t, tdata_t,
-toff_t);</b></p>
-<!-- INDENTATION -->
-<p><b>TIFF* TIFFClientOpen(const char
-*</b><i>filename</i><b>, const char *</b><i>mode</i><b>,
-thandle_t</b> <i>clientdata</i><b>, TIFFReadWriteProc</b>
-<i>readproc</i><b>, TIFFReadWriteProc</b>
-<i>writeproc</i><b>, TIFFSeekProc</b> <i>seekproc</i><b>,
-TIFFCloseProc</b> <i>closeproc</i><b>, TIFFSizeProc</b>
-<i>sizeproc</i><b>, TIFFMapFileProc</b> <i>mapproc</i><b>,
-TIFFUnmapFileProc</b> <i>unmapproc</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFOpen</i> opens a <small>TIFF</small> file whose
-name is <i>filename</i> and returns a handle to be used in
-subsequent calls to routines in <i>libtiff</i>. If the open
-operation fails, then zero is returned. The <i>mode</i>
-parameter specifies if the file is to be opened for reading
-(&lsquo;&lsquo;r&rsquo;&rsquo;), writing
-(&lsquo;&lsquo;w&rsquo;&rsquo;), or appending
-(&lsquo;&lsquo;a&rsquo;&rsquo;) and, optionally, whether to
-override certain default aspects of library operation (see
-below). When a file is opened for appending, existing data
-will not be touched; instead new data will be written as
-additional subfiles. If an existing file is opened for
-writing, all previous data is overwritten.</p>
-<!-- INDENTATION -->
-<p>If a file is opened for reading, the first
-<small>TIFF</small> directory in the file is automatically
-read (also see <i>TIFFSetDirectory</i>(3TIFF) for reading
-directories other than the first). If a file is opened for
-writing or appending, a default directory is automatically
-created for writing subsequent data. This directory has all
-the default values specified in <small>TIFF</small> Revision
-6.0: <i>BitsPerSample</i>=1, <i>ThreshHolding</i>=bilevel
-art scan, <i>FillOrder</i>=1 (most significant bit of each
-data byte is filled first), <i>Orientation</i>=1 (the 0th
-row represents the visual top of the image, and the 0th
-column represents the visual left hand side),
-<i>SamplesPerPixel</i>=1, <i>RowsPerStrip</i>=infinity,
-<i>ResolutionUnit</i>=2 (inches), and <i>Compression</i>=1
-(no compression). To alter these values, or to define values
-for additional fields, <i>TIFFSetField</i>(3TIFF) must be
-used.</p>
-<!-- INDENTATION -->
-<p><i>TIFFFdOpen</i> is like <i>TIFFOpen</i> except that it
-opens a <small>TIFF</small> file given an open file
-descriptor <i>fd</i>. The file&rsquo;s name and mode must
-reflect that of the open descriptor. The object associated
-with the file descriptor <b>must support random
-access</b>.</p>
-<!-- INDENTATION -->
-<p><i>TIFFClientOpen</i> is like <i>TIFFOpen</i> except that
-the caller supplies a collection of functions that the
-library will use to do <small>UNIX</small> -like I/O
-operations. The <i>readproc</i> and <i>writeproc</i> are
-called to read and write data at the current file position.
-<i>seekproc</i> is called to change the current file
-position a la <i>lseek</i>(2). <i>closeproc</i> is invoked
-to release any resources associated with an open file.
-<i>sizeproc</i> is invoked to obtain the size in bytes of a
-file. <i>mapproc</i> and <i>unmapproc</i> are called to map
-and unmap a file&rsquo;s contents in memory; c.f.
-<i>mmap</i>(2) and <i>munmap</i>(2). The <i>clientdata</i>
-parameter is an opaque &lsquo;&lsquo;handle&rsquo;&rsquo;
-passed to the client-specified routines passed as parameters
-to <i>TIFFClientOpen</i>.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The open mode parameter can include the following flags
-in addition to the &lsquo;&lsquo;r&rsquo;&rsquo;,
-&lsquo;&lsquo;w&rsquo;&rsquo;, and
-&lsquo;&lsquo;a&rsquo;&rsquo; flags. Note however that
-option flags must follow the read-write-append
-specification.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>l</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>When creating a new file force information be written
-with Little-Endian byte order (but see below). By default
-the library will create new files using the native
-<small>CPU</small> byte order.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>b</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>When creating a new file force information be written
-with Big-Endian byte order (but see below). By default the
-library will create new files using the native
-<small>CPU</small> byte order.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>L</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Force image data that is read or written to be treated
-with bits filled from Least Significant Bit (
-<small>LSB</small> ) to Most Significant Bit (
-<small>MSB</small> ). Note that this is the opposite to the
-way the library has worked from its inception.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>B</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Force image data that is read or written to be treated
-with bits filled from Most Significant Bit (
-<small>MSB</small> ) to Least Significant Bit (
-<small>LSB</small> ); this is the default.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>H</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Force image data that is read or written to be treated
-with bits filled in the same order as the native
-<small>CPU.</small></p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>M</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Enable the use of memory-mapped files for images opened
-read-only. If the underlying system does not support
-memory-mapped files or if the specific image being opened
-cannot be memory-mapped then the library will fallback to
-using the normal system interface for reading information.
-By default the library will attempt to use memory-mapped
-files.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>m</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Disable the use of memory-mapped files.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>C</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Enable the use of &lsquo;&lsquo;strip
-chopping&rsquo;&rsquo; when reading images that are
-comprised of a single strip or tile of uncompressed data.
-Strip chopping is a mechanism by which the library will
-automatically convert the single-strip image to multiple
-strips, each of which has about 8 Kilobytes of data. This
-facility can be useful in reducing the amount of memory used
-to read an image because the library normally reads each
-strip in its entirety. Strip chopping does however alter the
-apparent contents of the image because when an image is
-divided into multiple strips it looks as though the
-underlying file contains multiple separate strips. Finally,
-note that default handling of strip chopping is a
-compile-time configuration parameter. The default behaviour,
-for backwards compatibility, is to enable strip
-chopping.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>c</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Disable the use of strip chopping when reading
-images.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>h</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Read TIFF header only, do not load the first image
-directory. That could be useful in case of the broken first
-directory. We can open the file and proceed to the other
-directories.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="BYTE ORDER"></a>
-<h2>BYTE ORDER</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The <small>TIFF</small> specification (<b>all
-versions</b>) states that compliant readers <i>must be
-capable of reading images written in either byte order</i>.
-Nonetheless some software that claims to support the reading
-of <small>TIFF</small> images is incapable of reading images
-in anything but the native <small>CPU</small> byte order on
-which the software was written. (Especially notorious are
-applications written to run on Intel-based machines.) By
-default the library will create new files with the native
-byte-order of the <small>CPU</small> on which the
-application is run. This ensures optimal performance and is
-portable to any application that conforms to the TIFF
-specification. To force the library to use a specific
-byte-order when creating a new file the
-&lsquo;&lsquo;b&rsquo;&rsquo; and
-&lsquo;&lsquo;l&rsquo;&rsquo; option flags may be included
-in the call to open a file; for example,
-&lsquo;&lsquo;wb&rsquo;&rsquo; or
-&lsquo;&lsquo;wl&rsquo;&rsquo;.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Upon successful completion <i>TIFFOpen</i>,
-<i>TIFFFdOpen</i>, and <i>TIFFClientOpen</i> return a
-<small>TIFF</small> pointer. Otherwise, NULL is
-returned.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine. Likewise, warning messages
-are directed to the <i>TIFFWarning</i>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>&quot;%s&quot;: Bad mode</b>. The specified
-<i>mode</i> parameter was not one of
-&lsquo;&lsquo;r&rsquo;&rsquo; (read),
-&lsquo;&lsquo;w&rsquo;&rsquo; (write), or
-&lsquo;&lsquo;a&rsquo;&rsquo; (append).</p>
-<!-- INDENTATION -->
-<p><b>%s: Cannot open</b>. <i>TIFFOpen</i>() was unable to
-open the specified filename for read/writing.</p>
-<!-- INDENTATION -->
-<p><b>Cannot read TIFF header</b>. An error occurred while
-attempting to read the header information.</p>
-<!-- INDENTATION -->
-<p><b>Error writing TIFF header</b>. An error occurred while
-writing the default header information for a new file.</p>
-<!-- INDENTATION -->
-<p><b>Not a TIFF file, bad magic number %d (0x%x)</b>. The
-magic number in the header was not (hex) 0x4d4d or (hex)
-0x4949.</p>
-<!-- INDENTATION -->
-<p><b>Not a TIFF file, bad version number %d (0x%x)</b>. The
-version field in the header was not 42 (decimal).</p>
-<!-- INDENTATION -->
-<p><b>Cannot append to file that has opposite byte
-ordering</b>. A file with a byte ordering opposite to the
-native byte ordering of the current machine was opened for
-appending (&lsquo;&lsquo;a&rsquo;&rsquo;). This is a
-limitation of the library.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>libtiff</i>(3TIFF), <i>TIFFClose</i>(3TIFF)</p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFPrintDirectory.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFPrintDirectory.3tiff.html
deleted file mode 100644
index a5f418a115..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFPrintDirectory.3tiff.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFPrintDirectory</title>
-</head>
-<body>
-
-<h1 align=center>TIFFPrintDirectory</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFPrintDirectory &minus; print a description of a
-<small>TIFF</small> directory</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>void TIFFPrintDirectory(TIFF *</b><i>tif</i><b>, FILE
-*</b><i>fd</i><b>, long</b> <i>flags</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFPrintDirectory</i> prints a description of the
-current directory in the specified <small>TIFF</small> file
-to the standard I/O output stream <i>fd</i>. The
-<i>flags</i> parameter is used to control the <i>level of
-detail</i> of the printed information; it is a bit-or of the
-flags defined in <b>tiffio.h</b>:</p></td>
-</table>
-<!-- TABS -->
-
-<p>#define TIFFPRINT_NONE 0x0 /* no extra info */</p>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="1%">
-
-<p>#define</p>
-</td>
-<td width="30%">
-
-<p>TIFFPRINT_STRIPS</p>
-</td>
-<td width="10%">
-
-<p>0x1</p>
-</td>
-<td width="48%">
-
-<p>/* strips/tiles info */</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="1%">
-
-<p>#define</p>
-</td>
-<td width="30%">
-
-<p>TIFFPRINT_CURVES</p>
-</td>
-<td width="10%">
-
-<p>0x2</p>
-</td>
-<td width="48%">
-
-<p>/* color/gray response curves */</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="1%">
-
-<p>#define</p>
-</td>
-<td width="30%">
-
-<p>TIFFPRINT_COLORMAP</p>
-</td>
-<td width="10%">
-
-<p>0x4</p>
-</td>
-<td width="48%">
-
-<p>/* colormap */</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="1%">
-
-<p>#define</p>
-</td>
-<td width="30%">
-
-<p>TIFFPRINT_JPEGQTABLES</p>
-</td>
-<td width="10%">
-
-<p>0x100</p>
-</td>
-<td width="48%">
-
-<p>/* JPEG Q matrices */</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="1%">
-
-<p>#define</p>
-</td>
-<td width="30%">
-
-<p>TIFFPRINT_JPEGACTABLES</p>
-</td>
-<td width="10%">
-
-<p>0x200</p>
-</td>
-<td width="48%">
-
-<p>/* JPEG AC tables */</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="1%">
-
-<p>#define</p>
-</td>
-<td width="30%">
-
-<p>TIFFPRINT_JPEGDCTABLES</p>
-</td>
-<td width="10%">
-
-<p>0x200</p>
-</td>
-<td width="48%">
-
-<p>/* JPEG DC tables */</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>In C++ the <i>flags</i> parameter defaults to 0.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>None.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>None.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>libtiff</i>(3TIFF), <i>TIFFOpen</i>(3TIFF),
-<i>TIFFReadDirectory</i>(3TIFF),
-<i>TIFFSetDirectory</i>(3TIFF)</p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFRGBAImage.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFRGBAImage.3tiff.html
deleted file mode 100644
index 7bbee0f25e..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFRGBAImage.3tiff.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFRGBAImage</title>
-</head>
-<body>
-
-<h1 align=center>TIFFRGBAImage</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#ALTERNATE RASTER FORMATS">ALTERNATE RASTER FORMATS</a><br>
-<a href="#SIMULTANEOUS RASTER STORE AND DISPLAY">SIMULTANEOUS RASTER STORE AND DISPLAY</a><br>
-<a href="#SUPPORTING ADDITIONAL TIFF FORMATS">SUPPORTING ADDITIONAL TIFF FORMATS</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFRGBAImageOK, TIFFRGBAImageBegin, TIFFRGBAImageGet,
-TIFFRGBAImageEnd &minus; read and decode an image into a
-raster</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>typedef unsigned char TIFFRGBValue; typedef struct
-_TIFFRGBAImage TIFFRGBAImage;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFRGBAImageOK(TIFF *</b><i>tif</i><b>, char</b>
-<i>emsg[1024]</i><b>)<br>
-int TIFFRGBAImageBegin(TIFFRGBAImage *</b><i>img</i><b>,
-TIFF*</b> <i>tif</i><b>, int</b> <i>stopOnError</i><b>,
-char</b> <i>emsg[1024]</i><b>)<br>
-int TIFFRGBAImageGet(TIFFRGBAImage *</b><i>img</i><b>,
-uint32*</b> <i>raster</i><b>, uint32</b> <i>width</i> <b>,
-uint32</b> <i>height</i><b>)<br>
-void TIFFRGBAImageEnd(TIFFRGBAImage
-*</b><i>img</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The routines described here provide a high-level
-interface through which <small>TIFF</small> images may be
-read into memory. Images may be strip- or tile-based and
-have a variety of different characteristics: bits/sample,
-samples/pixel, photometric, etc. Decoding state is
-encapsulated in a <i>TIFFRGBAImage</i> structure making it
-possible to capture state for multiple images and quickly
-switch between them. The target raster format can be
-customized to a particular application&rsquo;s needs by
-installing custom routines that manipulate image data
-according to application requirements.</p>
-<!-- INDENTATION -->
-<p>The default usage for these routines is: check if an
-image can be processed using <i>TIFFRGBAImageOK</i>,
-construct a decoder state block using
-<i>TIFFRGBAImageBegin</i>, read and decode an image into a
-target raster using <i>TIFFRGBAImageGet</i>, and then
-release resources using <i>TIFFRGBAImageEnd</i>.
-<i>TIFFRGBAImageGet</i> can be called multiple times to
-decode an image using different state parameters. If
-multiple images are to be displayed and there is not enough
-space for each of the decoded rasters, multiple state blocks
-can be managed and then calls can be made to
-<i>TIFFRGBAImageGet</i> as needed to display an image.</p>
-<!-- INDENTATION -->
-<p>The generated raster is assumed to be an array of
-<i>width</i> times <i>height</i> 32-bit entries, where
-<i>width</i> must be less than or equal to the width of the
-image (<i>height</i> may be any non-zero size). If the
-raster dimensions are smaller than the image, the image data
-is cropped to the raster bounds. If the raster height is
-greater than that of the image, then the image data are
-placed in the lower part of the raster. (Note that the
-raster is assume to be organized such that the pixel at
-location (<i>x</i>,<i>y</i>) is
-<i>raster</i>[<i>y</i>*<i>width</i>+<i>x</i>]; with the
-raster origin in the <b>lower-left</b> hand corner.)</p>
-<!-- INDENTATION -->
-<p>Raster pixels are 8-bit packed red, green, blue, alpha
-samples. The macros <i>TIFFGetR</i>, <i>TIFFGetG</i>,
-<i>TIFFGetB</i>, and <i>TIFFGetA</i> should be used to
-access individual samples. Images without Associated Alpha
-matting information have a constant Alpha of 1.0 (255).</p>
-<!-- INDENTATION -->
-<p><i>TIFFRGBAImageGet</i> converts non-8-bit images by
-scaling sample values. Palette, grayscale, bilevel,
-<small>CMYK</small> , and YCbCr images are converted to
-<small>RGB</small> transparently. Raster pixels are returned
-uncorrected by any colorimetry information present in the
-directory.</p>
-<!-- INDENTATION -->
-<p>The parameter <i>stopOnError</i> specifies how to act if
-an error is encountered while reading the image. If
-<i>stopOnError</i> is non-zero, then an error will terminate
-the operation; otherwise <i>TIFFRGBAImageGet</i> will
-continue processing data until all the possible data in the
-image have been requested.</p>
-</td>
-</table>
-<a name="ALTERNATE RASTER FORMATS"></a>
-<h2>ALTERNATE RASTER FORMATS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>To use the core support for reading and processing
-<small>TIFF</small> images, but write the resulting raster
-data in a different format one need only override the
-&lsquo;&lsquo;<i>put methods</i>&rsquo;&rsquo; used to store
-raster data. These methods are are defined in the
-<i>TIFFRGBAImage</i> structure and initially setup by
-<i>TIFFRGBAImageBegin</i> to point to routines that pack
-raster data in the default <small>ABGR</small> pixel format.
-Two different routines are used according to the physical
-organization of the image data in the file:
-<i>PlanarConfiguration</i>=1 (packed samples), and
-<i>PlanarConfiguration</i>=2 (separated samples). Note that
-this mechanism can be used to transform the data before
-storing it in the raster. For example one can convert data
-to colormap indices for display on a colormap display.</p>
-</td>
-</table>
-<a name="SIMULTANEOUS RASTER STORE AND DISPLAY"></a>
-<h2>SIMULTANEOUS RASTER STORE AND DISPLAY</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>It is simple to display an image as it is being read into
-memory by overriding the put methods as described above for
-supporting alternate raster formats. Simply keep a reference
-to the default put methods setup by
-<i>TIFFRGBAImageBegin</i> and then invoke them before or
-after each display operation. For example, the
-<i>tiffgt</i>(1) utility uses the following put method to
-update the display as the raster is being filled:</p>
-<!-- INDENTATION -->
-<pre>static void
-putContigAndDraw(TIFFRGBAImage* img, uint32* raster,
- uint32 x, uint32 y, uint32 w, uint32 h,
- int32 fromskew, int32 toskew,
- unsigned char* cp)
-{
- (*putContig)(img, raster, x, y, w, h, fromskew, toskew, cp);
- if (x+w == width) {
- w = width;
- if (img-&gt;orientation == ORIENTATION_TOPLEFT)
- lrectwrite(0, y-(h-1), w-1, y, raster-x-(h-1)*w);
- else
- lrectwrite(0, y, w-1, y+h-1, raster);
- }
-}
-</pre>
-<!-- INDENTATION -->
-<p>(the original routine provided by the library is saved in
-the variable <i>putContig</i>.)</p>
-</td>
-</table>
-<a name="SUPPORTING ADDITIONAL TIFF FORMATS"></a>
-<h2>SUPPORTING ADDITIONAL TIFF FORMATS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The <i>TIFFRGBAImage</i> routines support the most
-commonly encountered flavors of <small>TIFF.</small> It is
-possible to extend this support by overriding the
-&lsquo;&lsquo;<i>get method</i>&rsquo;&rsquo; invoked by
-<i>TIFFRGBAImageGet</i> to read <small>TIFF</small> image
-data. Details of doing this are a bit involved, it is best
-to make a copy of an existing get method and modify it to
-suit the needs of an application.</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Samples must be either 1, 2, 4, 8, or 16 bits.
-Colorimetric samples/pixel must be either 1, 3, or 4 (i.e.
-<i>SamplesPerPixel</i> minus <i>ExtraSamples</i>).</p>
-<!-- INDENTATION -->
-<p>Palette image colormaps that appear to be incorrectly
-written as 8-bit values are automatically scaled to
-16-bits.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All routines return 1 if the operation was successful.
-Otherwise, 0 is returned if an error was encountered and
-<i>stopOnError</i> is zero.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>Sorry, can not handle %d-bit pictures</b>. The image
-had <i>BitsPerSample</i> other than 1, 2, 4, 8, or 16.</p>
-<!-- INDENTATION -->
-<p><b>Sorry, can not handle %d-channel images</b>. The image
-had <i>SamplesPerPixel</i> other than 1, 3, or 4.</p>
-<!-- INDENTATION -->
-<p><b>Missing needed &quot;PhotometricInterpretation&quot;
-tag</b>. The image did not have a tag that describes how to
-display the data.</p>
-<!-- INDENTATION -->
-<p><b>No &quot;PhotometricInterpretation&quot; tag, assuming
-RGB</b>. The image was missing a tag that describes how to
-display it, but because it has 3 or 4 samples/pixel, it is
-assumed to be <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>No &quot;PhotometricInterpretation&quot; tag, assuming
-min-is-black</b>. The image was missing a tag that describes
-how to display it, but because it has 1 sample/pixel, it is
-assumed to be a grayscale or bilevel image.</p>
-<!-- INDENTATION -->
-<p><b>No space for photometric conversion table</b>. There
-was insufficient memory for a table used to convert image
-samples to 8-bit <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>Missing required &quot;Colormap&quot; tag</b>. A
-Palette image did not have a required <i>Colormap</i>
-tag.</p>
-<!-- INDENTATION -->
-<p><b>No space for tile buffer</b>. There was insufficient
-memory to allocate an i/o buffer.</p>
-<!-- INDENTATION -->
-<p><b>No space for strip buffer</b>. There was insufficient
-memory to allocate an i/o buffer.</p>
-<!-- INDENTATION -->
-<p><b>Can not handle format</b>. The image has a format
-(combination of <i>BitsPerSample</i>,
-<i>SamplesPerPixel</i>, and
-<i>PhotometricInterpretation</i>) that can not be
-handled.</p>
-<!-- INDENTATION -->
-<p><b>No space for B&amp;W mapping table</b>. There was
-insufficient memory to allocate a table used to map
-grayscale data to <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>No space for Palette mapping table</b>. There was
-insufficient memory to allocate a table used to map data to
-8-bit <small>RGB.</small></p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF), <b>TIFFReadRGBAImage</b>(3TIFF),
-<b>TIFFReadRGBAImageOriented</b>(3TIFF),
-<b>TIFFReadRGBAStrip</b>(3TIFF),
-<b>TIFFReadRGBATile</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFReadDirectory.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFReadDirectory.3tiff.html
deleted file mode 100644
index 5bb828efa7..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFReadDirectory.3tiff.html
+++ /dev/null
@@ -1,218 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFReadDirectory</title>
-</head>
-<body>
-
-<h1 align=center>TIFFReadDirectory</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>TIFFReadDirectory &minus; get the contents of the
-next directory in an open</big> TIFF <big>file</big></p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>#include &lt;tiffio.h&gt;</b></big></p>
-<!-- INDENTATION -->
-<p><big><b>int TIFFReadDirectory(TIFF
-*</b><i>tif</i><b>)</b></big></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>Read the next directory in the specified file and
-make it the current directory. Applications only need to
-call <i>TIFFReadDirectory</i> to read multiple subfiles in a
-single</big> TIFF <big>file&mdash; the first directory in a
-file is automatically read when <i>TIFFOpen</i> is
-called.</big></p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>If the library is compiled with</big>
-STRIPCHOP_SUPPORT <big>enabled, then images that have a
-single uncompressed strip or tile of data are automatically
-treated as if they were made up of multiple strips or tiles
-of approximately 8 kilobytes each. This operation is done
-only in-memory; it does not alter the contents of the file.
-However, the construction of the &lsquo;&lsquo;chopped
-strips&rsquo;&rsquo; is visible to the application through
-the number of strips [tiles] returned by
-<i>TIFFNumberOfStrips</i>
-[<i>TIFFNumberOfTiles</i>].</big></p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>If the next directory was successfully read, 1 is
-returned. Otherwise, 0 is returned if an error was
-encountered, or if there are no more directories to be
-read.</big></p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine. All warning messages are
-directed to the <i>TIFFWarning</i>(3TIFF) routine.</big></p>
-<!-- INDENTATION -->
-<p><big><b>Seek error accessing TIFF directory</b>. An error
-occurred while positioning to the location of the
-directory.</big></p>
-<!-- INDENTATION -->
-<p><big><b>Wrong data type %d for field &quot;%s&quot;</b>.
-The tag entry in the directory had an incorrect data type.
-For example, an <i>ImageDescription</i> tag with a</big>
-SHORT <big>data type.</big></p>
-<!-- INDENTATION -->
-<p><big><b>TIFF directory is missing required &quot;%s&quot;
-field</b>. The specified tag is required to be present by
-the</big> TIFF <big>5.0 specification, but is missing. The
-directory is (usually) unusable.</big></p>
-<!-- INDENTATION -->
-<p><big><b>%s: Rational with zero denominator</b>. A
-directory tag has a</big> RATIONAL <big>value whose
-denominator is zero.</big></p>
-<!-- INDENTATION -->
-<p><big><b>Incorrect count %d for field &quot;%s&quot; (%lu,
-expecting %lu); tag ignored</b>. The specified tag&rsquo;s
-count field is bad. For example, a count other than 1 for a
-<i>SubFileType</i> tag.</big></p>
-<!-- INDENTATION -->
-<p><big><b>Cannot handle different per-sample values for
-field &quot;%s&quot;</b>. The tag has <i>SamplesPerPixel</i>
-values and they are not all the same; e.g.
-<i>BitsPerSample</i>. The library is unable to handle images
-of this sort.</big></p>
-<!-- INDENTATION -->
-<p><big><b>Count mismatch for field &quot;%s&quot;;
-expecting %d, got %d</b>. The count field in a tag does not
-agree with the number expected by the library. This should
-never happen, so if it does, the library refuses to read the
-directory.</big></p>
-<!-- INDENTATION -->
-<p><big><b>Invalid TIFF directory; tags are not sorted in
-ascending order</b>. The directory tags are not properly
-sorted as specified in the</big> TIFF <big>5.0
-specification. This error is not fatal.</big></p>
-<!-- INDENTATION -->
-<p><big><b>Ignoring unknown field with tag %d (0x%x)</b>. An
-unknown tag was encountered in the directory; the library
-ignores all such tags.</big></p>
-<!-- INDENTATION -->
-<p><big><b>TIFF directory is missing requred
-&quot;ImageLength&quot; field</b>. The image violates the
-specification by not having a necessary field. There is no
-way for the library to recover from this error.</big></p>
-<!-- INDENTATION -->
-<p><big><b>TIFF directory is missing requred
-&quot;PlanarConfig&quot; field</b>. The image violates the
-specification by not having a necessary field. There is no
-way for the library to recover from this error.</big></p>
-<!-- INDENTATION -->
-<p><big><b>TIFF directory is missing requred
-&quot;StripOffsets&quot; field</b>. The image has multiple
-strips, but is missing the tag that specifies the file
-offset to each strip of data. There is no way for the
-library to recover from this error.</big></p>
-<!-- INDENTATION -->
-<p><big><b>TIFF directory is missing requred
-&quot;TileOffsets&quot; field</b>. The image has multiple
-tiles, but is missing the tag that specifies the file offset
-to each tile of data. There is no way for the library to
-recover from this error.</big></p>
-<!-- INDENTATION -->
-<p><big><b>TIFF directory is missing required
-&quot;StripByteCounts&quot; field</b>. The image has
-multiple strips, but is missing the tag that specifies the
-size of each strip of data. There is no way for the library
-to recover from this error.</big></p>
-<!-- INDENTATION -->
-<p><big><b>TIFF directory is missing required
-&quot;StripByteCounts&quot; field, calculating from
-imagelength</b>. The image violates the specification by not
-having a necessary field. However, when the image is
-comprised of only one strip or tile, the library will
-estimate the missing value based on the file size.</big></p>
-<!-- INDENTATION -->
-<p><big><b>Bogus &quot;StripByteCounts&quot; field, ignoring
-and calculating from imagelength</b>. Certain vendors
-violate the specification by writing zero for the
-StripByteCounts tag when they want to leave the value
-unspecified. If the image has a single strip, the library
-will estimate the missing value based on the file
-size.</big></p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFOpen</b>(3TIFF),
-<b>TIFFWriteDirectory</b>(3TIFF),
-<b>TIFFSetDirectory</b>(3TIFF),
-<b>TIFFSetSubDirectory</b>(3TIFF),
-<b>libtiff</b>(3TIFF)</big></p>
-<!-- INDENTATION -->
-<p><big>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></big></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFReadEncodedStrip.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFReadEncodedStrip.3tiff.html
deleted file mode 100644
index 39d411d765..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFReadEncodedStrip.3tiff.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFReadEncodedStrip</title>
-</head>
-<body>
-
-<h1 align=center>TIFFReadEncodedStrip</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>TIFFReadEncodedStrip &minus; read and decode a strip
-of data from an open</big> TIFF <big>file</big></p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>#include &lt;tiffio.h&gt;</b></big></p>
-<!-- INDENTATION -->
-<p><big><b>tsize_t TIFFReadEncodedStrip(TIFF
-*</b><i>tif</i><b>, tstrip_t</b> <i>strip</i><b>,
-tdata_t</b> <i>buf</i><b>, tsize_t</b>
-<i>size</i><b>)</b></big></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>Read the specified strip of data and place up to
-<i>size</i> bytes of decompressed information in the (user
-supplied) data buffer.</big></p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>The value of <i>strip</i> is a &lsquo;&lsquo;raw
-strip number.&rsquo;&rsquo; That is, the caller must take
-into account whether or not the data are organized in
-separate planes (<i>PlanarConfiguration</i>=2). To read a
-full strip of data the data buffer should typically be at
-least as large as the number returned by
-<b>TIFFStripSize</b>(3TIFF). If the -1 passed in <i>size</i>
-parameter, the whole strip will be read. You should be sure
-you have enough space allocated for the buffer.</big></p>
-<!-- INDENTATION -->
-<p><big>The library attempts to hide bit- and byte-ordering
-differences between the image and the native machine by
-converting data to the native machine order. Bit reversal is
-done if the <i>FillOrder</i> tag is opposite to the native
-machine bit order. 16- and 32-bit samples are automatically
-byte-swapped if the file was written with a byte order
-opposite to the native machine byte order,</big></p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>The actual number of bytes of data that were placed
-in <i>buf</i> is returned; <i>TIFFReadEncodedStrip</i>
-returns &minus;1 if an error was encountered.</big></p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</big></p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFOpen</b>(3TIFF),
-<b>TIFFReadRawStrip</b>(3TIFF),
-<b>TIFFReadScanline</b>(3TIFF),
-<b>libtiff</b>(3TIFF)</big></p>
-<!-- INDENTATION -->
-<p><big>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></big></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFReadEncodedTile.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFReadEncodedTile.3tiff.html
deleted file mode 100644
index 752b1ea3e6..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFReadEncodedTile.3tiff.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFReadEncodedTile</title>
-</head>
-<body>
-
-<h1 align=center>TIFFReadEncodedTile</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFReadEncodedTile &minus; read and decode a tile of
-data from an open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFReadEncodedTile(TIFF *</b><i>tif</i><b>,
-ttile_t</b> <i>tile</i><b>, tdata_t</b> <i>buf</i><b>,
-tsize_t</b> <i>size</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Read the specified tile of data and place up to
-<i>size</i> bytes of decompressed information in the (user
-supplied) data buffer.</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The value of <i>tile</i> is a &lsquo;&lsquo;raw tile
-number.&rsquo;&rsquo; That is, the caller must take into
-account whether or not the data are organized in separate
-planes (<i>PlanarConfiguration</i>=2).
-<i>TIFFComputeTile</i> automatically does this when
-converting an (x,y,z,sample) coordinate quadruple to a tile
-number. To read a full tile of data the data buffer should
-be at least as large as the value returned by
-<i>TIFFTileSize</i>.</p>
-<!-- INDENTATION -->
-<p>The library attempts to hide bit- and byte-ordering
-differences between the image and the native machine by
-converting data to the native machine order. Bit reversal is
-done if the <i>FillOrder</i> tag is opposite to the native
-machine bit order. 16- and 32-bit samples are automatically
-byte-swapped if the file was written with a byte order
-opposite to the native machine byte order,</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The actual number of bytes of data that were placed in
-<i>buf</i> is returned; <i>TIFFReadEncodedTile</i> returns
-&minus;1 if an error was encountered.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF), <b>TIFFReadRawTile</b>(3TIFF),
-<b>TIFFReadTile</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFReadRGBAImage.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFReadRGBAImage.3tiff.html
deleted file mode 100644
index 165284e50c..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFReadRGBAImage.3tiff.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFReadRGBAImage</title>
-</head>
-<body>
-
-<h1 align=center>TIFFReadRGBAImage</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFReadRGBAImage, TIFFReadRGBAImageOriented &minus; read
-and decode an image into a fixed-format raster</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>#define TIFFGetR(abgr) ((abgr) &amp; 0xff)<br>
-#define TIFFGetG(abgr) (((abgr) &gt;&gt; 8) &amp; 0xff)<br>
-#define TIFFGetB(abgr) (((abgr) &gt;&gt; 16) &amp; 0xff)<br>
-#define TIFFGetA(abgr) (((abgr) &gt;&gt; 24) &amp;
-0xff)</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFReadRGBAImage(TIFF *</b><i>tif</i><b>,
-uint32</b> <i>width</i><b>, uint32</b> <i>height</i><b>,
-uint32 *</b><i>raster</i><b>, int</b>
-<i>stopOnError</i><b>)<br>
-int TIFFReadRGBAImageOriented(TIFF *</b><i>tif</i><b>,
-uint32</b> <i>width</i><b>, uint32</b> <i>height</i><b>,
-uint32 *</b><i>raster</i><b>, int</b> <i>orientation</i><b>,
-int</b> <i>stopOnError</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFReadRGBAImage</i> reads a strip- or tile-based
-image into memory, storing the result in the user supplied
-<i>raster</i>. The raster is assumed to be an array of
-<i>width</i> times <i>height</i> 32-bit entries, where
-<i>width</i> must be less than or equal to the width of the
-image (<i>height</i> may be any non-zero size). If the
-raster dimensions are smaller than the image, the image data
-is cropped to the raster bounds. If the raster height is
-greater than that of the image, then the image data are
-placed in the lower part of the raster. (Note that the
-raster is assume to be organized such that the pixel at
-location (<i>x</i>,<i>y</i>) is
-<i>raster</i>[<i>y</i>*<i>width</i>+<i>x</i>]; with the
-raster origin in the lower-left hand corner.)</p>
-<!-- INDENTATION -->
-<p><i>TIFFReadRGBAImageOriented</i> works like
-<i>TIFFReadRGBAImage</i> with except of that user can
-specify the raster origin position with the
-<i>orientation</i> parameter. Four orientations
-supported:</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>ORIENTATION_TOPLEFT</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>origin in top-left corner,</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>ORIENTATION_TOPRIGHT</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>origin in top-right corner,</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>ORIENTATION_BOTLEFT</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>origin in bottom-left corner and</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>ORIENTATION_BOTRIGHT</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>origin in bottom-right corner.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>If you choose <b>ORIENTATION_BOTLEFT</b> result will be
-the same as returned by the <i>TIFFReadRGBAImage.</i></p>
-<!-- INDENTATION -->
-<p>Raster pixels are 8-bit packed red, green, blue, alpha
-samples. The macros <i>TIFFGetR</i>, <i>TIFFGetG</i>,
-<i>TIFFGetB</i>, and <i>TIFFGetA</i> should be used to
-access individual samples. Images without Associated Alpha
-matting information have a constant Alpha of 1.0 (255).</p>
-<!-- INDENTATION -->
-<p><i>TIFFReadRGBAImage</i> converts non-8-bit images by
-scaling sample values. Palette, grayscale, bilevel,
-<small>CMYK</small> , and YCbCr images are converted to
-<small>RGB</small> transparently. Raster pixels are returned
-uncorrected by any colorimetry information present in the
-directory.</p>
-<!-- INDENTATION -->
-<p>The paramater <i>stopOnError</i> specifies how to act if
-an error is encountered while reading the image. If
-<i>stopOnError</i> is non-zero, then an error will terminate
-the operation; otherwise <i>TIFFReadRGBAImage</i> will
-continue processing data until all the possible data in the
-image have been requested.</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>In C++ the <i>stopOnError</i> parameter defaults to
-0.</p>
-<!-- INDENTATION -->
-<p>Samples must be either 1, 2, 4, 8, or 16 bits.
-Colorimetric samples/pixel must be either 1, 3, or 4 (i.e.
-<i>SamplesPerPixel</i> minus <i>ExtraSamples</i>).</p>
-<!-- INDENTATION -->
-<p>Palettte image colormaps that appear to be incorrectly
-written as 8-bit values are automatically scaled to
-16-bits.</p>
-<!-- INDENTATION -->
-<p><i>TIFFReadRGBAImage</i> is just a wrapper around the
-more general <i>TIFFRGBAImage</i>(3TIFF) facilities.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>1 is returned if the image was successfully read and
-converted. Otherwise, 0 is returned if an error was
-encountered and <i>stopOnError</i> is zero.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>Sorry, can not handle %d-bit pictures</b>. The image
-had <i>BitsPerSample</i> other than 1, 2, 4, 8, or 16.</p>
-<!-- INDENTATION -->
-<p><b>Sorry, can not handle %d-channel images</b>. The image
-had <i>SamplesPerPixel</i> other than 1, 3, or 4.</p>
-<!-- INDENTATION -->
-<p><b>Missing needed &quot;PhotometricInterpretation&quot;
-tag</b>. The image did not have a tag that describes how to
-display the data.</p>
-<!-- INDENTATION -->
-<p><b>No &quot;PhotometricInterpretation&quot; tag, assuming
-RGB</b>. The image was missing a tag that describes how to
-display it, but because it has 3 or 4 samples/pixel, it is
-assumed to be <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>No &quot;PhotometricInterpretation&quot; tag, assuming
-min-is-black</b>. The image was missing a tag that describes
-how to display it, but because it has 1 sample/pixel, it is
-assumed to be a grayscale or bilevel image.</p>
-<!-- INDENTATION -->
-<p><b>No space for photometric conversion table</b>. There
-was insufficient memory for a table used to convert image
-samples to 8-bit <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>Missing required &quot;Colormap&quot; tag</b>. A
-Palette image did not have a required <i>Colormap</i>
-tag.</p>
-<!-- INDENTATION -->
-<p><b>No space for tile buffer</b>. There was insufficient
-memory to allocate an i/o buffer.</p>
-<!-- INDENTATION -->
-<p><b>No space for strip buffer</b>. There was insufficient
-memory to allocate an i/o buffer.</p>
-<!-- INDENTATION -->
-<p><b>Can not handle format</b>. The image has a format
-(combination of <i>BitsPerSample</i>,
-<i>SamplesPerPixel</i>, and
-<i>PhotometricInterpretation</i>) that
-<i>TIFFReadRGBAImage</i> can not handle.</p>
-<!-- INDENTATION -->
-<p><b>No space for B&amp;W mapping table</b>. There was
-insufficient memory to allocate a table used to map
-grayscale data to <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>No space for Palette mapping table</b>. There was
-insufficient memory to allocate a table used to map data to
-8-bit <small>RGB.</small></p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF), <b>TIFFRGBAImage</b>(3TIFF),
-<b>TIFFReadRGBAStrip</b>(3TIFF),
-<b>TIFFReadRGBATile</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFReadRGBAStrip.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFReadRGBAStrip.3tiff.html
deleted file mode 100644
index df09f649fa..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFReadRGBAStrip.3tiff.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFReadRGBAStrip</title>
-</head>
-<body>
-
-<h1 align=center>TIFFReadRGBAStrip</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFReadRGBAStrip &minus; read and decode an image strip
-into a fixed-format raster</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>#define TIFFGetR(abgr) ((abgr) &amp; 0xff)<br>
-#define TIFFGetG(abgr) (((abgr) &gt;&gt; 8) &amp; 0xff)<br>
-#define TIFFGetB(abgr) (((abgr) &gt;&gt; 16) &amp; 0xff)<br>
-#define TIFFGetA(abgr) (((abgr) &gt;&gt; 24) &amp;
-0xff)</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFReadRGBAStrip(TIFF *</b><i>tif</i><b>,
-uint32</b> <i>row</i><b>, uint32
-*</b><i>raster</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFReadRGBAStrip</i> reads a single strip of a
-strip-based image into memory, storing the result in the
-user supplied RGBA <i>raster</i>. The raster is assumed to
-be an array of width times rowsperstrip 32-bit entries,
-where width is the width of the image (TIFFTAG_IMAGEWIDTH)
-and rowsperstrip is the maximum lines in a strip
-(TIFFTAG_ROWSPERSTRIP).</p>
-<!-- INDENTATION -->
-<p>The <i>row</i> value should be the row of the first row
-in the strip (strip * rowsperstrip, zero based).</p>
-<!-- INDENTATION -->
-<p>Note that the raster is assume to be organized such that
-the pixel at location (<i>x</i>,<i>y</i>) is
-<i>raster</i>[<i>y</i>*<i>width</i>+<i>x</i>]; with the
-raster origin in the <i>lower-left hand corner</i> of the
-strip. That is bottom to top organization. When reading a
-partial last strip in the file the last line of the image
-will begin at the beginning of the buffer.</p>
-<!-- INDENTATION -->
-<p>Raster pixels are 8-bit packed red, green, blue, alpha
-samples. The macros <i>TIFFGetR</i>, <i>TIFFGetG</i>,
-<i>TIFFGetB</i>, and <i>TIFFGetA</i> should be used to
-access individual samples. Images without Associated Alpha
-matting information have a constant Alpha of 1.0 (255).</p>
-<!-- INDENTATION -->
-<p>See the <i>TIFFRGBAImage</i>(3TIFF) page for more details
-on how various image types are converted to RGBA values.</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Samples must be either 1, 2, 4, 8, or 16 bits.
-Colorimetric samples/pixel must be either 1, 3, or 4 (i.e.
-<i>SamplesPerPixel</i> minus <i>ExtraSamples</i>).</p>
-<!-- INDENTATION -->
-<p>Palette image colormaps that appear to be incorrectly
-written as 8-bit values are automatically scaled to
-16-bits.</p>
-<!-- INDENTATION -->
-<p><i>TIFFReadRGBAStrip</i> is just a wrapper around the
-more general <i>TIFFRGBAImage</i>(3TIFF) facilities.
-It&rsquo;s main advantage over the similar
-<i>TIFFReadRGBAImage()</i> function is that for large images
-a single buffer capable of holding the whole image
-doesn&rsquo;t need to be allocated, only enough for one
-strip. The <i>TIFFReadRGBATile()</i> function does a similar
-operation for tiled images.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>1 is returned if the image was successfully read and
-converted. Otherwise, 0 is returned if an error was
-encountered.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>Sorry, can not handle %d-bit pictures</b>. The image
-had <i>BitsPerSample</i> other than 1, 2, 4, 8, or 16.</p>
-<!-- INDENTATION -->
-<p><b>Sorry, can not handle %d-channel images</b>. The image
-had <i>SamplesPerPixel</i> other than 1, 3, or 4.</p>
-<!-- INDENTATION -->
-<p><b>Missing needed &quot;PhotometricInterpretation&quot;
-tag</b>. The image did not have a tag that describes how to
-display the data.</p>
-<!-- INDENTATION -->
-<p><b>No &quot;PhotometricInterpretation&quot; tag, assuming
-RGB</b>. The image was missing a tag that describes how to
-display it, but because it has 3 or 4 samples/pixel, it is
-assumed to be <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>No &quot;PhotometricInterpretation&quot; tag, assuming
-min-is-black</b>. The image was missing a tag that describes
-how to display it, but because it has 1 sample/pixel, it is
-assumed to be a grayscale or bilevel image.</p>
-<!-- INDENTATION -->
-<p><b>No space for photometric conversion table</b>. There
-was insufficient memory for a table used to convert image
-samples to 8-bit <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>Missing required &quot;Colormap&quot; tag</b>. A
-Palette image did not have a required <i>Colormap</i>
-tag.</p>
-<!-- INDENTATION -->
-<p><b>No space for tile buffer</b>. There was insufficient
-memory to allocate an i/o buffer.</p>
-<!-- INDENTATION -->
-<p><b>No space for strip buffer</b>. There was insufficient
-memory to allocate an i/o buffer.</p>
-<!-- INDENTATION -->
-<p><b>Can not handle format</b>. The image has a format
-(combination of <i>BitsPerSample</i>,
-<i>SamplesPerPixel</i>, and
-<i>PhotometricInterpretation</i>) that
-<i>TIFFReadRGBAImage</i> can not handle.</p>
-<!-- INDENTATION -->
-<p><b>No space for B&amp;W mapping table</b>. There was
-insufficient memory to allocate a table used to map
-grayscale data to <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>No space for Palette mapping table</b>. There was
-insufficient memory to allocate a table used to map data to
-8-bit <small>RGB.</small></p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF), <b>TIFFRGBAImage</b>(3TIFF),
-<b>TIFFReadRGBAImage</b>(3TIFF),
-<b>TIFFReadRGBATile</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFReadRGBATile.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFReadRGBATile.3tiff.html
deleted file mode 100644
index ed67b83278..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFReadRGBATile.3tiff.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFReadRGBATile</title>
-</head>
-<body>
-
-<h1 align=center>TIFFReadRGBATile</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFReadRGBATile &minus; read and decode an image tile
-into a fixed-format raster</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="-2%">
-
-<p><b>#define TIFFGetR(abgr)</b></p>
-</td>
-<td width="25%"></td>
-<td width="6%"></td>
-<td width="61%">
-
-<p><b>((abgr) &amp; 0xff)</b></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="-2%">
-
-<p><b>#define TIFFGetG(abgr)</b></p>
-</td>
-<td width="25%"></td>
-<td width="6%"></td>
-<td width="61%">
-
-<p><b>(((abgr) &gt;&gt; 8) &amp; 0xff)</b></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="-2%">
-
-<p><b>#define TIFFGetB(abgr)</b></p>
-</td>
-<td width="25%"></td>
-<td width="6%"></td>
-<td width="61%">
-
-<p><b>(((abgr) &gt;&gt; 16) &amp; 0xff)</b></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="-2%">
-
-<p><b>#define TIFFGetA(abgr)</b></p>
-</td>
-<td width="25%"></td>
-<td width="6%"></td>
-<td width="61%">
-
-<p><b>(((abgr) &gt;&gt; 24) &amp; 0xff)</b></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>int TIFFReadRGBATile(TIFF *</b><i>tif</i><b>,
-uint32</b> <i>x</i><b>, uint32</b> <i>y</i><b>, uint32
-*</b><i>raster</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFReadRGBATile</i> reads a single tile of a
-tile-based image into memory, storing the result in the user
-supplied RGBA <i>raster</i>. The raster is assumed to be an
-array of width times length 32-bit entries, where width is
-the width of a tile (TIFFTAG_TILEWIDTH) and length is the
-height of a tile (TIFFTAG_TILELENGTH).</p>
-<!-- INDENTATION -->
-<p>The <i>x</i> and <i>y</i> values are the offsets from the
-top left corner to the top left corner of the tile to be
-read. They must be an exact multiple of the tile width and
-length.</p>
-<!-- INDENTATION -->
-<p>Note that the raster is assume to be organized such that
-the pixel at location (<i>x</i>,<i>y</i>) is
-<i>raster</i>[<i>y</i>*<i>width</i>+<i>x</i>]; with the
-raster origin in the <i>lower-left hand corner</i> of the
-tile. That is bottom to top organization. Edge tiles which
-partly fall off the image will be filled out with
-appropriate zeroed areas.</p>
-<!-- INDENTATION -->
-<p>Raster pixels are 8-bit packed red, green, blue, alpha
-samples. The macros <i>TIFFGetR</i>, <i>TIFFGetG</i>,
-<i>TIFFGetB</i>, and <i>TIFFGetA</i> should be used to
-access individual samples. Images without Associated Alpha
-matting information have a constant Alpha of 1.0 (255).</p>
-<!-- INDENTATION -->
-<p>See the <i>TIFFRGBAImage</i>(3TIFF) page for more details
-on how various image types are converted to RGBA values.</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Samples must be either 1, 2, 4, 8, or 16 bits.
-Colorimetric samples/pixel must be either 1, 3, or 4 (i.e.
-<i>SamplesPerPixel</i> minus <i>ExtraSamples</i>).</p>
-<!-- INDENTATION -->
-<p>Palette image colormaps that appear to be incorrectly
-written as 8-bit values are automatically scaled to
-16-bits.</p>
-<!-- INDENTATION -->
-<p><i>TIFFReadRGBATile</i> is just a wrapper around the more
-general <i>TIFFRGBAImage</i>(3TIFF) facilities. It&rsquo;s
-main advantage over the similar <i>TIFFReadRGBAImage()</i>
-function is that for large images a single buffer capable of
-holding the whole image doesn&rsquo;t need to be allocated,
-only enough for one tile. The <i>TIFFReadRGBAStrip()</i>
-function does a similar operation for stripped images.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>1 is returned if the image was successfully read and
-converted. Otherwise, 0 is returned if an error was
-encountered.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>Sorry, can not handle %d-bit pictures</b>. The image
-had <i>BitsPerSample</i> other than 1, 2, 4, 8, or 16.</p>
-<!-- INDENTATION -->
-<p><b>Sorry, can not handle %d-channel images</b>. The image
-had <i>SamplesPerPixel</i> other than 1, 3, or 4.</p>
-<!-- INDENTATION -->
-<p><b>Missing needed &quot;PhotometricInterpretation&quot;
-tag</b>. The image did not have a tag that describes how to
-display the data.</p>
-<!-- INDENTATION -->
-<p><b>No &quot;PhotometricInterpretation&quot; tag, assuming
-RGB</b>. The image was missing a tag that describes how to
-display it, but because it has 3 or 4 samples/pixel, it is
-assumed to be <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>No &quot;PhotometricInterpretation&quot; tag, assuming
-min-is-black</b>. The image was missing a tag that describes
-how to display it, but because it has 1 sample/pixel, it is
-assumed to be a grayscale or bilevel image.</p>
-<!-- INDENTATION -->
-<p><b>No space for photometric conversion table</b>. There
-was insufficient memory for a table used to convert image
-samples to 8-bit <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>Missing required &quot;Colormap&quot; tag</b>. A
-Palette image did not have a required <i>Colormap</i>
-tag.</p>
-<!-- INDENTATION -->
-<p><b>No space for tile buffer</b>. There was insufficient
-memory to allocate an i/o buffer.</p>
-<!-- INDENTATION -->
-<p><b>No space for strip buffer</b>. There was insufficient
-memory to allocate an i/o buffer.</p>
-<!-- INDENTATION -->
-<p><b>Can not handle format</b>. The image has a format
-(combination of <i>BitsPerSample</i>,
-<i>SamplesPerPixel</i>, and
-<i>PhotometricInterpretation</i>) that
-<i>TIFFReadRGBAImage</i> can not handle.</p>
-<!-- INDENTATION -->
-<p><b>No space for B&amp;W mapping table</b>. There was
-insufficient memory to allocate a table used to map
-grayscale data to <small>RGB.</small></p>
-<!-- INDENTATION -->
-<p><b>No space for Palette mapping table</b>. There was
-insufficient memory to allocate a table used to map data to
-8-bit <small>RGB.</small></p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF), <b>TIFFRGBAImage</b>(3TIFF),
-<b>TIFFReadRGBAImage</b>(3TIFF),
-<b>TIFFReadRGBAStrip</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFReadRawStrip.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFReadRawStrip.3tiff.html
deleted file mode 100644
index bd14f723bc..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFReadRawStrip.3tiff.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFReadRawStrip</title>
-</head>
-<body>
-
-<h1 align=center>TIFFReadRawStrip</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFReadRawStrip &minus; return the undecoded contents of
-a strip of data from an open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>tsize_t TIFFReadRawStrip(TIFF *</b><i>tif</i><b>,
-tstrip_t</b> <i>strip</i><b>, tdata_t</b> <i>buf</i><b>,
-tsize_t</b> <i>size</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Read the contents of the specified strip into the (user
-supplied) data buffer. Note that the value of <i>strip</i>
-is a &lsquo;&lsquo;raw strip number.&rsquo;&rsquo; That is,
-the caller must take into account whether or not the data is
-organized in separate planes (<i>PlanarConfiguration</i>=2).
-To read a full strip of data the data buffer should
-typically be at least as large as the number returned by
-<i>TIFFStripSize</i>.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The actual number of bytes of data that were placed in
-<i>buf</i> is returned; <i>TIFFReadEncodedStrip</i> returns
-&minus;1 if an error was encountered.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF),
-<b>TIFFReadEncodedStrip</b>(3TIFF),
-<b>TIFFReadScanline</b>(3TIFF), <b>TIFFStripSize</b>(3TIFF),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFReadRawTile.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFReadRawTile.3tiff.html
deleted file mode 100644
index bae2b46cd6..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFReadRawTile.3tiff.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFReadRawTile</title>
-</head>
-<body>
-
-<h1 align=center>TIFFReadRawTile</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFReadRawTile &minus; return an undecoded tile of data
-from an open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>tsize_t TIFFReadRawTile(TIFF *</b><i>tif</i><b>,
-ttile_t</b> <i>tile</i><b>, tdata_t</b> <i>buf</i><b>,
-tsize_t</b> <i>size</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Read the contents of the specified tile into the (user
-supplied) data buffer. Note that the value of <i>tile</i> is
-a &lsquo;&lsquo;raw tile number.&rsquo;&rsquo; That is, the
-caller must take into account whether or not the data is
-organized in separate planes (<i>PlanarConfiguration</i>=2).
-<i>TIFFComputeTile</i> automatically does this when
-converting an (x,y,z,sample) coordinate quadruple to a tile
-number. To read a full tile of data the data buffer should
-typically be at least as large as the value returned by
-<i>TIFFTileSize</i>.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The actual number of bytes of data that were placed in
-<i>buf</i> is returned; <i>TIFFReadEncodedTile</i> returns
-&minus;1 if an error was encountered.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF),
-<b>TIFFReadEncodedTile</b>(3TIFF),
-<b>TIFFReadTile</b>(3TIFF), <b>TIFFTileSize</b>(3TIFF),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFReadScanline.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFReadScanline.3tiff.html
deleted file mode 100644
index 423645cc96..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFReadScanline.3tiff.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFReadScanline</title>
-</head>
-<body>
-
-<h1 align=center>TIFFReadScanline</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFReadScanline &minus; read and decode a scanline of
-data from an open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFReadScanline(TIFF *</b><i>tif</i><b>,
-tdata_t</b> <i>buf</i><b>, uint32</b> <i>row</i><b>,
-tsample_t</b> <i>sample</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Read the data for the specified row into the (user
-supplied) data buffer <i>buf</i>. The data are returned
-decompressed and, in the native byte- and bit-ordering, but
-are otherwise packed (see further below). The buffer must be
-large enough to hold an entire scanline of data.
-Applications should call the routine <i>TIFFScanlineSize</i>
-to find out the size (in bytes) of a scanline buffer. The
-<i>row</i> parameter is always used by
-<i>TIFFReadScanline</i>; the <i>sample</i> parameter is used
-only if data are organized in separate planes
-(<i>PlanarConfiguration</i>=2).</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The library attempts to hide bit- and byte-ordering
-differences between the image and the native machine by
-converting data to the native machine order. Bit reversal is
-done if the <i>FillOrder</i> tag is opposite to the native
-machine bit order. 16- and 32-bit samples are automatically
-byte-swapped if the file was written with a byte order
-opposite to the native machine byte order,</p>
-<!-- INDENTATION -->
-<p>In C++ the <i>sample</i> parameter defaults to 0.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFReadScanline</i> returns &minus;1 if it detects an
-error; otherwise 1 is returned.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>Compression algorithm does not support random
-access</b>. Data was requested in a non-sequential order
-from a file that uses a compression algorithm and that has
-<i>RowsPerStrip</i> greater than one. That is, data in the
-image is stored in a compressed form, and with multiple rows
-packed into a strip. In this case, the library does not
-support random access to the data. The data should either be
-accessed sequentially, or the file should be converted so
-that each strip is made up of one row of data.</p>
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Reading subsampled YCbCR data does not work correctly
-because, for <i>PlanarConfiguration</i>=2 the size of a
-scanline is not calculated on a per-sample basis, and for
-<i>PlanarConfiguration</i>=1 the library does not unpack the
-block-interleaved samples; use the strip- and tile-based
-interfaces to read these formats.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF),
-<b>TIFFReadEncodedStrip</b>(3TIFF),
-<b>TIFFReadRawStrip</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFReadTile.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFReadTile.3tiff.html
deleted file mode 100644
index ff726b49d2..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFReadTile.3tiff.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:16 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFReadTile</title>
-</head>
-<body>
-
-<h1 align=center>TIFFReadTile</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFReadTile &minus; read and decode a tile of data from
-an open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>tsize_t TIFFReadTile(TIFF *</b><i>tif</i><b>,
-tdata_t</b> <i>buf</i><b>, uint32</b> <i>x</i><b>,
-uint32</b> <i>y</i><b>, uint32</b> <i>z</i><b>,
-tsample_t</b> <i>sample</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Return the data for the tile <i>containing</i> the
-specified coordinates. The data placed in <i>buf</i> are
-returned decompressed and, typically, in the native byte-
-and bit-ordering, but are otherwise packed (see further
-below). The buffer must be large enough to hold an entire
-tile of data. Applications should call the routine
-<i>TIFFTileSize</i> to find out the size (in bytes) of a
-tile buffer. The <i>x</i> and <i>y</i> parameters are always
-used by <i>TIFFReadTile</i>. The <i>z</i> parameter is used
-if the image is deeper than 1 slice
-(<i>ImageDepth</i>&gt;1). The <i>sample</i> parameter is
-used only if data are organized in separate planes
-(<i>PlanarConfiguration</i>=2).</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The library attempts to hide bit- and byte-ordering
-differences between the image and the native machine by
-converting data to the native machine order. Bit reversal is
-done if the <i>FillOrder</i> tag is opposite to the native
-machine bit order. 16- and 32-bit samples are automatically
-byte-swapped if the file was written with a byte order
-opposite to the native machine byte order,</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFReadTile</i> returns &minus;1 if it detects an
-error; otherwise the number of bytes in the decoded tile is
-returned.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFCheckTile</b>(3TIFF),
-<b>TIFFComputeTile</b>(3TIFF), <b>TIFFOpen</b>(3TIFF),
-<b>TIFFReadEncodedTile</b>(3TIFF),
-<b>TIFFReadRawTile</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFSetDirectory.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFSetDirectory.3tiff.html
deleted file mode 100644
index a0e5cfc0a1..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFSetDirectory.3tiff.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFSetDirectory</title>
-</head>
-<body>
-
-<h1 align=center>TIFFSetDirectory</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFSetDirectory, TIFFSetSubDirectory &minus; set the
-current directory for an open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFSetDirectory(TIFF *</b><i>tif</i><b>,
-tdir_t</b> <i>dirnum</i><b>)<br>
-int TIFFSetSubDirectory(TIFF *</b><i>tif</i><b>, uint32</b>
-<i>diroff</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFSetDirectory</i> changes the current directory and
-reads its contents with <i>TIFFReadDirectory</i>. The
-parameter <i>dirnum</i> specifies the subfile/directory as
-an integer number, with the first directory numbered
-zero.</p>
-<!-- INDENTATION -->
-<p><i>TIFFSetSubDirectory</i> acts like
-<i>TIFFSetDirectory</i>, except the directory is specified
-as a file offset instead of an index; this is required for
-accessing subdirectories linked through a <i>SubIFD</i>
-tag.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>On successful return 1 is returned. Otherwise, 0 is
-returned if <i>dirnum</i> or <i>diroff</i> specifies a
-non-existent directory, or if an error was encountered while
-reading the directory&rsquo;s contents.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>%s: Error fetching directory count</b>. An error was
-encountered while reading the &lsquo;&lsquo;directory
-count&rsquo;&rsquo; field.</p>
-<!-- INDENTATION -->
-<p><b>%s: Error fetching directory link</b>. An error was
-encountered while reading the &lsquo;&lsquo;link
-value&rsquo;&rsquo; that points to the next directory in a
-file.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFCurrentDirectory</i>(3TIFF),
-<i>TIFFOpen</i>(3TIFF), <i>TIFFReadDirectory</i>(3TIFF),
-<i>TIFFWriteDirectory</i>(3TIFF), <i>libtiff</i>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFSetField.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFSetField.3tiff.html
deleted file mode 100644
index 2e70225b33..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFSetField.3tiff.html
+++ /dev/null
@@ -1,1362 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFSetField</title>
-</head>
-<body>
-
-<h1 align=center>TIFFSetField</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFSetField, TIFFVSetField &minus; set the value(s) of a
-tag in a <small>TIFF</small> file open for writing</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFSetField(TIFF *</b><i>tif</i><b>, ttag_t</b>
-<i>tag</i><b>,</b> <i>...</i><b>)</b></p>
-<!-- INDENTATION -->
-<p><b>#include &lt;stdarg.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFVSetField(TIFF *</b><i>tif</i><b>, ttag_t</b>
-<i>tag</i><b>, va_list</b> <i>ap</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFSetField</i> sets the value of a field or
-pseudo-tag in the current directory associated with the open
-<small>TIFF</small> file <i>tif</i>. (A <i>pseudo-tag</i> is
-a parameter that is used to control the operation of the
-<small>TIFF</small> library but whose value is not read or
-written to the underlying file.) To set the value of a field
-the file must have been previously opened for writing with
-<i>TIFFOpen</i>(3TIFF); pseudo-tags can be set whether the
-file was opened for reading or writing. The field is
-identified by <i>tag</i>, one of the values defined in the
-include file <b>tiff.h</b> (see also the table below). The
-actual value is specified using a variable argument list, as
-prescribed by the <i>stdarg</i>(3) interface (or, on some
-machines, the <i>varargs</i>(3) interface.)</p>
-<!-- INDENTATION -->
-<p><i>TIFFVSetField</i> is functionally equivalent to
-<i>TIFFSetField</i> except that it takes a pointer to a
-variable argument list. <i>TIFFVSetField</i> is useful for
-writing routines that are layered on top of the
-functionality provided by <i>TIFFSetField</i>.</p>
-<!-- INDENTATION -->
-<p>The tags understood by <i>libtiff</i>, the number of
-parameter values, and the expected types for the parameter
-values are shown below. The data types are: <i>char*</i> is
-null-terminated string and corresponds to the
-<small>ASCII</small> data type; <i>uint16</i> is an unsigned
-16-bit value; <i>uint32</i> is an unsigned 32-bit value;
-<i>uint16*</i> is an array of unsigned 16-bit values.
-<i>void*</i> is an array of data values of unspecified
-type.</p>
-<!-- INDENTATION -->
-<p>Consult the <small>TIFF</small> specification for
-information on the meaning of each tag.</p></td>
-</table>
-<!-- TABS -->
-
-<p><i>Tag Name Count Types Notes</i></p>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_ARTIST</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_BADFAXLINES</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_BITSPERSAMPLE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_CLEANFAXDATA</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_COLORMAP</p>
-</td>
-<td width="8%">
-
-<p>3</p>
-</td>
-<td width="24%">
-
-<p>uint16*</p>
-</td>
-<td width="16%">
-
-<p>1&lt;&lt;BitsPerSample arrays</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_COMPRESSION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_CONSECUTIVEBADFAXLINES</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_COPYRIGHT</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_DATETIME</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_DOCUMENTNAME</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_DOTRANGE</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_EXTRASAMPLES</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint16,uint16*</p>
-</td>
-<td width="16%">
-
-<p>&dagger; count &amp; types array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_FAXFILLFUNC</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>TIFFFaxFillFunc</p>
-</td>
-<td width="16%">
-
-<p>G3/G4 compression pseudo-tag</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_FAXMODE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>int</p>
-</td>
-<td width="16%">
-
-<p>&dagger; G3/G4 compression pseudo-tag</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_FILLORDER</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_GROUP3OPTIONS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_GROUP4OPTIONS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_HALFTONEHINTS</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_HOSTCOMPUTER</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_ICCPROFILE</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint32,void*</p>
-</td>
-<td width="16%">
-
-<p>count, profile data</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_IMAGEDEPTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_IMAGEDESCRIPTION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_IMAGELENGTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_IMAGEWIDTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_INKNAMES</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint16, char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_INKSET</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_JPEGCOLORMODE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>int</p>
-</td>
-<td width="16%">
-
-<p>&dagger; JPEG pseudo-tag</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_JPEGQUALITY</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>int</p>
-</td>
-<td width="16%">
-
-<p>JPEG pseudo-tag</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_JPEGTABLES</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint32*,void*</p>
-</td>
-<td width="16%">
-
-<p>&dagger; count &amp; tables</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_JPEGTABLESMODE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>int</p>
-</td>
-<td width="16%">
-
-<p>&dagger; JPEG pseudo-tag</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_MAKE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_MATTEING</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_MAXSAMPLEVALUE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_MINSAMPLEVALUE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_MODEL</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_ORIENTATION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PAGENAME</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PAGENUMBER</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PHOTOMETRIC</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PHOTOSHOP</p>
-</td>
-<td width="8%">
-
-<p>?</p>
-</td>
-<td width="24%">
-
-<p>uint32,void*</p>
-</td>
-<td width="16%">
-
-<p>count, data</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PLANARCONFIG</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PREDICTOR</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_PRIMARYCHROMATICITIES</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>float*</p>
-</td>
-<td width="16%">
-
-<p>6-entry array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_REFERENCEBLACKWHITE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>float*</p>
-</td>
-<td width="16%">
-
-<p>&dagger; 2*SamplesPerPixel array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_RESOLUTIONUNIT</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_RICHTIFFIPTC</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint32,void*</p>
-</td>
-<td width="16%">
-
-<p>count, data</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_ROWSPERSTRIP</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-
-<p>&dagger; must be &gt; 0</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SAMPLEFORMAT</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SAMPLESPERPIXEL</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger; value must be &lt;= 4</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SMAXSAMPLEVALUE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>double</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SMINSAMPLEVALUE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>double</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SOFTWARE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_STONITS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>double</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SUBFILETYPE</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_SUBIFD</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint16,uint32*</p>
-</td>
-<td width="16%">
-
-<p>count &amp; offsets array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TARGETPRINTER</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>char*</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_THRESHHOLDING</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TILEDEPTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TILELENGTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-
-<p>&dagger; must be a multiple of 8</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TILEWIDTH</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint32</p>
-</td>
-<td width="16%">
-
-<p>&dagger; must be a multiple of 8</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_TRANSFERFUNCTION</p>
-</td>
-<td width="8%">
-
-<p>1 or 3&Dagger; uint16*</p>
-</td>
-<td width="24%"></td>
-<td width="16%">
-
-<p>1&lt;&lt;BitsPerSample entry arrays</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_WHITEPOINT</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>float*</p>
-</td>
-<td width="16%">
-
-<p>2-entry array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_XMLPACKET</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint32,void*</p>
-</td>
-<td width="16%">
-
-<p>count, data</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_XPOSITION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>float</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_XRESOLUTION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>float</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_YCBCRCOEFFICIENTS</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>float*</p>
-</td>
-<td width="16%">
-
-<p>&dagger; 3-entry array</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_YCBCRPOSITIONING</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_YCBCRSAMPLING</p>
-</td>
-<td width="8%">
-
-<p>2</p>
-</td>
-<td width="24%">
-
-<p>uint16</p>
-</td>
-<td width="16%">
-
-<p>&dagger;</p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_YPOSITION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>float</p>
-</td>
-<td width="16%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="41%">
-
-<p>TIFFTAG_YRESOLUTION</p>
-</td>
-<td width="8%">
-
-<p>1</p>
-</td>
-<td width="24%">
-
-<p>float</p>
-</td>
-<td width="16%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>&dagger; Tag may not have its values changed once data is
-written.<br>
-&Dagger; If <i>SamplesPerPixel</i> is one, then a single
-array is passed; otherwise three arrays should be
-passed.<br>
-* The contents of this field are quite complex. See <b>The
-ICC Profile Format Specification</b>, Annex B.3
-&quot;Embedding ICC Profiles in TIFF Files&quot; (available
-at http://www.color.org) for an explanation.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>1 is returned if the operation was successful. Otherwise,
-0 is returned if an error was detected.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>%s: Cannot modify tag &quot;%s&quot; while
-writing</b>. Data has already been written to the file, so
-the specified tag&rsquo;s value can not be changed. This
-restriction is applied to all tags that affect the format of
-written data.</p>
-<!-- INDENTATION -->
-<p><b>%d: Bad value for &quot;%s&quot;</b>. An invalid value
-was supplied for the named tag.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF), <b>TIFFGetField</b>(3TIFF),
-<b>TIFFSetDirectory</b>(3TIFF),
-<b>TIFFWriteDirectory</b>(3TIFF),
-<b>TIFFReadDirectory</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFWarning.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFWarning.3tiff.html
deleted file mode 100644
index df17073b57..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFWarning.3tiff.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFWarning</title>
-</head>
-<body>
-
-<h1 align=center>TIFFWarning</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFWarning, TIFFSetWarningHandler &minus; library
-warning interface</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>void TIFFWarning(const char *</b><i>module</i><b>,
-const char *</b><i>fmt</i><b>,</b> <i>...</i><b>)</b></p>
-<!-- INDENTATION -->
-<p><b>#include &lt;stdargh.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>typedef void (*TIFFWarningHandler)(const char
-*</b><i>module</i><b>, const char *</b><i>fmt</i><b>,
-va_list</b> <i>ap</i><b>);</b></p>
-<!-- INDENTATION -->
-<p><b>TIFFWarningHandler
-TIFFSetWarningHandler(TIFFWarningHandler</b>
-<i>handler</i><b>);</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFWarning</i> invokes the library-wide warning
-handler function to (normally) write a warning message to
-the <b>stderr</b>. The <i>fmt</i> parameter is a
-<i>printf</i>(3S) format string, and any number arguments
-can be supplied. The <i>module</i> parameter is interpreted
-as a string that, if non-zero, should be printed before the
-message; it typically is used to identify the software
-module in which a warning is detected.</p>
-<!-- INDENTATION -->
-<p>Applications that desire to capture control in the event
-of a warning should use <i>TIFFSetWarningHandler</i> to
-override the default warning handler. A <small>NULL</small>
-(0) warning handler function may be installed to suppress
-error messages.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFSetWarningHandler</i> returns a reference to the
-previous error handling function.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFError</b>(3TIFF), <b>libtiff</b>(3TIFF),
-<b>printf</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFWriteDirectory.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFWriteDirectory.3tiff.html
deleted file mode 100644
index 07a443e145..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFWriteDirectory.3tiff.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFWriteDirectory</title>
-</head>
-<body>
-
-<h1 align=center>TIFFWriteDirectory</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFWriteDirectory, TIFFRewriteDirectory,
-TIFFCheckpointDirectory &minus; write the current directory
-in an open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFWriteDirectory(TIFF *</b><i>tif</i><b>)<br>
-int TIFFRewriteDirectory(TIFF *</b><i>tif</i><b>)<br>
-int TIFFCheckpointDirectory(TIFF *</b><i>tif</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFWriteDirectory</i> will write the contents of the
-current directory to the file and setup to create a new
-subfile in the same file. Applications only need to call
-<i>TIFFWriteDirectory</i> when writing multiple subfiles to
-a single <small>TIFF</small> file. <i>TIFFWriteDirectory</i>
-is automatically called by <i>TIFFClose</i> and
-<i>TIFFFlush</i> to write a modified directory if the file
-is open for writing.</p>
-<!-- INDENTATION -->
-<p>The <i>TIFFRewriteDirectory</i> function operates
-similarly to <i>TIFFWriteDirectory,</i> but can be called
-with directories previously read or written that already
-have an established location in the file. It will rewrite
-the directory, but instead of place it at it&rsquo;s old
-location (as <i>TIFFWriteDirectory</i> would) it will place
-them at the end of the file, correcting the pointer from the
-preceeding directory or file header to point to it&rsquo;s
-new location. This is particularly important in cases where
-the size of the directory and pointed to data has grown, so
-it won&rsquo;t fit in the space available at the old
-location.</p>
-<!-- INDENTATION -->
-<p>The <i>TIFFCheckpointDirectory</i> writes the current
-state of the tiff directory into the file to make what is
-currently in the file readable. Unlike
-<i>TIFFWriteDirectory, TIFFCheckpointDirectory</i> does not
-free up the directory data structures in memory, so they can
-be updated (as strips/tiles are written) and written again.
-Reading such a partial file you will at worst get a tiff
-read error for the first strip/tile encountered that is
-incomplete, but you will at least get all the valid data in
-the file before that. When the file is complete, just use
-<i>TIFFWriteDirectory</i> as usual to finish it off
-cleanly.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>1 is returned when the contents are successfully written
-to the file. Otherwise, 0 is returned if an error was
-encountered when writing the directory contents.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>Error post-encoding before directory write</b>. Before
-writing the contents of the current directory, any pending
-data are flushed. This message indicates that an error
-occurred while doing this.</p>
-<!-- INDENTATION -->
-<p><b>Error flushing data before directory write</b>. Before
-writing the contents of the current directory, any pending
-data are flushed. This message indicates that an error
-occurred while doing this.</p>
-<!-- INDENTATION -->
-<p><b>Cannot write directory, out of space</b>. There was
-not enough space to allocate a temporary area for the
-directory that was to be written.</p>
-<!-- INDENTATION -->
-<p><b>Error writing directory count</b>. A write error
-occurred when writing the count of fields in the
-directory.</p>
-<!-- INDENTATION -->
-<p><b>Error writing directory contents</b>. A write error
-occurred when writing the directory fields.</p>
-<!-- INDENTATION -->
-<p><b>Error writing directory link</b>. A write error
-occurred when writing the link to the next directory.</p>
-<!-- INDENTATION -->
-<p><b>Error writing data for field &quot;%s&quot;</b>. A
-write error occurred when writing indirect data for the
-specified field.</p>
-<!-- INDENTATION -->
-<p><b>Error writing TIFF header</b>. A write error occurred
-when re-writing header at the front of the file.</p>
-<!-- INDENTATION -->
-<p><b>Error fetching directory count</b>. A read error
-occurred when fetching the directory count field for a
-previous directory. This can occur when setting up a link to
-the directory that is being written.</p>
-<!-- INDENTATION -->
-<p><b>Error fetching directory link</b>. A read error
-occurred when fetching the directory link field for a
-previous directory. This can occur when setting up a link to
-the directory that is being written.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF), <b>TIFFError</b>(3TIFF),
-<b>TIFFReadDirectory</b>(3TIFF),
-<b>TIFFSetDirectory</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFWriteEncodedStrip.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFWriteEncodedStrip.3tiff.html
deleted file mode 100644
index 5a45f593a2..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFWriteEncodedStrip.3tiff.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFWriteEncodedStrip</title>
-</head>
-<body>
-
-<h1 align=center>TIFFWriteEncodedStrip</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>TIFFWritedEncodedStrip &minus; compress and write a
-strip of data to an open</big> TIFF <big>file</big></p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>#include &lt;tiffio.h&gt;</b></big></p>
-<!-- INDENTATION -->
-<p><big><b>tsize_t TIFFWriteEncodedStrip(TIFF
-*</b><i>tif</i><b>, tstrip_t</b> <i>strip</i><b>,
-tdata_t</b> <i>buf</i><b>, tsize_t</b>
-<i>size</i><b>)</b></big></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>Compress <i>size</i> bytes of raw data from
-<i>buf</i> and write the result to the specified strip;
-replacing any previously written data. Note that the value
-of <i>strip</i> is a &lsquo;&lsquo;raw strip
-number.&rsquo;&rsquo; That is, the caller must take into
-account whether or not the data are organized in separate
-planes (<i>PlanarConfiguration</i>=2).</big></p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>The library writes encoded data using the native
-machine byte order. Correctly implemented</big> TIFF
-<big>readers are expected to do any necessary byte-swapping
-to correctly process image data with BitsPerSample greater
-than 8.</big></p>
-<!-- INDENTATION -->
-<p><big>The strip number must be valid according to the
-current settings of the <i>ImageLength</i> and
-<i>RowsPerStrip</i> tags. An image may be dynamically grown
-by increasing the value of <i>ImageLength</i> prior to each
-call to <i>TIFFWriteEncodedStrip</i>.</big></p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>&minus;1 is returned if an error was encountered.
-Otherwise, the value of <i>size</i> is returned.</big></p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine.</big></p>
-<!-- INDENTATION -->
-<p><big><b>%s: File not open for writing</b>. The file was
-opened for reading, not writing.</big></p>
-<!-- INDENTATION -->
-<p><big><b>Can not write scanlines to a tiled image</b>. The
-image is assumed to be organized in tiles because the
-<i>TileWidth</i> and <i>TileLength</i> tags have been set
-with <i>TIFFSetField</i>(3TIFF).</big></p>
-<!-- INDENTATION -->
-<p><big><b>%s: Must set &quot;ImageWidth&quot; before
-writing data</b>. The image&rsquo;s width has not be set
-before the first write. See <i>TIFFSetField</i>(3TIFF) for
-information on how to do this.</big></p>
-<!-- INDENTATION -->
-<p><big><b>%s: Must set &quot;PlanarConfiguration&quot;
-before writing data</b>. The organization of data has not be
-defined before the first write. See
-<i>TIFFSetField</i>(3TIFF) for information on how to do
-this.</big></p>
-<!-- INDENTATION -->
-<p><big><b>%s: No space for strip arrays&quot;</b>. There
-was not enough space for the arrays that hold strip offsets
-and byte counts.</big></p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFOpen</b>(3TIFF),
-<b>TIFFWriteScanline</b>(3TIFF),
-<b>TIFFWriteRawStrip</b>(3TIFF),
-<b>libtiff</b>(3TIFF)</big></p>
-<!-- INDENTATION -->
-<p><big>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></big></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFWriteEncodedTile.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFWriteEncodedTile.3tiff.html
deleted file mode 100644
index 0e6e1bac88..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFWriteEncodedTile.3tiff.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFWriteEncodedTile</title>
-</head>
-<body>
-
-<h1 align=center>TIFFWriteEncodedTile</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>TIFFWritedEncodedTile &minus; compress and write a
-tile of data to an open</big> TIFF <big>file</big></p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>#include &lt;tiffio.h&gt;</b></big></p>
-<!-- INDENTATION -->
-<p><big><b>tsize_t TIFFWriteEncodedTile(TIFF
-*</b><i>tif</i><b>, ttile_t</b> <i>tile</i><b>, tdata_t</b>
-<i>buf</i><b>, tsize_t</b> <i>size</i><b>)</b></big></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>Compress <i>size</i> bytes of raw data from
-<i>buf</i> and <b>append</b> the result to the end of the
-specified tile. Note that the value of <i>tile</i> is a
-&lsquo;&lsquo;raw tile number.&rsquo;&rsquo; That is, the
-caller must take into account whether or not the data are
-organized in separate places (<i>PlanarConfiguration</i>=2).
-<i>TIFFComputeTile</i> automatically does this when
-converting an (x,y,z,sample) coordinate quadruple to a tile
-number.</big></p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>The library writes encoded data using the native
-machine byte order. Correctly implemented</big> TIFF
-<big>readers are expected to do any necessary byte-swapping
-to correctly process image data with BitsPerSample greater
-than 8.</big></p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>&minus;1 is returned if an error was encountered.
-Otherwise, the value of <i>size</i> is returned.</big></p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</big></p>
-<!-- INDENTATION -->
-<p><big><b>%s: File not open for writing</b>. The file was
-opened for reading, not writing.</big></p>
-<!-- INDENTATION -->
-<p><big><b>Can not write tiles to a stripped image</b>. The
-image is assumed to be organized in strips because neither
-of the <i>TileWidth</i> or <i>TileLength</i> tags have been
-set with <b>TIFFSetField</b>(3TIFF).</big></p>
-<!-- INDENTATION -->
-<p><big><b>%s: Must set &quot;ImageWidth&quot; before
-writing data</b>. The image&rsquo;s width has not be set
-before the first write. See <b>TIFFSetField</b>(3TIFF) for
-information on how to do this.</big></p>
-<!-- INDENTATION -->
-<p><big><b>%s: Must set &quot;PlanarConfiguration&quot;
-before writing data</b>. The organization of data has not be
-defined before the first write. See
-<b>TIFFSetField</b>(3TIFF) for information on how to do
-this.</big></p>
-<!-- INDENTATION -->
-<p><big><b>%s: No space for tile arrays&quot;</b>. There was
-not enough space for the arrays that hold tile offsets and
-byte counts.</big></p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFOpen</b>(3TIFF), <b>TIFFWriteTile</b>(3TIFF),
-<b>TIFFWriteRawTile</b>(3TIFF),
-<b>libtiff</b>(3TIFF)</big></p>
-<!-- INDENTATION -->
-<p><big>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></big></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFWriteRawStrip.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFWriteRawStrip.3tiff.html
deleted file mode 100644
index 95b48570ed..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFWriteRawStrip.3tiff.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFWriteRawstrip</title>
-</head>
-<body>
-
-<h1 align=center>TIFFWriteRawstrip</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFWriteRawStrip &minus; write a strip of raw data to an
-open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>tsize_t TIFFWriteRawStrip(TIFF *</b><i>tif</i><b>,
-tstrip_t</b> <i>strip</i><b>, tdata_t</b> <i>buf</i><b>,
-tsize_t</b> <i>size</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Append <i>size</i> bytes of raw data to the specified
-strip.</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The strip number must be valid according to the current
-settings of the <i>ImageLength</i> and <i>RowsPerStrip</i>
-tags. An image may be dynamically grown by increasing the
-value of <i>ImageLength</i> prior to each call to
-<i>TIFFWriteRawStrip</i>.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>&minus;1 is returned if an error occurred. Otherwise, the
-value of <i>size</i> is returned.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>%s: File not open for writing</b>. The file was opened
-for reading, not writing.</p>
-<!-- INDENTATION -->
-<p><b>Can not write scanlines to a tiled image</b>. The
-image is assumed to be organized in tiles because the
-<i>TileWidth</i> and <i>TileLength</i> tags have been set
-with <b>TIFFSetField</b>(3TIFF).</p>
-<!-- INDENTATION -->
-<p><b>%s: Must set &quot;ImageWidth&quot; before writing
-data</b>. The image&rsquo;s width has not be set before the
-first write. See <b>TIFFSetField</b>(3TIFF) for information
-on how to do this.</p>
-<!-- INDENTATION -->
-<p><b>%s: Must set &quot;PlanarConfiguration&quot; before
-writing data</b>. The organization of data has not be
-defined before the first write. See
-<b>TIFFSetField</b>(3TIFF) for information on how to do
-this.</p>
-<!-- INDENTATION -->
-<p><b>%s: No space for strip arrays&quot;</b>. There was not
-enough space for the arrays that hold strip offsets and byte
-counts.</p>
-<!-- INDENTATION -->
-<p><b>%s: Strip %d out of range, max %d</b>. The specified
-strip is not a valid strip according to the currently
-specified image dimensions.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF),
-<b>TIFFWriteEncodedStrip</b>(3TIFF),
-<b>TIFFWriteScanline</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFWriteRawTile.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFWriteRawTile.3tiff.html
deleted file mode 100644
index 3d18ed18c3..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFWriteRawTile.3tiff.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:18 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFWriteRawtile</title>
-</head>
-<body>
-
-<h1 align=center>TIFFWriteRawtile</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFWriteRawTile &minus; write a tile of raw data to an
-open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>tsize_t TIFFWriteRawTile(TIFF *</b><i>tif</i><b>,
-ttile_t</b> <i>tile</i><b>, tdata_t</b> <i>buf</i><b>,
-tsize_t</b> <i>size</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Append <i>size</i> bytes of raw data to the specified
-tile.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>&minus;1 is returned if an error occurred. Otherwise, the
-value of <i>size</i> is returned.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>%s: File not open for writing</b>. The file was opened
-for reading, not writing.</p>
-<!-- INDENTATION -->
-<p><b>Can not write tiles to a stripped image</b>. The image
-is assumed to be organized in strips because neither of the
-<i>TileWidth</i> or <i>TileLength</i> tags have been set
-with <b>TIFFSetField</b>(3TIFF).</p>
-<!-- INDENTATION -->
-<p><b>%s: Must set &quot;ImageWidth&quot; before writing
-data</b>. The image&rsquo;s width has not be set before the
-first write. See <b>TIFFSetField</b>(3TIFF) for information
-on how to do this.</p>
-<!-- INDENTATION -->
-<p><b>%s: Must set &quot;PlanarConfiguration&quot; before
-writing data</b>. The organization of data has not be
-defined before the first write. See
-<b>TIFFSetField</b>(3TIFF) for information on how to do
-this.</p>
-<!-- INDENTATION -->
-<p><b>%s: No space for tile arrays&quot;</b>. There was not
-enough space for the arrays that hold tile offsets and byte
-counts.</p>
-<!-- INDENTATION -->
-<p><b>%s: Specified tile %d out of range, max %d</b>. The
-specified tile is not valid according to the currently
-specified image dimensions.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF),
-<b>TIFFWriteEncodedTile</b>(3TIFF),
-<b>TIFFWriteScanline</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFWriteScanline.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFWriteScanline.3tiff.html
deleted file mode 100644
index bb9323d2e3..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFWriteScanline.3tiff.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:18 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFWriteScanline</title>
-</head>
-<body>
-
-<h1 align=center>TIFFWriteScanline</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFWriteScanline &minus; write a scanline to an open
-<small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFWriteScanline(TIFF *</b><i>tif</i><b>,
-tdata_t</b> <i>buf</i><b>, uint32</b> <i>row</i><b>,
-tsample_t</b> <i>sample</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Write data to a file at the specified row. The
-<i>sample</i> parameter is used only if data are organized
-in separate planes (<i>PlanarConfiguration</i>=2). The data
-are assumed to be uncompressed and in the native bit- and
-byte-order of the host machine. The data written to the file
-is compressed according to the compression scheme of the
-current <small>TIFF</small> directory (see further below).
-If the current scanline is past the end of the current
-subfile, the <i>ImageLength</i> field is automatically
-increased to include the scanline (except for
-<i>PlanarConfiguration</i>=2, where the <i>ImageLength</i>
-cannot be changed once the first data are written). If the
-<i>ImageLength</i> is increased, the <i>StripOffsets</i> and
-<i>StripByteCounts</i> fields are similarly enlarged to
-reflect data written past the previous end of image.</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The library writes encoded data using the native machine
-byte order. Correctly implemented <small>TIFF</small>
-readers are expected to do any necessary byte-swapping to
-correctly process image data with BitsPerSample greater than
-8. The library attempts to hide bit-ordering differences
-between the image and the native machine by converting data
-from the native machine order.</p>
-<!-- INDENTATION -->
-<p>In C++ the <i>sample</i> parameter defaults to 0.</p>
-<!-- INDENTATION -->
-<p>Once data are written to a file for the current
-directory, the values of certain tags may not be altered;
-see <i>TIFFSetField</i>(3TIFF) for more information.</p>
-<!-- INDENTATION -->
-<p>It is not possible to write scanlines to a file that uses
-a tiled organization. The routine <i>TIFFIsTiled</i> can be
-used to determine if the file is organized as tiles or
-strips.</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFWriteScanline</i> returns &minus;1 if it
-immediately detects an error and 1 for a successful
-write.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<i>TIFFError</i>(3TIFF) routine.</p>
-<!-- INDENTATION -->
-<p><b>%s: File not open for writing .</b> The file was
-opened for reading, not writing.</p>
-<!-- INDENTATION -->
-<p><b>Can not write scanlines to a tiled image</b>. An
-attempt was made to write a scanline to a tiled image. The
-image is assumed to be organized in tiles because the
-<i>TileWidth</i> and <i>TileLength</i> tags have been set
-with <i>TIFFSetField</i>(3TIFF).</p>
-<!-- INDENTATION -->
-<p><b>Compression algorithm does not support random
-access</b>. Data was written in a non-sequential order to a
-file that uses a compression algorithm and that has
-<i>RowsPerStrip</i> greater than one. That is, data in the
-image is to be stored in a compressed form, and with
-multiple rows packed into a strip. In this case, the library
-does not support random access to the data. The data should
-either be written as entire strips, sequentially by rows, or
-the value of <i>RowsPerStrip</i> should be set to one.</p>
-<!-- INDENTATION -->
-<p><b>%s: Must set &quot;ImageWidth&quot; before writing
-data</b>. The image&rsquo;s width has not be set before the
-first write. See <b>TIFFSetField</b>(3TIFF) for information
-on how to do this.</p>
-<!-- INDENTATION -->
-<p><b>%s: Must set &quot;PlanarConfiguration&quot; before
-writing data</b>. The organization of data has not be
-defined before the first write. See
-<b>TIFFSetField</b>(3TIFF) for information on how to do
-this.</p>
-<!-- INDENTATION -->
-<p><b>Can not change &quot;ImageLength&quot; when using
-separate planes</b>. Separate image planes are being used
-(<i>PlanarConfiguration</i>=2), but the number of rows has
-not been specified before the first write. The library
-supports the dynamic growth of an image only when data are
-organized in a contiguous manner
-(<i>PlanarConfiguration</i>=1).</p>
-<!-- INDENTATION -->
-<p><b>%d: Sample out of range, max %d</b>. The <i>sample</i>
-parameter was greater than the value of the SamplesPerPixel
-tag.</p>
-<!-- INDENTATION -->
-<p><b>%s: No space for strip arrays .</b> There was not
-enough space for the arrays that hold strip offsets and byte
-counts.</p>
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Writing subsampled YCbCR data does not work correctly
-because, for <i>PlanarConfiguration</i>=2 the size of a
-scanline is not calculated on a per-sample basis, and for
-<i>PlanarConfiguration</i>=1 the library does not pack the
-block-interleaved samples.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF),
-<b>TIFFWriteEncodedStrip</b>(3TIFF),
-<b>TIFFWriteRawStrip</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFWriteTile.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFWriteTile.3tiff.html
deleted file mode 100644
index d6bc5d8aed..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFWriteTile.3tiff.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:18 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFWriteTile</title>
-</head>
-<body>
-
-<h1 align=center>TIFFWriteTile</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#RETURN VALUES">RETURN VALUES</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFWriteTile &minus; encode and write a tile of data to
-an open <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>tsize_t TIFFWriteTile(TIFF *</b><i>tif</i><b>,
-tdata_t</b> <i>buf</i><b>, uint32</b> <i>x</i><b>,
-uint32</b> <i>y</i><b>, uint32</b> <i>z</i><b>,
-tsample_t</b> <i>sample</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Write the data for the tile <i>containing</i> the
-specified coordinates. The data in <i>buf</i> are is
-(potentially) compressed, and written to the indicated file,
-normally being appended to the end of the file. The buffer
-must be contain an entire tile of data. Applications should
-call the routine <i>TIFFTileSize</i> to find out the size
-(in bytes) of a tile buffer. The <i>x</i> and <i>y</i>
-parameters are always used by <i>TIFFWriteTile</i>. The
-<i>z</i> parameter is used if the image is deeper than 1
-slice (<i>ImageDepth</i>&gt;1). The <i>sample</i> parameter
-is used only if data are organized in separate planes
-(<i>PlanarConfiguration</i>=2).</p>
-</td>
-</table>
-<a name="RETURN VALUES"></a>
-<h2>RETURN VALUES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFWriteTile</i> returns &minus;1 if it detects an
-error; otherwise the number of bytes in the tile is
-returned.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>All error messages are directed to the
-<b>TIFFError</b>(3TIFF) routine.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFCheckTile</b>(3TIFF),
-<b>TIFFComputeTile</b>(3TIFF), <b>TIFFOpen</b>(3TIFF),
-<b>TIFFReadTile</b>(3TIFF), <b>TIFFWriteScanline</b>(3TIFF),
-<b>TIFFWriteEncodedTile</b>(3TIFF),
-<b>TIFFWriteRawTile</b>(3TIFF), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFbuffer.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFbuffer.3tiff.html
deleted file mode 100644
index 3d610ca539..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFbuffer.3tiff.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:14 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFBUFFER</title>
-</head>
-<body>
-
-<h1 align=center>TIFFBUFFER</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFReadBufferSetup, TIFFWriteBufferSetup &minus; I/O
-buffering control routines</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<pre><b>#include &lt;tiffio.h&gt;
-
-int TIFFReadBufferSetup(TIFF *</b><i>tif</i><b>, tdata_t</b> <i>buffer</i><b>, tsize_t</b> <i>size</i><b>);
-int TIFFWriteBufferSetup(TIFF *</b><i>tif</i><b>, tdata_t</b> <i>buffer</i><b>, tsize_t</b> <i>size</i><b>);
-</b></pre>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The following routines are provided for client-control of
-the I/O buffers used by the library. Applications need never
-use these routines; they are provided only for
-&lsquo;&lsquo;intelligent clients&rsquo;&rsquo; that wish to
-optimize memory usage and/or eliminate potential copy
-operations that can occur when working with images that have
-data stored without compression.</p>
-<!-- INDENTATION -->
-<p><i>TIFFReadBufferSetup</i> sets up the data buffer used
-to read raw (encoded) data from a file. If the specified
-pointer is <small>NULL</small> (zero), then a buffer of the
-appropriate size is allocated. Otherwise the caller must
-guarantee that the buffer is large enough to hold any
-individual strip of raw data. <i>TIFFReadBufferSetup</i>
-returns a non-zero value if the setup was successful and
-zero otherwise.</p>
-<!-- INDENTATION -->
-<p><i>TIFFWriteBufferSetup</i> sets up the data buffer used
-to write raw (encoded) data to a file. If the specified
-<i>size</i> is &minus;1 then the buffer size is selected to
-hold a complete tile or strip, or at least 8 kilobytes,
-whichever is greater. If the specified <i>buffer</i> is
-<small>NULL</small> (zero), then a buffer of the appropriate
-size is dynamically allocated. <i>TIFFWriteBufferSetup</i>
-returns a non-zero value if the setup was successful and
-zero otherwise.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>%s: No space for data buffer at scanline %ld</b>.
-<i>TIFFReadBufferSetup</i> was unable to dynamically
-allocate space for a data buffer.</p>
-<!-- INDENTATION -->
-<p><b>%s: No space for output buffer</b>.
-<i>TIFFWriteBufferSetup</i> was unable to dynamically
-allocate space for a data buffer.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFcodec.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFcodec.3tiff.html
deleted file mode 100644
index 8567b30b4b..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFcodec.3tiff.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>CODEC</title>
-</head>
-<body>
-
-<h1 align=center>CODEC</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFFindCODEC, TIFFRegisterCODEC, TIFFUnRegisterCODEC,
-TIFFIsCODECConfigured &minus; codec-related utility
-routines</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>const TIFFCodec* TIFFFindCODEC(uint16</b>
-<i>scheme</i><b>);<br>
-TIFFCodec* TIFFRegisterCODEC(uint16</b> <i>scheme</i><b>,
-const char *</b><i>method</i><b>, TIFFInitMethod</b>
-<i>init</i><b>);<br>
-void TIFFUnRegisterCODEC(TIFFCodec
-*</b><i>codec</i><b>);<br>
-int TIFFIsCODECConfigured(uint16</b>
-<i>scheme</i><b>);</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>libtiff</i> supports a variety of compression schemes
-implemented by software <i>codecs</i>. Each codec adheres to
-a modular interface that provides for the decoding and
-encoding of image data; as well as some other methods for
-initialization, setup, cleanup, and the control of default
-strip and tile sizes. Codecs are identified by the
-associated value of the <small>TIFF</small>
-<i>Compression</i> tag; e.g. 5 for <small>LZW</small>
-compression.</p>
-<!-- INDENTATION -->
-<p>The <i>TIFFRegisterCODEC</i> routine can be used to
-augment or override the set of codecs available to an
-application. If the specified <i>scheme</i> already has a
-registered codec then it is <i>overridden</i> and any images
-with data encoded with this compression scheme will be
-decoded using the supplied coded.</p>
-<!-- INDENTATION -->
-<p><i>TIFFIsCODECConfigured</i> returns 1 if the codec is
-configured and working. Otherwise 0 will be returned.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>No space to register compression scheme %s</b>.
-<i>TIFFRegisterCODEC</i> was unable to allocate memory for
-the data structures needed to register a codec.</p>
-<!-- INDENTATION -->
-<p><b>Cannot remove compression scheme %s; not
-registered</b>. <i>TIFFUnRegisterCODEC</i> did not locate
-the specified codec in the table of registered compression
-schemes.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFcolor.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFcolor.3tiff.html
deleted file mode 100644
index 7e4eea51c7..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFcolor.3tiff.html
+++ /dev/null
@@ -1,975 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>COLOR</title>
-</head>
-<body>
-
-<h1 align=center>COLOR</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFYCbCrToRGBInit, TIFFYCbCrtoRGB, TIFFCIELabToRGBInit,
-TIFFCIELabToXYZ, TIFFXYZToRGB &minus; color conversion
-routines.</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB
-*</b><i>ycbcr</i><b>, float *</b><i>luma</i><b>, float
-*</b><i>refBlackWhite&quot;</i><b>);&quot;<br>
-void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *</b><i>ycbcr</i><b>,
-uint32</b> <i>Y</i><b>, int32</b> <i>Cb</i><b>, int32</b>
-<i>Cr</i><b>, uint32 *</b><i>R</i><b>, uint32
-*</b><i>G</i><b>, uint32 *</b><i>B</i> <b>);</b></p>
-<!-- INDENTATION -->
-<p><b>int TIFFCIELabToRGBInit(TIFFCIELabToRGB
-*</b><i>cielab</i><b>, TIFFDisplay *</b><i>display</i><b>,
-float *</b><i>refWhite</i><b>);<br>
-void TIFFCIELabToXYZ(TIFFCIELabToRGB *</b><i>cielab</i><b>,
-uint32</b> <i>L</i><b>, int32</b> <i>a</i><b>, int32</b>
-<i>b</i><b>, float *</b><i>X</i><b>, float *</b><i>Y</i><b>,
-float *</b><i>Z</i><b>);<br>
-void TIFFXYZToRGB(TIFFCIELabToRGB *</b><i>cielab</i><b>,
-float</b> <i>X</i><b>, float</b> <i>Y</i><b>, float</b>
-<i>Z&quot;</i><b>,</b><i>uint32</i><b>*&quot;</b><i>R</i><b>,
-uint32 *</b><i>G</i><b>, uint32 *</b><i>B</i><b>);</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFF supports several color spaces for images stored in
-that format. There is usually a problem of application to
-handle the data properly and convert between different
-colorspaces for displaying and printing purposes. To
-simplify this task libtiff implements several color
-conversion routines itself. In particular, these routines
-used in <b>TIFFRGBAImage(3TIFF)</b> interface.</p>
-<!-- INDENTATION -->
-<p><b>TIFFYCbCrToRGBInit()</b> used to initialize
-<i>YCbCr</i> to <i>RGB</i> conversion state. Allocating and
-freeing of the <i>ycbcr</i> structure belongs to programmer.
-<i>TIFFYCbCrToRGB</i> defined in <b>tiffio.h</b> as</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>typedef struct { /* YCbCr-&gt;RGB support */
- TIFFRGBValue* clamptab; /* range clamping table */
-</pre>
-</td>
-</table>
-<!-- TABS -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-
-<p>int*</p>
-<td width="28%"></td>
-<td width="-3%"></td>
-<td width="12%"></td>
-<td width="6%">
-
-<p>Cr_r_tab;<br>
-int*</p>
-</td>
-<td width="56%">
-</td>
-<tr valign="top" align="left">
-<td width="28%"></td>
-<td width="-3%"></td>
-<td width="12%"></td>
-<td width="6%">
-
-<p>Cb_b_tab;<br>
-int32*</p>
-</td>
-<td width="56%">
-</td>
-<tr valign="top" align="left">
-<td width="28%"></td>
-<td width="-3%"></td>
-<td width="12%"></td>
-<td width="6%">
-
-<p>Cr_g_tab;<br>
-int32*</p>
-</td>
-<td width="56%">
-</td>
-<tr valign="top" align="left">
-<td width="28%"></td>
-<td width="-3%"></td>
-<td width="12%"></td>
-<td width="6%">
-
-<p>Cb_g_tab;</p>
-</td>
-<td width="56%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>int32* Y_tab;<br>
-} TIFFYCbCrToRGB;</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>luma</i> is a float array of three values representing
-proportions of the red, green and blue in luminance, Y (see
-section 21 of the TIFF 6.0 specification, where the YCbCr
-images discussed). <i>TIFFTAG_YCBCRCOEFFICIENTS</i> holds
-that values in TIFF file. <i>refBlackWhite</i> is a float
-array of 6 values which specifies a pair of headroom and
-footroom image data values (codes) for each image component
-(see section 20 of the TIFF 6.0 specification where the
-colorinmetry fields discussed).
-<i>TIFFTAG_REFERENCEBLACKWHITE</i> is responsible for
-storing these values in TIFF file. Following code snippet
-should helps to understand the the technique:</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>float *luma, *refBlackWhite;
-uint16 hs, vs;
-
-/* Initialize structures */
-ycbcr = (TIFFYCbCrToRGB*)
-</pre>
-</td>
-</table>
-<!-- TABS -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>_TIFFmalloc(TIFFroundup(sizeof(TIFFYCbCrToRGB),
-sizeof(long))</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>+ 4*256*sizeof(TIFFRGBValue)</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>+ 2*256*sizeof(int)</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>+ 3*256*sizeof(int32));</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>if (ycbcr == NULL) {<br>
-TIFFError(&quot;YCbCr-&gt;RGB&quot;,</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="4" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>&quot;No space for YCbCr-&gt;RGB conversion
-state&quot;);</p>
-</td>
-<td width="62%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>exit(0);<br>
-}</p>
-<!-- INDENTATION -->
-<p>TIFFGetFieldDefaulted(tif, TIFFTAG_YCBCRCOEFFICIENTS,
-&amp;luma);<br>
-TIFFGetFieldDefaulted(tif, TIFFTAG_REFERENCEBLACKWHITE,
-&amp;refBlackWhite);<br>
-if (TIFFYCbCrToRGBInit(ycbcr, luma, refBlackWhite) &lt;
-0)</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>exit(0);</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>/* Start conversion */<br>
-uint32 r, g, b;<br>
-uint32 Y;<br>
-int32 Cb, Cr;</p>
-<!-- INDENTATION -->
-<p>for each pixel in image</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>TIFFYCbCrtoRGB(img-&gt;ycbcr, Y, Cb, Cr, &amp;r, &amp;g,
-&amp;b);</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>/* Free state structure */<br>
-_TIFFfree(ycbcr);</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFCIELabToRGBInit()</b> initializes the <i>CIE
-L*a*b* 1976</i> to <i>RGB</i> conversion state.
-<b>TIFFCIELabToRGB</b> defined as</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>#define CIELABTORGB_TABLE_RANGE 1500
-
-</pre>
-</td>
-</table>
-<!-- TABS -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="9" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="6%">
-
-<p>typedef struct {</p>
-</td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>/* CIE Lab 1976-&gt;RGB support */</p>
-</td>
-<td width="6%"></td>
-<td width="37%">
-</td>
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>int</p>
-</td>
-<td width="6%">
-
-<p>range;</p>
-</td>
-<td width="6%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>/* Size of conversion table */</p>
-</td>
-<td width="6%"></td>
-<td width="37%">
-</td>
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>float</p>
-</td>
-<td width="6%"></td>
-<td width="6%">
-
-<p>rstep, gstep, bstep;</p>
-</td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="37%">
-</td>
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>float</p>
-</td>
-<td width="6%"></td>
-<td width="6%">
-
-<p>X0, Y0, Z0;</p>
-</td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="6%">
-
-<p>/* Reference white point */</p>
-</td>
-<td width="37%">
-</td>
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="6%"></td>
-<td width="6%">
-
-<p>TIFFDisplay display;</p>
-</td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="37%">
-</td>
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>float</p>
-</td>
-<td width="6%"></td>
-<td width="6%">
-
-<p>Yr2r[CIELABTORGB_TABLE_RANGE + 1]; /* Conversion of Yr
-to r */</p>
-</td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="37%">
-</td>
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>float</p>
-</td>
-<td width="6%"></td>
-<td width="6%">
-
-<p>Yg2g[CIELABTORGB_TABLE_RANGE + 1]; /* Conversion of Yg
-to g */</p>
-</td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="37%">
-</td>
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>float</p>
-</td>
-<td width="6%"></td>
-<td width="6%">
-
-<p>Yb2b[CIELABTORGB_TABLE_RANGE + 1]; /* Conversion of Yb
-to b */</p>
-</td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="6%"></td>
-<td width="37%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>} TIFFCIELabToRGB;</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>display</i> is a display device description, declared
-as</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>typedef struct {
-</pre>
-</td>
-</table>
-<!-- TABS -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>float d_mat[3][3]; /* XYZ -&gt; luminance matrix */</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>float d_YCR; /* Light o/p for reference white */</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>float d_YCG;</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>float d_YCB;</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>uint32 d_Vrwr; /* Pixel values for ref. white */</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>uint32 d_Vrwg;</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>uint32 d_Vrwb;</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>float d_Y0R; /* Residual light for black pixel */</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>float d_Y0G;</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>float d_Y0B;</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>float d_gammaR; /* Gamma values for the three guns
-*/</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>float d_gammaG;</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>float d_gammaB;</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>} TIFFDisplay;</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>For example, the one can use sRGB device, which has the
-following parameters:</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>TIFFDisplay display_sRGB = {
-</pre>
-</td>
-</table>
-<!-- TABS -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>{ /* XYZ -&gt; luminance matrix */</p>
-</td>
-<td width="6%"></td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>{ 3.2410F, -1.5374F, -0.4986F },</p>
-</td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>{ -0.9692F, 1.8760F, 0.0416F },</p>
-</td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>{ 0.0556F, -0.2040F, 1.0570F }</p>
-</td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>},</p>
-</td>
-<td width="6%">
-</td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>100.0F, 100.0F, 100.0F, /* Light o/p for reference white
-*/</p>
-</td>
-<td width="6%"></td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>255, 255, 255, /* Pixel values for ref. white */</p>
-</td>
-<td width="6%"></td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>1.0F, 1.0F, 1.0F, /* Residual light o/p for black pixel
-*/</p>
-</td>
-<td width="6%"></td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>2.4F, 2.4F, 2.4F, /* Gamma values for the three guns
-*/</p>
-</td>
-<td width="6%"></td>
-<td width="62%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>};</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>refWhite</i> is a color temperature of the reference
-white. The <i>TIFFTAG_WHITEPOINT</i> contains the
-chromaticity of the white point of the image from where the
-reference white can be calculated using following
-formulae:</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>refWhite_Y = 100.0<br>
-refWhite_X = whitePoint_x / whitePoint_y * refWhite_Y<br>
-refWhite_Z = (1.0 - whitePoint_x - whitePoint_y) /
-whitePoint_y * refWhite_X</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The conversion itself performed in two steps: at the
-first one we will convert <i>CIE L*a*b* 1976</i> to <i>CIE
-XYZ</i> using <b>TIFFCIELabToXYZ()</b> routine, and at the
-second step we will convert <i>CIE XYZ</i> to <i>RGB</i>
-using <b>TIFFXYZToRGB().</b> Look at the code sample
-below:</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>float *whitePoint;
-float refWhite[3];
-
-/* Initialize structures */
-img-&gt;cielab = (TIFFCIELabToRGB *)
-</pre>
-</td>
-</table>
-<!-- TABS -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>_TIFFmalloc(sizeof(TIFFCIELabToRGB));</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>if (!cielab) {</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>TIFFError(&quot;CIE L*a*b*-&gt;RGB&quot;,</p>
-</td>
-<td width="6%"></td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>&quot;No space for CIE L*a*b*-&gt;RGB conversion
-state.&quot;);</p>
-</td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>exit(0);</p>
-</td>
-<td width="6%"></td>
-<td width="62%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>}</p>
-<!-- INDENTATION -->
-<p>TIFFGetFieldDefaulted(tif, TIFFTAG_WHITEPOINT,
-&amp;whitePoint);<br>
-refWhite[1] = 100.0F;<br>
-refWhite[0] = whitePoint[0] / whitePoint[1] *
-refWhite[1];<br>
-refWhite[2] = (1.0F - whitePoint[0] -
-whitePoint[1])</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>/ whitePoint[1] * refWhite[1];</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>if (TIFFCIELabToRGBInit(cielab, &amp;display_sRGB,
-refWhite) &lt; 0) {</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>TIFFError(&quot;CIE L*a*b*-&gt;RGB&quot;,</p>
-</td>
-<td width="6%"></td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-</td>
-<td width="6%">
-
-<p>&quot;Failed to initialize CIE L*a*b*-&gt;RGB conversion
-state.&quot;);</p>
-</td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>_TIFFfree(cielab);</p>
-</td>
-<td width="6%"></td>
-<td width="62%">
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="0%"></td>
-<td width="6%">
-
-<p>exit(0);</p>
-</td>
-<td width="6%"></td>
-<td width="62%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>}</p>
-<!-- INDENTATION -->
-<p>/* Now we can start to convert */<br>
-uint32 r, g, b;<br>
-uint32 L;<br>
-int32 a, b;<br>
-float X, Y, Z;</p>
-<!-- INDENTATION -->
-<p>for each pixel in image</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>TIFFCIELabToXYZ(cielab, L, a, b, &amp;X, &amp;Y,
-&amp;Z);</p>
-</td>
-<tr valign="top" align="left">
-<td width="24%"></td>
-<td width="75%">
-
-<p>TIFFXYZToRGB(cielab, X, Y, Z, &amp;r, &amp;g,
-&amp;b);</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>/* Don&rsquo;t forget to free the state structure */<br>
-_TIFFfree(cielab);</p></td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFRGBAImage</b>(3TIFF) <b>libtiff</b>(3TIFF),</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFmemory.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFmemory.3tiff.html
deleted file mode 100644
index 746b5ec269..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFmemory.3tiff.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>MEMORY</title>
-</head>
-<body>
-
-<h1 align=center>MEMORY</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>_TIFFmalloc, _TIFFrealloc, _TIFFfree, _TIFFmemset,
-_TIFFmemcpy, _TIFFmemcmp, &minus; memory management-related
-functions for use with <small>TIFF</small> files</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>tdata_t _TIFFmalloc(tsize_t</b> <i>size</i><b>);<br>
-tdata_t _TIFFrealloc(tdata_t</b> <i>buffer</i><b>,
-tsize_t</b> <i>size</i><b>);<br>
-void _TIFFfree(tdata_t</b> <i>buffer</i><b>);<br>
-void _TIFFmemset(tdata_t</b> <i>s</i><b>, int</b>
-<i>c</i><b>, tsize_t</b> <i>n</i><b>);<br>
-void _TIFFmemcpy(tdata_t</b> <i>dest</i><b>, const
-tdata_t</b> <i>src</i><b>, tsize_t</b> <i>n</i><b>);<br>
-int _TIFFmemcmp(const tdata_t</b> <i>s1</i><b>, const
-tdata_t</b> <i>s2</i><b>, tsize_t</b> <i>n</i><b>);</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>These routines are provided for writing portable software
-that uses <i>libtiff</i>; they hide any memory-management
-related issues, such as dealing with segmented architectures
-found on 16-bit machines.</p>
-<!-- INDENTATION -->
-<p><i>_TIFFmalloc</i> and <i>_TIFFrealloc</i> are used to
-dynamically allocate and reallocate memory used by
-<i>libtiff</i>; such as memory passed into the I/O routines.
-Memory allocated through these interfaces is released back
-to the system using the <i>_TIFFfree</i> routine.</p>
-<!-- INDENTATION -->
-<p>Memory allocated through one of the above interfaces can
-be set to a known value using <i>_TIFFmemset</i>, copied to
-another memory location using <i>_TIFFmemcpy</i>, or
-compared for equality using <i>_TIFFmemcmp</i>. These
-routines conform to the equivalent <small>ANSI</small> C
-routines: <i>memset</i>, <i>memcpy</i>, and <i>memcmp</i>,
-repsectively.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>None.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>malloc</b>(3), <b>memory</b>(3),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFquery.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFquery.3tiff.html
deleted file mode 100644
index e27354af84..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFquery.3tiff.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:15 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>QUERY</title>
-</head>
-<body>
-
-<h1 align=center>QUERY</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFCurrentRow, TIFFCurrentStrip, TIFFCurrentTile,
-TIFFCurrentDirectory, TIFFLastDirectory, TIFFFileno,
-TIFFFileName, TIFFGetMode, TIFFIsTiled, TIFFIsByteSwapped,
-TIFFIsUpSampled, TIFFIsMSB2LSB, TIFFGetVersion &minus; query
-routines</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>uint32 TIFFCurrentRow(TIFF*</b> <i>tif</i><b>)<br>
-tstrip_t TIFFCurrentStrip(TIFF*</b> <i>tif</i><b>)<br>
-ttile_t TIFFCurrentTile(TIFF*</b> <i>tif</i><b>)<br>
-tdir_t TIFFCurrentDirectory(TIFF*</b> <i>tif</i><b>)<br>
-int TIFFLastDirectory(TIFF*</b> <i>tif</i><b>)<br>
-int TIFFFileno(TIFF*</b> <i>tif</i><b>)<br>
-char* TIFFFileName(TIFF*</b> <i>tif</i><b>)<br>
-int TIFFGetMode(TIFF*</b> <i>tif</i><b>)<br>
-int TIFFIsTiled(TIFF*</b> <i>tif</i><b>)<br>
-int TIFFIsByteSwapped(TIFF*</b> <i>tif</i><b>)<br>
-int TIFFIsUpSampled(TIFF*</b> <i>tif</i><b>)<br>
-int TIFFIsMSB2LSB(TIFF*</b> <i>tif</i><b>)<br>
-const char* TIFFGetVersion(void)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The following routines return status information about an
-open <small>TIFF</small> file.</p>
-<!-- INDENTATION -->
-<p><i>TIFFCurrentDirectory</i> returns the index of the
-current directory (directories are numbered starting at 0).
-This number is suitable for use with the
-<i>TIFFSetDirectory</i> routine.</p>
-<!-- INDENTATION -->
-<p><i>TIFFLastDirectory</i> returns a non-zero value if the
-current directory is the last directory in the file;
-otherwise zero is returned.</p>
-<!-- INDENTATION -->
-<p><i>TIFFCurrentRow</i>, <i>TIFFCurrentStrip</i>, and
-<i>TIFFCurrentTile</i>, return the current row, strip, and
-tile, respectively, that is being read or written. These
-values are updated each time a read or write is done.</p>
-<!-- INDENTATION -->
-<p><i>TIFFFileno</i> returns the underlying file descriptor
-used to access the <small>TIFF</small> image in the
-filesystem.</p>
-<!-- INDENTATION -->
-<p><i>TIFFFileName</i> returns the pathname argument passed
-to <i>TIFFOpen</i> or <i>TIFFFdOpen</i>.</p>
-<!-- INDENTATION -->
-<p><i>TIFFGetMode</i> returns the mode with which the
-underlying file was opened. On <small>UNIX</small> systems,
-this is the value passed to the <i>open</i>(2) system
-call.</p>
-<!-- INDENTATION -->
-<p><i>TIFFIsTiled</i> returns a non-zero value if the image
-data has a tiled organization. Zero is returned if the image
-data is organized in strips.</p>
-<!-- INDENTATION -->
-<p><i>TIFFIsByteSwapped</i> returns a non-zero value if the
-image data was in a different byte-order than the host
-machine. Zero is returned if the TIFF file and local host
-byte-orders are the same. Note that TIFFReadTile(),
-TIFFReadStrip() and TIFFReadScanline() functions already
-normally perform byte swapping to local host order if
-needed.</p>
-<!-- INDENTATION -->
-<p><i>TIFFIsUpSampled</i> returns a non-zero value if image
-data returned through the read interface routines is being
-up-sampled. This can be useful to applications that want to
-calculate I/O buffer sizes to reflect this usage (though the
-usual strip and tile size routines already do this).</p>
-<!-- INDENTATION -->
-<p><i>TIFFIsMSB2LSB</i> returns a non-zero value if the
-image data is being returned with bit 0 as the most
-significant bit.</p>
-<!-- INDENTATION -->
-<p><i>TIFFGetVersion</i> returns an <small>ASCII</small>
-string that has a version stamp for the <small>TIFF</small>
-library software.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>None.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>libtiff</i>(3TIFF), <i>TIFFOpen</i>(3TIFF),
-<i>TIFFFdOpen</i>(3TIFF)</p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFsize.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFsize.3tiff.html
deleted file mode 100644
index 54fb71b8c3..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFsize.3tiff.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFSIZE</title>
-</head>
-<body>
-
-<h1 align=center>TIFFSIZE</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFScanlineSize, TIFFRasterScanlineSize, &minus; return
-the size of various items associated with an open
-<small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>tsize_t TIFFRasterScanlineSize(TIFF
-*</b><i>tif</i><b>)<br>
-tsize_t TIFFScanlineSize(TIFF *</b><i>tif</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFScanlineSize</i> returns the size in bytes of a
-row of data as it would be returned in a call to
-<i>TIFFReadScanline</i>, or as it would be expected in a
-call to <i>TIFFWriteScanline</i>.</p>
-<!-- INDENTATION -->
-<p><i>TIFFRasterScanlineSize</i> returns the size in bytes
-of a complete decoded and packed raster scanline. Note that
-this value may be different from the value returned by
-<i>TIFFScanlineSize</i> if data is stored as separate
-planes.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>None.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFOpen</b>(3TIFF), <b>TIFFReadScanline</b>(3TIFF),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFstrip.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFstrip.3tiff.html
deleted file mode 100644
index a0fc358bff..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFstrip.3tiff.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFSTRIP</title>
-</head>
-<body>
-
-<h1 align=center>TIFFSTRIP</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFDefaultStripSize, TIFFStripSize, TIFFVStripSize,
-TIFFRawStripSize, TIFFComputeStrip, TIFFNumberOfStrips
-&minus; strip-related utility routines</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>uint32 TIFFDefaultStripSize(TIFF *</b><i>tif</i><b>,
-uint32</b> <i>estimate</i><b>)<br>
-tsize_t TIFFStripSize(TIFF *</b><i>tif</i><b>)<br>
-tsize_t TIFFVStripSize(TIFF *</b><i>tif</i><b>, uint32</b>
-<i>nrows</i><b>)<br>
-tsize_t TIFFRawStripSize(TIFF *</b><i>tif</i><b>,
-tstrip_t</b> <i>strip</i><b>)<br>
-tstrip_t TIFFComputeStrip(TIFF *</b><i>tif</i><b>,
-uint32</b> <i>row</i><b>, tsample_t</b>
-<i>sample</i><b>)<br>
-tstrip_t TIFFNumberOfStrips(TIFF *</b><i>tif</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFDefaultStripSize</i> returns the number of rows
-for a reasonable-sized strip according to the current
-settings of the <i>ImageWidth</i>, <i>BitsPerSample</i>,
-<i>SamplesPerPixel</i>, tags and any compression-specific
-requirements. If the <i>estimate</i> parameter, if non-zero,
-then it is taken as an estimate of the desired strip size
-and adjusted according to any compression-specific
-requirements. The value returned by this function is
-typically used to define the <i>RowsPerStrip</i> tag. In
-lieu of any unusual requirements <i>TIFFDefaultStripSize</i>
-tries to create strips that have approximately 8 kilobytes
-of uncompressed data.</p>
-<!-- INDENTATION -->
-<p><i>TIFFStripSize</i> returns the equivalent size for a
-strip of data as it would be returned in a call to
-<i>TIFFReadEncodedStrip</i> or as it would be expected in a
-call to <i>TIFFWriteEncodedStrip</i>.</p>
-<!-- INDENTATION -->
-<p><i>TIFFVStripSize</i> returns the number of bytes in a
-strip with <i>nrows</i> rows of data.</p>
-<!-- INDENTATION -->
-<p><i>TIFFRawStripSize</i> returns the number of bytes in a
-raw strip (i.e. not decoded).</p>
-<!-- INDENTATION -->
-<p><i>TIFFComputeStrip</i> returns the strip that contains
-the specified coordinates. A valid strip is always returned;
-out-of-range coordinate values are clamped to the bounds of
-the image. The <i>row</i> parameter is always used in
-calculating a strip. The <i>sample</i> parameter is used
-only if data are organized in separate planes
-(<i>PlanarConfiguration</i>=2).</p>
-<!-- INDENTATION -->
-<p><i>TIFFNumberOfStrips</i> returns the number of strips in
-the image.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>None.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFReadEncodedStrip</b>(3TIFF),
-<b>TIFFReadRawStrip</b>(3TIFF),
-<b>TIFFWriteEncodedStrip</b>(3TIFF),
-<b>TIFFWriteRawStrip</b>(3TIFF), <b>libtiff</b>(3TIFF),</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFswab.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFswab.3tiff.html
deleted file mode 100644
index 2924a38bd9..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFswab.3tiff.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>SWAB</title>
-</head>
-<body>
-
-<h1 align=center>SWAB</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFGetBitRevTable, TIFFReverseBits, TIFFSwabShort,
-TIFFSwabLong, TIFFSwabArrayOfShort, TIFFSwabArrayOfLong
-&minus; byte- and bit-swapping routines</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>const unsigned char* TIFFGetBitRevTable(int</b>
-<i>reversed</i><b>)<br>
-void TIFFReverseBits(u_char *</b><i>data</i><b>, unsigned
-long</b> <i>nbytes</i><b>)<br>
-void TIFFSwabShort(uint16 *</b><i>data</i><b>)<br>
-void TIFFSwabLong(uint32 *</b><i>data</i><b>)<br>
-void TIFFSwabArrayOfShort(uint16 *</b><i>data</i><b>,
-unsigned long</b> <i>nshorts</i><b>)<br>
-void TIFFSwabArrayOfLong(uint32 *</b><i>data</i><b>,
-unsigned long</b> <i>nlongs</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The following routines are used by the library to swap
-16- and 32-bit data and to reverse the order of bits in
-bytes.</p>
-<!-- INDENTATION -->
-<p><i>TIFFSwabShort</i> and <i>TIFFSwabLong</i> swap the
-bytes in a single 16-bit and 32-bit item, respectively.
-<i>TIFFSwabArrayOfShort</i> and <i>TIFFSwabArrayOfLong</i>
-swap the bytes in an array of 16-bit and 32-bit items,
-respectively.</p>
-<!-- INDENTATION -->
-<p><i>TIFFReverseBits</i> replaces each byte in <i>data</i>
-with the equivalent bit-reversed value. This operation is
-performed with a lookup table, which is returned using the
-<i>TIFFGetBitRevTable</i> function. <i>reversed</i>
-parameter specifies which table should be returned. Supply
-<i>1</i> if you want bit reversal table. Supply <i>0</i> to
-get the table that do not reverse bit values. It is a lookup
-table that can be used as an <i>identity function</i>; i.e.
-<i>TIFFNoBitRevTable[n] == n</i>.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>None.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/TIFFtile.3tiff.html b/src/3rdparty/libtiff/html/man/TIFFtile.3tiff.html
deleted file mode 100644
index e8e0008a06..0000000000
--- a/src/3rdparty/libtiff/html/man/TIFFtile.3tiff.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:17 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFTILE</title>
-</head>
-<body>
-
-<h1 align=center>TIFFTILE</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>TIFFTileSize, TIFFTileRowSize, TIFFVTileSize,
-TIFFDefaultTileSize, TIFFComputeTile, TIFFCheckTile,
-TIFFNumberOfTiles &minus; tile-related utility routines</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>#include &lt;tiffio.h&gt;</b></p>
-<!-- INDENTATION -->
-<p><b>void TIFFDefaultTileSize(TIFF *</b><i>tif</i><b>,
-uint32 *</b><i>tw</i><b>, uint32 *</b><i>th</i><b>)<br>
-tsize_t TIFFTileSize(TIFF *</b><i>tif</i><b>)<br>
-tsize_t TIFFTileRowSize(TIFF *</b><i>tif</i><b>)<br>
-tsize_t TIFFVTileSize(TIFF *</b><i>tif</i><b>, uint32</b>
-<i>nrows</i><b>)<br>
-ttile_t TIFFComputeTile(TIFF *</b><i>tif</i><b>, uint32</b>
-<i>x</i><b>, uint32</b> <i>y</i><b>, uint32</b> <i>z</i><b>,
-tsample_t</b> <i>sample</i><b>)<br>
-int TIFFCheckTile(TIFF *</b><i>tif</i><b>, uint32</b>
-<i>x</i><b>, uint32</b> <i>y</i><b>, uint32</b> <i>z</i><b>,
-tsample_t</b> <i>sample</i><b>)<br>
-ttile_t TIFFNumberOfTiles(TIFF *</b><i>tif</i><b>)</b></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>TIFFDefaultTileSize</i> returns the pixel width and
-height of a reasonable-sized tile; suitable for setting up
-the <i>TileWidth</i> and <i>TileLength</i> tags. If the
-<i>tw</i> and <i>th</i> values passed in are non-zero, then
-they are adjusted to reflect any compression-specific
-requirements. The returned width and height are constrained
-to be a multiple of 16 pixels to conform with the
-<small>TIFF</small> specification.</p>
-<!-- INDENTATION -->
-<p><i>TIFFTileSize</i> returns the equivalent size for a
-tile of data as it would be returned in a call to
-<i>TIFFReadTile</i> or as it would be expected in a call to
-<i>TIFFWriteTile</i>.</p>
-<!-- INDENTATION -->
-<p><i>TIFFVTileSize</i> returns the number of bytes in a
-row-aligned tile with <i>nrows</i> of data.</p>
-<!-- INDENTATION -->
-<p><i>TIFFTileRowSize</i> returns the number of bytes of a
-row of data in a tile.</p>
-<!-- INDENTATION -->
-<p><i>TIFFComputeTile</i> returns the tile that contains the
-specified coordinates. A valid tile is always returned;
-out-of-range coordinate values are clamped to the bounds of
-the image. The <i>x</i> and <i>y</i> parameters are always
-used in calculating a tile. The <i>z</i> parameter is used
-if the image is deeper than 1 slice
-(<i>ImageDepth</i>&gt;1). The <i>sample</i> parameter is
-used only if data are organized in separate planes
-(<i>PlanarConfiguration</i>=2).</p>
-<!-- INDENTATION -->
-<p><i>TIFFCheckTile</i> returns a non-zero value if the
-supplied coordinates are within the bounds of the image and
-zero otherwise. The <i>x</i> parameter is checked against
-the value of the <i>ImageWidth</i> tag. The <i>y</i>
-parameter is checked against the value of the
-<i>ImageLength</i> tag. The <i>z</i> parameter is checked
-against the value of the <i>ImageDepth</i> tag (if defined).
-The <i>sample</i> parameter is checked against the value of
-the <i>SamplesPerPixel</i> parameter if the data are
-organized in separate planes.</p>
-<!-- INDENTATION -->
-<p><i>TIFFNumberOfTiles</i> returns the number of tiles in
-the image.</p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>None.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>TIFFReadEncodedTile</b>(3TIFF),
-<b>TIFFReadRawTile</b>(3TIFF), <b>TIFFReadTile</b>(3TIFF),
-<b>TIFFWriteEncodedTile</b>(3TIFF),
-<b>TIFFWriteRawTile</b>(3TIFF), <b>TIFFWriteTile</b>(3TIFF),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/fax2ps.1.html b/src/3rdparty/libtiff/html/man/fax2ps.1.html
deleted file mode 100644
index c5396143ab..0000000000
--- a/src/3rdparty/libtiff/html/man/fax2ps.1.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:18 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>FAX2PS</title>
-</head>
-<body>
-
-<h1 align=center>FAX2PS</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>fax2ps &minus; convert a <small>TIFF</small> facsimile to
-compressed PostScript&trade;</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>fax2ps</b> [ <i>options</i> ] [ <i>file ...</i> ]</p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>fax2ps</i> reads one or more <small>TIFF</small>
-facsimile image files and prints a compressed form of
-PostScript on the standard output that is suitable for
-printing.</p>
-<!-- INDENTATION -->
-<p>By default, each page is scaled to reflect the image
-dimensions and resolutions stored in the file. The
-<b>&minus;x</b> and <b>&minus;y</b> options can be used to
-specify the horizontal and vertical image resolutions
-(lines/inch), respectively. If the <b>&minus;S</b> option is
-specified, each page is scaled to fill an output page. The
-default output page is 8.5 by 11 inches. Alternate page
-dimensions can be specified in inches with the
-<b>&minus;W</b> and <b>&minus;H</b> options.</p>
-<!-- INDENTATION -->
-<p>By default <i>fax2ps</i> generates PostScript for all
-pages in the file. The <b>&minus;p</b> option can be used to
-select one or more pages from a multi-page document.</p>
-<!-- INDENTATION -->
-<p><i>fax2ps</i> generates a compressed form of PostScript
-that is optimized for sending pages of text to a PostScript
-printer attached to a host through a low-speed link (such as
-a serial line). Each output page is filled with white and
-then only the black areas are drawn. The PostScript
-specification of the black drawing operations is optimized
-by using a special font that encodes the move-draw
-operations required to fill the black regions on the page.
-This compression scheme typically results in a substantially
-reduced PostScript description, relative to the
-straightforward imaging of the page with a PostScript
-<i>image</i> operator. This algorithm can, however, be
-ineffective for continuous-tone and white-on-black images.
-For these images, it sometimes is more efficient to send the
-raster bitmap image directly; see <b>tiff2ps</b>(1).</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="4" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="11%">
-
-<p><b>&minus;p</b> <i>number</i></p>
-</td>
-<td width="76%">
-
-<p>Print only the indicated page. Multiple pages may be
-printed by specifying this option more than once.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;x</b> <i>resolution</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="23%"></td>
-<td width="76%">
-<p>Use <i>resolution</i> as the horizontal resolution, in
-dots/inch, of the image data. By default this value is taken
-from the file.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;y</b> <i>resolution</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="23%"></td>
-<td width="76%">
-<p>Use <i>resolution</i> as the vertical resolution, in
-lines/inch, of the image data. By default this value is
-taken from the file.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="4" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="12%">
-
-<p><b>&minus;S</b></p>
-</td>
-<td width="76%">
-
-<p>Scale each page of image data to fill the output page
-dimensions. By default images are presented according to the
-dimension information recorded in the <small>TIFF</small>
-file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="12%">
-
-<p><b>&minus;W</b> <i>width</i></p>
-</td>
-<td width="76%">
-
-<p>Use <i>width</i> as the width, in inches, of the output
-page.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="12%">
-
-<p><b>&minus;H</b> <i>height</i></p>
-</td>
-<td width="76%">
-
-<p>Use <i>height</i> as the height, in inches, of the
-output page.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Some messages about malformed <small>TIFF</small> images
-come from the <small>TIFF</small> library.</p>
-<!-- INDENTATION -->
-<p>Various messages about badly formatted facsimile images
-may be generated due to transmission errors in received
-facsimile. <i>fax2ps</i> attempts to recover from such data
-errors by resynchronizing decoding at the end of the current
-scanline. This can result in long horizontal black lines in
-the resultant PostScript image.</p>
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>If the destination printer supports PostScript Level II
-then it is always faster to just send the encoded bitmap
-generated by the <b>tiff2ps</b>(1) program.</p>
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>fax2ps</i> should probably figure out when it is doing
-a poor job of compressing the output and just generate
-PostScript to image the bitmap raster instead.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiff2ps</b>(1), <b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/fax2tiff.1.html b/src/3rdparty/libtiff/html/man/fax2tiff.1.html
deleted file mode 100644
index 38b54c013c..0000000000
--- a/src/3rdparty/libtiff/html/man/fax2tiff.1.html
+++ /dev/null
@@ -1,607 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:18 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>FAX2TIFF</title>
-</head>
-<body>
-
-<h1 align=center>FAX2TIFF</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>fax2tiff &minus; create a <small>TIFF</small> Class F fax
-file from raw fax data</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>fax2tiff</b> [ <i>options</i> ] [ <b>&minus;o</b>
-<i>output.tif</i> ] <i>input.raw</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>Fax2tiff</i> creates a <small>TIFF</small> file
-containing <small>CCITT</small> Group 3 or Group 4 encoded
-data from one or more files containing
-&lsquo;&lsquo;raw&rsquo;&rsquo; Group 3 or Group 4 encoded
-data (typically obtained directly from a fax modem). By
-default, each row of data in the resultant
-<small>TIFF</small> file is 1-dimensionally encoded and
-padded or truncated to 1728 pixels, as needed. The resultant
-image is a set of low resolution (98 lines/inch) or medium
-resolution (196 lines/inch) pages, each of which is a single
-strip of data. The generated file conforms to the
-<small>TIFF</small> Class F ( <small>FAX</small> )
-specification for storing facsimile data. This means, in
-particular, that each page of the data does <b>not</b>
-include the trailing <i>return to control</i> (
-<small>RTC</small> ) code; as required for transmission by
-the <small>CCITT</small> Group 3 specifications. The old,
-&lsquo;&lsquo;classic&rsquo;&rsquo;, format is created if
-the <b>&minus;c</b> option is used. (The Class F format can
-also be requested with the <b>&minus;f</b> option.)</p>
-<!-- INDENTATION -->
-<p>The default name of the output image is <i>fax.tif</i>;
-this can be changed with the <b>&minus;o</b> option. Each
-input file is assumed to be a separate page of facsimile
-data from the same document. The order in which input files
-are specified on the command line is the order in which the
-resultant pages appear in the output file.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Options that affect the interpretation of input data
-are:</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;3</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Assume input data is <small>CCITT</small> Group 3
-encoded (default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;4</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Assume input data is <small>CCITT</small> Group 4
-encoded.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;U</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Assume input data is uncompressed (Group 3 or Group
-4).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;1</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Assume input data is encoded with the 1-dimensional
-version of the <small>CCITT</small> Group 3 Huffman encoding
-algorithm (default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;2</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Assume input data is 2-dimensional version of the
-<small>CCITT</small> Group 3 Huffman encoding algorithm.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;P</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Assume input data is <b>not</b> EOL-aligned (default).
-This option has effect with Group 3 encoded input only.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;A</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Assume input data is EOL-aligned. This option has effect
-with Group 3 encoded input only.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;M</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Treat input data as having bits filled from most
-significant bit ( <small>MSB</small> ) to most least bit (
-<small>LSB</small> ).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;L</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Treat input data as having bits filled from least
-significant bit ( <small>LSB</small> ) to most significant
-bit ( <small>MSB</small> ) (default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;B</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Assume input data was encoded with black as 0 and white
-as 1.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;W</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Assume input data was encoded with black as 1 and white
-as 0 (default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;R</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the vertical resolution, in lines/inch, of the
-input images. By default input are assumed to have a
-vertical resolution of 196 lines/inch. If images are low
-resolution facsimile, a value of 98 lines/inch should be
-specified.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;X</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the width, in pixels, of the input images. By
-default input are assumed to have a width of 1728
-pixels.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Options that affect the output file format are:</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;o</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the name of the output file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;7</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output to be compressed with the
-<small>CCITT</small> Group 3 Huffman encoding algorithm
-(default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;8</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output to be compressed with the
-<small>CCITT</small> Group 4 Huffman encoding.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;u</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output to be uncompressed (Group 3 or Group
-4).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;5</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output to be encoded with the 1-dimensional
-version of the <small>CCITT</small> Group 3 Huffman encoding
-algorithm.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;6</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output to be encoded with the 2-dimensional
-version of the <small>CCITT</small> Group 3 Huffman encoding
-algorithm (default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;a</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force the last bit of each <i>End Of Line</i> (
-<small>EOL</small> ) code to land on a byte boundary
-(default). This &lsquo;&lsquo;zero padding&rsquo;&rsquo;
-will be reflected in the contents of the
-<i>Group3Options</i> tag of the resultant
-<small>TIFF</small> file. This option has effect with Group
-3 encoded output only.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;p</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Do not EOL-align output. This option has effect with
-Group 3 encoded output only.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Generate &quot;classic&quot; Group 3 TIFF format.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;f</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Generate TIFF Class F (TIFF/F) format (default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;m</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output data to have bits filled from most
-significant bit ( <small>MSB</small> ) to most least bit (
-<small>LSB</small> ).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;l</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output data to have bits filled from least
-significant bit ( <small>LSB</small> ) to most significant
-bit ( <small>MSB</small> ) (default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the number of rows (scanlines) in each strip of
-data written to the output file. By default (or when value
-<b>0</b> is specified), <i>tiffcp</i> attempts to set the
-rows/strip that no more than 8 kilobytes of data appear in a
-strip (with except of G3/G4 compression schemes). If you
-specify special value <b>&minus;1</b> it will results in
-infinite number of the rows per strip. The entire image will
-be the one strip in that case. This is default in case of
-G3/G4 output compression schemes.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;s</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Stretch the input image vertically by writing each input
-row of data twice to the output file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;v</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force <i>fax2tiff</i> to print the number of rows of
-data it retrieved from the input file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;z</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output to be compressed with the LZW encoding.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The following warnings and errors come from the decoding
-routines in the library.</p>
-<!-- INDENTATION -->
-<p><b>Warning, %s: Premature EOL at scanline %d (x
-%d).\n</b>. The input data had a row that was shorter than
-the expected width. The row is padded with white.</p>
-<!-- INDENTATION -->
-<p><b>%s: Premature EOF at scanline %d (x %d).\n</b>. The
-decoder ran out of data in the middle of a scanline. The
-resultant row is padded with white.</p>
-<!-- INDENTATION -->
-<p><b>%s: Bad code word at row %d, x %d\n</b>. An invalid
-Group 3 <i>code</i> was encountered while decoding the input
-file. The row number and horizontal position is given. The
-remainder of the input row is discarded, while the
-corresponding output row is padded with white.</p>
-<!-- INDENTATION -->
-<p><b>%s: Bad 2D code word at scanline %d.\n</b>. An invalid
-Group 4 or 2D Group 3 <i>code</i> was encountered while
-decoding the input file. The row number and horizontal
-position is given. The remainder of the input row is
-discarded, while the corresponding output row is padded with
-white.</p>
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Input data are assumed to have a a &lsquo;&lsquo;top
-left&rsquo;&rsquo; orientation; it should be possible to
-override this assumption from the command line.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b><small>CCITT</small> Recommendation T.4</b>
-(Standardization of Group 3 Facsimile Apparatus for Document
-Transmission).</p>
-<!-- INDENTATION -->
-<p><b>The Spirit of TIFF Class F</b>, an appendix to the
-TIFF 5.0 specification prepared by Cygnet Technologies.</p>
-<!-- INDENTATION -->
-<p><b>tiffinfo</b>(1), <b>tiffdither</b>(1),
-<b>tiffgt</b>(1), <b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/gif2tiff.1.html b/src/3rdparty/libtiff/html/man/gif2tiff.1.html
deleted file mode 100644
index 6114bd317a..0000000000
--- a/src/3rdparty/libtiff/html/man/gif2tiff.1.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:18 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>GIF2TIFF</title>
-</head>
-<body>
-
-<h1 align=center>GIF2TIFF</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>gif2tiff &minus; create a <small>TIFF</small> file from a
-GIF87 format image file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>gif2tiff</b> [ <i>options</i> ] <i>input.gif
-output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>Gif2tiff</i> converts a file in the GIF87 format to
-<small>TIFF.</small> The <small>TIFF</small> image is
-created as a palette image, with samples compressed with the
-Lempel-Ziv &amp; Welch algorithm (<i>Compression</i>=5).
-These characteristics can overridden, or explicitly
-specified with the options described below.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify a compression scheme to use when writing image
-data: <b>&minus;c none</b> for no compression, <b>&minus;c
-packbits</b> for the PackBits compression algorithm,
-<b>&minus;c zip</b> for the Deflate compression algorithm,
-and <b>&minus;c lzw</b> for Lempel-Ziv &amp; Welch (the
-default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Write data with a specified number of rows per strip; by
-default the number of rows/strip is selected so that each
-strip is approximately 8 kilobytes.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The program is based on Paul Haeberli&rsquo;s
-<i>fromgif</i> program which, in turn, is based on Marcel
-J.E. Mol&rsquo;s GIF reader.</p>
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Should have more options to control output format.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>tiffmedian</b>(1), <b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/index.html b/src/3rdparty/libtiff/html/man/index.html
deleted file mode 100644
index 7e9e8d2c7f..0000000000
--- a/src/3rdparty/libtiff/html/man/index.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<HTML><HEAD><TITLE>Libtiff HTML manpage index</TITLE></HEAD><BODY BGCOLOR=white><ul><H2>Man Pages</h2><p>
-<li><A HREF=TIFFbuffer.3tiff.html>TIFFbuffer.3tiff.html</a>
-<li><A HREF=TIFFClose.3tiff.html>TIFFClose.3tiff.html</a>
-<li><A HREF=TIFFcodec.3tiff.html>TIFFcodec.3tiff.html</a>
-<li><A HREF=TIFFcolor.3tiff.html>TIFFcolor.3tiff.html</a>
-<li><A HREF=TIFFDataWidth.3tiff.html>TIFFDataWidth.3tiff.html</a>
-<li><A HREF=TIFFError.3tiff.html>TIFFError.3tiff.html</a>
-<li><A HREF=TIFFFlush.3tiff.html>TIFFFlush.3tiff.html</a>
-<li><A HREF=TIFFGetField.3tiff.html>TIFFGetField.3tiff.html</a>
-<li><A HREF=TIFFmemory.3tiff.html>TIFFmemory.3tiff.html</a>
-<li><A HREF=TIFFOpen.3tiff.html>TIFFOpen.3tiff.html</a>
-<li><A HREF=TIFFPrintDirectory.3tiff.html>TIFFPrintDirectory.3tiff.html</a>
-<li><A HREF=TIFFquery.3tiff.html>TIFFquery.3tiff.html</a>
-<li><A HREF=TIFFReadDirectory.3tiff.html>TIFFReadDirectory.3tiff.html</a>
-<li><A HREF=TIFFReadEncodedStrip.3tiff.html>TIFFReadEncodedStrip.3tiff.html</a>
-<li><A HREF=TIFFReadEncodedTile.3tiff.html>TIFFReadEncodedTile.3tiff.html</a>
-<li><A HREF=TIFFReadRawStrip.3tiff.html>TIFFReadRawStrip.3tiff.html</a>
-<li><A HREF=TIFFReadRawTile.3tiff.html>TIFFReadRawTile.3tiff.html</a>
-<li><A HREF=TIFFReadRGBAImage.3tiff.html>TIFFReadRGBAImage.3tiff.html</a>
-<li><A HREF=TIFFReadRGBAStrip.3tiff.html>TIFFReadRGBAStrip.3tiff.html</a>
-<li><A HREF=TIFFReadRGBATile.3tiff.html>TIFFReadRGBATile.3tiff.html</a>
-<li><A HREF=TIFFReadScanline.3tiff.html>TIFFReadScanline.3tiff.html</a>
-<li><A HREF=TIFFReadTile.3tiff.html>TIFFReadTile.3tiff.html</a>
-<li><A HREF=TIFFRGBAImage.3tiff.html>TIFFRGBAImage.3tiff.html</a>
-<li><A HREF=TIFFSetDirectory.3tiff.html>TIFFSetDirectory.3tiff.html</a>
-<li><A HREF=TIFFSetField.3tiff.html>TIFFSetField.3tiff.html</a>
-<li><A HREF=TIFFsize.3tiff.html>TIFFsize.3tiff.html</a>
-<li><A HREF=TIFFstrip.3tiff.html>TIFFstrip.3tiff.html</a>
-<li><A HREF=TIFFswab.3tiff.html>TIFFswab.3tiff.html</a>
-<li><A HREF=TIFFtile.3tiff.html>TIFFtile.3tiff.html</a>
-<li><A HREF=TIFFWarning.3tiff.html>TIFFWarning.3tiff.html</a>
-<li><A HREF=TIFFWriteDirectory.3tiff.html>TIFFWriteDirectory.3tiff.html</a>
-<li><A HREF=TIFFWriteEncodedStrip.3tiff.html>TIFFWriteEncodedStrip.3tiff.html</a>
-<li><A HREF=TIFFWriteEncodedTile.3tiff.html>TIFFWriteEncodedTile.3tiff.html</a>
-<li><A HREF=TIFFWriteRawStrip.3tiff.html>TIFFWriteRawStrip.3tiff.html</a>
-<li><A HREF=TIFFWriteRawTile.3tiff.html>TIFFWriteRawTile.3tiff.html</a>
-<li><A HREF=TIFFWriteScanline.3tiff.html>TIFFWriteScanline.3tiff.html</a>
-<li><A HREF=TIFFWriteTile.3tiff.html>TIFFWriteTile.3tiff.html</a>
-<li><A HREF=fax2ps.1.html>fax2ps.1.html</a>
-<li><A HREF=fax2tiff.1.html>fax2tiff.1.html</a>
-<li><A HREF=gif2tiff.1.html>gif2tiff.1.html</a>
-<li><A HREF=pal2rgb.1.html>pal2rgb.1.html</a>
-<li><A HREF=ppm2tiff.1.html>ppm2tiff.1.html</a>
-<li><A HREF=ras2tiff.1.html>ras2tiff.1.html</a>
-<li><A HREF=raw2tiff.1.html>raw2tiff.1.html</a>
-<li><A HREF=rgb2ycbcr.1.html>rgb2ycbcr.1.html</a>
-<li><A HREF=sgi2tiff.1.html>sgi2tiff.1.html</a>
-<li><A HREF=thumbnail.1.html>thumbnail.1.html</a>
-<li><A HREF=tiff2bw.1.html>tiff2bw.1.html</a>
-<li><A HREF=tiff2pdf.1.html>tiff2pdf.1.html</a>
-<li><A HREF=tiff2ps.1.html>tiff2ps.1.html</a>
-<li><A HREF=tiff2rgba.1.html>tiff2rgba.1.html</a>
-<li><A HREF=tiffcmp.1.html>tiffcmp.1.html</a>
-<li><A HREF=tiffcp.1.html>tiffcp.1.html</a>
-<li><A HREF=tiffcrop.1.html>tiffcrop.1.html</a>
-<li><A HREF=tiffdither.1.html>tiffdither.1.html</a>
-<li><A HREF=tiffdump.1.html>tiffdump.1.html</a>
-<li><A HREF=tiffgt.1.html>tiffgt.1.html</a>
-<li><A HREF=tiffinfo.1.html>tiffinfo.1.html</a>
-<li><A HREF=tiffmedian.1.html>tiffmedian.1.html</a>
-<li><A HREF=tiffset.1.html>tiffset.1.html</a>
-<li><A HREF=tiffsplit.1.html>tiffsplit.1.html</a>
-<li><A HREF=tiffsv.1.html>tiffsv.1.html</a>
-</ul></BODY></HTML>
diff --git a/src/3rdparty/libtiff/html/man/libtiff.3tiff.html b/src/3rdparty/libtiff/html/man/libtiff.3tiff.html
deleted file mode 100644
index bea73f761f..0000000000
--- a/src/3rdparty/libtiff/html/man/libtiff.3tiff.html
+++ /dev/null
@@ -1,3137 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:14 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>INTRO</title>
-</head>
-<body>
-
-<h1 align=center>INTRO</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#DATA TYPES">DATA TYPES</a><br>
-<a href="#LIST OF ROUTINES">LIST OF ROUTINES</a><br>
-<a href="#TAG USAGE">TAG USAGE</a><br>
-<a href="#PSEUDO TAGS">PSEUDO TAGS</a><br>
-<a href="#DIAGNOSTICS">DIAGNOSTICS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-<a href="#BUGS">BUGS</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>libtiff &minus; introduction to <i>libtiff</i>, a
-library for reading and writing</big> TIFF
-<big>files</big></p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>#include &lt;tiffio.h&gt;</b></big></p>
-<!-- INDENTATION -->
-<p><big>cc file.c <b>-ltiff</b></big></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><i>libtiff</i> is a library for reading and writing
-data files encoded with the <i>Tag Image File</i> format,
-Revision 6.0 (or revision 5.0 or revision 4.0). This file
-format is suitable for archiving multi-color and
-monochromatic image data.</big></p>
-<!-- INDENTATION -->
-<p><big>The library supports several compression algorithms,
-as indicated by the <i>Compression</i> field, including: no
-compression (1),</big> CCITT <big>1D Huffman compression
-(2),</big> CCITT <big>Group 3 Facsimile compression
-(3),</big> CCITT <big>Group 4 Facsimile compression (4),
-Lempel-Ziv &amp; Welch compression (5), baseline JPEG
-compression (7), word-aligned 1D Huffman compression
-(32771), and PackBits compression (32773). In addition,
-several nonstandard compression algorithms are supported:
-the 4-bit compression algorithm used by the
-<i>ThunderScan</i> program (32809) (decompression only),
-NeXT&rsquo;s 2-bit compression algorithm (32766)
-(decompression only), an experimental LZ-style algorithm
-known as Deflate (32946), and an experimental CIE LogLuv
-compression scheme designed for images with high dynamic
-range (32845 for LogL and 32845 for LogLuv). Directory
-information may be in either little- or big-endian byte
-order&minus;byte swapping is automatically done by the
-library. Data bit ordering may be either Most Significant
-Bit (</big> MSB <big>) to Least Significant Bit (</big> LSB
-<big>) or</big> LSB <big>to</big> MSB. <big>Finally, the
-library does not support files in which the
-<i>BitsPerSample</i>, <i>Compression</i>,
-<i>MinSampleValue</i>, or <i>MaxSampleValue</i> fields are
-defined differently on a per-sample basis (in Rev. 6.0 the
-<i>Compression</i> tag is not defined on a per-sample basis,
-so this is immaterial).</big></p>
-</td>
-</table>
-<a name="DATA TYPES"></a>
-<h2>DATA TYPES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>The library makes extensive use of C typedefs to
-promote portability. Two sets of typedefs are used, one for
-communication with clients of the library and one for
-internal data structures and parsing of the</big> TIFF
-<big>format. The following typedefs are exposed to users
-either through function definitions or through parameters
-passed through the varargs interfaces.</big></p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="3" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef unsigned short uint16;</big></p>
-</td>
-<td width="38%">
-
-<p><big>16-bit unsigned integer</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef unsigned &lt;<i>thing</i>&gt;
-uint32;</big></p>
-</td>
-<td width="38%">
-
-<p><big>32-bit unsigned integer</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef unsigned int ttag_t;</big></p>
-</td>
-<td width="38%">
-
-<p><big>directory tag</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef uint16 tdir_t;</big></p>
-</td>
-<td width="38%">
-
-<p><big>directory index</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef uint16 tsample_t;</big></p>
-</td>
-<td width="38%">
-
-<p><big>sample number</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef uint32 tstrip_t;</big></p>
-</td>
-<td width="38%">
-
-<p><big>strip number</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef uint32 ttile_t;</big></p>
-</td>
-<td width="38%">
-
-<p><big>tile number</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef int32 tsize_t;</big></p>
-</td>
-<td width="38%">
-
-<p><big>i/o size in bytes</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef void* tdata_t;</big></p>
-</td>
-<td width="38%">
-
-<p><big>image data ref</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef void* thandle_t;</big></p>
-</td>
-<td width="38%">
-
-<p><big>client data handle</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="46%">
-
-<p><big>typedef int32 toff_t;</big></p>
-</td>
-<td width="38%">
-
-<p><big>file offset</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>Note that <i>tstrip_t</i>, <i>ttile_t</i>, and
-<i>tsize_t</i> are constrained to be no more than 32-bit
-quantities by 32-bit fields they are stored in in the</big>
-TIFF <big>image. Likewise <i>tsample_t</i> is limited by the
-16-bit field used to store the <i>SamplesPerPixel</i> tag.
-<i>tdir_t</i> constrains the maximum number of</big> IFDs
-<big>that may appear in an image and may be an arbitrary
-size (w/o penalty). <i>ttag_t</i> must be either int,
-unsigned int, pointer, or double because the library uses a
-varargs interface and</big> ANSI C <big>restricts the type
-of the parameter before an ellipsis to be a promoted type.
-<i>toff_t</i> is defined as int32 because TIFF file offsets
-are (unsigned) 32-bit quantities. A signed value is used
-because some interfaces return &minus;1 on error. Finally,
-note that user-specified data references are passed as
-opaque handles and only cast at the lowest layers where
-their type is presumed.</big></p>
-</td>
-</table>
-<a name="LIST OF ROUTINES"></a>
-<h2>LIST OF ROUTINES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>The following routines are part of the library.
-Consult specific manual pages for details on their
-operation; on most systems doing &lsquo;&lsquo;man
-function-name&rsquo;&rsquo; will work.</big></p></td>
-</table>
-<!-- TABS -->
-
-<p><big><i>Name Description</i></big></p>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="3" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFCheckpointDirectory</big></p>
-</td>
-<td width="67%">
-
-<p><big>writes the current state of the directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFCheckTile</big></p>
-</td>
-<td width="67%">
-
-<p><big>very x,y,z,sample is within image</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFCIELabToRGBInit</big></p>
-</td>
-<td width="67%">
-
-<p><big>initialize CIE L*a*b* 1976 to RGB conversion
-state</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFCIELabToXYZ</big></p>
-</td>
-<td width="67%">
-
-<p><big>perform CIE L*a*b* 1976 to CIE XYZ
-conversion</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFClientOpen</big></p>
-</td>
-<td width="67%">
-
-<p><big>open a file for reading or writing</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFClose</big></p>
-</td>
-<td width="67%">
-
-<p><big>close an open file</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFComputeStrip</big></p>
-</td>
-<td width="67%">
-
-<p><big>return strip containing y,sample</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFComputeTile</big></p>
-</td>
-<td width="67%">
-
-<p><big>return tile containing x,y,z,sample</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFCurrentDirectory</big></p>
-</td>
-<td width="67%">
-
-<p><big>return index of current directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFCurrentRow</big></p>
-</td>
-<td width="67%">
-
-<p><big>return index of current scanline</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFCurrentStrip</big></p>
-</td>
-<td width="67%">
-
-<p><big>return index of current strip</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFCurrentTile</big></p>
-</td>
-<td width="67%">
-
-<p><big>return index of current tile</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFDataWidth</big></p>
-</td>
-<td width="67%">
-
-<p><big>return the size of TIFF data types</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFError</big></p>
-</td>
-<td width="67%">
-
-<p><big>library error handler</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFFdOpen</big></p>
-</td>
-<td width="67%">
-
-<p><big>open a file for reading or writing</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFFileName</big></p>
-</td>
-<td width="67%">
-
-<p><big>return name of open file</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFFileno</big></p>
-</td>
-<td width="67%">
-
-<p><big>return open file descriptor</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFFindCODEC</big></p>
-</td>
-<td width="67%">
-
-<p><big>find standard codec for the specific
-scheme</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFFlush</big></p>
-</td>
-<td width="67%">
-
-<p><big>flush all pending writes</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFFlushData</big></p>
-</td>
-<td width="67%">
-
-<p><big>flush pending data writes</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFGetBitRevTable</big></p>
-</td>
-<td width="67%">
-
-<p><big>return bit reversal table</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFGetField</big></p>
-</td>
-<td width="67%">
-
-<p><big>return tag value in current directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFGetFieldDefaulted</big></p>
-</td>
-<td width="67%">
-
-<p><big>return tag value in current directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFGetMode</big></p>
-</td>
-<td width="67%">
-
-<p><big>return open file mode</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFGetVersion</big></p>
-</td>
-<td width="67%">
-
-<p><big>return library version string</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFIsCODECConfigured</big></p>
-</td>
-<td width="67%">
-
-<p><big>check, whether we have working codec</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFIsMSB2LSB</big></p>
-</td>
-<td width="67%">
-
-<p><big>return true if image data is being
-returned</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%"></td>
-<td width="67%">
-
-<p><big>with bit 0 as the most significant bit</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFIsTiled</big></p>
-</td>
-<td width="67%">
-
-<p><big>return true if image data is tiled</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFIsByteSwapped</big></p>
-</td>
-<td width="67%">
-
-<p><big>return true if image data is byte-swapped</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFNumberOfStrips</big></p>
-</td>
-<td width="67%">
-
-<p><big>return number of strips in an image</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFNumberOfTiles</big></p>
-</td>
-<td width="67%">
-
-<p><big>return number of tiles in an image</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFOpen</big></p>
-</td>
-<td width="67%">
-
-<p><big>open a file for reading or writing</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFPrintDirectory</big></p>
-</td>
-<td width="67%">
-
-<p><big>print description of the current
-directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFReadBufferSetup</big></p>
-</td>
-<td width="67%">
-
-<p><big>specify i/o buffer for reading</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFReadDirectory</big></p>
-</td>
-<td width="67%">
-
-<p><big>read the next directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFReadEncodedStrip</big></p>
-</td>
-<td width="67%">
-
-<p><big>read and decode a strip of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFReadEncodedTile</big></p>
-</td>
-<td width="67%">
-
-<p><big>read and decode a tile of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFReadRawStrip</big></p>
-</td>
-<td width="67%">
-
-<p><big>read a raw strip of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFReadRawTile</big></p>
-</td>
-<td width="67%">
-
-<p><big>read a raw tile of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFReadRGBAImage</big></p>
-</td>
-<td width="67%">
-
-<p><big>read an image into a fixed format raster</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFReadScanline</big></p>
-</td>
-<td width="67%">
-
-<p><big>read and decode a row of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFReadTile</big></p>
-</td>
-<td width="67%">
-
-<p><big>read and decode a tile of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFRegisterCODEC</big></p>
-</td>
-<td width="67%">
-
-<p><big>override standard codec for the specific
-scheme</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFReverseBits</big></p>
-</td>
-<td width="67%">
-
-<p><big>reverse bits in an array of bytes</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFRGBAImageBegin</big></p>
-</td>
-<td width="67%">
-
-<p><big>setup decoder state for TIFFRGBAImageGet</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFRGBAImageEnd</big></p>
-</td>
-<td width="67%">
-
-<p><big>release TIFFRGBAImage decoder state</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFRGBAImageGet</big></p>
-</td>
-<td width="67%">
-
-<p><big>read and decode an image</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFRGBAImageOK</big></p>
-</td>
-<td width="67%">
-
-<p><big>is image readable by TIFFRGBAImageGet</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFScanlineSize</big></p>
-</td>
-<td width="67%">
-
-<p><big>return size of a scanline</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFSetDirectory</big></p>
-</td>
-<td width="67%">
-
-<p><big>set the current directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFSetSubDirectory</big></p>
-</td>
-<td width="67%">
-
-<p><big>set the current directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFSetErrorHandler</big></p>
-</td>
-<td width="67%">
-
-<p><big>set error handler function</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFSetField</big></p>
-</td>
-<td width="67%">
-
-<p><big>set a tag&rsquo;s value in the current
-directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFSetWarningHandler</big></p>
-</td>
-<td width="67%">
-
-<p><big>set warning handler function</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFStripSize</big></p>
-</td>
-<td width="67%">
-
-<p><big>returns size of a strip</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFRawStripSize</big></p>
-</td>
-<td width="67%">
-
-<p><big>returns the number of bytes in a raw
-strip</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFSwabShort</big></p>
-</td>
-<td width="67%">
-
-<p><big>swap bytes of short</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFSwabLong</big></p>
-</td>
-<td width="67%">
-
-<p><big>swap bytes of long</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFSwabArrayOfShort</big></p>
-</td>
-<td width="67%">
-
-<p><big>swap bytes of an array of shorts</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFSwabArrayOfLong</big></p>
-</td>
-<td width="67%">
-
-<p><big>swap bytes of an array of longs</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFTileRowSize</big></p>
-</td>
-<td width="67%">
-
-<p><big>return size of a row in a tile</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFTileSize</big></p>
-</td>
-<td width="67%">
-
-<p><big>return size of a tile</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFUnRegisterCODEC</big></p>
-</td>
-<td width="67%">
-
-<p><big>unregisters the codec</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFVGetField</big></p>
-</td>
-<td width="67%">
-
-<p><big>return tag value in current directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFVGetFieldDefaulted</big></p>
-</td>
-<td width="67%">
-
-<p><big>return tag value in current directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFVSetField</big></p>
-</td>
-<td width="67%">
-
-<p><big>set a tag&rsquo;s value in the current
-directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFVStripSize</big></p>
-</td>
-<td width="67%">
-
-<p><big>returns the number of bytes in a strip</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFWarning</big></p>
-</td>
-<td width="67%">
-
-<p><big>library warning handler</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFWriteDirectory</big></p>
-</td>
-<td width="67%">
-
-<p><big>write the current directory</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFWriteEncodedStrip</big></p>
-</td>
-<td width="67%">
-
-<p><big>compress and write a strip of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFWriteEncodedTile</big></p>
-</td>
-<td width="67%">
-
-<p><big>compress and write a tile of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFWriteRawStrip</big></p>
-</td>
-<td width="67%">
-
-<p><big>write a raw strip of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFWriteRawTile</big></p>
-</td>
-<td width="67%">
-
-<p><big>write a raw tile of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFWriteScanline</big></p>
-</td>
-<td width="67%">
-
-<p><big>write a scanline of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFWriteTile</big></p>
-</td>
-<td width="67%">
-
-<p><big>compress and write a tile of data</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFXYZToRGB</big></p>
-</td>
-<td width="67%">
-
-<p><big>perform CIE XYZ to RGB conversion</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFYCbCrToRGBInit</big></p>
-</td>
-<td width="67%">
-
-<p><big>initialize YCbCr to RGB conversion state</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>TIFFYCbCrtoRGB</big></p>
-</td>
-<td width="67%">
-
-<p><big>perform YCbCr to RGB conversion</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>Auxiliary functions:</big></p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="3" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>_TIFFfree</big></p>
-</td>
-<td width="67%">
-
-<p><big>free memory buffer</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>_TIFFmalloc</big></p>
-</td>
-<td width="67%">
-
-<p><big>dynamically allocate memory buffer</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>_TIFFmemcmp</big></p>
-</td>
-<td width="67%">
-
-<p><big>compare contents of the memory buffers</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>_TIFFmemcpy</big></p>
-</td>
-<td width="67%">
-
-<p><big>copy contents of the one buffer to
-another</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>_TIFFmemset</big></p>
-</td>
-<td width="67%">
-
-<p><big>fill memory buffer with a constant byte</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="23%">
-
-<p><big>_TIFFrealloc</big></p>
-</td>
-<td width="67%">
-
-<p><big>dynamically reallocate memory buffer</big></p>
-</td>
-</table>
-<a name="TAG USAGE"></a>
-<h2>TAG USAGE</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>The table below lists the</big> TIFF <big>tags that
-are recognized and handled by the library. If no use is
-indicated in the table, then the library reads and writes
-the tag, but does not use it internally. Note that some tags
-are meaningful only when a particular compression scheme is
-being used; e.g. <i>Group3Options</i> is only useful if
-<i>Compression</i> is set to</big> CCITT <big>Group 3
-encoding. Tags of this sort are considered
-<i>codec-specific</i> tags and the library does not
-recognize them except when the <i>Compression</i> tag has
-been previously set to the relevant compression
-scheme.</big></p>
-<!-- INDENTATION -->
-<pre><big><i>Tag Name Value R/W Library Use/Notes
-</i></big></pre>
-</td>
-</table>
-<!-- TABS -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Artist</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>315</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>BadFaxLines</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>326</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>BitsPerSample</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>258</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>lots</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>CellLength</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>265</big></p>
-</td>
-<td width="53%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>parsed but ignored</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>CellWidth</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>264</big></p>
-</td>
-<td width="53%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>parsed but ignored</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>CleanFaxData</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>327</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>ColorMap</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>320</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>ColorResponseUnit</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>300</big></p>
-</td>
-<td width="53%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>parsed but ignored</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Compression</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>259</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>choosing codec</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>ConsecutiveBadFaxLines</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>328</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>Copyright 33432 R/W</big></p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>DataType</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>32996</big></p>
-</td>
-<td width="53%">
-
-<p><big>R</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>obsoleted by SampleFormat tag</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>DateTime</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>306</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>DocumentName</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>269</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>DotRange</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>336</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>ExtraSamples</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>338</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>lots</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>FaxRecvParams</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>34908</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>FaxSubAddress</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>34909</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>FaxRecvTime</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>34910</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>FillOrder</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>266</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>control bit order</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>FreeByteCounts</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>289</big></p>
-</td>
-<td width="53%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>parsed but ignored</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>FreeOffsets</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>288</big></p>
-</td>
-<td width="53%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>parsed but ignored</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>GrayResponseCurve</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>291</big></p>
-</td>
-<td width="53%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>parsed but ignored</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>GrayResponseUnit</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>290</big></p>
-</td>
-<td width="53%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>parsed but ignored</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Group3Options</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>292</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>used by Group 3 codec</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Group4Options</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>293</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>HostComputer</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>316</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>ImageDepth</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>32997</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>tile/strip calculations</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>ImageDescription</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>270</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>ImageLength</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>257</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>lots</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>ImageWidth</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>256</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>lots</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>InkNames</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>333</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>InkSet</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>332</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>JPEGTables</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>347</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>used by JPEG codec</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Make</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>271</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Matteing</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>32995</big></p>
-</td>
-<td width="53%">
-
-<p><big>R</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>obsoleted by ExtraSamples tag</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>MaxSampleValue</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>281</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>MinSampleValue</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>280</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Model</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>272</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>NewSubFileType</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>254</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>called SubFileType in spec</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>NumberOfInks</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>334</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Orientation</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>274</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>PageName</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>285</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>PageNumber</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>297</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>PhotometricInterpretation</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>262</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>R/Wused by Group 3 and JPEG codecs</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>PlanarConfiguration</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>284</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>data i/o</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Predictor</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>317</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>used by LZW and Deflate codecs</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>PrimaryChromacities</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>319</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>ReferenceBlackWhite</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>532</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>ResolutionUnit</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>296</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>used by Group 3 codec</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>RowsPerStrip</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>278</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>data i/o</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>SampleFormat</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>339</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>SamplesPerPixel</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>277</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>lots</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>SMinSampleValue</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>340</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>SMaxSampleValue</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>341</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Software</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>305</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>StoNits</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>37439</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>StripByteCounts</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>279</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>data i/o</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>StripOffsets</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>273</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>data i/o</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>SubFileType</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>255</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>called OSubFileType in spec</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TargetPrinter</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>337</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>Thresholding</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>263</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TileByteCounts</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>324</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>data i/o</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TileDepth</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>32998</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>tile/strip calculations</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TileLength</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>323</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>data i/o</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TileOffsets</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>324</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>data i/o</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TileWidth</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>322</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>data i/o</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TransferFunction</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>301</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>WhitePoint</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>318</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>XPosition</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>286</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>XResolution</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>282</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>YCbCrCoefficients</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>529</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>used by TIFFRGBAImage support</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>YCbCrPositioning</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>531</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>tile/strip size calulcations</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>YCbCrSubsampling</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>530</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>YPosition</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>286</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>YResolution</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>283</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>used by Group 3 codec</big></p>
-</td>
-</table>
-<a name="PSEUDO TAGS"></a>
-<h2>PSEUDO TAGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>In addition to the normal</big> TIFF <big>tags the
-library supports a collection of tags whose values lie in a
-range outside the valid range of</big> TIFF <big>tags. These
-tags are termed <i>pseud-tags</i> and are used to control
-various codec-specific functions within the library. The
-table below summarizes the defined pseudo-tags.</big></p>
-<!-- INDENTATION -->
-<pre><big><i>Tag Name Codec R/W Library Use/Notes
-</i></big></pre>
-</td>
-</table>
-<!-- TABS -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TIFFTAG_FAXMODE</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>G3</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>general codec operation</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TIFFTAG_FAXFILLFUNC</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>G3/G4</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>bitmap fill function</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TIFFTAG_JPEGQUALITY</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>JPEG</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>compression quality control</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TIFFTAG_JPEGCOLORMODE</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>JPEG</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>control colorspace conversions</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TIFFTAG_JPEGTABLESMODE</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>JPEG</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>control contents of <i>JPEGTables</i> tag</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TIFFTAG_ZIPQUALITY</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>Deflate</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/Wcompression quality level</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TIFFTAG_PIXARLOGDATAFMT</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>PixarLog</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/Wuser data format</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TIFFTAG_PIXARLOGQUALITY</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>PixarLog</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/Wcompression quality level</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%">
-
-<p><big>TIFFTAG_SGILOGDATAFMT</big></p>
-</td>
-<td width="8%"></td>
-<td width="6%">
-
-<p><big>SGILog</big></p>
-</td>
-<td width="53%">
-
-<p><big>R/W</big></p>
-</td>
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="21%"></td>
-<td width="8%"></td>
-<td width="6%"></td>
-<td width="53%">
-
-<p><big>user data format</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_FAXMODE</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Control the operation of the Group 3 codec. Possible
-values (independent bits that can be combined by
-or&rsquo;ing them together) are: FAXMODE_CLASSIC (enable
-old-style format in which the</big> RTC <big>is written at
-the end of the last strip), FAXMODE_NORTC (opposite of
-FAXMODE_CLASSIC; also called FAXMODE_CLASSF), FAXMODE_NOEOL
-(do not write</big> EOL <big>codes at the start of each row
-of data), FAXMODE_BYTEALIGN (align each encoded row to an
-8-bit boundary), FAXMODE_WORDALIGN (align each encoded row
-to an 16-bit boundary), The default value is dependent on
-the compression scheme; this pseudo-tag is used by the
-various G3 and G4 codecs to share code.</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_FAXFILLFUNC</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Control the function used to convert arrays of black
-and white runs to packed bit arrays. This hook can be used
-to image decoded scanlines in multi-bit depth rasters (e.g.
-for display in colormap mode) or for other purposes. The
-default value is a pointer to a builtin function that images
-packed bilevel data.</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_IPTCNEWSPHOTO</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Tag contaings image metadata per the IPTC newsphoto
-spec: Headline, captioning, credit, etc... Used by most wire
-services.</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_PHOTOSHOP</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Tag contains Photoshop captioning information and
-metadata. Photoshop uses in parallel and redundantly
-alongside IPTCNEWSPHOTO information.</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_JPEGQUALITY</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Control the compression quality level used in the
-baseline algorithm. Note that quality levels are in the
-range 0-100 with a default value of 75.</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_JPEGCOLORMODE</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Control whether or not conversion is done between
-RGB and YCbCr colorspaces. Possible values are:
-JPEGCOLORMODE_RAW (do not convert), and JPEGCOLORMODE_RGB
-(convert to/from RGB) The default value is
-JPEGCOLORMODE_RAW.</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_JPEGTABLESMODE</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Control the information written in the
-<i>JPEGTables</i> tag. Possible values (independent bits
-that can be combined by or&rsquo;ing them together) are:
-JPEGTABLESMODE_QUANT (include quantization tables), and
-JPEGTABLESMODE_HUFF (include Huffman encoding tables). The
-default value is
-JPEGTABLESMODE_QUANT|JPEGTABLESMODE_HUFF.</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_ZIPQUALITY</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Control the compression technique used by the
-Deflate codec. Quality levels are in the range 1-9 with
-larger numbers yielding better compression at the cost of
-more computation. The default quality level is 6 which
-yields a good time-space tradeoff.</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_PIXARLOGDATAFMT</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Control the format of user data passed <i>in</i> to
-the PixarLog codec when encoding and passed <i>out</i> from
-when decoding. Possible values are: PIXARLOGDATAFMT_8BIT for
-8-bit unsigned pixels, PIXARLOGDATAFMT_8BITABGR for 8-bit
-unsigned ABGR-ordered pixels, PIXARLOGDATAFMT_11BITLOG for
-11-bit log-encoded raw data, PIXARLOGDATAFMT_12BITPICIO for
-12-bit PICIO-compatible data, PIXARLOGDATAFMT_16BIT for
-16-bit signed samples, and PIXARLOGDATAFMT_FLOAT for 32-bit
-IEEE floating point samples.</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_PIXARLOGQUALITY</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Control the compression technique used by the
-PixarLog codec. This value is treated identically to
-TIFFTAG_ZIPQUALITY; see the above description.</big></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>TIFFTAG_SGILOGDATAFMT</b></big></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p><big>Control the format of client data passed <i>in</i>
-to the SGILog codec when encoding and passed <i>out</i> from
-when decoding. Possible values are: SGILOGDATAFMT_FLTXYZ for
-converting between LogLuv and 32-bit IEEE floating valued
-XYZ pixels, SGILOGDATAFMT_16BITLUV for 16-bit encoded Luv
-pixels, SGILOGDATAFMT_32BITRAW and SGILOGDATAFMT_24BITRAW
-for no conversion of data, SGILOGDATAFMT_8BITRGB for
-returning 8-bit RGB data (valid only when decoding
-LogLuv-encoded data), SGILOGDATAFMT_FLTY for converting
-between LogL and 32-bit IEEE floating valued Y pixels,
-SGILOGDATAFMT_16BITL for 16-bit encoded L pixels, and
-SGILOGDATAFMT_8BITGRY for returning 8-bit greyscale data
-(valid only when decoding LogL-encoded data).</big></p>
-</td>
-</table>
-<a name="DIAGNOSTICS"></a>
-<h2>DIAGNOSTICS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>All error messages are directed through the
-<i>TIFFError</i> routine. By default messages are directed
-to <b>stderr</b> in the form: <i>module: message\n.</i>
-Warning messages are likewise directed through the
-<i>TIFFWarning</i> routine.</big></p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big><b>fax2tiff</b>(1), <b>gif2tiff</b>(1),
-<b>pal2rgb</b>(1), <b>ppm2tiff</b>(1), <b>rgb2ycbcr</b>(1),
-<b>ras2tiff</b>(1), <b>raw2tiff</b>(1), <b>sgi2tiff</b>(1),
-<b>tiff2bw</b>(1), <b>tiffdither</b>(1), <b>tiffdump</b>(1),
-<b>tiffcp</b>(1), <b>tiffcmp</b>(1), <b>tiffgt</b>(1),
-<b>tiffinfo</b>(1), <b>tiffmedian</b>(1),
-<b>tiffsplit</b>(1), <b>tiffsv</b>(1).</big></p>
-<!-- INDENTATION -->
-<p><big><b>Tag Image File Format Specification &mdash;
-Revision 6.0</b>, an Aldus Technical Memorandum.</big></p>
-<!-- INDENTATION -->
-<p><big><b>The Spirit of TIFF Class F</b>, an appendix to
-the TIFF 5.0 specification prepared by Cygnet
-Technologies.</big></p>
-<!-- INDENTATION -->
-<p><big>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></big></p>
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><big>The library does not support multi-sample images
-where some samples have different bits/sample.</big></p>
-<!-- INDENTATION -->
-<p><big>The library does not support random access to
-compressed data that is organized with more than one row per
-tile or strip.</big></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/pal2rgb.1.html b/src/3rdparty/libtiff/html/man/pal2rgb.1.html
deleted file mode 100644
index 5c3a679a95..0000000000
--- a/src/3rdparty/libtiff/html/man/pal2rgb.1.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:18 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>PAL2RGB</title>
-</head>
-<body>
-
-<h1 align=center>PAL2RGB</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>pal2rgb &minus; convert a palette color
-<small>TIFF</small> image to a full color image</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b> [ <i>options</i> ] <i>input.tif
-output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>Pal2rgb</i> converts a palette color
-<small>TIFF</small> image to a full color image by applying
-the colormap of the palette image to each sample to generate
-a full color <small>RGB</small> image.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Options that affect the interpretation of input data
-are:</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;C</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>This option overrides the default behavior of
-<i>pal2rgb</i> in determining whether or not colormap
-entries contain 16-bit or 8-bit values. By default the
-colormap is inspected and if no colormap entry greater than
-255 is found, the colormap is assumed to have only 8-bit
-values; otherwise 16-bit values (as required by the
-<small>TIFF</small> specification) are assumed. The
-<b>&minus;C</b> option can be used to explicitly specify the
-number of bits for colormap entries: <b>&minus;C 8</b> for
-8-bit values, <b>&minus;C 16</b> for 16-bit values.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Options that affect the output file format are:</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="5%">
-
-<p><b>&minus;p</b></p>
-</td>
-<td width="3%"></td>
-<td width="80%">
-
-<p>Explicitly select the planar configuration used in
-organizing data samples in the output image: <b>&minus;p
-contig</b> for samples packed contiguously, and <b>&minus;p
-separate</b> for samples stored separately. By default
-samples are packed.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="5%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="3%"></td>
-<td width="80%">
-
-<p>Use the specific compression algorithm to encoded image
-data in the output file: <b>&minus;c packbits</b> for
-Macintosh Packbits, <b>&minus;c lzw</b> for Lempel-Ziv &amp;
-Welch, <b>&minus;c zip</b> for Deflate, <b>&minus;c none</b>
-for no compression. If no compression-related option is
-specified, the input file&rsquo;s compression algorithm is
-used.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="5%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="3%"></td>
-<td width="80%">
-
-<p>Explicitly specify the number of rows in each strip of
-the output file. If the <b>&minus;r</b> option is not
-specified, a number is selected such that each output strip
-has approximately 8 kilobytes of data in it.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Only 8-bit images are handled.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>tiffmedian</b>(1), <b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/ppm2tiff.1.html b/src/3rdparty/libtiff/html/man/ppm2tiff.1.html
deleted file mode 100644
index 60e56e1ff5..0000000000
--- a/src/3rdparty/libtiff/html/man/ppm2tiff.1.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:18 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>PPM2TIFF</title>
-</head>
-<body>
-
-<h1 align=center>PPM2TIFF</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>ppm2tiff &minus; create a <small>TIFF</small> file from
-<small>PPM, PGM</small> and <small>PBM</small> image
-files</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>ppm2tiff</b> [ <i>options</i> ] [ <i>input.ppm</i> ]
-<i>output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>ppm2tiff</i> converts a file in the <small>PPM,
-PGM</small> and <small>PBM</small> image formats to
-<small>TIFF.</small> By default, the <small>TIFF</small>
-image is created with data samples packed
-(<i>PlanarConfiguration</i>=1), compressed with the Packbits
-algorithm (<i>Compression</i>=32773), and with each strip no
-more than 8 kilobytes. These characteristics can be
-overridden, or explicitly specified with the options
-described below</p>
-<!-- INDENTATION -->
-<p>If the <small>PPM</small> file contains greyscale data,
-then the <i>PhotometricInterpretation</i> tag is set to 1
-(min-is-black), otherwise it is set to 2 (RGB).</p>
-<!-- INDENTATION -->
-<p>If no <small>PPM</small> file is specified on the command
-line, <i>ppm2tiff</i> will read from the standard input.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify a compression scheme to use when writing image
-data: <b>none</b> for no compression, <b>packbits</b> for
-PackBits compression (will be used by default), <b>lzw</b>
-for Lempel-Ziv &amp; Welch compression, <b>jpeg</b> for
-baseline JPEG compression, <b>zip</b> for Deflate
-compression, <b>g3</b> for CCITT Group 3 (T.4) compression,
-and <b>g4</b> for CCITT Group 4 (T.6) compression.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Write data with a specified number of rows per strip; by
-default the number of rows/strip is selected so that each
-strip is approximately 8 kilobytes.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;R</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Mark the resultant image to have the specified X and Y
-resolution (in dots/inch).</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>tiffmedian</b>(1), <b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/ras2tiff.1.html b/src/3rdparty/libtiff/html/man/ras2tiff.1.html
deleted file mode 100644
index b0b8993288..0000000000
--- a/src/3rdparty/libtiff/html/man/ras2tiff.1.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:18 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>RAS2TIFF</title>
-</head>
-<body>
-
-<h1 align=center>RAS2TIFF</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>ras2tiff &minus; create a <small>TIFF</small> file from a
-Sun rasterfile</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>ras2tiff</b> [ <i>options</i> ] <i>input.ras
-output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>ras2tiff</i> converts a file in the Sun rasterfile
-format to <small>TIFF.</small> By default, the
-<small>TIFF</small> image is created with data samples
-packed (<i>PlanarConfiguration</i>=1), compressed with the
-Lempel-Ziv &amp; Welch algorithm (<i>Compression</i>=5), and
-with each strip no more than 8 kilobytes. These
-characteristics can overridden, or explicitly specified with
-the options described below.</p>
-<!-- INDENTATION -->
-<p>Any colormap information in the rasterfile is carried
-over to the <small>TIFF</small> file by including a
-<i>Colormap</i> tag in the output file. If the rasterfile
-has a colormap, the <i>PhotometricInterpretation</i> tag is
-set to 3 (palette); otherwise it is set to 2 (RGB) if the
-depth is 24 or 1 (min-is-black) if the depth is not 24.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Specify a compression scheme to use when writing image
-data: <b>&minus;c none</b> for no compression, <b>&minus;c
-packbits</b> for the PackBits compression algorithm,
-<b>&minus;c jpeg</b> for the baseline JPEG compression
-algorithm, <b>&minus;c zip</b> for the Deflate compression
-algorithm, and <b>&minus;c lzw</b> for Lempel-Ziv &amp;
-Welch (the default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Write data with a specified number of rows per strip; by
-default the number of rows/strip is selected so that each
-strip is approximately 8 kilobytes.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Does not handle all possible rasterfiles. In particular,
-<i>ras2tiff</i> does not handle run-length encoded
-images.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>tiffmedian</b>(1), <b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/raw2tiff.1.html b/src/3rdparty/libtiff/html/man/raw2tiff.1.html
deleted file mode 100644
index 360eb27718..0000000000
--- a/src/3rdparty/libtiff/html/man/raw2tiff.1.html
+++ /dev/null
@@ -1,510 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:18 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>RAW2TIFF</title>
-</head>
-<body>
-
-<h1 align=center>RAW2TIFF</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#GUESSING THE IMAGE GEOMETRY">GUESSING THE IMAGE GEOMETRY</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>raw2tiff &minus; create a <small>TIFF</small> file from a
-raw data</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>raw2tiff</b> [ <i>options</i> ] <i>input.raw
-output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>raw2tiff</i> converts a raw byte sequence into
-<small>TIFF.</small> By default, the <small>TIFF</small>
-image is created with data samples packed
-(<i>PlanarConfiguration</i>=1), compressed with the PackBits
-algorithm (<i>Compression</i>=32773), and with each strip no
-more than 8 kilobytes. These characteristics can overridden,
-or explicitly specified with the options described
-below.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;H</b> <i>number</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>size of input image file header in bytes (0 by default).
-This amount of data just will be skipped from the start of
-file while reading.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;w</b> <i>number</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>width of input image in pixels (can be guessed, see
-<b><small>GUESSING THE IMAGE GEOMETRY</small></b>
-below).</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;l</b> <i>number</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>length of input image in lines (can be guessed, see
-<b><small>GUESSING THE IMAGE GEOMETRY</small></b>
-below).</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;b</b> <i>number</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>number of bands in input image (1 by default).</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;d</b> <i>data_type</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>type of samples in input image, where <i>data_type</i>
-may be:</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="3" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="10%">
-
-<p><b>byte</b></p>
-</td>
-<td width="70%">
-
-<p>8-bit unsigned integer (default),</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="10%">
-
-<p><b>short</b></p>
-</td>
-<td width="70%">
-
-<p>16-bit unsigned integer,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="10%">
-
-<p><b>long</b></p>
-</td>
-<td width="70%">
-
-<p>32-bit unsigned integer,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="10%">
-
-<p><b>sbyte</b></p>
-</td>
-<td width="70%">
-
-<p>8-bit signed integer,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="10%">
-
-<p><b>sshort</b></p>
-</td>
-<td width="70%">
-
-<p>16-bit signed integer,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="10%">
-
-<p><b>slong</b></p>
-</td>
-<td width="70%">
-
-<p>32-bit signed integer,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="10%">
-
-<p><b>float</b></p>
-</td>
-<td width="70%">
-
-<p>32-bit IEEE floating point,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="10%">
-
-<p><b>double</b></p>
-</td>
-<td width="70%">
-
-<p>64-bit IEEE floating point.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;i</b> <i>config</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>type of samples interleaving in input image, where
-<i>config</i> may be:</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="3" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="8%">
-
-<p><b>pixel</b></p>
-</td>
-<td width="71%">
-
-<p>pixel interleaved data (default),</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="8%">
-
-<p><b>band</b></p>
-</td>
-<td width="71%">
-
-<p>band interleaved data.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;p</b> <i>photo</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>photometric interpretation (color space) of the input
-image, where <i>photo</i> may be:</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="3" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="15%">
-
-<p><b>miniswhite</b></p>
-</td>
-<td width="65%">
-
-<p>white color represented with 0 value,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="15%">
-
-<p><b>minisblack</b></p>
-</td>
-<td width="65%">
-
-<p>black color represented with 0 value (default),</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="15%">
-
-<p><b>rgb</b></p>
-</td>
-<td width="65%">
-
-<p>image has RGB color model,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="15%">
-
-<p><b>cmyk</b></p>
-</td>
-<td width="65%">
-
-<p>image has CMYK (separated) color model,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="15%">
-
-<p><b>ycbcr</b></p>
-</td>
-<td width="65%">
-
-<p>image has YCbCr color model,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="15%">
-
-<p><b>cielab</b></p>
-</td>
-<td width="65%">
-
-<p>image has CIE L*a*b color model,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="15%">
-
-<p><b>icclab</b></p>
-</td>
-<td width="65%">
-
-<p>image has ICC L*a*b color model,</p>
-</td>
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="15%">
-
-<p><b>itulab</b></p>
-</td>
-<td width="65%">
-
-<p>image has ITU L*a*b color model.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;s</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>swap bytes fetched from the input file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;L</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>input data has LSB2MSB bit order (default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;M</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>input data has MSB2LSB bit order.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify a compression scheme to use when writing image
-data: <b>&minus;c none</b> for no compression, <b>&minus;c
-packbits</b> for the PackBits compression algorithm (the
-default), <b>&minus;c jpeg</b> for the baseline JPEG
-compression algorithm, <b>&minus;c zip</b> for the Deflate
-compression algorithm, and <b>&minus;c lzw</b> for
-Lempel-Ziv &amp; Welch.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;r</b> <i>number</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Write data with a specified number of rows per strip; by
-default the number of rows/strip is selected so that each
-strip is approximately 8 kilobytes.</p>
-</td>
-</table>
-<a name="GUESSING THE IMAGE GEOMETRY"></a>
-<h2>GUESSING THE IMAGE GEOMETRY</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>raw2tiff</i> can guess image width and height in case
-one or both of these parameters are not specified. If you
-omit one of those parameters, the complementary one will be
-calculated based on the file size (taking into account
-header size, number of bands and data type). If you omit
-both parameters, the statistical approach will be used.
-Utility will compute correlation coefficient between two
-lines at the image center using several appropriate line
-sizes and the highest absolute value of the coefficient will
-indicate the right line size. That is why you should be
-cautious with the very large images, because guessing
-process may take a while (depending on your system
-performance). Of course, the utility can&rsquo;t guess the
-header size, number of bands and data type, so it should be
-specified manually. If you don&rsquo;t know anything about
-your image, just try with the several combinations of those
-options.</p>
-<!-- INDENTATION -->
-<p>There is no magic, it is just a mathematical statistics,
-so it can be wrong in some cases. But for most ordinary
-images guessing method will work fine.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>tiffcp</b>(1),
-<b>tiffmedian</b>(1), <b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/rgb2ycbcr.1.html b/src/3rdparty/libtiff/html/man/rgb2ycbcr.1.html
deleted file mode 100644
index 5cff15fb53..0000000000
--- a/src/3rdparty/libtiff/html/man/rgb2ycbcr.1.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>RGB2YCBCR</title>
-</head>
-<body>
-
-<h1 align=center>RGB2YCBCR</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>rgb2ycbcr &minus; convert non-YCbCr <small>TIFF</small>
-images to a YCbCr <small>TIFF</small> image</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>rgb2ycbcr</b> [ <i>options</i> ] <i>src1.tif src2.tif
-... dst.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>rgb2ycbcr</i> converts <small>RGB</small> color,
-greyscale, or bi-level <small>TIFF</small> images to YCbCr
-images by transforming and sampling pixel data. If multiple
-files are specified on the command line each source file is
-converted to a separate directory in the destination
-file.</p>
-<!-- INDENTATION -->
-<p>By default, chrominance samples are created by sampling 2
-by 2 blocks of luminance values; this can be changed with
-the <b>&minus;h</b> and <b>&minus;v</b> options. Output data
-are compressed with the <small>PackBits</small> compression
-scheme, by default; an alternate scheme can be selected with
-the <b>&minus;c</b> option. By default, output data are
-compressed in strips with the number of rows in each strip
-selected so that the size of a strip is never more than 8
-kilobytes; the <b>&minus;r</b> option can be used to
-explicitly set the number of rows per strip.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify a compression scheme to use when writing image
-data: <b>&minus;c none</b> for no compression, <b>&minus;c
-packbits</b> for the PackBits compression algorithm (the
-default), <b>&minus;c jpeg</b> for the JPEG compression
-algorithm, <b>&minus;c zip</b> for the deflate compression
-algorithm, and <b>&minus;c lzw</b> for Lempel-Ziv &amp;
-Welch.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;h</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Set the horizontal sampling dimension to one of: 1, 2
-(default), or 4.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Write data with a specified number of rows per strip; by
-default the number of rows/strip is selected so that each
-strip is approximately 8 kilobytes.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;v</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Set the vertical sampling dimension to one of: 1, 2
-(default), or 4.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/sgi2tiff.1.html b/src/3rdparty/libtiff/html/man/sgi2tiff.1.html
deleted file mode 100644
index fe90d6477f..0000000000
--- a/src/3rdparty/libtiff/html/man/sgi2tiff.1.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>SGI2TIFF</title>
-</head>
-<body>
-
-<h1 align=center>SGI2TIFF</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>sgi2tiff &minus; create a <small>TIFF</small> file from
-an <small>SGI</small> image file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>sgi2tiff</b> [ <i>options</i> ] <i>input.rgb
-output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>sgi2tiff</i> converts a file in the <small>SGI</small>
-image format to <small>TIFF.</small> By default, the
-<small>TIFF</small> image is created with data samples
-packed (<i>PlanarConfiguration</i>=1), compressed with the
-Lempel-Ziv &amp; Welch algorithm (<i>Compression</i>=5), and
-with each strip no more than 8 kilobytes. These
-characteristics can overridden, or explicitly specified with
-the options described below.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify a compression scheme to use when writing image
-data: <b>&minus;c none</b> for no compression, <b>&minus;c
-packbits</b> for the PackBits compression algorithm),
-<b>&minus;c jpeg</b> for the baseline JPEG compression
-algorithm, <b>&minus;c zip</b> for the Deflate compression
-algorithm, and <b>&minus;c lzw</b> for Lempel-Ziv &amp;
-Welch (the default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;p</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Explicitly select the planar configuration used in
-organizing data samples in the output image: <b>&minus;p
-contig</b> for samples packed contiguously, and <b>&minus;p
-separate</b> for samples stored separately. By default
-samples are packed.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Write data with a specified number of rows per strip; by
-default the number of rows/strip is selected so that each
-strip is approximately 8 kilobytes.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Does not record colormap information.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>tiffmedian</b>(1), <b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/thumbnail.1.html b/src/3rdparty/libtiff/html/man/thumbnail.1.html
deleted file mode 100644
index fabc60116e..0000000000
--- a/src/3rdparty/libtiff/html/man/thumbnail.1.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>THUMBNAIL</title>
-</head>
-<body>
-
-<h1 align=center>THUMBNAIL</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>thumbnail &minus; create a <small>TIFF</small> file with
-thumbnail images</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>thumbnail</b> [ <i>options</i> ] <i>input.tif
-output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>thumbnail</i> is a program written to show how one
-might use the SubIFD tag (#330) to store thumbnail images.
-<i>thumbnail</i> copies a <small>TIFF</small> Class F
-facsimile file to the output file and for each image an
-8-bit greyscale <i>thumbnail sketch</i>. The output file
-contains the thumbnail image with the associated
-full-resolution page linked below with the SubIFD tag.</p>
-<!-- INDENTATION -->
-<p>By default, thumbnail images are 216 pixels wide by 274
-pixels high. Pixels are calculated by sampling and filtering
-the input image with each pixel value passed through a
-contrast curve.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;w</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the width of thumbnail images in pixels.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;h</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the height of thumbnail images in pixels.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify a contrast curve to apply in generating the
-thumbnail images. By default pixels values are passed
-through a linear contrast curve that simply maps the pixel
-value ranges. Alternative curves are: <b>exp50</b> for a 50%
-exponential curve, <b>exp60</b> for a 60% exponential curve,
-<b>exp70</b> for a 70% exponential curve, <b>exp80</b> for a
-80% exponential curve, <b>exp90</b> for a 90% exponential
-curve, <b>exp</b> for a pure exponential curve,
-<b>linear</b> for a linear curve.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>There are no options to control the format of the saved
-thumbnail images.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffdump</b>(1), <b>tiffgt</b>(1), <b>tiffinfo</b>(1),
-<b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiff2bw.1.html b/src/3rdparty/libtiff/html/man/tiff2bw.1.html
deleted file mode 100644
index 6b6accfc1d..0000000000
--- a/src/3rdparty/libtiff/html/man/tiff2bw.1.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFF2BW</title>
-</head>
-<body>
-
-<h1 align=center>TIFF2BW</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiff2bw &minus; convert a color <small>TIFF</small> image
-to greyscale</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiff2bw</b> [ <i>options</i> ] <i>input.tif
-output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>Tiff2bw</i> converts an <small>RGB</small> or Palette
-color <small>TIFF</small> image to a greyscale image by
-combining percentages of the red, green, and blue channels.
-By default, output samples are created by taking 28% of the
-red channel, 59% of the green channel, and 11% of the blue
-channel. To alter these percentages, the <b>&minus;R</b>,
-<b>&minus;G</b>, and <b>&minus;B</b> options may be
-used.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify a compression scheme to use when writing image
-data: <b>&minus;c none</b> for no compression, <b>&minus;c
-packbits</b> for the PackBits compression algorithm,
-<b>&minus;c zip</b> for the Deflate compression algorithm,
-<b>&minus;c g3</b> for the CCITT Group 3 compression
-algorithm, <b>&minus;c g4</b> for the CCITT Group 4
-compression algorithm, and <b>&minus;c lzw</b> for
-Lempel-Ziv &amp; Welch (the default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Write data with a specified number of rows per strip; by
-default the number of rows/strip is selected so that each
-strip is approximately 8 kilobytes.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;R</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the percentage of the red channel to use
-(default 28).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;G</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the percentage of the green channel to use
-(default 59).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;B</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the percentage of the blue channel to use
-(default 11).</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>tiffmedian</b>(1), <b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiff2pdf.1.html b/src/3rdparty/libtiff/html/man/tiff2pdf.1.html
deleted file mode 100644
index 80e0d557ae..0000000000
--- a/src/3rdparty/libtiff/html/man/tiff2pdf.1.html
+++ /dev/null
@@ -1,609 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFF2PDF</title>
-</head>
-<body>
-
-<h1 align=center>TIFF2PDF</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#EXAMPLES">EXAMPLES</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p>tiff2pdf &minus; convert a TIFF image to a PDF
-document</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>tiff2pdf</b> [ <i>options</i> ] <i>input.tiff</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><i>tiff2pdf</i> opens a TIFF image and writes a PDF
-document to standard output.</p>
-<!-- INDENTATION -->
-<p>The program converts one TIFF file to one PDF file,
-including multiple page TIFF files, tiled TIFF files, black
-and white. grayscale, and color TIFF files that contain data
-of TIFF photometric interpretations of bilevel, grayscale,
-RGB, YCbCr, CMYK separation, and ICC L*a*b* as supported by
-<i>libtiff</i> and PDF.</p>
-<!-- INDENTATION -->
-<p>If you have multiple TIFF files to convert into one PDF
-file then use <i>tiffcp</i> or other program to concatenate
-the files into a multiple page TIFF file. If the input TIFF
-file is of huge dimensions (greater than 10000 pixels height
-or width) convert the input image to a tiled TIFF if it is
-not already.</p>
-<!-- INDENTATION -->
-<p>The standard output is standard output. Set the output
-file name with the <b>&minus;o</b> <i>output.pdf</i>
-option.</p>
-<!-- INDENTATION -->
-<p>All black and white files are compressed into a single
-strip CCITT G4 Fax compressed PDF, unless tiled, where tiled
-black and white images are compressed into tiled CCITT G4
-Fax compressed PDF, <i>libtiff</i> CCITT support is
-assumed.</p>
-<!-- INDENTATION -->
-<p>Color and grayscale data can be compressed using either
-JPEG compression, ITU-T T.81, or Zip/Deflate LZ77
-compression. Set the compression type using the
-<b>&minus;j</b> or <b>&minus;z</b> options. JPEG compression
-support requires that <i>libtiff</i> be configured with JPEG
-support, and Zip/Deflate compression support requires that
-<i>libtiff</i> be configured with Zip support, in
-tiffconf.h. Use only one or the other of <b>&minus;j</b> and
-<b>&minus;z.</b></p>
-<!-- INDENTATION -->
-<p>If the input TIFF contains single strip CCITT G4 Fax
-compressed information, then that is written to the PDF file
-without transcoding, unless the options of no compression
-and no passthrough are set, <b>&minus;d</b> and
-<b>&minus;n.</b></p>
-<!-- INDENTATION -->
-<p>If the input TIFF contains JPEG or single strip
-Zip/Deflate compressed information, and they are configured,
-then that is written to the PDF file without transcoding,
-unless the options of no compression and no passthrough are
-set.</p>
-<!-- INDENTATION -->
-<p>The default page size upon which the TIFF image is placed
-is determined by the resolution and extent of the image
-data. Default values for the TIFF image resolution can be
-set using the <b>&minus;x</b> and <b>&minus;y</b> options.
-The page size can be set using the <b>&minus;p</b> option
-for paper size, or <b>&minus;w</b> and <b>&minus;l</b> for
-paper width and length, then each page of the TIFF image is
-centered on its page. The distance unit for default
-resolution and page width and length can be set by the
-<b>&minus;u</b> option, the default unit is inch.</p>
-<!-- INDENTATION -->
-<p>Various items of the output document information can be
-set with the <b>&minus;e</b>, <b>&minus;c</b>,
-<b>&minus;a</b>, <b>&minus;t</b>, <b>&minus;s</b>, and
-<b>&minus;k</b> options. Setting the argument of the option
-to &quot;&quot; for these tags causes the relevant document
-information field to be not written. Some of the document
-information values otherwise get their information from the
-input TIFF image, the software, author, document name, and
-image description.</p>
-<!-- INDENTATION -->
-<p>The Portable Document Format (PDF) specification is
-copyrighted by Adobe Systems, Incorporated.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;o</b> <i>output-file</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set the output to go to file. <i>output-file</i></p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="4" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="4%">
-
-<p><b>&minus;j</b></p>
-</td>
-<td width="5%"></td>
-<td width="77%">
-
-<p>Compress with JPEG (requires <i>libjpeg</i> configured
-with <i>libtiff</i>).</p>
-</td>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="4%">
-
-<p><b>&minus;z</b></p>
-</td>
-<td width="5%"></td>
-<td width="77%">
-
-<p>Compress with Zip/Deflate (requires <i>zlib</i>
-configured with <i>libtiff</i>).</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;q</b> <i>quality</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set the compression quality, 1-100 for JPEG.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="4" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;n</b></p>
-</td>
-<td width="7%"></td>
-<td width="77%">
-
-<p>Do not allow data to be converted without uncompressing,
-no compressed data passthrough.</p>
-</td>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;b</b></p>
-</td>
-<td width="7%"></td>
-<td width="77%">
-
-<p>Set PDF &lsquo;&lsquo;Interpolate&rsquo;&rsquo; user
-preference.</p>
-</td>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;d</b></p>
-</td>
-<td width="7%"></td>
-<td width="77%">
-
-<p>Do not compress (decompress).</p>
-</td>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;i</b></p>
-</td>
-<td width="7%"></td>
-<td width="77%">
-
-<p>Invert colors.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;p</b> <i>paper-size</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set paper size, e.g., <b>letter</b>, <b>legal</b>,
-<b>A4</b>.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;u</b> [<b>i</b>|<b>m</b>]</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set distance unit, <b>i</b> for inch, <b>m</b> for
-centimeter.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;w</b> <i>width</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set width in units.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;l</b> <i>length</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set length in units.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;x</b> <i>xres</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set x/width resolution default.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;y</b> <i>yres</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set y/length resolution default.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;r</b> [<b>d</b>|<b>o</b>]</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set <b>d</b> for resolution default for images without
-resolution, <b>o</b> for resolution override for all
-images.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;f</b></p>
-</td>
-<td width="13%"></td>
-<td width="57%">
-
-<p>Set PDF &lsquo;&lsquo;Fit Window&rsquo;&rsquo; user
-preference.</p>
-</td>
-<td width="14%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;e</b> <i>YYYYMMDDHHMMSS</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set document information date, overrides image or current
-date/time default, <i>YYYYMMDDHHMMSS.</i></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;c</b> <i>creator</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set document information creator, overrides image
-software default.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;a</b> <i>author</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set document information author, overrides image artist
-default.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;t</b> <i>title</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set document information title, overrides image document
-name default.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;s</b> <i>subject</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set document information subject, overrides image image
-description default.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>&minus;k</b> <i>keywords</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td>
-<td width="77%">
-<p>Set document information keywords.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;h</b></p>
-</td>
-<td width="13%"></td>
-<td width="57%">
-
-<p>List usage reminder to stderr and exit.</p>
-</td>
-<td width="14%">
-</td>
-</table>
-<a name="EXAMPLES"></a>
-<h2>EXAMPLES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p>The following example would generate the file output.pdf
-from input.tiff.</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="20%"></td>
-<td width="79%">
-<pre>tiff2pdf &minus;o output.pdf input.tiff
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p>The following example would generate PDF output from
-input.tiff and write it to standard output.</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="20%"></td>
-<td width="79%">
-<pre>tiff2pdf input.tiff
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p>The following example would generate the file output.pdf
-from input.tiff, putting the image pages on a letter sized
-page, compressing the output with JPEG, with JPEG quality
-75, setting the title to
-&lsquo;&lsquo;Document&rsquo;&rsquo;, and setting the
-&lsquo;&lsquo;Fit Window&rsquo;&rsquo; option.</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="20%"></td>
-<td width="79%">
-<pre>tiff2pdf &minus;p letter &minus;j &minus;q 75 &minus;t &quot;Document&quot; &minus;f &minus;o output.pdf input.tiff
-</pre>
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p>Please report bugs via the web interface at</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="20%"></td>
-<td width="79%">
-
-<p>http://bugzilla.remotesensing.org/enter_bug.cgi?product=libtiff</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="89%">
-<p><b>libtiff</b>(3), <b>tiffcp</b>(1),
-<b>tiff2ps</b>(1)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiff2ps.1.html b/src/3rdparty/libtiff/html/man/tiff2ps.1.html
deleted file mode 100644
index e13bb8f893..0000000000
--- a/src/3rdparty/libtiff/html/man/tiff2ps.1.html
+++ /dev/null
@@ -1,532 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFF2PS</title>
-</head>
-<body>
-
-<h1 align=center>TIFF2PS</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#EXAMPLES">EXAMPLES</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiff2ps &minus; convert a <small>TIFF</small> image to
-PostScript&trade;</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiff2ps</b> [ <i>options</i> ] <i>input.tif
-...</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>tiff2ps</i> reads <small>TIFF</small> images and
-writes PostScript or Encapsulated PostScript (EPS) on the
-standard output. By default, <i>tiff2ps</i> writes
-Encapsulated PostScript for the first image in the specified
-<small>TIFF</small> image file.</p>
-<!-- INDENTATION -->
-<p>By default, <i>tiff2ps</i> will generate PostScript that
-fills a printed area specified by the <small>TIFF</small>
-tags in the input file. If the file does not contain
-<i>XResolution</i> or <i>YResolution</i> tags, then the
-printed area is set according to the image dimensions. The
-<b>&minus;w</b> and <b>&minus;h</b> options (see below) can
-be used to set the dimensions of the printed area in inches;
-overriding any relevant <small>TIFF</small> tags.</p>
-<!-- INDENTATION -->
-<p>The PostScript generated for <small>RGB,</small> palette,
-and <small>CMYK</small> images uses the <i>colorimage</i>
-operator. The PostScript generated for greyscale and bilevel
-images uses the <i>image</i> operator. When the
-<i>colorimage</i> operator is used, PostScript code to
-emulate this operator on older PostScript printers is also
-generated. Note that this emulation code can be very
-slow.</p>
-<!-- INDENTATION -->
-<p>Color images with associated alpha data are composited
-over a white background.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;1</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Generate PostScript Level 1 (the default).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;2</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Generate PostScript Level 2.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;3</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Generate PostScript Level 3. It basically allows one to
-use the /flateDecode filter for ZIP compressed TIFF
-images.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;a</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Generate output for all IFDs (pages) in the input
-file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;b</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the bottom margin for the output (in inches).
-This does not affect the height of the printed image.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Center the image in the output. This option only shows
-an effect if both the <b>&minus;w</b> and the
-<b>&minus;h</b> option are given.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;d</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Set the initial <small>TIFF</small> directory to the
-specified directory number. (NB: Directories are numbered
-starting at zero.) This option is useful for selecting
-individual pages in a multi-page (e.g. facsimile) file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;e</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force the generation of Encapsulated PostScript (implies
-<b>&minus;z</b>).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;h</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the vertical size of the printed area (in
-inches).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;H</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the maximum height of image (in inches). Images
-with larger sizes will be split in several pages. Option
-<b>&minus;L</b> may be used for specifying size of split
-images overlapping.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;i</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Enable/disable pixel interpolation. This option requires
-a single numeric value: zero to disable pixel interpolation
-and non-zero to enable. The default is enabled.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;L</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the size of overlapping for split images (in
-inches). Used in conjunction with <b>&minus;H</b>
-option.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;l</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the left margin for the output (in inches). This
-does not affect the width of the printed image.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;m</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Where possible render using the <i>imagemask</i>
-PostScript operator instead of the <i>image</i> operator.
-When this option is specified <i>tiff2ps</i> will use
-<i>imagemask</i> for rendering 1 bit deep images. If this
-option is not specified or if the image depth is greater
-than 1 then the <i>image</i> operator is used.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;o</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Set the initial <small>TIFF</small> directory to the
-<small>IFD</small> at the specified file offset. This option
-is useful for selecting thumbnail images and the like which
-are hidden using the <i>SubIFD</i> tag.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;p</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force the generation of (non-Encapsulated)
-PostScript.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Rotate image by 180 degrees.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;s</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Generate output for a single IFD (page) in the input
-file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;w</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the horizontal size of the printed area (in
-inches).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;x</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Override resolution units specified in the TIFF as
-centimeters.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;y</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Override resolution units specified in the TIFF as
-inches.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;z</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>When generating PostScript Level 2, data is scaled so
-that it does not image into the <i>deadzone</i> on a page
-(the outer margin that the printing device is unable to
-mark). This option suppresses this behavior. When PostScript
-Level 1 is generated, data is imaged to the entire printed
-page and this option has no affect.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="EXAMPLES"></a>
-<h2>EXAMPLES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The following generates PostScript Level 2 for all pages
-of a facsimile:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiff2ps &minus;a2 fax.tif | lpr
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Note also that if you have version 2.6.1 or newer of
-Ghostscript then you can efficiently preview facsimile
-generated with the above command.</p>
-<!-- INDENTATION -->
-<p>To generate Encapsulated PostScript for a the image at
-directory 2 of an image use:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiff2ps &minus;d 1 foo.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>(Notice that directories are numbered starting at
-zero.)</p>
-<!-- INDENTATION -->
-<p>If you have a long image, it may be split in several
-pages:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiff2ps &minus;h11 &minus;w8.5 &minus;H14 &minus;L.5 foo.tif &gt; foo.ps
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The page size is set to 8.5x11 by <b>&minus;w</b> and
-<b>&minus;h</b> options. We will accept a small amount of
-vertical compression, so <b>&minus;H</b> set to 14. Any
-pages between 11 and 14 inches will be fit onto one page.
-Pages longer than 14 inches are cut off at 11 and continued
-on the next page. The <b>&minus;L.5</b> option says to
-repeat a half inch on the next page (to improve
-readability).</p>
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Because PostScript does not support the notion of a
-colormap, 8-bit palette images produce 24-bit PostScript
-images. This conversion results in output that is six times
-bigger than the original image and which takes a long time
-to send to a printer over a serial line. Matters are even
-worse for 4-, 2-, and 1-bit palette images.</p>
-<!-- INDENTATION -->
-<p>Does not handle tiled images when generating PostScript
-Level I output.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>tiffgt</b>(1), <b>tiffmedian</b>(1), <b>tiff2bw</b>(1),
-<b>tiffsv</b>(1), <b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiff2rgba.1.html b/src/3rdparty/libtiff/html/man/tiff2rgba.1.html
deleted file mode 100644
index eec3968317..0000000000
--- a/src/3rdparty/libtiff/html/man/tiff2rgba.1.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFF2RGBA</title>
-</head>
-<body>
-
-<h1 align=center>TIFF2RGBA</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiff2rgba &minus; convert a <small>TIFF</small> image to
-RGBA color space</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiff2rgba</b> [ <i>options</i> ] <i>input.tif
-output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>Tiff2rgba</i> converts a wide variety of TIFF images
-into an RGBA TIFF image. This includes the ability to
-translate different color spaces and photometric
-interpretation into RGBA, support for alpha blending, and
-translation of many different bit depths into a 32bit RGBA
-image.</p>
-<!-- INDENTATION -->
-<p>Internally this program is implemented using the
-<i>TIFFReadRGBAImage()</i> function, and it suffers any
-limitations of that image. This includes limited support for
-&gt; 8 BitsPerSample images, and flaws with some esoteric
-combinations of BitsPerSample, photometric interpretation,
-block organization and planar configuration.</p>
-<!-- INDENTATION -->
-<p>The generated images are stripped images with four
-samples per pixel (red, green, blue and alpha) or if the
-<b>&minus;n</b> flag is used, three samples per pixel (red,
-green, and blue). The resulting images are always planar
-configuration contiguous. For this reason, this program is a
-useful utility for transform exotic TIFF files into a form
-ingestible by almost any TIFF supporting software.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify a compression scheme to use when writing image
-data: <b>&minus;c none</b> for no compression (the default),
-<b>&minus;c packbits</b> for the PackBits compression
-algorithm, <b>&minus;c zip</b> for the Deflate compression
-algorithm, <b>&minus;c jpeg</b> for the JPEG compression
-algorithm, and <b>&minus;c lzw</b> for Lempel-Ziv &amp;
-Welch.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Write data with a specified number of rows per strip; by
-default the number of rows/strip is selected so that each
-strip is approximately 8 kilobytes.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;b</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Process the image one block (strip/tile) at a time
-instead of by reading the whole image into memory at once.
-This may be necessary for very large images on systems with
-limited RAM.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;n</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Drop the alpha component from the output file, producing
-a pure RGB file. Currently this does not work if the
-<b>&minus;b</b> flag is also in effect.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiff2bw</b>(1), <b>TIFFReadRGBAImage</b>(3t),
-<b>libtiff</b>(3)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffcmp.1.html b/src/3rdparty/libtiff/html/man/tiffcmp.1.html
deleted file mode 100644
index a9fca2f15a..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffcmp.1.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFCMP</title>
-</head>
-<body>
-
-<h1 align=center>TIFFCMP</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffcmp &minus; compare two <small>TIFF</small> files</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffcmp</b> [ <i>options</i> ] <i>file1.tif
-file2.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>Tiffcmp</i> compares the tags and data in two files
-created according to the Tagged Image File Format, Revision
-6.0. The schemes used for compressing data in each file are
-immaterial when data are compared&minus;data are compared on
-a scanline-by-scanline basis after decompression. Most
-directory tags are checked; notable exceptions are:
-<i>GrayResponseCurve</i>, <i>ColorResponseCurve</i>, and
-<i>ColorMap</i> tags. Data will not be compared if any of
-the <i>BitsPerSample</i>, <i>SamplesPerPixel</i>, or
-<i>ImageWidth</i> values are not equal. By default,
-<i>tiffcmp</i> will terminate if it encounters any
-difference.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;l</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>List each byte of image data that differs between the
-files.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;z</b> <i>number</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>List specified number of image data bytes that differs
-between the files.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>&minus;t</b></p>
-</td>
-<td width="11%"></td>
-<td width="52%">
-
-<p>Ignore any differences in directory tags.</p>
-</td>
-<td width="23%">
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Tags that are not recognized by the library are not
-compared; they may also generate spurious diagnostics.</p>
-<!-- INDENTATION -->
-<p>The image data of tiled files is not compared, since the
-<i>TIFFReadScanline()</i> function is used. An error will be
-reported for tiled files.</p>
-<!-- INDENTATION -->
-<p>The pixel and/or sample number reported in differences
-may be off in some exotic cases.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>tiffcp</b>(1),
-<b>tiffmedian</b>(1), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffcp.1.html b/src/3rdparty/libtiff/html/man/tiffcp.1.html
deleted file mode 100644
index 2b30d5f19a..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffcp.1.html
+++ /dev/null
@@ -1,522 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFCP</title>
-</head>
-<body>
-
-<h1 align=center>TIFFCP</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#EXAMPLES">EXAMPLES</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffcp &minus; copy (and possibly convert) a
-<small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffcp</b> [ <i>options</i> ] <i>src1.tif ... srcN.tif
-dst.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>tiffcp</i> combines one or more files created
-according to the Tag Image File Format, Revision 6.0 into a
-single <small>TIFF</small> file. Because the output file may
-be compressed using a different algorithm than the input
-files, <i>tiffcp</i> is most often used to convert between
-different compression schemes.</p>
-<!-- INDENTATION -->
-<p>By default, <i>tiffcp</i> will copy all the understood
-tags in a <small>TIFF</small> directory of an input file to
-the associated directory in the output file.</p>
-<!-- INDENTATION -->
-<p><i>tiffcp</i> can be used to reorganize the storage
-characteristics of data in a file, but it is explicitly
-intended to not alter or convert the image data content in
-any way.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;b</b> <i>image</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>subtract the following monochrome image from all others
-processed. This can be used to remove a noise bias from a
-set of images. This bias image is typically an image of
-noise the camera saw with its shutter closed.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;B</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output to be written with Big-Endian byte order.
-This option only has an effect when the output file is
-created or overwritten and not when it is appended to.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;C</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Suppress the use of &lsquo;&lsquo;strip
-chopping&rsquo;&rsquo; when reading images that have a
-single strip/tile of uncompressed data.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the compression to use for data written to the
-output file: <b>none</b> for no compression, <b>packbits</b>
-for PackBits compression, <b>lzw</b> for Lempel-Ziv &amp;
-Welch compression, <b>jpeg</b> for baseline JPEG
-compression, <b>zip</b> for Deflate compression, <b>g3</b>
-for CCITT Group 3 (T.4) compression, and <b>g4</b> for CCITT
-Group 4 (T.6) compression. By default <i>tiffcp</i> will
-compress data according to the value of the
-<i>Compression</i> tag found in the source file.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>The <small>CCITT</small> Group 3 and Group 4 compression
-algorithms can only be used with bilevel data.</p>
-<!-- INDENTATION -->
-<p>Group 3 compression can be specified together with
-several T.4-specific options: <b>1d</b> for 1-dimensional
-encoding, <b>2d</b> for 2-dimensional encoding, and
-<b>fill</b> to force each encoded scanline to be zero-filled
-so that the terminating EOL code lies on a byte boundary.
-Group 3-specific options are specified by appending a
-&lsquo;&lsquo;:&rsquo;&rsquo;-separated list to the
-&lsquo;&lsquo;g3&rsquo;&rsquo; option; e.g. <b>&minus;c
-g3:2d:fill</b> to get 2D-encoded data with byte-aligned EOL
-codes.</p>
-<!-- INDENTATION -->
-<p><small>LZW</small> compression can be specified together
-with a <i>predictor</i> value. A predictor value of 2 causes
-each scanline of the output image to undergo horizontal
-differencing before it is encoded; a value of 1 forces each
-scanline to be encoded without differencing. LZW-specific
-options are specified by appending a
-&lsquo;&lsquo;:&rsquo;&rsquo;-separated list to the
-&lsquo;&lsquo;lzw&rsquo;&rsquo; option; e.g. <b>&minus;c
-lzw:2</b> for <small>LZW</small> compression with horizontal
-differencing.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;f</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the bit fill order to use in writing output
-data. By default, <i>tiffcp</i> will create a new file with
-the same fill order as the original. Specifying <b>&minus;f
-lsb2msb</b> will force data to be written with the FillOrder
-tag set to <small>LSB2MSB,</small> while <b>&minus;f
-msb2lsb</b> will force data to be written with the FillOrder
-tag set to <small>MSB2LSB.</small></p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;i</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Ignore non-fatal read errors and continue processing of
-the input file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;l</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the length of a tile (in pixels). <i>tiffcp</i>
-attempts to set the tile dimensions so that no more than 8
-kilobytes of data appear in a tile.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;L</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output to be written with Little-Endian byte
-order. This option only has an effect when the output file
-is created or overwritten and not when it is appended
-to.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;M</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Suppress the use of memory-mapped files when reading
-images.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;p</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the planar configuration to use in writing image
-data that has one 8-bit sample per pixel. By default,
-<i>tiffcp</i> will create a new file with the same planar
-configuration as the original. Specifying <b>&minus;p
-contig</b> will force data to be written with multi-sample
-data packed together, while <b>&minus;p separate</b> will
-force samples to be written in separate planes.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the number of rows (scanlines) in each strip of
-data written to the output file. By default (or when value
-<b>0</b> is specified), <i>tiffcp</i> attempts to set the
-rows/strip that no more than 8 kilobytes of data appear in a
-strip. If you specify special value <b>&minus;1</b> it will
-results in infinite number of the rows per strip. The entire
-image will be the one strip in that case.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;s</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force the output file to be written with data organized
-in strips (rather than tiles).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;t</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force the output file to be written with data organized
-in tiles (rather than strips). options can be used to force
-the resultant image to be written as strips or tiles of
-data, respectively.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;w</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the width of a tile (in pixels). <i>tiffcp</i>
-attempts to set the tile dimensions so that no more than 8
-kilobytes of data appear in a tile. <i>tiffcp</i> attempts
-to set the tile dimensions so that no more than 8 kilobytes
-of data appear in a tile.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;,=</b><i>character</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>substitute <i>character</i> for &lsquo;,&rsquo; in
-parsing image directory indices in files. This is necessary
-if filenames contain commas. Note that <b>&minus;,=</b> with
-whitespace immediately following will disable the special
-meaning of the &lsquo;,&rsquo; entirely. See examples.</p>
-</td>
-</table>
-<a name="EXAMPLES"></a>
-<h2>EXAMPLES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The following concatenates two files and writes the
-result using <small>LZW</small> encoding:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcp &minus;c lzw a.tif b.tif result.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>To convert a G3 1d-encoded <small>TIFF</small> to a
-single strip of G4-encoded data the following might be
-used:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcp &minus;c g4 &minus;r 10000 g3.tif g4.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>(1000 is just a number that is larger than the number of
-rows in the source file.)</p>
-<!-- INDENTATION -->
-<p>To extract a selected set of images from a multi-image
-TIFF file, the file name may be immediately followed by a
-&lsquo;,&rsquo; separated list of image directory indices.
-The first image is always in directory 0. Thus, to copy the
-1st and 3rd images of image file
-&lsquo;&lsquo;album.tif&rsquo;&rsquo; to
-&lsquo;&lsquo;result.tif&rsquo;&rsquo;:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcp album.tif,0,2 result.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>A trailing comma denotes remaining images in sequence.
-The following command will copy all image with except the
-first one:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcp album.tif,1, result.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Given file &lsquo;&lsquo;CCD.tif&rsquo;&rsquo; whose
-first image is a noise bias followed by images which include
-that bias, subtract the noise from all those images
-following it (while decompressing) with the
-command:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcp &minus;c none &minus;b CCD.tif CCD.tif,1, result.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>If the file above were named
-&lsquo;&lsquo;CCD,X.tif&rsquo;&rsquo;, the <b>&minus;,=</b>
-option would be required to correctly parse this filename
-with image numbers, as follows:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcp &minus;c none &minus;,=% &minus;b CCD,X.tif CCD,X%1%.tif result.tif
-
-</pre>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>tiffinfo</b>(1), <b>tiffcmp</b>(1),
-<b>tiffmedian</b>(1), <b>tiffsplit</b>(1),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffcrop.1.html b/src/3rdparty/libtiff/html/man/tiffcrop.1.html
deleted file mode 100644
index 4c25c2921b..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffcrop.1.html
+++ /dev/null
@@ -1,851 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFCROP</title>
-</head>
-<body>
-
-<h1 align=center>TIFFCROP</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#EXAMPLES">EXAMPLES</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffcrop &minus; copy, convert, crop, extract, or process
-a <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffcrop</b> [ <i>options</i> ] <i>src1.tif ...
-srcN.tif dst.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>tiffcrop</i> combines one or more files created
-according to the Tag Image File Format, Revision 6.0 into a
-single <small>TIFF</small> file. The output file may be
-compressed using a different algorithm than the input files.
-<i>tiffcrop</i> is most often used to extract portions of an
-image for processing with bar code recognizer or OCR
-software when that software cannot restrict the region of
-interest to a specific portion of the image or to improve
-efficiency when the regions of interest must be rotated. It
-can also be used to subdivide all or part of a processed
-image into smaller sections.</p>
-<!-- INDENTATION -->
-<p>Functions are applied to the input image in the following
-order:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>cropping, fixed area extraction, zones, inversion, mirroring, rotation.
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Functions are applied to the output image in the
-following order:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>output resolution, output margins, rows and columns
-<b>or</b> page size divisions, orientation options, strip,
-tile, byte order, and compression options.</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>By default, <i>tiffcrop</i> will copy all the understood
-tags in a <small>TIFF</small> directory of an input file to
-the associated directory in the output file. Options can be
-used to force the resultant image to be written as strips or
-tiles of data, respectively.</p>
-<!-- INDENTATION -->
-<p><i>tiffcrop</i> can be used to reorganize the storage
-characteristics of data in a file, and to reorganize,
-extract, rotate, and otherwise process the image data as
-specified at the same time whereas tiffcp does not alter the
-image data itself.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;N odd|even|#,#-#,#|last</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Specify one or more series or range(s) of images within
-file to process. The words <b>odd</b> or <b>even</b> may be
-used to specify all odd or even numbered images. The word
-<b>last</b> may be used in place of a number in the sequence
-to indicate the final image in the file without knowing how
-many images there are. Ranges of images may be specified
-with a dash and multiple sets can be indicated by joining
-them in a comma-separated list. eg. use <b>&minus;N
-1,5-7,last</b> to process the 1st, 5th through 7th, and
-final image in the file.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;E top|bottom|left|right</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Specify the top, bottom, left, or right edge as the
-reference from which to calcuate the width and length of
-crop regions or sequence of postions for zones. May be
-abbreviated to first letter.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;U in|cm|px</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Specify the type of units to apply to dimensions for
-margins and crop regions for input and output images. Inches
-or centimeters are converted to pixels using the resolution
-unit specified in the TIFF file (which defaults to inches if
-not specified in the IFD).</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;m #,#,#,#</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Specify margins to be removed from the input image. The
-order must be top, left, bottom, right with only commas
-separating the elements of the list. Margins are scaled
-according to the current units and removed before any other
-extractions are computed. Captial M was in use.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="6%">
-
-<p><b>&minus;X #</b></p>
-</td>
-<td width="2%"></td>
-<td width="80%">
-
-<p>Set the horizontal (X-axis) dimension of a region to
-extract relative to the specified origin reference. If the
-origin is the top or bottom edge, the X axis value will be
-assumed to start at the left edge.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="6%">
-
-<p><b>&minus;Y #</b></p>
-</td>
-<td width="2%"></td>
-<td width="80%">
-
-<p>Set the vertical (Y-axis) dimension of a region to
-extract relative to the specified origin reference. If the
-origin is the left or right edge, the Y axis value will be
-assumed to start at the top.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;Z #:#,#:#</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Specify zones of the image designated as position X of Y
-equal sized portions measured from the reference edge, eg
-1:3 would be first third of the image starting from the
-reference edge minus any margins specified for the confining
-edges. Multiple zones can be specified as a comma separated
-list but they must reference the same edge. To extract the
-top quarter and the bottom third of an image you would use
-<b>&minus;Z 1:4,3:3.</b></p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;F horiz|vert</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Flip, ie mirror, the image or extracted region
-horizontally or vertically.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;R 90|180|270</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Rotate the image or extracted region 90, 180, or 270
-degrees clockwise.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="6%">
-
-<p><b>&minus;I</b></p>
-</td>
-<td width="2%"></td>
-<td width="80%">
-
-<p>Invert the colorspace values for grayscale and bilevel
-images. This would be used to correct negative images that
-have incorrect PHOTMETRIC INTERPRETATION tags. No support
-for color images.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="6%">
-
-<p><b>&minus;H #</b></p>
-</td>
-<td width="2%"></td>
-<td width="80%">
-
-<p>Set the horizontal resolution of output images to #
-expressed in the current units.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="6%">
-
-<p><b>&minus;V #</b></p>
-</td>
-<td width="2%"></td>
-<td width="80%">
-
-<p>Set the vertical resolution of the output images to #
-expressed in the current units.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="6%">
-
-<p><b>&minus;J #</b></p>
-</td>
-<td width="2%"></td>
-<td width="80%">
-
-<p>Set the horizontal margin of an output page size to #
-expressed in the current units.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="6%">
-
-<p><b>&minus;K #</b></p>
-</td>
-<td width="2%"></td>
-<td width="80%">
-
-<p>Set the vertical margin of an output page size to #
-expressed in the current units.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;O portrait|landscape|auto</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Set the output orientation of the pages or sections. Auto
-will use the arrangement that requires the fewest pages.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;S cols:rows</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Divide each image into cols across and rows down equal
-sections.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;P page</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Format the output images to fit on page size paper. Use
--P list to show the supported page sizes and dimensions.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;B</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output to be written with Big-Endian byte order.
-This option only has an effect when the output file is
-created or overwritten and not when it is appended to.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;C</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Suppress the use of &lsquo;&lsquo;strip
-chopping&rsquo;&rsquo; when reading images that have a
-single strip/tile of uncompressed data.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the compression to use for data written to the
-output file: <b>none</b> for no compression, <b>packbits</b>
-for PackBits compression, <b>lzw</b> for Lempel-Ziv &amp;
-Welch compression, <b>jpeg</b> for baseline JPEG
-compression, <b>zip</b> for Deflate compression, <b>g3</b>
-for CCITT Group 3 (T.4) compression, and <b>g4</b> for CCITT
-Group 4 (T.6) compression. By default <i>tiffcrop</i> will
-compress data according to the value of the
-<i>Compression</i> tag found in the source file.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>The <small>CCITT</small> Group 3 and Group 4 compression
-algorithms can only be used with bilevel data.</p>
-<!-- INDENTATION -->
-<p>Group 3 compression can be specified together with
-several T.4-specific options: <b>1d</b> for 1-dimensional
-encoding, <b>2d</b> for 2-dimensional encoding, and
-<b>fill</b> to force each encoded scanline to be zero-filled
-so that the terminating EOL code lies on a byte boundary.
-Group 3-specific options are specified by appending a
-&lsquo;&lsquo;:&rsquo;&rsquo;-separated list to the
-&lsquo;&lsquo;g3&rsquo;&rsquo; option; e.g. <b>&minus;c
-g3:2d:fill</b> to get 2D-encoded data with byte-aligned EOL
-codes.</p>
-<!-- INDENTATION -->
-<p><small>LZW</small> compression can be specified together
-with a <i>predictor</i> value. A predictor value of 2 causes
-each scanline of the output image to undergo horizontal
-differencing before it is encoded; a value of 1 forces each
-scanline to be encoded without differencing. LZW-specific
-options are specified by appending a
-&lsquo;&lsquo;:&rsquo;&rsquo;-separated list to the
-&lsquo;&lsquo;lzw&rsquo;&rsquo; option; e.g. <b>&minus;c
-lzw:2</b> for <small>LZW</small> compression with horizontal
-differencing.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;f</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the bit fill order to use in writing output
-data. By default, <i>tiffcrop</i> will create a new file
-with the same fill order as the original. Specifying
-<b>&minus;f lsb2msb</b> will force data to be written with
-the FillOrder tag set to <small>LSB2MSB,</small> while
-<b>&minus;f msb2lsb</b> will force data to be written with
-the FillOrder tag set to <small>MSB2LSB.</small></p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;i</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Ignore non-fatal read errors and continue processing of
-the input file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;l</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the length of a tile (in pixels).
-<i>tiffcrop</i> attempts to set the tile dimensions so that
-no more than 8 kilobytes of data appear in a tile.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;L</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force output to be written with Little-Endian byte
-order. This option only has an effect when the output file
-is created or overwritten and not when it is appended
-to.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;M</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Suppress the use of memory-mapped files when reading
-images.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;p</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the planar configuration to use in writing image
-data that has more than one 8-bit sample per pixel. By
-default, <i>tiffcrop</i> will create a new file with the
-same planar configuration as the original. Specifying
-<b>&minus;p contig</b> will force data to be written with
-multi-sample data packed together, while <b>&minus;p
-separate</b> will force samples to be written in separate
-planes.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the number of rows (scanlines) in each strip of
-data written to the output file. By default (or when value
-<b>0</b> is specified), <i>tiffcrop</i> attempts to set the
-rows/strip that no more than 8 kilobytes of data appear in a
-strip. If you specify the special value <b>-1</b> it will
-results in infinite number of the rows per strip. The entire
-image will be the one strip in that case.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;s</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force the output file to be written with data organized
-in strips (rather than tiles).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;t</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force the output file to be written with data organized
-in tiles (rather than strips).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;w</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the width of a tile (in pixels). <i>tiffcrop</i>
-attempts to set the tile dimensions so that no more than 8
-kilobytes of data appear in a tile. <i>tiffcrop</i> attempts
-to set the tile dimensions so that no more than 8 kilobytes
-of data appear in a tile.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;,={character}</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>substitute {character} for &rsquo;,&rsquo; in parsing
-image directory indices in files. This is necessary if
-filenames contain commas. Note that &rsquo;,=&rsquo; with
-whitespace immediately following will disable the special
-meaning of the &rsquo;,&rsquo; entirely. See examples.</p>
-</td>
-</table>
-<a name="EXAMPLES"></a>
-<h2>EXAMPLES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The following concatenates two files and writes the
-result using <small>LZW</small> encoding:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcrop -c lzw a.tif b.tif result.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>To convert a G3 1d-encoded <small>TIFF</small> to a
-single strip of G4-encoded data the following might be
-used:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcrop -c g4 -r 10000 g3.tif g4.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>(1000 is just a number that is larger than the number of
-rows in the source file.)</p>
-<!-- INDENTATION -->
-<p>To extract a selected set of images from a multi-image
-TIFF file use the -N option described above. Thus, to copy
-the 1st and 3rd images of image file &quot;album.tif&quot;
-to &quot;result.tif&quot;:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcrop -N 1,3 album.tif result.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Invert a bilevel image scan of a microfilmed document and
-crop off margins of 0.25 inches on the left and right, 0.5
-inch on the top, nad 0.75 inch on the bottom. From the
-remaining portion of the image, select the second and third
-quarters, ie, one half of the area left from the center to
-each margin.</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcrop -U in -m 0.5,0.25,0.75,0.25 -E left -Z 2:4,3:4 -I MicrofilmNegative.tif MicrofilmPostiveCenter.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Extract only the final image of a large Architectural E
-sized multipage TIFF file and rotate it 90 degrees clockwise
-while reformatting the output to fit on tabloid sized sheets
-with one quarter of an inch on each side:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffcrop -N last -R 90 -O auto -P tabloid -U in -J 0.25 -K 0.25 -H 300 -V 300 Big-PlatMap.tif BigPlatMap-Tabloid.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The output images will have a specified resolution of 300
-dpi in both directions. The orientation of each page will be
-determined by whichever choice requires the fewest pages. To
-specify a specific orientation, use the portrait or
-landscape option.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>tiffinfo</b>(1), <b>tiffcmp</b>(1),
-<b>tiffcp</b>(1), <b>tiffmedian</b>(1), <b>tiffsplit</b>(1),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffdither.1.html b/src/3rdparty/libtiff/html/man/tiffdither.1.html
deleted file mode 100644
index 2427a90125..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffdither.1.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:19 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFDITHER</title>
-</head>
-<body>
-
-<h1 align=center>TIFFDITHER</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffdither &minus; convert a greyscale image to bilevel
-using dithering</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffdither</b> [ <i>options</i> ] <i>input.tif
-output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>tiffdither</i> converts a single channel 8-bit
-greyscale image to a bilevel image using Floyd-Steinberg
-error propagation with thresholding.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Specify the compression to use for data written to the
-output file: <b>none</b> for no compression, <b>packbits</b>
-for PackBits compression, <b>lzw</b> for Lempel-Ziv &amp;
-Welch compression, <b>zip</b> for Deflate compression,
-<b>g3</b> for CCITT Group 3 (T.4) compression, and <b>g4</b>
-for CCITT Group 4 (T.6) compression. By default
-<i>tiffdither</i> will compress data according to the value
-of the <i>Compression</i> tag found in the source file.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p>The <small>CCITT</small> Group 3 and Group 4 compression
-algorithms can only be used with bilevel data.</p>
-<!-- INDENTATION -->
-<p>Group 3 compression can be specified together with
-several T.4-specific options: <b>1d</b> for 1-dimensional
-encoding, <b>2d</b> for 2-dimensional encoding, and
-<b>fill</b> to force each encoded scanline to be zero-filled
-so that the terminating EOL code lies on a byte boundary.
-Group 3-specific options are specified by appending a
-&lsquo;&lsquo;:&rsquo;&rsquo;-separated list to the
-&lsquo;&lsquo;g3&rsquo;&rsquo; option; e.g. <b>&minus;c
-g3:2d:fill</b> to get 2D-encoded data with byte-aligned EOL
-codes.</p>
-<!-- INDENTATION -->
-<p><small>LZW</small> compression can be specified together
-with a <i>predictor</i> value. A predictor value of 2 causes
-each scanline of the output image to undergo horizontal
-differencing before it is encoded; a value of 1 forces each
-scanline to be encoded without differencing. LZW-specific
-options are specified by appending a
-&lsquo;&lsquo;:&rsquo;&rsquo;-separated list to the
-&lsquo;&lsquo;lzw&rsquo;&rsquo; option; e.g. <b>&minus;c
-lzw:2</b> for <small>LZW</small> compression with horizontal
-differencing.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;f</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the bit fill order to use in writing output
-data. By default, <i>tiffdither</i> will create a new file
-with the same fill order as the original. Specifying
-<b>&minus;f lsb2msb</b> will force data to be written with
-the <i>FillOrder</i> tag set to <small>LSB2MSB ,</small>
-while <b>&minus;f msb2lsb</b> will force data to be written
-with the <i>Fill- Order</i> tag set to <small>MSB2LSB
-.</small></p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;t</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Set the threshold value for dithering. By default the
-threshold value is 128.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The dither algorithm is taken from the
-<b>tiffmedian</b>(1) program (written by Paul Heckbert).</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>fax2tiff</b>(1),
-<b>tiffinfo</b>(1), <b>tiffcp</b>(1), <b>tiff2bw</b>(1),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffdump.1.html b/src/3rdparty/libtiff/html/man/tiffdump.1.html
deleted file mode 100644
index abf0662c66..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffdump.1.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:20 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFDUMP</title>
-</head>
-<body>
-
-<h1 align=center>TIFFDUMP</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffdump &minus; print verbatim information about
-<small>TIFF</small> files</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffdump</b> [ <i>options</i> ] <i>name ...</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>tiffdump</i> displays directory information from files
-created according to the Tag Image File Format, Revision
-6.0. The header of each <small>TIFF</small> file (magic
-number, version, and first directory offset) is displayed,
-followed by the tag contents of each directory in the file.
-For each tag, the name, data type, count, and value(s) is
-displayed. When the symbolic name for a tag or data type is
-known, the symbolic name is displayed followed by it&rsquo;s
-numeric (decimal) value. Tag values are displayed enclosed
-in &lsquo;&lsquo;&lt;&gt;&rsquo;&rsquo; characters
-immediately preceded by the value of the count field. For
-example, an <i>ImageWidth</i> tag might be displayed as
-&lsquo;&lsquo;ImageWidth (256) SHORT (3)
-1&lt;800&gt;&rsquo;&rsquo;.</p>
-<!-- INDENTATION -->
-<p><i>tiffdump</i> is particularly useful for investigating
-the contents of <small>TIFF</small> files that
-<i>libtiff</i> does not understand.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>&minus;h</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Force numeric data to be printed in hexadecimal rather
-than the default decimal.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;m</b> <i>items</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Change the number of indirect data items that are
-printed. By default, this will be 24.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;o</b> <i>offset</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Dump the contents of the <small>IFD</small> at the a
-particular file offset. The file offset may be specified
-using the usual C-style syntax; i.e. a leading
-&lsquo;&lsquo;0x&rsquo;&rsquo; for hexadecimal and a leading
-&lsquo;&lsquo;0&rsquo;&rsquo; for octal.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffinfo</b>(1), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffgt.1.html b/src/3rdparty/libtiff/html/man/tiffgt.1.html
deleted file mode 100644
index e8bd4b2312..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffgt.1.html
+++ /dev/null
@@ -1,551 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:20 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFGT</title>
-</head>
-<body>
-
-<h1 align=center>TIFFGT</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffgt &minus; display an image stored in a
-<small>TIFF</small> file (Silicon Graphics version)</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffgt</b> [ <i>options</i> ] <i>input.tif ...</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>tiffgt</i> displays one or more images stored using
-the Tag Image File Format, Revision 6.0. Each image is
-placed in a fixed size window that the user must position on
-the display (unless configured otherwise through X
-defaults). If the display has fewer than 24 bitplanes, or if
-the image does not warrant full color, then
-<small>RGB</small> color values are mapped to the closest
-values that exist in the colormap (this is done using the
-<i>rgbi</i> routine found in the graphics utility library
-<b>&minus;lgutil</b>.)</p>
-<!-- INDENTATION -->
-<p><i>tiffgt</i> correctly handles files with any of the
-following characteristics:</p></td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="3" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="34%">
-
-<p><i>BitsPerSample</i></p>
-</td>
-<td width="50%">
-
-<p>1, 2, 4, 8, 16</p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="34%">
-
-<p><i>SamplesPerPixel</i></p>
-</td>
-<td width="50%">
-
-<p>1, 3, 4 (the 4th sample is ignored)</p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="34%">
-
-<p><i>PhotometricInterpretation</i></p>
-</td>
-<td width="50%">
-
-<p>0 (min-is-white), 1 (min-is-black), 2 (RGB), 3
-(palette), 6 (YCbCr)</p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="34%">
-
-<p><i>PlanarConfiguration</i></p>
-</td>
-<td width="50%">
-
-<p>1 (contiguous), 2 (separate)</p>
-</td>
-<tr valign="top" align="left">
-<td width="15%"></td>
-<td width="34%">
-
-<p><i>Orientation</i></p>
-</td>
-<td width="50%">
-
-<p>1 (top-left), 4 (bottom-left)</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Data may be organized as strips or tiles and may be
-compressed with any of the compression algorithms supported
-by the <i>libtiff</i>(3) library.</p>
-<!-- INDENTATION -->
-<p>For palette images (<i>PhotometricInterpretation</i>=3),
-<i>tiffgt</i> inspects the colormap values and assumes
-either 16-bit or 8-bit values according to the maximum
-value. That is, if no colormap entry greater than 255 is
-found, <i>tiffgt</i> assumes the colormap has only 8-bit
-values; otherwise it assumes 16-bit values. This inspection
-is done to handle old images written by previous (incorrect)
-versions of <i>libtiff</i>.</p>
-<!-- INDENTATION -->
-<p><i>tiffgt</i> can be used to display multiple images
-one-at-a-time. The left mouse button switches the display to
-the first image in the <i>next</i> file in the list of files
-specified on the command line. The right mouse button
-switches to the first image in the <i>previous</i> file in
-the list. The middle mouse button causes the first image in
-the first file specified on the command line to be
-displayed. In addition the following keyboard commands are
-recognized:</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="4" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="8%">
-
-<p><b>b</b></p>
-</td>
-<td width="80%">
-
-<p>Use a <i>PhotometricInterpretation</i> of MinIsBlack in
-displaying the current image.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="8%">
-
-<p><b>l</b></p>
-</td>
-<td width="80%">
-
-<p>Use a <i>FillOrder</i> of lsb-to-msb in decoding the
-current image.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="8%">
-
-<p><b>m</b></p>
-</td>
-<td width="80%">
-
-<p>Use a <i>FillOrder</i> of msb-to-lsb in decoding the
-current image.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="8%">
-
-<p><b>c</b></p>
-</td>
-<td width="80%">
-
-<p>Use a colormap visual to display the current image.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="8%">
-
-<p><b>r</b></p>
-</td>
-<td width="80%">
-
-<p>Use a true color (24-bit RGB) visual to display the
-current image.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="8%">
-
-<p><b>w</b></p>
-</td>
-<td width="80%">
-
-<p>Use a <i>PhotometricInterpretation</i> of MinIsWhite in
-displaying the current image.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="8%">
-
-<p><b>W</b></p>
-</td>
-<td width="80%">
-
-<p>Toggle (enable/disable) display of warning messages from
-the <small>TIFF</small> library when decoding images.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="8%">
-
-<p><b>E</b></p>
-</td>
-<td width="80%">
-
-<p>Toggle (enable/disable) display of error messages from
-the <small>TIFF</small> library when decoding images.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="8%">
-
-<p><b>z</b></p>
-</td>
-<td width="80%">
-
-<p>Reset all parameters to their default settings
-(<i>FillOrder</i>, <i>PhotometricInterpretation</i>,
-handling of warnings and errors).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="8%">
-
-<p><b>PageUp</b></p>
-</td>
-<td width="80%">
-
-<p>Display the previous image in the current file or the
-last image in the previous file.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>PageDown</b></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Display the next image in the current file or the first
-image in the next file.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="6%">
-
-<p><b>Home</b></p>
-</td>
-<td width="2%"></td>
-<td width="80%">
-
-<p>Display the first image in the current file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="6%">
-
-<p><b>End</b></p>
-</td>
-<td width="2%"></td>
-<td width="80%">
-
-<p>Display the last image in the current file
-(unimplemented).</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force image display in a colormap window.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;d</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify an image to display by directory number. By
-default the first image in the file is displayed.
-Directories are numbered starting at zero.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;e</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Enable reporting of error messages from the
-<small>TIFF</small> library. By default <i>tiffgt</i>
-silently ignores images that cannot be read.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;f</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force <i>tiffgt</i> to run as a foreground process. By
-default <i>tiffgt</i> will place itself in the background
-once it has opened the requested image file.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;l</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force the presumed bit ordering to be <small>LSB</small>
-to <small>MSB.</small></p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;m</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force the presumed bit ordering to be <small>MSB</small>
-to <small>LSB.</small></p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;o</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify an image to display by directory offset. By
-default the first image in the file is displayed.
-Directories offsets may be specified using C-style syntax;
-i.e. a leading &lsquo;&lsquo;0x&rsquo;&rsquo; for
-hexadecimal and a leading &lsquo;&lsquo;0&rsquo;&rsquo; for
-octal.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;p</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Override the value of the
-<i>PhotometricInterpretation</i> tag; the parameter may be
-one of: <b>miniswhite</b>, <b>minisblack</b>, <b>rgb</b>,
-<b>palette</b>, <b>mask</b>, <b>separated</b>, <b>ycbcr</b>,
-and <b>cielab</b>.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Force image display in a full color window.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;s</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Stop on the first read error. By default all errors in
-the input data are ignored and <i>tiffgt</i> does it&rsquo;s
-best to display as much of an image as possible.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;w</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Enable reporting of warning messages from the
-<small>TIFF</small> library. By default <i>tiffgt</i>
-ignores warning messages generated when reading an
-image.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;v</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Place information in the title bar describing what type
-of window (full color or colormap) is being used, the name
-of the input file, and the directory index of the image (if
-non-zero). By default, the window type is not shown in the
-title bar.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Images wider and taller than the display are silently
-truncated to avoid crashing old versions of the window
-manager.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffdump</b>(1), <b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffinfo.1.html b/src/3rdparty/libtiff/html/man/tiffinfo.1.html
deleted file mode 100644
index 4863ed3762..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffinfo.1.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:20 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFINFO</title>
-</head>
-<body>
-
-<h1 align=center>TIFFINFO</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffinfo &minus; print information about
-<small>TIFF</small> files</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffinfo</b> [ <i>options</i> ] <i>input.tif
-...</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>Tiffinfo</i> displays information about files created
-according to the Tag Image File Format, Revision 6.0. By
-default, the contents of each <small>TIFF</small> directory
-in each file is displayed, with the value of each tag shown
-symbolically (where sensible).</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Display the colormap and color/gray response curves, if
-present.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;D</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>In addition to displaying the directory tags, read and
-decompress all the data in each image (but not display
-it).</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;d</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>In addition to displaying the directory tags, print each
-byte of decompressed data in hexadecimal.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;j</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Display any <small>JPEG</small> -related tags that are
-present.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;o</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Set the initial <small>TIFF</small> directory according
-to the specified file offset. The file offset may be
-specified using the usual C-style syntax; i.e. a leading
-&lsquo;&lsquo;0x&rsquo;&rsquo; for hexadecimal and a leading
-&lsquo;&lsquo;0&rsquo;&rsquo; for octal.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;s</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Display the offsets and byte counts for each data strip
-in a directory.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;z</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Enable strip chopping when reading image data.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;#</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Set the initial <small>TIFF</small> directory to
-<i>#</i>.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>tiffcp</b>(1), <b>tiffcmp</b>(1),
-<b>tiffmedian</b>(1), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffmedian.1.html b/src/3rdparty/libtiff/html/man/tiffmedian.1.html
deleted file mode 100644
index 59613177c9..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffmedian.1.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:20 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFMEDIAN</title>
-</head>
-<body>
-
-<h1 align=center>TIFFMEDIAN</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#NOTES">NOTES</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffmedian &minus; apply the median cut algorithm to data
-in a <small>TIFF</small> file</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffmedian</b> [ <i>options</i> ] <i>input.tif
-output.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>tiffmedian</i> applies the median cut algorithm to an
-<small>RGB</small> image in <i>input.tif</i> to generate a
-palette image that is written to <i>output.tif</i>. The
-generated colormap has, by default, 256 entries. The image
-data is quantized by mapping each pixel to the closest color
-values in the colormap.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="2%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the compression to use for data written to the
-output file: <b>none</b> for no compression, <b>packbits</b>
-for PackBits compression, <b>lzw</b> for Lempel-Ziv &amp;
-Welch compression, and <b>zip</b> for Deflate compression.
-By default <i>tiffmedian</i> will compress data according to
-the value of the <i>Compression</i> tag found in the source
-file.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p><small>LZW</small> compression can be specified together
-with a <i>predictor</i> value. A predictor value of 2 causes
-each scanline of the output image to undergo horizontal
-differencing before it is encoded; a value of 1 forces each
-scanline to be encoded without differencing. LZW-specific
-options are specified by appending a
-&lsquo;&lsquo;:&rsquo;&rsquo;-separated list to the
-&lsquo;&lsquo;lzw&rsquo;&rsquo; option; e.g. <b>&minus;c
-lzw:2</b> for <small>LZW</small> compression with horizontal
-differencing.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>&minus;C</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Specify the number of entries to use in the generated
-colormap. By default all 256 entries/colors are used.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>&minus;f</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Apply Floyd-Steinberg dithering before selecting a
-colormap entry.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="2%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="6%"></td>
-<td width="80%">
-
-<p>Specify the number of rows (scanlines) in each strip of
-data written to the output file. By default,
-<i>tiffmedian</i> attempts to set the rows/strip that no
-more than 8 kilobytes of data appear in a strip.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="NOTES"></a>
-<h2>NOTES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>This program is derived from Paul Heckbert&rsquo;s
-<i>median</i> program.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>pal2rgb</b>(1), <b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>tiffcmp</b>(1), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p><b>Color Image Quantization for Frame Buffer Display</b>,
-Paul Heckbert, SIGGRAPH proceedings, 1982, pp. 297-307.</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffset.1.html b/src/3rdparty/libtiff/html/man/tiffset.1.html
deleted file mode 100644
index fb4d0ed580..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffset.1.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:20 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFSET</title>
-</head>
-<body>
-
-<h1 align=center>TIFFSET</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#EXAMPLES">EXAMPLES</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffset &minus; set a field in a <small>TIFF</small>
-header</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffset</b> [ <i>options</i> ] <i>filename.tif</i></p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>Tiffset</i> sets the value of a <small>TIFF</small>
-header to a specified value.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;s</b> <i>tagnumber</i> [ <i>count</i> ]
-<i>value ...</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Set the value of the named tag to the value or values
-specified.</p>
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>&minus;sf</b> <i>tagnumber filename</i></p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="19%"></td>
-<td width="80%">
-<p>Set the value of the tag to the contents of filename.
-This option is supported for ASCII tags only.</p>
-</td>
-</table>
-<a name="EXAMPLES"></a>
-<h2>EXAMPLES</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The following example sets the image description tag
-(270) of a.tif to the contents of the file descrip:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffset &minus;sf 270 descrip a.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>The following example sets the artist tag (315) of a.tif
-to the string
-&lsquo;&lsquo;Anonymous&rsquo;&rsquo;:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffset &minus;s 305 Anonymous a.tif
-</pre>
-</td>
-</table>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>This example sets the resolution of the file a.tif to 300
-dpi:</p></td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<pre>tiffset &minus;s 296 2 a.tif
-tiffset &minus;s 282 300.0 a.tif
-tiffset &minus;s 283 300.0 a.tif
-</pre>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffdump</b>(1), <b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffsplit.1.html b/src/3rdparty/libtiff/html/man/tiffsplit.1.html
deleted file mode 100644
index adbc2f8899..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffsplit.1.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:20 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFSPLIT</title>
-</head>
-<body>
-
-<h1 align=center>TIFFSPLIT</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffsplit &minus; split a multi-image <small>TIFF</small>
-into single-image <small>TIFF</small> files</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffsplit</b> <i>src.tif</i> [ <i>prefix</i> ]</p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>tiffsplit</i> takes a multi-directory (page)
-<small>TIFF</small> file and creates one or more
-single-directory (page) <small>TIFF</small> files from it.
-The output files are given names created by concatenating a
-prefix, a lexically ordered suffix in the range
-[<i>aaa</i>-<i>zzz</i>], the suffix <i>.tif</i> (e.g.
-<i>xaaa.tif</i>, <i>xaab.tif</i>, <i>xzzz.tif</i>). If a
-prefix is not specified on the command line, the default
-prefix of <i>x</i> is used.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>None.</p>
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Only a select set of &lsquo;&lsquo;known
-tags&rsquo;&rsquo; is copied when splitting.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffcp</b>(1), <b>tiffinfo</b>(1),
-<b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/man/tiffsv.1.html b/src/3rdparty/libtiff/html/man/tiffsv.1.html
deleted file mode 100644
index fb484b01f8..0000000000
--- a/src/3rdparty/libtiff/html/man/tiffsv.1.html
+++ /dev/null
@@ -1,207 +0,0 @@
-<!-- Creator : groff version 1.18.1 -->
-<!-- CreationDate: Fri Jul 13 17:43:20 2007 -->
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta name="Content-Style" content="text/css">
-<title>TIFFSV</title>
-</head>
-<body>
-
-<h1 align=center>TIFFSV</h1>
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#OPTIONS">OPTIONS</a><br>
-<a href="#NOTE">NOTE</a><br>
-<a href="#BUGS">BUGS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-
-<hr>
-<a name="NAME"></a>
-<h2>NAME</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>tiffsv &minus; save an image from the framebuffer in a
-<small>TIFF</small> file (Silicon Graphics version)</p>
-</td>
-</table>
-<a name="SYNOPSIS"></a>
-<h2>SYNOPSIS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>tiffsv</b> [ <i>options</i> ] <i>output.tif</i> [
-<i>x1 x2 y1 y2</i> ]</p>
-</td>
-</table>
-<a name="DESCRIPTION"></a>
-<h2>DESCRIPTION</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><i>tiffsv</i> saves all or part of the framebuffer in a
-file using the Tag Image File Format, Revision 6.0. By
-default, the image is saved with data samples packed
-(<i>PlanarConfiguration</i>=1), compressed with the
-Lempel-Ziv &amp; Welch algorithm (<i>Compression</i>=5), and
-with each strip no more than 8 kilobytes. These
-characteristics can be overridden, or explicitly specified
-with the options described below.</p>
-</td>
-</table>
-<a name="OPTIONS"></a>
-<h2>OPTIONS</h2>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;b</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Save the image as a greyscale image as if it were
-processed by <i>tiff2bw</i>(1). This option is included for
-compatibility with the standard <i>scrsave</i>(6D)
-program.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;c</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the compression to use for data written to the
-output file: <b>none</b> for no compression, <b>packbits</b>
-for PackBits compression, <b>jpeg</b> for baseline JPEG
-compression, <b>zip</b> for Deflate compression, and
-<b>lzw</b> for Lempel-Ziv &amp; Welch compression
-(default).</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="17%"></td>
-<td width="82%">
-<p><small>LZW</small> compression can be specified together
-with a <i>predictor</i> value. A predictor value of 2 causes
-each scanline of the output image to undergo horizontal
-differencing before it is encoded; a value of 1 forces each
-scanline to be encoded without differencing. LZW-specific
-options are specified by appending a
-&lsquo;&lsquo;:&rsquo;&rsquo;-separated list to the
-&lsquo;&lsquo;lzw&rsquo;&rsquo; option; e.g. <b>&minus;c
-lzw:2</b> for <small>LZW</small> compression with horizontal
-differencing.</p>
-</td>
-</table>
-<!-- TABS -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="5" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;p</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the planar configuration to use in writing image
-data. By default, <i>tiffsv</i> will create a new file with
-the data samples packed contiguously. Specifying <b>&minus;p
-contig</b> will force data to be written with multi-sample
-data packed together, while <b>&minus;p separate</b> will
-force samples to be written in separate planes.</p>
-</td>
-<td width="0%">
-</td>
-<tr valign="top" align="left">
-<td width="10%"></td>
-<td width="3%">
-
-<p><b>&minus;r</b></p>
-</td>
-<td width="5%"></td>
-<td width="80%">
-
-<p>Specify the number of rows (scanlines) in each strip of
-data written to the output file. By default, <i>tiffsv</i>
-attempts to set the rows/strip that no more than 8 kilobytes
-of data appear in a strip.</p>
-</td>
-<td width="0%">
-</td>
-</table>
-<a name="NOTE"></a>
-<h2>NOTE</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>Except for the use of <small>TIFF,</small> this program
-is equivalent to the standard <i>scrsave</i> program. This
-means, for example, that you can use it in conjunction with
-the standard <i>icut</i> program simply by creating a link
-called <i>scrsave</i>, or by creating a shell script called
-<i>scrsave</i> that invokes <i>tiffgt</i> with the
-appropriate options.</p>
-</td>
-</table>
-<a name="BUGS"></a>
-<h2>BUGS</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p>If data are saved compressed and in separate planes, then
-the rows in each strip is silently set to one to avoid
-limitations in the <b>libtiff</b>(3TIFF) library.</p>
-</td>
-</table>
-<a name="SEE ALSO"></a>
-<h2>SEE ALSO</h2>
-<!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="8%"></td>
-<td width="91%">
-<p><b>scrsave</b>(6D) <b>pal2rgb</b>(1), <b>tiffdump</b>(1),
-<b>tiffgt</b>(1), <b>tiffinfo</b>(1), <b>tiffcp</b>(1),
-<b>tiffmedian</b>(1), <b>libtiff</b>(3TIFF)</p>
-<!-- INDENTATION -->
-<p>Libtiff library home page:
-<b>http://www.remotesensing.org/libtiff/</b></p>
-</td>
-</table>
-<hr>
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/misc.html b/src/3rdparty/libtiff/html/misc.html
deleted file mode 100644
index aed91a9213..0000000000
--- a/src/3rdparty/libtiff/html/misc.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Acknowledgments and Other Issues
-</TITLE>
-</HEAD>
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-<H1>
-<IMG SRC=images/ring.gif WIDTH=124 HEIGHT=124 ALIGN=left BORDER=1 HSPACE=6>
-Acknowledgments and Other Issues
-</H1>
-
-<P>
-Silicon Graphics has seen fit to allow us to give this work away. It
-is free. There is no support or guarantee of any sort as to its
-operations, correctness, or whatever. If you do anything useful with
-all or parts of it you need to honor the copyright notices. It would
-also be nice to be acknowledged.<p>
-
-<BR CLEAR=left>
-
-<H2>Acknowledgements</H2>
-
-The libtiff software was written by Sam Leffler while working for
-Silicon Graphics.<p>
-
-The LZW algorithm is derived from the compress program (the proper attribution
-is included in the source code). The Group 3 fax stuff originated as code
-from Jef Poskanzer, but has since been rewritten several times. The latest
-version uses an algorithm from Frank Cringle -- consult
-<TT>libtiff/mkg3states.c</TT> and <TT>libtiff/tif_fax3.h</TT> for further
-information. The JPEG support was written by Tom Lane and is dependent on the
-excellent work of Tom Lane and the Independent JPEG Group (IJG) who distribute
-their work under friendly licensing similar to this software. Joris Van Damme
-implemented the robust Old JPEG decoder (as included in libtiff since version
-3.9.0, there was another Old JPEG module in older releases, which was
-incomplete and unsuitable for many existing images of that format). JBIG
-module was written by Lee Howard and depends on JBIG library from the Markus
-Kuhn. Many other people have by now helped with bug fixes and code; a few of
-the more persistent contributors have been:
-
-<PRE>
- Bjorn P. Brox
- Dan McCoy
- J.T. Conklin
- Richard Minner
- Frank D. Cringle
- Richard Mlynarik
- Soren Pingel Dalsgaard
- Niles Ritter
- Steve Johnson
- Karsten Spang
- Tom Lane
- Peter Smith
- Brent Roman
- Mike Welles
- Frank Warmerdam
- Greg Ward
- Stanislav Brabec
- Roman Shpount
- Peter Skarpetis
- Arvan Pritchard
- Bernt Herd
- Joseph Orost
- Phil Beffery
- Ivo Penzar
- Francois Dagand
- Albert Chin-A-Young
- Bruce A. Mallett
- Dwight Kelly
- Andrey Kiselev
- Ross Finlayson
- Dmitry V. Levin
- Bob Friesenhahn
- Lee Howard
- Joris Van Damme
- Tavis Ormandy
- Richard Nolde
-</PRE>
-
-(my apology to anyone that was inadvertently not listed.)
-
-<H2>Use and Copyright</H2>
-
-<P><H5><PRE>
-Copyright (c) 1988-1997 Sam Leffler
-Copyright (c) 1991-1997 Silicon Graphics, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and
-its documentation for any purpose is hereby granted without fee, provided
-that (i) the above copyright notices and this permission notice appear in
-all copies of the software and related documentation, and (ii) the names of
-Sam Leffler and Silicon Graphics may not be used in any advertising or
-publicity relating to the software without the specific, prior written
-permission of Sam Leffler and Silicon Graphics.
-
-THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-</PRE></H5>
-
-<P>
-<HR>
-
-
-Last updated: $Date: 2007/02/24 15:47:04 $
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/support.html b/src/3rdparty/libtiff/html/support.html
deleted file mode 100644
index f6f5d60877..0000000000
--- a/src/3rdparty/libtiff/html/support.html
+++ /dev/null
@@ -1,655 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
-<head>
- <title>TIFF 6.0 Specification Coverage</title>
- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
- <meta http-equiv="content-language" content="en">
- <style type="text/css">
- <!--
- th {text-align: left; vertical-align: top; font-style: italic; font-weight: normal}
- -->
- </style>
-</head>
-<body lang="en" text="#000000" bgcolor="#ffffff" link="#0000ff" alink="#0000ff" vlink="#0000ff">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td style="padding-left: 1em; padding-right: 1em"><img src="images/strike.gif" width="128" height="100" alt=""></td>
- <td>
- <h1>TIFF 6.0 Specification Coverage</h1>
- <p>
- The library is capable of dealing with images that are written to
- follow the 5.0 or 6.0 TIFF spec. There is also considerable support
- for some of the more esoteric portions of the 6.0 TIFF spec.
- </p>
- </td>
- </tr>
- </table>
- <br>
- <table border="1" cellspacing="0" cellpadding="5">
- <tr>
- <th>Core requirements</th>
- <td>
- <p>
- Both <tt>"MM"</tt> and <tt>"II"</tt> byte orders are handled.
- Both packed and separated planar configuration of samples.
- Any number of samples per pixel (memory permitting).
- Any image width and height (memory permitting).
- Multiple subfiles can be read and written.
- Editing is <b>not</b> supported in that related subfiles (e.g.
- a reduced resolution version of an image) are not automatically
- updated.
- </p>
- <p>
- Tags handled: <tt>ExtraSamples</tt>, <tt>ImageWidth</tt>,
- <tt>ImageLength</tt>, <tt>NewSubfileType</tt>, <tt>ResolutionUnit</tt>.
- <tt>Rowsperstrip</tt>, <tt>StripOffsets</tt>, <tt>StripByteCounts</tt>,
- <tt>XResolution</tt>, <tt>YResolution</tt>
- </p>
- </td>
- </tr>
- <tr>
- <th>Tiled Images</th>
- <td><tt>TileWidth</tt>, <tt>TileLength</tt>, <tt>TileOffsets</tt>,
- <tt>TileByteCounts</tt></td>
- </tr>
- <tr>
- <th>Image Colorimetry Information</th>
- <td><tt>WhitePoint</tt>, <tt>PrimaryChromaticities</tt>, <tt>TransferFunction</tt>,
- <tt>ReferenceBlackWhite</tt></td>
- </tr>
- <tr>
- <th>Class B for bilevel images</th>
- <td><tt>SamplesPerPixel</tt> = 1<br>
- <tt>BitsPerSample</tt> = 1<br>
- <tt>Compression</tt> = 1 (none), 2 (CCITT 1D), or 32773 (PackBits)<br>
- <tt>PhotometricInterpretation</tt> = 0 (Min-is-White), 1 (Min-is-Black)</td>
- </tr>
- <tr>
- <th>Class G for grayscale images</th>
- <td><tt>SamplesPerPixel</tt> = 1<br>
- <tt>BitsPerSample</tt> = 4, 8<br>
- <tt>Compression</tt> = 1 (none) 5 (LZW)<br>
- <tt>PhotometricInterpretation</tt> = 0 (Min-is-White), 1 (Min-is-Black)</td>
- </tr>
- <tr>
- <th>Class P for palette color images</th>
- <td><tt>SamplesPerPixel</tt> = 1<br>
- <tt>BitsPerSample</tt> = 1-8<br>
- <tt>Compression</tt> = 1 (none) 5 (LZW)<br>
- <tt>PhotometricInterpretation</tt> = 3 (Palette RGB)<br>
- <tt>ColorMap</tt></td>
- </tr>
- <tr>
- <th>Class R for RGB full color images</th>
- <td><tt>SamplesPerPixel</tt> = 3<br>
- <tt>BitsPerSample</tt> = &lt;8,8,8&gt;<br>
- <tt>PlanarConfiguration</tt> = 1, 2<br>
- <tt>Compression</tt> = 1 (none) 5 (LZW)<br>
- <tt>PhotometricInterpretation</tt> = 2 (RGB)</td>
- </tr>
- <tr>
- <th>Class F for facsimile</th>
- <td>(<i>Class B tags plus...</i>)<br>
- <tt>Compression</tt> = 3 (CCITT Group 3), 4 (CCITT Group 4)<br>
- <tt>FillOrder</tt> = 1 (MSB), 2 (LSB)<br>
- <tt>Group3Options</tt> = 1 (2d encoding), 4 (zero fill), 5 (2d+fill)<br>
- <tt>ImageWidth</tt> = 1728, 2048, 2482<br>
- <tt>NewSubFileType</tt> = 2<br>
- <tt>ResolutionUnit</tt> = 2 (Inch), 3 (Centimeter)<br>
- <tt>PageNumber</tt>,
- <tt>XResolution</tt>,
- <tt>YResolution</tt>,
- <tt>Software</tt>,
- <tt>BadFaxLines</tt>,
- <tt>CleanFaxData</tt>,
- <tt>ConsecutiveBadFaxLines</tt>,
- <tt>DateTime</tt>,
- <tt>DocumentName</tt>,
- <tt>ImageDescription</tt>,
- <tt>Orientation</tt></td>
- </tr>
- <tr>
- <th>Class S for separated images</th>
- <td><tt>SamplesPerPixel</tt> = 4<br>
- <tt>PlanarConfiguration</tt> = 1, 2<br>
- <tt>Compression</tt> = 1 (none), 5 (LZW)<br>
- <tt>PhotometricInterpretation</tt> = 5 (Separated)<br>
- <tt>InkSet</tt> = 1 (CMYK)<br>
- <tt>DotRange</tt>,
- <tt>InkNames</tt>,
- <tt>DotRange</tt>,
- <tt>TargetPrinter</tt></td>
- </tr>
- <tr>
- <th>Class Y for YCbCr images</th>
- <td><tt>SamplesPerPixel</tt> = 3<br>
- <tt>BitsPerSample</tt> = &lt;8,8,8&gt;<br>
- <tt>PlanarConfiguration</tt> = 1, 2<br>
- <tt>Compression</tt> = 1 (none), 5 (LZW), 7 (JPEG)<br>
- <tt>PhotometricInterpretation</tt> = 6 (YCbCr)<br>
- <tt>YCbCrCoefficients</tt>,
- <tt>YCbCrSubsampling</tt>,
- <tt>YCbCrPositioning</tt><br>
- (<i>colorimetry info from Appendix H; see above</i>)</td>
- </tr>
- <tr>
- <th>Class "JPEG" for JPEG images (per TTN2)</th>
- <td><tt>PhotometricInterpretation</tt> = 1 (grayscale), 2 (RGB), 5 (CMYK), 6 (YCbCr)<br>
- (<i>Class Y tags if YCbCr</i>)<br>
- (<i>Class S tags if CMYK</i>)<br>
- <tt>Compression</tt> = 7 (JPEG)</td>
- </tr>
- </table>
- <p>
- In addition, the library supports some optional compression algorithms
- that are, in some cases, of dubious value.
- </p>
- <table border="0" cellspacing="0" cellpadding="2">
- <tr><th>Compression tag value</th><th>Compression algorithm</th></tr>
- <tr><td>32766</td><td>NeXT 2-bit encoding</td></tr>
- <tr><td>32809</td><td>ThunderScan 4-bit encoding</td></tr>
- <tr><td>32909</td><td>Pixar companded 11-bit ZIP encoding</td></tr>
- <tr><td>32946</td><td>PKZIP-style Deflate encoding (experimental)</td></tr>
- <tr><td>34676</td><td>SGI 32-bit Log Luminance encoding (experimental)</td></tr>
- <tr><td>34677</td><td>SGI 24-bit Log Luminance encoding (experimental)</td></tr>
- </table>
- <br>
- <p>
- Note that there is no support for the JPEG-related tags defined
- in the 6.0 specification; the JPEG support is based on the post-6.0
- proposal given in TIFF Technical Note #2.
- </p>
- <table>
- <tr>
- <td valign=top><img src="images/info.gif" width="32" height="32" alt=""></td>
- <td>For more information on the experimental Log Luminance encoding
- consult the materials available at
- <a href="http://www.anyhere.com/gward/pixformat/tiffluv.html">http://www.anyhere.com/gward/pixformat/tiffluv.html</a>.</td>
- </tr>
- </table>
- <br>
- <p>
- The following table shows the tags that are recognized
- and how they are used by the library. If no use is indicated,
- then the library reads and writes the tag, but does not use it internally.
- </p>
- <table border="1" cellspacing="0" cellpadding="5">
- <tr>
- <th>Tag Name</th>
- <th>Value</th>
- <th>R/W</th>
- <th>Library's Use (Comments)</th>
- </tr>
- <tr>
- <td><tt>NewSubFileType</tt></td>
- <td>254</td>
- <td>R/W</td>
- <td>none (called <tt>SubFileType</tt> in &lt;tiff.h&gt;)</td>
- </tr>
- <tr>
- <td><tt>SubFileType</tt></td>
- <td>255</td>
- <td>R/W</td>
- <td>none (called <tt>OSubFileType</tt> in &lt;tiff.h&gt;)</td>
- </tr>
- <tr>
- <td><tt>ImageWidth</tt></td>
- <td>256</td>
- <td>R/W</td>
- <td>lots</td>
- </tr>
- <tr>
- <td><tt>ImageLength</tt></td>
- <td>257</td>
- <td>R/W</td>
- <td>lots</td>
- </tr>
- <tr>
- <td><tt>BitsPerSample</tt></td>
- <td>258</td>
- <td>R/W</td>
- <td>lots</td>
- </tr>
- <tr>
- <td><tt>Compression</tt></td>
- <td>259</td>
- <td>R/W</td>
- <td>to select appropriate codec</td>
- </tr>
- <tr>
- <td><tt>PhotometricInterpretation</tt></td>
- <td>262</td>
- <td>R/W</td>
- <td>lots</td>
- </tr>
- <tr>
- <td><tt>Thresholding</tt></td>
- <td>263</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>CellWidth</tt></td>
- <td>264</td>
- <td>&nbsp;</td>
- <td>parsed but ignored</td>
- </tr>
- <tr>
- <td><tt>CellLength</tt></td>
- <td>265</td>
- <td>&nbsp;</td>
- <td>parsed but ignored</td>
- </tr>
- <tr>
- <td><tt>FillOrder</tt></td>
- <td>266</td>
- <td>R/W</td>
- <td>control bit order</td>
- </tr>
- <tr>
- <td><tt>DocumentName</tt></td>
- <td>269</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>ImageDescription</tt></td>
- <td>270</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>Make</tt></td>
- <td>271</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>Model</tt></td>
- <td>272</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>StripOffsets</tt></td>
- <td>273</td>
- <td>R/W</td>
- <td>data i/o</td>
- </tr>
- <tr>
- <td><tt>Orientation</tt></td>
- <td>274</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>SamplesPerPixel</tt></td>
- <td>277</td>
- <td>R/W</td>
- <td>lots</td>
- </tr>
- <tr>
- <td><tt>RowsPerStrip</tt></td>
- <td>278</td>
- <td>R/W</td>
- <td>data i/o</td>
- </tr>
- <tr>
- <td><tt>StripByteCounts</tt></td>
- <td>279</td>
- <td>R/W</td>
- <td>data i/o</td>
- </tr>
- <tr>
- <td><tt>MinSampleValue</tt></td>
- <td>280</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>MaxSampleValue</tt></td>
- <td>281</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>XResolution</tt></td>
- <td>282</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>YResolution</tt></td>
- <td>283</td>
- <td>R/W</td>
- <td>used by Group 3 2d encoder</td>
- </tr>
- <tr>
- <td><tt>PlanarConfiguration</tt></td>
- <td>284</td>
- <td>R/W</td>
- <td>data i/o</td>
- </tr>
- <tr>
- <td><tt>PageName</tt></td>
- <td>285</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>XPosition</tt></td>
- <td>286</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>YPosition</tt></td>
- <td>286</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>FreeOffsets</tt></td>
- <td>288</td>
- <td>&nbsp;</td>
- <td>parsed but ignored</td>
- </tr>
- <tr>
- <td><tt>FreeByteCounts</tt></td>
- <td>289</td>
- <td>&nbsp;</td>
- <td>parsed but ignored</td>
- </tr>
- <tr>
- <td><tt>GrayResponseUnit</tt></td>
- <td>290</td>
- <td>&nbsp;</td>
- <td>parsed but ignored</td>
- </tr>
- <tr>
- <td><tt>GrayResponseCurve</tt></td>
- <td>291</td>
- <td>&nbsp;</td>
- <td>parsed but ignored</td>
- </tr>
- <tr>
- <td><tt>Group3Options</tt></td>
- <td>292</td>
- <td>R/W</td>
- <td>used by Group 3 codec</td>
- </tr>
- <tr>
- <td><tt>Group4Options</tt></td>
- <td>293</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>ResolutionUnit</tt></td>
- <td>296</td>
- <td>R/W</td>
- <td>used by Group 3 2d encoder</td>
- </tr>
- <tr>
- <td><tt>PageNumber</tt></td>
- <td>297</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>ColorResponseUnit</tt></td>
- <td>300</td>
- <td>&nbsp;</td>
- <td>parsed but ignored</td>
- </tr>
- <tr>
- <td><tt>TransferFunction</tt></td>
- <td>301</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>Software</tt></td>
- <td>305</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>DateTime</tt></td>
- <td>306</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>Artist</tt></td>
- <td>315</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>HostComputer</tt></td>
- <td>316</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>Predictor</tt></td>
- <td>317</td>
- <td>R/W</td>
- <td>used by LZW codec</td>
- </tr>
- <tr>
- <td><tt>WhitePoint</tt></td>
- <td>318</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>PrimaryChromacities</tt></td>
- <td>319</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>ColorMap</tt></td>
- <td>320</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>TileWidth</tt></td>
- <td>322</td>
- <td>R/W</td>
- <td>data i/o</td>
- </tr>
- <tr>
- <td><tt>TileLength</tt></td>
- <td>323</td>
- <td>R/W</td>
- <td>data i/o</td>
- </tr>
- <tr>
- <td><tt>TileOffsets</tt></td>
- <td>324</td>
- <td>R/W</td>
- <td>data i/o</td>
- </tr>
- <tr>
- <td><tt>TileByteCounts</tt></td>
- <td>324</td>
- <td>R/W</td>
- <td>data i/o</td>
- </tr>
- <tr>
- <td><tt>BadFaxLines</tt></td>
- <td>326</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>CleanFaxData</tt></td>
- <td>327</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>ConsecutiveBadFaxLines</tt></td>
- <td>328</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>SubIFD</tt></td>
- <td>330</td>
- <td>R/W</td>
- <td>subimage descriptor support</td>
- </tr>
- <tr>
- <td><tt>InkSet</tt></td>
- <td>332</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>InkNames</tt></td>
- <td>333</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>DotRange</tt></td>
- <td>336</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>TargetPrinter</tt></td>
- <td>337</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>ExtraSamples</tt></td>
- <td>338</td>
- <td>R/W</td>
- <td>lots</td>
- </tr>
- <tr>
- <td><tt>SampleFormat</tt></td>
- <td>339</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>SMinSampleValue</tt></td>
- <td>340</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>SMaxSampleValue</tt></td>
- <td>341</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>JPEGTables</tt></td>
- <td>347</td>
- <td>R/W</td>
- <td>used by JPEG codec</td>
- </tr>
- <tr>
- <td><tt>YCbCrCoefficients</tt></td>
- <td>529</td>
- <td>R/W</td>
- <td>used by <tt>TIFFReadRGBAImage</tt> support</td>
- </tr>
- <tr>
- <td><tt>YCbCrSubsampling</tt></td>
- <td>530</td>
- <td>R/W</td>
- <td>tile/strip size calculations</td>
- </tr>
- <tr>
- <td><tt>YCbCrPositioning</tt></td>
- <td>531</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>ReferenceBlackWhite</tt></td>
- <td>532</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td><tt>Matteing</tt></td>
- <td>32995</td>
- <td>R</td>
- <td>none (obsoleted by <tt>ExtraSamples</tt> tag)</td>
- </tr>
- <tr>
- <td><tt>DataType</tt></td>
- <td>32996</td>
- <td>R</td>
- <td>none (obsoleted by <tt>SampleFormat</tt> tag)</td>
- </tr>
- <tr>
- <td><tt>ImageDepth</tt></td>
- <td>32997</td>
- <td>R/W</td>
- <td>tile/strip calculations</td>
- </tr>
- <tr>
- <td><tt>TileDepth</tt></td>
- <td>32998</td>
- <td>R/W</td>
- <td>tile/strip calculations</td>
- </tr>
- <tr>
- <td><tt>StoNits</tt></td>
- <td>37439</td>
- <td>R/W</td>
- <td>&nbsp;</td>
- </tr>
- </table>
- <p>
- The <tt>Matteing</tt> and <tt>DataType</tt>
- tags have been obsoleted by the 6.0
- <tt>ExtraSamples</tt> and <tt>SampleFormat</tt> tags.
- Consult the documentation on the
- <tt>ExtraSamples</tt> tag and Associated Alpha for elaboration. Note however
- that if you use Associated Alpha, you are expected to save data that is
- pre-multipled by Alpha. If this means nothing to you, check out
- Porter &amp; Duff's paper in the '84 SIGGRAPH proceedings: "Compositing Digital
- Images".
- </p>
- <p>
- The <tt>ImageDepth</tt>
- tag is a non-standard, but registered tag that specifies
- the Z-dimension of volumetric data. The combination of <tt>ImageWidth</tt>,
- <tt>ImageLength</tt>, and <tt>ImageDepth</tt>,
- defines a 3D volume of pixels that are
- further specified by <tt>BitsPerSample</tt> and
- <tt>SamplesPerPixel</tt>. The <tt>TileDepth</tt>
- tag (also non-standard, but registered) can be used to specified a
- subvolume "tiling" of a volume of data.
- </p>
- <p>
- The Colorimetry, and CMYK tags are additions that appear in TIFF 6.0.
- Consult the TIFF 6.0 specification included in the <b>doc</b> directory
- and <a href="document.html">online</a>.
- </p>
- <p>
- The JPEG-related tag is specified in
- <a href="TIFFTechNote2.html">TIFF Technical Note #2</a> which defines
- a revised JPEG-in-TIFF scheme (revised over that appendix that was
- part of the TIFF 6.0 specification).
- </p>
- <hr>
- <p>
- Last updated: $Date: 2005/12/28 06:53:18 $
- </p>
-</body>
-</html>
-
diff --git a/src/3rdparty/libtiff/html/tools.html b/src/3rdparty/libtiff/html/tools.html
deleted file mode 100644
index b1a757e7ef..0000000000
--- a/src/3rdparty/libtiff/html/tools.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta name="generator" content=
-"HTML Tidy for Solaris (vers 12 April 2005), see www.w3.org">
-<title>TIFF Tools Overview</title>
-</head>
-<body bgcolor="white">
-<h1><font face="Arial, Helvetica, Sans"><img src="images/quad.jpg"
-width="144" height="108" align="left" border="1" hspace="6"> TIFF
-Tools Overview</font></h1>
-<p>This software distribution comes with a small collection of
-programs for converting non-TIFF format images to TIFF and for
-manipulating and interrogating the contents of TIFF images. Several
-of these tools are useful in their own right. Many of them however
-are more intended to serve as programming examples for using the
-TIFF library.</p>
-<h3>Device-dependent Programs</h3>
-There are two device-dependent programs that serve as simple
-examples for writing programs to display and save TIFF images.
-<table border cellpadding="3">
-<tr>
-<td valign="top" width="10%">
-<tt><a href="man/tiffgt.1.html">tiffgt</a>&nbsp;&nbsp;&nbsp;&nbsp;</tt></td>
-<td>Display the contents of one or more TIFF images using OpenGL.
-The software makes extensive use of the <tt>TIFFRGBAImage</tt>
-facilities described elsewhere.</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffsv.1.html">tiffsv</a></tt></td>
-<td>A program to save all or part of a screen dump on a Silicon
-Graphics system. As for <tt>tiffgt</tt> this code, while written to
-use the IRIS GL, can be easily tailored to other devices.</td>
-</tr>
-</table>
-<h3>Device-independent Programs</h3>
-The remaining programs should be device-independent:
-<table border cellpadding="3">
-<tr>
-<td valign="top" width="10%"><tt><a href="man/bmp2tiff.1.html">bmp2tiff</a></tt></td>
-<td>Convert BMP images to TIFF</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/fax2ps.1.html">fax2ps</a></tt></td>
-<td>Convert a Group 3- or Group 4- compressed TIFF to PostScript
-that is significantly more compressed than is generated by
-<tt>tiff2ps</tt> (unless <tt>tiff2ps</tt> writes PS Level II)</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/fax2tiff.1.html">fax2tiff</a></tt></td>
-<td>Convert raw Group 3 or Group 4 facsimile data to TIFF</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/gif2tiff.1.html">gif2tiff</a></tt></td>
-<td>A quick hack that converts GIF 87a (old) format images to TIFF</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/pal2rgb.1.html">pal2rgb</a></tt></td>
-<td>Convert a Palette-style image to a full color RGB image by
-applying the colormap</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/ppm2tiff.1.html">ppm2tiff</a></tt></td>
-<td>A quick hack that converts 8-bit PPM format images to TIFF</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/ras2tiff.1.html">ras2tiff</a></tt></td>
-<td>A quick hack that converts Sun rasterfile format images to TIFF
--- it's less than complete</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/raw2tiff.1.html">raw2tiff</a></tt></td>
-<td>Create a TIFF file from raw data</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/rgb2ycbcr.1.html">rgb2ycbcr</a></tt></td>
-<td>Convert an RGB, grayscale, or bilevel TIFF image to a YCbCr
-TIFF image; it's mainly provided for testing</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/sgi2tiff.1.html">sgi2tiff</a></tt></td>
-<td>A program to convert SGI image files to TIFF. This program is
-only useful on SGI machines as it uses <tt>-limage</tt>.</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/thumbnail.1.html">thumbnail</a></tt></tt></td>
-<td>Copy a bilevel TIFF to one that includes 8-bit greyscale
-"thumbnail images" for each page; it is provided as an example of
-how one might use the <tt>SubIFD</tt> tag (and the library support
-for it)</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiff2bw.1.html">tiff2bw</a></tt></td>
-<td>A simple program to convert a color image to grayscale</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiff2pdf.1.html">tiff2pdf</a></tt></td>
-<td>Convert TIFF images to PDF</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiff2ps.1.html">tiff2ps</a></tt></td>
-<td>Convert TIFF images to PostScript</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiff2rgba.1.html">tiff2rgba</a></tt></td>
-<td>Convert a TIFF image to RGBA color space</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffcmp.1.html">tiffcmp</a></tt></td>
-<td>Compare the contents of two TIFF files (it does not check all
-the directory information, but does check all the data)</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffcp.1.html">tiffcp</a></tt></td>
-<td>Copy, concatenate, and convert TIFF images (e.g. switching from
-Compression=5 to Compression=1)</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffcrop.1.html">tiffcrop</a></tt></td>
-<td>Provides selection of images from within one or more multi-image
-TIFF files, with orthogonal rotation, mirroring, cropping, and
-extraction of multiple sections and exporting to one or more files.
-It extends the functionality of tiffcp to support additional bit
-depths in strips and tiles and enhances the selection capabilities of
-tiffsplit. Bilevel images can be inverted and images may be split into
-segments to fit on multiple /pages/ (standard paper sizes), plus other
-functions described in the tiffcrop man page</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffdither.1.html">tiffdither</a></tt></td>
-<td>Dither a b&amp;w image into a bilevel image (suitable for use
-in creating fax files)</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffdump.1.html">tiffdump</a></tt></td>
-<td>Display the verbatim contents of the TIFF directory in a file
-(it's very useful for debugging bogus files that you may get from
-someone that claims they support TIFF)</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffinfo.1.html">tiffinfo</a></tt></td>
-<td>Display information about one or more TIFF files.</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffmedian.1.html">tiffmedian</a></tt></td>
-<td>A version of Paul Heckbert's median cut program that reads an
-RGB TIFF image, and creates a TIFF palette file as a result</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffset.1.html">tiffset</a></tt></td>
-<td>Set a field in a TIFF header</td>
-</tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffsplit.1.html">tiffsplit</a></tt></td>
-<td>Create one or more single-image files from a (possibly)
-multi-image file</td>
-</tr>
-</table>
-<p>Check out the manual pages for details about the above
-programs.</p>
-<hr>
-Last updated: $Date: 2009-10-28 22:13:58 $
-</body>
-</html>
diff --git a/src/3rdparty/libtiff/html/v3.4beta007.html b/src/3rdparty/libtiff/html/v3.4beta007.html
deleted file mode 100644
index c535d2708d..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta007.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta007
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta007<BR>
-<B>Previous Version</B>: v3.4beta004<BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#port">Changes in the portability support</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI>bit order was corrected for Pentium systems
-<LI>a new define, <TT>HOST_BIGENDIAN</TT>, was added for code that
- wants to statically use information about native cpu byte order
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>the G3/G4 decoder was replaced by a new one that is faster and
- has smaller state tables
-<LI>Niles Ritter's client tag extension hooks were added
-<LI>a new routine <TT>TIFFCurrentDirOffset</TT> was added for
- applications that want to find out the file offset of a TIFF directory
-<LI>the calculation of the number of strips in an image was corected
- for images with certain esoteric configurations
-<LI>a potential memory leak (very unlikely) was plugged
-<LI>the <TT>TIFFReadRGBAImage</TT> support was completely rewritten
- and new, more flexible support was added for reading images into
- a fixed-format raster
-<LI>YCbCr to RGB conversion done in the <TT>TIFFReadRGBAImage</TT> support
- was optimized
-<LI>a bug in JPEG support calculation of strip size was corrected
-<LI>the LZW decoder was changed to initialize the code table to zero
- to lessen potential problems that arise when invalid data is decoded
-<LI><B>tiffcomp.h</B> is now aware of OS/2
-<LI>some function prototypes in <B>tiffio.h</B> and <B>tiffiop.h</B>
- that contained parameter
- names have been changed to avoid complaints from certain compilers
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="port"><B><FONT SIZE=+3>C</FONT>HANGES IN THE PORTABILITY SUPPORT:</B></A>
-
-<UL>
-<LI><B>Makefile.in</B> has been corrected to use the parameters
- chosen by the configure script
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-<LI><TT>fax2ps</TT> has been rewritten and moved over from the user
- contributed software
-<LI>an uninitialized variable in <TT>pal2rgb</TT> has been fixed
-<LI><TT>ras2tiff</TT> now converts 24-bit RGB raster data so that
- samples are written in the proper order
-<LI><TT>tiff2ps</TT> has been updated to include fixes
- and enhancements from Alberto Accomazzi
-<LI><TT>tiffcp</TT> now has a <TT>-o</TT> option to select a directory
- by file offset
-<LI><TT>tiffinfo</TT> is now capable of displaying the raw undecoded
- image data in a file
-<LI><TT>tiffgt</TT> has been rewritten to use the new <TT>TIFFRGBAImage</TT>
- support and to handle multiple files
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta016.html b/src/3rdparty/libtiff/html/v3.4beta016.html
deleted file mode 100644
index 22f185f54b..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta016.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta016
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta016<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta007.html>v3.4beta007</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#man">Changes in the manual pages</A>
-<LI><A HREF="#html">Changes in the documentation</A>
-<LI><A HREF="#contrib">Changes in contributed software</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI>support was added for configuring the Deflate codec
-<LI>support was added for the HTML documentation
-<LI>codecs that are not configured for inclusion in the library
- are no longer compiled
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>support was added for registering new codecs external to the library
- and for overriding the codecs that are builtin to the library
-<LI>emulation support for the old <TT>DataType</TT> tag was improved
-<LI>suppport was added for the <TT>SMinSampleValue</TT>
- and <TT>SMaxSampleValue</TT> tags
-<LI>the library no longer ignores <TT>TileWidth</TT> and <TT>TileLength</TT>
- tags whose values are not a multiple of 16 (per the spec); this
- permits old, improperly written, images to be read
-<LI>the support for the <TT>Predictor</TT> tag was placed in a reusable
- module so that it can be shared by multiple codecs
-<LI>experimental compression support was added for the Deflate algorithm
- (using the freely available zlib package)
-<LI>a new routine, <TT>TIFFWriteBufferSetup</TT> was added a la the
- routine <TT>TIFFReadBufferSetup</TT>
-<LI>the DSO version of the library is now statically linked with the
- JPEG and Deflate libraries; this means applications that link against
- the DSO do not also need to link against these ancillary libraries
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-<LI>all the tools now use common code to process compress-oriented arguments
-<LI><TT>tiffdump</TT> should now compile on a Macintosh with MPW
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="man"><B><FONT SIZE=+3>C</FONT>HANGES IN THE MANUAL PAGES:</B></A>
-
-<UL>
-<LI>everything was updated
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="html"><B><FONT SIZE=+3>C</FONT>HANGES IN THE DOCUMENTATION:</B></A>
-
-<UL>
-<LI>everything was updated
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN CONTRIBUTED SOFTWARE:</B></A>
-
-<UL>
-<LI><B>contrib/dbs/xtiff</B> was made to compile
-<LI><B>contrib/mac-mpw</B> is new support for compiling the software on
- a Macintosh under MPW; consult <A HREF=build.html#Mac>the documentation</A>
- for details
-<LI><B>contrib/tags</B> is information on how to use the tag extenion
- facilities; consult
- <A HREF=../contrib/tags/README>contrib/tags/README</A> for details
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta018.html b/src/3rdparty/libtiff/html/v3.4beta018.html
deleted file mode 100644
index ac1877fae4..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta018.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta018
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta018<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta016.html>v3.4beta016</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI>configure now recognizes IRIX 6.x systems
-<LI>configure now uses <TT>ENVOPTS</TT> when searching for an ANSI
- C compiler; this fixes a problem configuring the software under
- HP/UX with the native C compiler
-<LI>configure now correctly recognizes memory-mapped files are supported
- under AIX
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI><TT>make install</TT> now properly installs the include files
-<LI>some portability fixes from Bjorn Brox
-<LI>the G3/G4 codec now warns about decoded rows that are longer than
- the image/tile width
-<LI>changes from Frank Cringle to make the library work with the
- gcc-specific bounds checking software
-<LI>miscellaneous fixes to <TT>TIFFPrintDirectory</TT>
-<LI>bug fix to correct a problem where <TT>TIFFWriteRawStrip</TT>
- could not be used to automatically grow an image's length
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-<LI>fixes from Frank Cringle to update <TT>fax2tiff</TT>
-<LI>portability fixes to <TT>tiff2bw</TT> and <TT>tiffcmp</TT>
-<LI><TT>tiffdump</TT> now uses the byte swapping routines in the library
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta024.html b/src/3rdparty/libtiff/html/v3.4beta024.html
deleted file mode 100644
index 25a33478fa..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta024.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta024
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta024<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta018.html>v3.4beta018</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#man">Changes in the manual pages</A>
-<LI><A HREF="#contrib">Changes in the contributed software</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI>It is now possible to setup the software to build only the
- library; configure reconizes this is the intent when the
- <B>VERSION</B>, <B>tiff.alpha</B>, and <B>tif_version.c</B>
- files are in the local directory (i.e. ``.'')
-<LI>configure no longer tries to setup HTML materials
-<LI>include file directories needed in building the library are now
- specified with a <TT>DIRS_LIBINC</TT> config parameter
-<LI>configure no longer checks for alternate compilers if <TT>CC</TT>
- is set; if the specified compiler is not found or is not appropriate
- the configuration procedure aborts
-<LI>the <B>port.h</B> file generated by configure is now used only by
- the library and as such as have been moved to the <B>libtiff</B>
- directory
-<LI>there is beginning support for building DSO's on systems other than IRIX
-<LI>configure now verifies the JPEG and zlib directory pathnames by
- checking for well-known include files in these directories
-<LI>configure no longer creates the <B>dist</B> directory needed only
- on SGI machines (for building SGI binary distributions)
-<LI>a bug was fixed whereby configure would incorrectly set
- <TT>ENVOPTS</TT> when building the software with gcc under AIX
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>two new typedefs were added to <B>tiff.h</TT>: <TT>int8</TT>
- and <TT>uint8</TT> for signed and unsigned 8-bit quantities,
- respectively; these are currently used only by
- programs in the <B>tools</B> directory
-<LI>the <TT>BadFaxLines</TT>, <TT>CleanFaxData</TT>, and
- <TT>ConsecutiveBadFaxLines</B> tags are now supported with
- Group 4 compression
-<LI>byte order is now correctly identified on 64-bit machines
-<LI>a bug was fixed in the PackBits decoder where input data would
- appear short when a no-op run was present
-<LI>a bug was fixed in calculations with very wide strips
-<LI><TT>TIFFWriteEncodedStrip</TT> and <TT>TIFFWriteRawStrip</TT>
- were extended to support dynamically growing the number of
- strips in an image (must set <TT>ImageLength</TT> prior to
- making calls though)
-<LI><TT>TIFFDefaultTileSize</TT> now rounds tile width and height
- up to a multiple of 16 pixels, as required by the TIFF 6.0 specification
-<LI>the file <B>version.h</B> is now built by a new <B>mkversion</B>
- program; this was done for portability to non-UNIX systems
-<LI>support was added for the Acorn RISC OS (from Peter Greenham)
-<LI>the builtin codec table is now made <TT>const</TT> when compiling
- under VMS so that <B>libtiff</B> can be built as a shared library
-<LI>support for the PowerPC Mac (from Ruedi Boesch)
-<LI>support for Window NT/Window 95 (from Scott Wagner)
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-<LI>the tools no longer include <B>port.h</B>
-<LI>various portability fixes; mostly to eliminate implicit assumptions
- about how long <TT>int32</TT> data types are
-<LI>PostScript Level II additions to <TT>tiff2ps</TT> from Bjorn Brox
-<LI><TT>sgi2tiff</TT> now handles RGBA images
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="man"><B><FONT SIZE=+3>C</FONT>HANGES IN THE MANUAL PAGES:</B></A>
-
-<UL>
-<LI>the documentation has been updated to reflect the current state of
- the software
-<LI>some routines have been moved to different manual pages
- to group like-routines together
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIBUTED SOFTWARE:</B></A>
-
-<UL>
-<LI>support was added for the Acorn RISC OS (from Peter Greenham)
-<LI>support for Windows NT/Windows 95 contributed for a previous
- version of this software was sort of incorporated (it's broken
- right now) (from Scott Wagner)
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta028.html b/src/3rdparty/libtiff/html/v3.4beta028.html
deleted file mode 100644
index ff7ef69a23..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta028.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta028
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta028<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta024.html>v3.4beta024</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#man">Changes in the manual pages</A>
-<LI><A HREF="#contrib">Changes in the contributed software</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI>a <TT>-noninteractive</TT> flag was added to configure to
- control whether or not it prints and prompts for configuration information
-<LI>various typos and fixes were made in configure for the the
- library-only build support (this and other configure fixes from
- Richard Mlynarik <A HREF=mailto:mly@adoc.xerox.com>&lt;mly@adoc.xerox.com&gt;</A>)
-<LI>bugs were fixed in the handling of pathnames supplied for external
- packages; e.g. <TT>DIR_JPEG</TT>
-<LI>the handling of <TT>SETMAKE</TT> is now done properly
-<LI>the default prototype function declaration for <TT>pow</TT> was corrected
-<LI>a bug was fixed in <B>libtiff/Makefile.in</B> that caused installation
- to fail on systems without DSO support
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>Acorn RISC O/S support that was accidentally left out of the
- left out of the previous distribution is present (from Peter Greenham)
-<LI>complaints about unknown and/or unsupported codecs have been
- delayed until they are invoked; this permits applications to open
- images and look at tags even if the image data is compressed with
- an unknown/unsupported compression scheme
-<LI>bugs in handling unknown tags have been corrected; applications
- that use multiple codecs, each with codec-specific tags, no longer
- generate confusing error messages
-<LI>a missing pseudo-tag definition in the CCITT G3 codec was fixed
- (this problem caused core dumps in the <TT>tiffcp</TT> program)
-<LI>pseudo-tags are now treated specially; they are always considered
- to be set (i.e. they do not use bits in the <TT>FIELD_*</TT> bit-vectors).
-<LI>the use of strip chopping can now be controlled on a per-file basis
- through a mode parameter supplied when opening a file (``C'' to
- enable strip chopping and ``c'' to disable)
-<LI>two bugs were fixed in the writing of opposite-endian byte-order
- files
-<LI>support was added for three new fax-related tags registered to
- SGI: FaxRecvParams, FaxRecvTime, and FaxSubAddress
-<LI>the bit order of image data read and written can now be controlled
- on a per-file basis through a mode parameter supplied when opening
- a file (``B'' to force MSB2LSB bit order, ``L'' for LSB2MSB bit
- order, and ``H'' for the bit order of the native CPU)
-<LI>the byte order of image and tag data written to newly-created files
- can now be controlled on a per-file basis through a mode parameter
- supplied when openening a file (``b'' to force Big-Endian byte order
- and ``l'' to force Little-Endian byte order)
-<LI>the use memory-mapped files for images opened read-only can now
- be controlled on a per-file basis through a mode parameter supplied
- when opening a file (``M'' to enable use of memory-mapped files
- and ``m'' to disable use)
-<LI>the use of the <TT>WIN32</TT> define in <B>tiffiop.h</B> has
- been replaced by <TT>__WIN32__</TT>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-<LI><TT>fax2ps</TT> now does a <TT>save</TT> and <TT>restore</TT>
- around each page of PostScript; this fixes a problem with VM
- overflow when printing a many-page document on some printers
-<LI>a bug in the handling of 3-channel images by <TT>ras2tiff</TT>
- was fixed
-<LI><TT>tiffcp</TT> has new options to control the byte order of
- newly created files: <B>-B</B> for Big-Endian byte order, <B>-L</B>
- for Little-Endian byte order; a <B>-M</B> option to disable the
- use of memory-mapped files, and a <B>-C</B> option to disable the
- use of strip chopping
-<LI>bugs were fixed in <TT>tiffcp</TT>'s handling of codec-specific tags
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="man"><B><FONT SIZE=+3>C</FONT>HANGES IN THE MANUAL PAGES:</B></A>
-
-<UL>
-<LI>the <TT>TIFFOpen</TT> page has been updated to reflect the new
- optional open mode parameters
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIBUTED SOFTWARE:</B></A>
-
-<UL>
-<LI><B>contrib/win95</B> contains information and code from Philippe Tenenhaus
- <A HREF=mailto:100423.3705@compuserve.com>&lt;100423.3705@compuserve.com&gt;</A>
- about using the software under Windows 95
-<LI><B>contrib/winnt</B> contains information and code from Dave Dyer
- <A HREF=mailto:ddyer@triple-i.com>&lt;ddyer@triple-i.com&gt;</A>
- about using the software under Windows NT
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta029.html b/src/3rdparty/libtiff/html/v3.4beta029.html
deleted file mode 100644
index f2a3d3f6aa..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta029.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta029
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta029<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta028.html>v3.4beta028</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#contrib">Changes in the contributed software</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI><B>configure</B> now relativizes pathname references given in
- <TT>-L</TT> options (as frequently specified when configuring
- ancillary packages)
-<LI>problems related to configuring the software on Ultrix 4.4 have
- been corrected
-<LI>the shell to use in Makefiles and scripts can now be set with the
- <TT>SCRIPT_SH</TT> configuration parameter
-<LI>comments in <B>config.site</B> now correctly indicate how to setup the
- use of ancillary packages
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>mods for building the software on a Mac using the
- MetroWerks CodeWarrior compilers
-<LI>a bug in the CCITT T.4/T.6 decoder was fixed where the last codeword in
- a strip/tile might not be decoded; this was seen only when decoding
- multi-strip images
-<LI>a bug in the CCITT RLE codecs was fixed whereby the pseudo tags were not
- being properly registered
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIBUTED SOFTWARE:</B></A>
-
-<UL>
-<LI><B>contrib/mac-cw</B> contains information and code from Niles Ritter
- <A HREF=mailto:ndr@tazboy.jpl.nasa.gov>&lt;ndr@tazboy.jpl.nasa.gov&gt;</A>
- about building the software with the MetroWerks CodeWarrior compilers
- on Macintosh systems
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta031.html b/src/3rdparty/libtiff/html/v3.4beta031.html
deleted file mode 100644
index d5b7eac4f4..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta031.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta031
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta031<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta029.html>v3.4beta029</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#man">Changes in the manual pages</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI><B>configure</B> now captures significantly more information
- in the <B>config.log</B> file and provides more information when
- it is unable to setup a configuration
-<LI>support was added for building shared libraries on more systems:
- AIX, HPUX, Solaris, and Linux.
-<LI>a new configuration parameter <TT>LIBCOPTS</TT> was added for
- passing arguments to the C compiler to use when building only
- the library; this is part of the enhanced support for building
- shared libraries
-<LI>include files for optional packages that reside in <B>/usr/include</B>
- are now handled correctly
-<LI>build trees may now be configured using either relative or absolute
- pathnames to the source distribution
-<LI>several new configuration parameters were added, mainly for building
- shared libraries: <TT>DIST_MAJOR</TT>, <TT>DIST_MINOR</TT>,
- <TT>DIST_ALPHA</TT>, and <TT>DSOSUF_VERSION</TT>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>the Deflate support has been revised: it requires version 0.99 of
- the zlib software distribution, <B>the output format has changed and
- is incompatible with previous versions of this library</B> (each
- strip now includes a header read and written by the zlib library)
-<LI>the codec name printed by the TIFFPrintDirectory routine is now
- taken from the codec table instead of from a builtin table; this means
- that application-defined codecs are handled correctly
-<LI>a new symbol was added that contains the library version number;
- this can be used to do a compile-time compatibility check of the
- library version
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="man"><B><FONT SIZE=+3>C</FONT>HANGES IN THE MANUAL PAGES:</B></A>
-
-<UL>
-<LI>the creation and installation of manual pages was redone; it now
- implements the documented ``configuration scheme''
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta032.html b/src/3rdparty/libtiff/html/v3.4beta032.html
deleted file mode 100644
index bc14ef3368..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta032.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta032
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta032<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta031.html>v3.4beta031</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contributed software</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI>various fixups and subtle improvements to <B>configure</B>
- from Richard Mlynarik
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>a new codec from Pixar designed for high-resolution color images;
- note that this codec is not configured by default
-<LI>a bug fix for reading tags with a single <TT>FLOAT</TT> value
-<LI>change to the <TT>TIFFGetField</TT> calling convention:
- a tag that has a single value of
- type <TT>DOUBLE</TT> is now retrieved by passing a
- ``<TT>double*</TT>'' instead of a
- ``<TT>double**</TT>'' (this change makes the handling of tags with
- <TT>DOUBLE</TT> values identical to the handling of tags with
- <TT>FLOAT</TT> values)
-<LI>fix to VMS support for the handling of floating point values
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-<LI><B>tiffdump</B> now handles tags with <TT>FLOAT</TT> and <TT>DOUBLE</TT>
- values
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIBUTED SOFTWARE:</B></A>
-
-<UL>
-<LI>updates to the Acorn OS support from Peter Greenham
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta033.html b/src/3rdparty/libtiff/html/v3.4beta033.html
deleted file mode 100644
index 8d8345a871..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta033.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta033
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta033 (aka the v3.4 release)<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta032.html>v3.4beta032</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contributed software</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI>support was added for building the library as a DSO under OSF/1
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>fixes to the Pixar codec
-<LI>portability mods for VMS
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-<LI>fixes to <B>gif2tiff</B> and <B>ppm2tiff</B> for building under MS/DOS
-<LI>portability mods to <B>fax2ps</B> and <B>ycbcr</B> for VMS
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIBUTED SOFTWARE:</B></A>
-
-<UL>
-<LI>a new package from Alexander Lehmann
- for building the library and tools under MS/DOS with DJGPP v2
-<LI>updated VMS support from Karsten Spang
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta034.html b/src/3rdparty/libtiff/html/v3.4beta034.html
deleted file mode 100644
index 77d9863b4b..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta034.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta034
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta034<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta033.html>v3.4beta033</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI>support was added for building the library as a DSO under NetBSD
-<LI>a bug was fixed in the DSO support for Linux
-<LI>the handling of version strings has changed slightly to simplify parsing
-<LI>a new parameter, <TT>TIFFLIBREF</TT>, was added to control how the
- library is referenced when linking programs in the <B>tools</B> directory
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>DSO creation under Solaris now forces the DSO name with a <TT>-h</TT> option
-<LI>the interface to the <B>mkversion</B> program was changed
- to eliminate the need to parse files
-<LI>a bug was fixed in the EOL-detection logic of the T.4/T.6 decoder
-<LI>ANSI IT8 TIFF/IT tag definitions were added to <B>tiff.h</B>
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta035.html b/src/3rdparty/libtiff/html/v3.4beta035.html
deleted file mode 100644
index 22fb2b8d0e..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta035.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta035
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta035<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta034.html>v3.4beta034</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI>support was added installing the HTML documentation
-<LI>support was added for building the library as a DSO under FreeBSD
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>the interface to the <B>mkversion</B> program was restored to
- the form used prior to v3.4beta034
-<LI>several portability problems for 16-bit systems were fixed
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.4beta036.html b/src/3rdparty/libtiff/html/v3.4beta036.html
deleted file mode 100644
index e36754d364..0000000000
--- a/src/3rdparty/libtiff/html/v3.4beta036.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.4beta036
-</TITLE>
-</HEAD>
-
-<BODY>
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.4beta036<BR>
-<B>Previous Version</B>: <A HREF=v3.4beta035.html>v3.4beta035</A><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.sgi.com/graphics/tiff">ftp.sgi.com (192.48.153.1), directory graphics/tiff</A><BR>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<LI>support was added for building the library as a DSO under HP-UX with
- the native C compiler
-<LI>tools are now built with explicit pathnames for the DSO under IRIX,
- Solaris, and Linux
-<LI>DSO configuration support for Linux was changed to require that
- <B>libc.so</B> only be readable (not executable)
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-<LI>support was add for ICC: <TT>NumberOfInks</TT>, and <TT>ICCProfile</TT>
-<LI>a memory leak caused by doing <TT>TIFFSetDirectory(0)</TT> was fixed
-<LI>a bug was fixed whereby certain multi-directory files were not
- properly handled when accessed by mapping the data into memory
-<LI>the strip chopping support is now always compiled
- into the library with the default usage controlled by a
- <TT>STRIPCHOP_DEFAULT</TT> configuration parameter
-<LI>the strip chopping support no longer chops tiled images
-<LI>all static strings are now const--for shared libraries
-<LI>the logic for estimating the strip size of images without
- a <TT>StripByteCounts</TT> tag was improved by handling
- <TT>PlanarContig</TT> images differently from <TT>PlanarSeparate</TT>
-<LI>a bug was fixed in the G3 codec when converting the Y resolution
- of data specified in metric units
-<LI>a bug was fixed in the G3/G4 decoder for data where lines terminate
- with a v0 code
-<LI>the <TT>TIFFRGBAImage</TT> support was changed to scale 16-bit colormap
- entries more conservatively to avoid problems with applications
- that do not generate fully saturated pixel values
-<LI>the LZW decoder was changed to use a more conservative scheme when
- bounds checking the hash table array; this avoids pitfalls with
- systems that load objects into memory in unusual locations
-<LI>a bug was fixed in <TT>TIFFPrintDirectory</TT>'s handling of the
- <TT>InkNames</TT> tag
-<LI><TT>TIFFPrintDirectory</TT> now understands <TT>NumberOfInks</TT>
- and ICC-related tags
-<LI>the routines for reading image data now provide more useful information
- when a read error is encountered
-<LI>support was added for compiling with Microsoft Visual C++ 4.0
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-<LI>a bug was fixed in <B>pal2rgb</B>'s colormap handling
-<LI><B>tiff2ps</B> now includes John Wehle's changes for maintaining
- the aspect ratio
- of images when scaling and for honoring the deadzone on a page when
- generating PostScript Level II
-<LI><B>tiff2ps</B> does a better job guarding against the mishandling
- of greyscale images
-<LI><B>tiff2ps</B> now correctly converts X- and Y-resolution values
- specified in metric units
-<LI><B>tiffdump</B> has a new <TT>-m</TT> option to control the maximum
- number of indirect
- data values printed for a tag (by default 24)
-<LI><B>tiffdump</B> understands several new tags
-<LI><B>tiffdump</B> now shows any terminating null in ASCII strings
-<LI><B>tiffinfo</B> now suppresses strip chopping when interpreting an image;
- a new <TT>-z</TT> option has been added to enable strip chopping
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-<ADDRESS>
-<A HREF="sam.html">Sam Leffler</A> / <A HREF="mailto:sam@engr.sgi.com">sam@engr.sgi.com</A>
-Last updated $Date: 1999/08/09 20:21:21 $.
-</ADDRESS>
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.5.1.html b/src/3rdparty/libtiff/html/v3.5.1.html
deleted file mode 100644
index 0c88de9547..0000000000
--- a/src/3rdparty/libtiff/html/v3.5.1.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.5.1
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.5.1<BR>
-<B>Previous Version</B>: v3.4beta037<BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.onshore.com/pub/libtiff">ftp.onshore.com, directory graphics/tiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff/>http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <LI> <em> None of consequence </em>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-
-<UL>
-<LI> Support was added for IPTC Newsphoto metadata (TIFFTAGE_IPTCNEWSPHOTO)
-<LI> Support was added for photoshop caption handling (TIFFTAG_PHOTOSHOP)
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-<LI> <A HREF=mailto:billr@corbis.com>Bill Radcliffe's</a> iptcutil was
-added to the "contrib" subdirectory . It can convert an IPTC binary
-blob to ASCII text and vice-versa. The blob itself can be extracted
-from or added to an image with the <A
-href=http://www.ImageMagick.org/>ImageMagick</a> convert(1)
-utility.
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2006/01/03 01:42:30 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.5.2.html b/src/3rdparty/libtiff/html/v3.5.2.html
deleted file mode 100644
index 71b486a6f4..0000000000
--- a/src/3rdparty/libtiff/html/v3.5.2.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.5.2
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.5.2<BR>
-<B>Previous Version</B>: <A HREF=v3.5.1.html>v3.5.1</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.onshore.com/pub/libtiff">ftp.onshore.com, directory graphics/tiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff/">http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <LI> Corrected alpha versioning.
-
- <LI> Removed distinction between alpha and release targets in Makefile.in.
-
- <LI> Added release.stamp target, which tags cvs tree, and updates
- "RELEASE-DATE"
-
- <LI> Added releasediff target, which diffs tree with source as of
- date in "RELEASE-DATE"
-
- <LI>Ticked up version to 3.5.2 (alpha 01 -- but I think we'll moving
- away from alpha/non-alpha distinctions).
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-
-<UL>
- <LI> Added IRIX/gcc, and OSF/1 4.x support on behalf of
- Albert Chin-A-Young <china@thewrittenword.com>
-
- <LI> Added TIFFReassignTagToIgnore() API on behalf of
- Bruce Cameron <cameron@petris.com>. Man page still pending.
-
- <LI> pre-remove so link before softlink in LINUXdso action in
- libtiff/Makefile.in to avoid failure on LINUXdso builds other than
- the first.
-
- <LI> Fixed problem with cvtcmap() in tif_getimage.c modifying the
- colormaps owned by the TIFF handle itself when trying to fixup wrong
- (eight bit) colormaps. Corrected by maintaining a private copy of
- the colormap.
-
- <LI> Added TIFFReadRGBATile()/TIFFReadRGBAStrip() support in
- tif_getimage.c.
-
- <LI> Applied "a" mode fix to tif_win32.c/TIFFOpen() as suggested
- by Christopher Lawton <clawton@mathworks.com>
-
- <LI> Set O_BINARY for tif_unix.c open() ... used on cygwin for instance.
-
- <LI> Added CYGWIN case in configure.
-
- <LI> Applied Francois Dagand's patch to handle fax decompression bug.
- (sizes >= 65536 were failing)
-</UL>
-
-<P><HR WIDTH=65% ALIGN=right>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <LI> Added addtiffo (add overviews to a TIFF file) in contrib. Didn't
- put it in tools since part of it is in C++.
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2004/11/26 14:37:20 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.5.3.html b/src/3rdparty/libtiff/html/v3.5.3.html
deleted file mode 100644
index e7910d9b7a..0000000000
--- a/src/3rdparty/libtiff/html/v3.5.3.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.5.3
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Arial, Helvetica, Sans">
-<FONT FACE="Arial, Helvetica, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.5.3<BR>
-<B>Previous Version</B>: <A HREF=v3.5.2.html>v3.5.2</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.onshore.com/pub/libtiff">ftp.onshore.com</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff/">http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-</UL>
-<p>
-The ChangeLog will follow, but please note the most important change:
-LZW compression has been removed.
-<p>
-Unisys has the patent on LZW compression and have been very active in
-their enforcement of late, demanding payments of $5000 or more from
-websites using unlicensed software to create GIF's. They could well
-do the same do persons using libtiff to create LZW compressed TIFF
-images.
-<p>
-From <A HREF=http://burnallgifs.org>Burn All GIF's Day</a>:
-<br>
-<em>The catch is that it appears to be difficult or impossible to get a
-Unisys license to use LZW in free software that complies with the Open
-Source Definition</em>
-<P>
-Unfortunatly, the removal of LZW compression means that saved image size has
-grown dramatically. Without a change in the TIFF spec to support
-another lossless compression format, this is unavoidable.
-<P>
-The library can use zip for lossless compression, but as this is not
-part of the spec, TIFFs using zip compression may not work with other
-software
-<P>
-We will be making a patch available that will contain the LZW
-compression code for users who have either obtained a license from
-Unisys or are willing to risk it.
-<p>
-LZW decompression is unchanged.
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <LI> Added zip creation to release makefile target
-
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-
-<UL>
-
- <LI> Added html for TIFFWriteTile.3t man page.
-
- <LI> Added some changes to tif_write.c to support rewriting existing
- fixed sized tiles and strips. Code mods disabled by default, only
- enabled if REWRITE_HACK is defined for now.
-
- <LI> Added TIFFWriteTile.3t man page.
-
- <LI> Added notes on use of makefile.vc in build.html, and fixed
- email subscription address.
-
- <LI> Fixed apocalypse-inducing y2k bug in contrib/ras/ras2tiff.c
-
- <LI> Did some casts cleaning up to reduce compiler warnings in tif_fax3.c,
- from Bruce Carmeron <cameron@petris.com> -- modifications of
- changes made by Frank (sun cc still complained on cast).
-
- <LI> fixed various VC++ warnings as suggested by Gilles Vollant
- <info@winimage.com>.
-
- <LI> Modified TIFFquery.3t man pages info on TIFFIsByteSwapped() to
- not imply applications are responsible for image data swapping.
-
- <LI> HTML-ized the man pages, added to html/man
-
- <LI> Removed LZW Compression to comply with Unisys patent extortion.
-
- <LI> Corrected one remaining 16 -> 32 bit value in tif_fax3.c,
- From Ivo Penzar <ivo.penzar@infolink-software.com.
-
- <LI> Added patch from Ivo Penzar to have TiffAdvanceDirectory handle
- memory mapped files. <ivo.penzar@infolink-software.com>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <LI> Fixed apocalypse-inducing y2k bug in contrib/ras/ras2tiff.c
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2004/11/26 14:37:20 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.5.4.html b/src/3rdparty/libtiff/html/v3.5.4.html
deleted file mode 100644
index 714621e0c8..0000000000
--- a/src/3rdparty/libtiff/html/v3.5.4.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.5.4
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.5.4<BR>
-<B>Previous Version</B>: <A HREF=v3.5.3.html>v3.5.3</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.onshore.com/pub/libtiff">ftp.onshore.com</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff/">http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <LI> None
-
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-
-<UL>
-
- <li> Added Pixar tag support. Contributed by Phil Beffery <phil@pixar.com>
-
- <li> Made one more change to tif_dir.c for removal of LZW compression. Also added notice
- when LZW compression invoked.
-
- <li> Fixed bug that caused LZW (non) compression to segfault. Added
- warning about LZW compression removed being removed, and why.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> Changed default compression in tools to TIFF_PACKBITS, and changed usage descriptions
- in tools to reflect removal of LZW compression
-
- <li> Added nostrip to install in tools/Makefile.in so that debugging
- symbols are kept.
-
- <li> Made Packbits the default compression in tools/tiff2rgba.c instead
- of LZW.
-
-
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2006/01/03 01:45:41 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.5.5.html b/src/3rdparty/libtiff/html/v3.5.5.html
deleted file mode 100644
index 20be92f8ec..0000000000
--- a/src/3rdparty/libtiff/html/v3.5.5.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.5.5
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.5.5<BR>
-<B>Previous Version</B>: <A HREF=v3.5.4.html>v3.5.4</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.onshore.com/pub/libtiff">ftp.onshore.com</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff/">http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#lzwkit">Changes in the LZW compression kit</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-
- <LI> configure: added test for libc6 for linux targets. Bug reported by
- Stanislav Brabec <utx@k332.feld.cvut.cz>
-
- <LI> configure: fixed bugs in sed scripts
- (applied sed script s:/@:s;@:;s:/s;;:;: to configure).
- fix submitted by Stanislav Brabec <utx@k332.feld.cvut.cz>
-
- <LI> tools/iptcutil was not in files list, and wasn't being
- added to tar archive. Updated Makefile.in.
-
- <LI> Added 3.5 docs to html/Makefile.in.
- Thanks to Stanislav Brabec <utx@k332.feld.cvut.cz>
-
- <LI> Fixed tools/tiffcmp so that stopondiff testing works.
- Patch care of Joseph Orost <joe@sanskrit.lz.att.com>.
-
- <LI> Added fax3sm_winnt.c to distribution list in Makefile.in.
-
- <LI> Added libtiff/libtiff.def to TIFFILES distribution list.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-
-<UL>
- <LI>tif_fax3.c: Fixed serious bug introduced during the uint16->uint32
- conversion for the run arrays.
-
- <LI> Set td_sampleformat default to SAMPLEFORMAT_UINT instead of
- SAMPLEFORMAT_VOID in TIFFDefaultDirectory() in tif_dir.c.
-
- <LI> Added "GetDefaulted" support for TIFFTAG_SAMPLEFORMAT in tif_aux.c.
-
- <LI> Patched tif_fax3.c so that dsp->runs is allocated a bit bigger
- to avoid overruns encountered with frle_bug.tif.
-
-
- <LI> Modified tif_unix.c to support 2-4GB seeks if USE_64BIT_API is
- set to 1, and added default (off) setting in tiffconf.h. This
- should eventually be set by the configure script somehow.
-
- The original work on all these 2-4GB changes was done by
- Peter Smith (psmith@creo.com).
-
- <LI> Modified tif_win32.c to support 2-4GB seeks.
-
- <LI> tentatively changed toff_t to be unsigned instead of signed to
- facilitate support for 2-4GB files.
-
- <LI> Updated a variety of files to use toff_t. Fixed some mixups
- between toff_t and tsize_t.
-
- <LI> Set tif_rawdatasize to zero when freeing raw data buffer in
- TIFFWriteDirectory().
-
- <LI> Enabled "REWRITE_HACK" in tif_write.c by default.
-
- <LI> Fix bug in tif_write.c when switching between reading one directory
- and writing to another.
-
- <LI> Made TIFFWriteCheck() public, and added TIFFCreateDirectory()
-
- <LI> Added TIFFmemory(3t) functions to libtiff.def.
-
- <LI> Added libtiff/libtiff.def to TIFFILES distribution list.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <LI> fax2ps: Fixed mixup of width and height in bounding box statement
- as per submission by Nalin Dahyabhai <nalin@redhat.com>.
-
- <LI> fax2ps: Modified printruns to take uint32 instead of uint16.
- Patch courtesy of Bernt Herd <herd@herdsoft.com>
-
-
- <LI> Largely reimplemented contrib/addtiffo to avoid temp files,
- updating the TIFF file in place. Fixed a few other bugs to.
-
- <LI> Altered descriptions in tools to reflect "by default" lzw not supported
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="lzwkit"><B><FONT SIZE=+3>C</FONT>HANGES IN THE LZW COMPRESSION KIT</B></A>
-<UL>
- <LI>created mangle-src.sh -- sed scripts to munge src into LZW enabled format. Thanks to Stanislav Brabec <utx@k332.feld.cvut.cz>
-
- <LI>created Makefile
-
- <LI>merged tif_dir.c with current source.
-
-
- <LI> Created lzw compression kit, as a new CVS module (libtiff-lzw-compression-kit).
-
- <LI> Updated index.html to note lzw compression kit.
-
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2004/11/26 14:37:20 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.5.6-beta.html b/src/3rdparty/libtiff/html/v3.5.6-beta.html
deleted file mode 100644
index 682f845baa..0000000000
--- a/src/3rdparty/libtiff/html/v3.5.6-beta.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.5.6
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.5.6beta<BR>
-<B>Previous Version</B>: <A HREF=v3.5.5.html>v3.5.5</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.onshore.com/pub/libtiff">ftp.onshore.com</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff/">http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in contrib</A>
-<LI><A HREF="#lzwkit">Changes in the LZW compression kit</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-
- <LI> Added GNULDdso target and switched linux and freebsd to use it.
- <LI> tools/Makefile.in: Modified to install properly on SGI.
- <LI> configure: Fixed DSO test for Linux as per patch from
- Jan Van Buggenhout <chipzz@Ace.ULYSSIS.Student.KULeuven.Ac.Be>.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-
-<UL>
-
- <LI> tif_dir.c: Clear TIFF_ISTILED flag in TIFFDefaultDirectory
- as per http://bugzilla.remotesensing.org/show_bug.cgi?id=18
- from vandrove@vc.cvut.cz.
-
- <LI> Modified tif_packbits.c decoding to avoid overrunning the
- output buffer, and to issue a warning if data needs to be
- discarded. See http://bugzilla.remotesensing.org/show_bug.cgi?id=18
-
- <LI> Modified TIFFClientOpen() to emit an error on an attempt to
- open a comperessed file for update (O_RDWR/r+) access. This is
- because the compressor/decompressor code gets very confused when
- the mode is O_RDWR, assuming this means writing only. See
- bug http://bugzilla.remotesensing.org/show_bug.cgi?id=13
-
- <LI> Applied patch for 0x0000 sequences in tif_fax3.h's definition
- of EXPAND1D() as per bug 11 (from Roman).
-
- <LI> Fixed tiffcomp.h to avoid win32 stuff if unix #defined, to improve
- cygwin compatibility.
-
- <LI> Applied patch from Roman Shpount to tif_fax3.c. This seems to
- be a proper fix to the buffer sizing problem. See
- http://bugzilla.remotesensing.org/show_bug.cgi?id=11
-
- <LI> Fixed tif_getimage.c to fix overrun bug with YCbCr images without
- downsampling. http://bugzilla.remotesensing.org/show_bug.cgi?id=10
- Thanks to Nick Lamb <njl98r@ecs.soton.ac.uk> for reporting the
- bug and proving the patch.
-
- <LI> Fixed tif_jpeg.c so avoid destroying the decompressor before
- we are done access data thanks to bug report from:
- Michael Eckstein <eckstein@gepro.cz>.
-
- <LI> tif_open.c: Don't set MMAP for O_RDWR files.
-
- <LI> tif_open.c: Set STRIPCHOP_DEFAULT for O_RDWR as well as O_RDONLY
- so that files opened for update can be strip chopped too.
-
- <LI> tif_read.c: fixed up bug with files missing rowsperstrip and
- the strips per separation fix done a few weeks ago.
-
- <LI> Tentatively added support for SAMPLEFORMAT_COMPLEXIEEEFP, and
- SAMPLEFORMAT_COMPLEXINT.
-
- <LI> index.html, bugs.html: added bugzilla info.
-
- <LI> tif_read.c: fix subtle bug with determining the number of
- rows for strips that are the last strip in a separation but
- not the last strip of all in TIFFReadEncodedStrip().
-
- <LI> Applied 16/32 bit fix to tif_fax3.c. Fix supplied by
- Peter Skarpetis <peters@serendipity-software.com.au>
-
- <LI> Modified tiffio.h logic with regard to including windows.h. It
- won't include it when building with __CYGWIN__.
-
- <LI> README: update to mention www.libtiff.org, don't list Sam's old
- email address.
-
- <LI> libtiff/tif_dirread.c: Don't use estimate strip byte count for
- one tile/strip images with an offset, and byte count of zero. These
- could be "unpopulated" images.
-
- <LI> tif_win32.c: Applied patch to fix overreads and ovverwrites
- caught by BoundsChecker. From Arvan Pritchard
- <arvan.pritchard@infomatix.co.uk> (untested).
-
- <LI> tif_getimage.c: Applied patch to silence VC6 warnings. From
- Arvan Pritchard <arvan.pritchard@informatix.co.uk>
-
- <LI> tif_lzw.c: Applied patch to silence VC6 warnings. From
- Arvan Pritchard <arvan.pritchard@informatix.co.uk>
-
- <LI> libtiff/tif_apple.c: Applied "Carbon" support patches supplied by
- Leonard Rosenthol <leonardr@lazerware.com>. May interfere
- with correct building on older systems. If so, please let me know.
-
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-
- <LI> tools/rgb2ycbcr.c: fixed output strip size to account for vertical
- roundup if rows_per_strip not a multiple of vertical sample size.
-
- <LI> tools/tiffsplit.c: Copy TIFFTAG_SAMPLEFORMAT.
-
- <LI> Modified tiff2bw to ensure portions add to 100%, and that
- white is properly recovered. See bug
- http://bugzilla.remotesensing.org/show_bug.cgi?id=15 Patch
- c/o Stanislav Brabec <utx@penguin.cz>
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN CONTRIB:</B></A>
-
-<UL>
-
- <LI> contrib/addtiffo: Added "averaging" resampling option.
-
- <LI> Added contrib/stream (stream io) code submitted by Avi Bleiweiss.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<A NAME="lzwkit"><B><FONT SIZE=+3>C</FONT>HANGES IN THE LZW COMPRESSION KIT</B></A>
-<UL>
-
- <LI> updated tif_dir.c to reflect changes to no-lzw tif_dir.c
-
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2006/03/18 17:12:47 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.5.7.html b/src/3rdparty/libtiff/html/v3.5.7.html
deleted file mode 100644
index 528df74e6e..0000000000
--- a/src/3rdparty/libtiff/html/v3.5.7.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.5.7
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.5.7<BR>
-<B>Previous Version</B>: <A HREF=v3.5.6-beta.html>v3.5.6 Beta</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff/">http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#lzwkit">Changes in the LZW compression kit</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<li> libtiff/libtiff.def: Brent Roman submitted new version adding
-serveral missing entry points. Also add a few other entry points
-later.
-
-<li> configure, Makefile.in, etc: added support for OPTIMIZER being
- set from config.site.
-<li> config.guess: updated wholesale to an FSF version apparently
- from 1998 (as opposed to 1994). This is mainly inspired by
- providing for MacOS X support.
-
-<li> configure/config.site: modified to check if -lm is needed for
- MACHDEPLIBS if not supplied by config.site. Needed for Darwin.
-<li> libtiff/tiff.h: Applied hac to try and resolve the problem
- with the inttypes.h include file on AIX. (Bug 39)
-
-<li> configure, *Makefile.in: Various changes to improve configuration
- for HP/UX specifically, and also in general. (Bug 40) They include:
-<ul>
- <li> Try to handle /usr/bin/sh instead of /bin/sh where necessary.
- <li> Upgrade to HP/UX 10.x+ compiler, linker and dso options.
- <li> Fixed mmap() test to avoid MMAP_FIXED ... it isn't available on HP
- <li> Use -${MAKEFLAGS} in sub makes from makefiles.
- <li> Fixed SCRIPT_SH/SHELL handling.
-</ul>
-<li> configure: Changes for DSO generation on AIX provided by
- John Marquart <jomarqua@indiana.edu>.
-
-<li> configure, libtiff/Makefile.in: Modified to build DSOs properly
- on Darwin thanks to Robert Krajewski (rpk@alum.mit.edu) and
- Keisuke Fujii (fujiik@jlcuxf.kek.jp).
-
-<li> configure, libtiff/Makefile.in: applied OpenBSD patches as per bug 61.
-
-<li> Makefile.in: added DESTDIR support as per bug 60.
-
-<li> libtiff/tif_jpeg.c: Define HAVE_BOOLEAN on windows if RPCNDR.H
- has been included.
-<li> man/Makefile.in: add TIFFClientOpen link as per debian submitted
- bug 66.
-<li> libtiff/Makefile.in: Fixed @DSOSUB_VERSION to be @DSOSUF_VERSION@
- in two places.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-
-<UL>
-<li> tif_fax3.c: keep rw_mode flag internal to fax3 state to remember
- whether we are encoding or decoding. This is to ensure graceful
- recovery if TIFFClientOpen() discovers an attempt to open a compressed
- file for "r+" access, and subsequently close it, as it resets the
- tif_mode flag to O_RDONLY in this case to avoid writes, confusing the
- compressor's concept of whether it is in encode or decode mode.
-<li> tif_luv.c/tiff.h/tiffio.h:
- New version of TIFF LogLuv (SGILOG) modules contributed by Greg Ward
- (greg@shutterfly.com). He writes:
-
-<ol>
- <li> I improved the gamut-mapping function in tif_luv.c for imaginary
- colors, because some images were being super-saturated on the input
- side and this resulted in some strange color shifts in the output.
-
- <li> I added a psuedotag in tiff.h to control random dithering during
- LogLuv encoding. This is turned off by default for 32-bit LogLuv and
- on for 24-bit LogLuv output. Dithering improves the average color
- accuracy over the image.
-
- <li> I added a #define for LOG_LUV_PUBLIC, which is enabled by default in
- tiffio.h, to expose internal routines for converting between LogLuv and
- XYZ coordinates. This is helpful for writing more efficient,
- specialized conversion routines, especially for reading LogLuv files.
-</ol>
-
-<li> libtiff/tif_dirinfo.c: don't declare tiffFieldInfo static on VMS.
-
-<li> Added TIFFTAG_COPYRIGHT support.
-<li> tif_getimage.c: Added support for 16bit minisblack/miniswhite
- images in RGBA interface.
-<li> libtiff/tif_dirinfo.c: removed duplicate TIFFTAG_PHOTOSHOP as per
- bug 44.
-<li> libtiff/tif_dirwrite.c: Added support for TIFF_VARIABLE2 in the
- case of writing TIFF_BYTE/TIFF_SBYTE fields as per bug 43.
-
-<li> libtiff/tif_dirinfo.c: Modified the TIFF_BYTE definition for
- TIFFTAG_PHOTOSHOP to use a writecount of TIFF_VARIABLE2 (-3) to
- force use of uint32 counts instead of short counts.
-
-<li> libtiff/tif_dirinfo.c: moved pixar and copyright flags to
- ensure everything is in order.
-
-<li> Integrated experimental OJPEG support from Scott Marovich of HP.
-
-<li> libtiff/tif_open.c: Seek back to zero after failed read,
- before writing header.
-
-<li> libtiff/tiff.h, libtiff/tif_fax3.c: added check for __LP64__
- when checking for 64 bit architectures as per bugzilla bug 67.
-<li> libtiff/tif_getimage.c: Use memmove() instead of TIFFmemcpy()
- in TIFFReadRGBATile() to avoid issues in cases of overlapping
- buffers. See Bug 69 in Bugzilla.
-<li> libtiff/tif_getimage.c: Don't complain for CMYK (separated)
- images with more than four samples per pixel as per bug 73.
-
-<li> libtiff/tif_getimage.c: relax handling of contig case where
-there are extra samples that are supposed to be ignored as per bug 75. This
-should now work for 8bit greyscale or palletted images.
-
-<li> libtiff/tif_packbits.c: fixed memory overrun error as per bug 77.
-
-<li> libtiff/tif_getimage.c: Fixed problem with reading strips or
-tiles that don't start on a tile boundary. Fix contributed by
-Josep Vallverdu (from HP), and further described in bug 47.
-
-<li> libtif/tif_fax3.c: Removed #ifdef PURIFY logic, and modified to
- always use the "safe" version, even if there is a very slight
- cost in performance as per bug 54.
-<li> libtiff/tif_lzw.c: added dummy LZWSetupEncode() to report an
- error about LZW not being available.
-
-<li> libtiff/tif_dir.c: propagate failure to initialize compression
- back from TIFFSetField() as an error status, so applications can
- detect failure.
-
-<li> libtiff/tif_lzw.c: Avoid MS VC++ 5.0 optimization bug as per bug 78.
-
-<li> libtiff/tif_dirwrite.c: added TIFFRewriteDirectory() function.
-Updated TIFFWriteDirectory man page to include TIFFRewriteDirectory.
-
-<li> libtiff/tiff.h: I have created COMPRESSION_CCITT_T4,
- COMPRESSION_CCITT_T6, TIFFTAG_T4OPTIONS and TIFFTAG_T6OPTIONS aliases
- in keeping with TIFF 6.0 standard in tiff.h as per bug 83.
-
-<li> Added PHOTOMETRIC_ITULAB as per bug 90.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-<li> Brent Roman contributed updated tiffcp utility (and tiffcp.1)
- with support for extracting subimages with the ,n syntax, and also
- adding the -b bias removal flag.
-<li> tiff2ps.c/tiff2ps.1: Substantial changes to tiff2ps by
- Bruce A. Mallett, including a faster encoder, fixes for level
- 2 PostScript, and support for the imagemask operator.
-<li> fax2ps.c: Helge (libtiff at oldach.net) submitted fix
-that corrects behaviour for non-Letter paper
-sizes. (Bug 35) It fixes two problems:
-<br>
- Without scaling (-S) the fax is now centered on the page size specified
- with -H and/or -W. Before, fax2ps was using an obscure and practially
- useless algorithm to allocate the image relative to Letter sized paper
- which sometime sled to useless whitespace on the paper, while at the
- same time cutting of the faxes printable area at the opposite border.
-<br>
-
- Second, scaling now preserves aspect ratio, which makes unusual faxes
- (in particular short ones) print properly.
-
-<li> thumbnail.c: changed default output compression
- to packbits from LZW since LZW isn't generally available.
-<li> tiff2rgba.c: added -n flag to avoid emitting alpha component. Also added
-a man page for tiff2rgba.
-
-<li> tiffcmp.c: Fixed multi samples per pixel support for ContigCompare
-as per bug 53.
-Updated bug section of tiffcmp.1 to note tiled file issues.
-
-<li> libtiff/tif_getimage.c: Fixed so that failure is properly
- reported by gtTileContig, gtStripContig, gtTileSeparate and
- gtStripSeparate as per bug 51.
-
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="lzwkit"><B><FONT SIZE=+3>C</FONT>HANGES IN THE LZW COMPRESSION KIT:</B></A>
-<UL>
- <LI> Rewrote lzw patching process so that is required to enable full
- LZW support is to drop the tif_lzw.c from the
- libtiff-lzw-compression-kit over the one in the libtiff directory.
-
- <LI> Some changes were made to make recovery from failure to
- initialize the LZW compressor more graceful.
-
- <LI> Note that as distributed libtiff support LZW decompression, but
- not LZW compression.
-</UL>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-<UL>
-<li> Fixed distribution to include contrib/addtiffo/tif_ovrcache.{c,h}.
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2004/11/26 14:37:20 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.6.0.html b/src/3rdparty/libtiff/html/v3.6.0.html
deleted file mode 100644
index 888e5472e7..0000000000
--- a/src/3rdparty/libtiff/html/v3.6.0.html
+++ /dev/null
@@ -1,434 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.6.0
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.6.0<BR>
-<B>Previous Version</B>: <A HREF=v3.5.7.html>v3.5.7</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-<LI><A HREF="#lzwkit">Changes in the LZW compression kit</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<ul>
- <li> New utility <a href=./man/raw2tiff.1.html>raw2tiff</a>
-for converting raw rasters into TIFF files.
- <li> Lots of new <a href=./man/tiff2ps.1.html>tiff2ps</a> options.
- <li> Lots of new <a href=./man/fax2tiff.1.html>fax2tiff</a> options.
- <li> Lots of bug fixes for LZW, JPEG and OJPEG compression.
-</ul>
-
-<h3>Custom Tag Support</h3>
-
-The approach to extending libtiff with custom tags has changed radically.
-Previously, all internally supported TIFF tags had a place in the
-private TIFFDirectory structure within libtiff to hold the values (if read),
-and a "field number" (ie. FIELD_SUBFILETYPE) used to identify that tag.
-However, every time a new tag was added to the core, the size of the
-TIFFDirectory structure would changing, breaking any dynamically linked
-software that used the private data structures.<p>
-
-Also, any tag not recognised
-by libtiff would not be read and accessable to applications without some
-fairly complicated work on the applications part to pre-register the tags
-as exemplified by the support for "Geo"TIFF tags by libgeotiff layered on
-libtiff. <p>
-
-Amoung other things this approach required the extension code
-to access the private libtiff structures ... which made the higher level
-non-libtiff code be locked into a specific version of libtiff at compile time.
-This caused no end of bug reports!<p>
-
-The new approach is for libtiff to read all tags from TIFF files. Those that
-aren't recognised as "core tags" (those having an associated FIELD_ value,
-and place for storage in the TIFFDirectory structure) are now read into a
-dynamic list of extra tags (td_customValues in TIFFDirectory). When a new
-tag code is encountered for the first time in a given TIFF file, a new
-anonymous tag definition is created for the tag in the tag definition list.
-The type, and some other metadata is worked out from the instance encountered.
-These fields are known as "custom tags". <p>
-
-Custom tags can be set and fetched normally using TIFFSetField() and
-TIFFGetField(), and appear pretty much like normal tags to application code.
-However, they have no impact on internal libtiff processing (such as
-compression). Some utilities, such as tiffcp will now copy these custom
-tags to the new output files. <p>
-
-As well as the internal work with custom tags, new C API entry points
-were added so that extension libraries, such as libgeotiff, could
-define new tags more easily without accessing internal data structures.
-Because tag handling of extension tags is done via the "custom fields"
-mechanism as well, the definition provided externally mostly serves to provide
-a meaningful name for the tag.
-
-The addition of "custom tags" and the altered approach to extending libtiff
-with externally defined tags is the primary reason for the shift to the
-3.6.x version number from 3.5.x.<p>
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-<li> configure, config.site: Fix for large files (>2GiB) support. New
-option in the config.site: LARGEFILE="yes". Should be enougth for the large
-files I/O.
-
-<li> configure: Set -DPIXARLOG_SUPPORT option along with -DZIP_SUPPORT.
-
-<li> html/Makefile.in: Updated to use groffhtml for generating html pages
-from man pages.
-
-<li> configure, libtiff/Makefile.in: Added SCO OpenServer 5.0.6 support
-from John H. DuBois III.
-
-<li> libtiff/{Makefile.vc, libtiff.def}: Missed declarations added.
-
-<li> libtiff/Makefile.in, tools/Makefile.in: Shared library will not be
-stripped when installing, utility binaries will do be stripped. As per bug 93.
-
-<li> man/Makefile.in: Patch DESTDIR handling as per bug 95.
-
-<li> configure: OpenBSD changes for Sparc64 and DSO version as per bug 96.
-
-<li> config.site/configure: added support for OJPEG=yes option to enable
-OJPEG support from config.site.
-
-<li> config.guess, config.sub: Updated from ftp.gnu.org/pub/config.
-
-<li> configure: Modify CheckForBigEndian so it can work in a cross
-compiled situation.
-
-<li> configure, libtiff/Makefile.in: Changes for building on MacOS 10.1
-as per bug 94.
-
-<li> html/Makefile.in: added missing images per bug 92.
-
-<li> port/Makefile.in: fixed clean target per bug 92.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-
-<li> libtiff/tif_getimage.c: New function <A
-HREF="./man/TIFFReadRGBAImage.3t.html">TIFFReadRGBAImageOriented()</A>
-implemented to retrieve raster array with user-specified origin position.
-
-<li> libtiff/tif_fax3.c: Fix wrong line numbering.
-
-<li> libtiff/tif_dirread.c: Check field counter against number of fields.
-
-<li> Store a list of opened IFD to prevent directory looping.
-
-<li> libtiff/tif_jpeg.c: modified segment_height calculation to always
-be a full height tile for tiled images. Also changed error to just
-be a warning.
-
-<li> libtiff/tif_lzw.c: fixed so that decoder state isn't allocated till
-LZWSetupDecode(). Needed to read LZW files in "r+" mode.
-
-<li> libtiff/tif_dir.c: fixed up the tif_postdecode settings responsible
-for byte swapping complex image data.
-
-<li> libtiff/tif_open.c: Removed error if opening a compressed file
-in update mode bug (198).
-
-<li> libtiff/tif_write.c: TIFFWriteCheck() now fails if the image is
-a pre-existing compressed image. That is, image writing to pre-existing
-compressed images is not allowed.
-
-<li> html/man/*.html: Web pages regenerated from man pages.
-
-<li> libtiff/tif_jpeg.c: Hack to ensure that "boolean" is defined properly
-on Windows so as to avoid the structure size mismatch error from libjpeg
-(bug 188).
-
-<li> libtiff/tiff.h: #ifdef USING_VISUALAGE around previous Visual Age
-AIX porting hack as it screwed up gcc. (bug 39)
-
-<li> libtiff/tiff.h: added COMPRESSION_JP2000 (34712) for LEAD tools
-custom compression.
-
-<li> libtiff/tif_dirread.c: Another fix for the fetching SBYTE arrays
-by the TIFFFetchByteArray() function. (bug 52)
-
-<li> libtiff/tif_dirread.c: Expand v[2] to v[4] in TIFFFetchShortPair()
-as per bug 196.
-
-<li> libtiff/tif_lzw.c: Additional consistency checking added in
-LZWDecode() and LZWDecodeCompat() fixing bugs 190 and 100.
-
-<li> libtiff/tif_lzw.c: Added check for valid code lengths in LZWDecode()
-and LZWDecodeCompat(). Fixes bug 115.
-
-<li> tif_getimage.c: Ensure that TIFFRGBAImageBegin() returns the
-return code from the underlying pick function as per bug 177.
-
-<li> libtiff/{tif_jpeg.c,tif_strip.c,tif_print.c}: Hacked tif_jpeg.c to
-fetch TIFFTAG_YCBCRSUBSAMPLING from the jpeg data stream if it isn't
-present in the tiff tags as per bug 168.
-
-<li> libtiff/tif_jpeg.c: Fixed problem with setting of nrows in
-JPEGDecode() as per bug 129.
-
-<li> libtiff/tif_read.c, libtiff/tif_write.c: TIFFReadScanline() and
-TIFFWriteScanline() now set tif_row explicitly in case the codec has
-fooled with the value as per bug 129.
-
-<li> libtiff/tif_ojpeg.c: Major upgrade from Scott. Details in bug 156.
-
-<li> libtiff/tif_open.c: Pointers to custom procedures
-in TIFFClientOpen() are checked to be not NULL-pointers.
-
-<li> libtiff/tif_lzw.c: Assertions in LZWDecode and LZWDecodeCompat
-replaced by warnings. Now libtiff should read corrupted LZW-compressed
-files by skipping bad strips as per bug 100.
-
-<li> libtiff/: tif_dirwrite.c, tif_write.c, tiffio.h:
-<a href=./man/TIFFWriteDirectory.3t.html>TIFFCheckpointDirectory()</a>
-routine added as per bug 124. The
-<a href=./man/TIFFWriteDirectory.3t.html>TIFFWriteDirectory</a>
-man page discusses this new function as well as the related
-<a href=./man/TIFFWriteDirectory.3t.html>TIFFRewriteDirectory()</a>.
-
-<li> libtiff/: tif_codec.c, tif_compress.c, tiffiop.h, tif_getimage.c:
-Introduced
-additional members tif->tif_decodestatus and tif->tif_encodestatus
-for correct handling of unconfigured codecs (we should not try to read
-data or to define data size without correct codecs). See bug 119.
-
-<li> tif_dirread.c: avoid div-by-zero if rowbytes is zero in chop func as
-per bug 111.
-
-<li> libtiff/: tiff.h, tif_dir.c, tif_dir.h, tif_dirinfo.c, tif_dirread.c,
-tif_dirwrite.c: Dwight Kelly added get/put code for new tag XMLPACKET as
-defined in Adobe XMP Technote. Added missing INKSET tag value from TIFF 6.0
-spec INKSET_MULTIINK (=2). Added missing tags from Adobe TIFF technotes:
-CLIPPATH, XCLIPPATHUNITS, YCLIPPATHUNITS, OPIIMAGEID, OPIPROXY and
-INDEXED. Added PHOTOMETRIC tag value from TIFF technote 4 ICCLAB (=9).
-
-<li> libtiff/tif_getimage.c: Additional check for supported codecs added in
-TIFFRGBAImageOK, TIFFReadRGBAImage, TIFFReadRGBAStrip and TIFFReadRGBATile now
-use TIFFRGBAImageOK before reading a per bug 110.
-
-<li> libtiff/: tif_dir.c, tif_dir.h, tif_dirinfo.c, tif_dirread.c,
-tif_dirwrite.c: Added routine
-<a href=./man/TIFFDataWidth.3t.html>TIFFDataWidth</a> for determining
-TIFFDataType sizes instead of working with tiffDataWidth array
-directly as per bug 109.
-
-<li>libtiff/: tif_dirinfo.c, tif_dirwrite.c: Added possibility to
-read broken TIFFs with LONG type used for TIFFTAG_COMPRESSION,
-TIFFTAG_BITSPERSAMPLE, TIFFTAG_PHOTOMETRIC as per bug 99.
-
-<li> libtiff/{tiff.h,tif_fax3.c}: Add support for __arch64__ as per bug 94.
-
-<li> libtiff/tif_read.c: Fixed TIFFReadEncodedStrip() to fail if the
-decodestrip function returns anything not greater than zero as per bug 97.
-
-<li> libtiff/tif_jpeg.c: fixed computation of segment_width for
-tiles files to avoid error about it not matching the
-cinfo.d.image_width values ("JPEGPreDecode: Improper JPEG strip/tile
-size.") for ITIFF files. Apparently the problem was incorporated since
-3.5.5, presumably during the OJPEG/JPEG work recently.
-
-<li> libtiff/tif_getimage.c: If DEFAULT_EXTRASAMPLE_AS_ALPHA is 1
-(defined in tiffconf.h - 1 by default) then the RGBA interface
-will assume that a fourth extra sample is ASSOCALPHA if the
-EXTRASAMPLE value isn't set for it. This changes the behaviour of
-the library, but makes it work better with RGBA files produced by
-lots of applications that don't mark the alpha values properly.
-As per bugs 93 and 65.
-
-<li> libtiff/tif_jpeg.c: allow jpeg data stream sampling values to
-override those from tiff directory. This makes this work with
-ImageGear generated files.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-
-<li> <a href=./man/tiff2ps.1.html>tiff2ps</a>: Added page size setting
-when creating PS Level 2.
-
-<li> <a href=./man/tiff2ps.1.html>tiff2ps</a>: Fixed PS comment emitted when
-FlateDecode is being used.
-
-<li> <a href=./man/tiffsplit.1.html>tiffsplit</a>: increased the maximum
-number of pages that can be split.
-
-<li> <a href=./man/raw2tiff.1.html>raw2tiff</a>: Added option `-p' to
-explicitly select color space of input image data.
-
-<li> <a href=./man/tiffmedian.1.html>tiffmedian</a>: Suppiort for large
-(> 2GB) images.
-
-<li> <a href=./man/ppm2tiff.1.html>ppm2tiff</a>: Fixed possible endless loop.
-
-<li> <a href=./man/tiff2rgba.1.html>tiff2rgba</a>: Switched to use
-<A HREF="./man/TIFFReadRGBAImage.3t.html">TIFFReadRGBAImageOriented()</A>
-instead of <A HREF="./man/TIFFReadRGBAImage.3t.html">TIFFReadRGBAImage()</A>.
-
-<li> <a href=./man/tiffcmp.1.html>tiffcmp</a>: Fixed problem with unused data
-comparing (bug 349). `-z' option now can be used to set the number of reported
-different bytes.
-
-<li> <a href=./man/tiffcp.1.html>tiffcp</a>: Added possibility to specify
-value -1 to -r option to get the entire image as one strip (bug 343).
-
-<li> <a href=./man/tiffcp.1.html>tiffcp</a>: Set the correct RowsPerStrip
-and PageNumber values (bug 343).
-
-<li> <a href=./man/fax2tiff.1.html>fax2tiff</a>: Page numbering fixed (bug
-341).
-
-<li> <a href=./man/ppm2tiff.1.html>ppm2tiff</a>: PPM header parser improved:
-now able to skip comments.
-
-<li> <a href=./man/tiff2ps.1.html>tiff2ps</a>: Force deadzone printing when
-EPS output specified (bug 325).
-
-<li> <a href=./man/tiff2ps.1.html>tiff2ps</a>: Add ability to generate
-PS Level 3. It basically allows one to use the /flateDecode filter for ZIP
-compressed TIFF images. Patch supplied by Tom Kacvinsky (bug 328).
-
-<li> <a href=./man/tiffcp.1.html>tiffcp</a>: Fixed problem with colorspace
-conversion for JPEG encoded images (bugs 23 and 275)
-
-<li> <a href=./man/fax2tiff.1.html>fax2tiff</a>: Applied patch from
-Julien Gaulmin. More switches for fax2tiff tool for better control
-of input and output (bugs 272 and 293).
-
-<li> <a href=./man/raw2tiff.1.html>raw2tiff</a>:
-New utility for turning raw raster images into TIFF files
-written by Andrey Kiselev.
-
-<li> <a href=./man/tiff2ps.1.html>tiff2ps</a>:
-Sebastian Eken provided patches (bug 200) to add new these new
-switches:
- <ul>
- <li> <b>-b #</b>: for a bottom margin of # inches
- <li> <b>-c</b>: center image
- <li> <b>-l #</b>: for a left margin of # inches
- <li> <b>-r</b>: rotate the image by 180 degrees
- </ul>
-
-Also, new features merged with code for shrinking/overlapping.
-
-<li> <a href=./man/tiff2ps.1.html>tiff2ps</a>: Don't emit BeginData/EndData
-DSC comments since we are unable to properly include the amount to skip
-as per bug 80.
-
-<li> <a href=./man/tiff2ps.1.html>tiff2ps</a>: Added workaround for some
-software that may crash when last strip of image contains fewer number
-of scanlines than specified by the `/Height' variable as per bug 164.
-
-<li> <a href=./man/tiff2ps.1.html>tiff2ps</a>: Patch from John Williams to add new
-functionality for tiff2ps utility splitting long images in several pages as
-per bug 142. New switches:
- <ul>
- <li> <b>-H #</b>: split image if height is more than # inches
- <li> <b>-L #</b>: overLap split images by # inches
- </ul>
-
-<li> <a href=./man/tiff2ps.1.html>tiff2ps</a>: New commandline
-switches to override resolution units obtained from the input file per bug 131:
- <ul>
- <li> <b>-x</b>: override resolution units as centimeters
- <li> <b>-y</b>: override resolution units as inches
- </ul>
-
-<li> <a href=./man/fax2tiff.1.html>fax2tiff</a>: Updated to reflect
-latest changes in libtiff per bug 125.
-
-<li> tiff2ps: Division by zero fixed as per bug 88.
-
-<li> <a href=./man/tiffcp.1.html>tiffcp<a>:
-Added support for 'Orientation' tag.
-
-<li> <a href=./man/tiffdump.1.html>tiffdump</a>:
-include TIFFTAG_JPEGTABLES in tag list.
-
-<li> tiffset: fix bug in error reporting.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-<UL>
-
-<li> Fixed distribution to include contrib/addtiffo/tif_ovrcache.{c,h}.
-<li> libtiff/contrib/win95: renamed to contrib/win_dib. Added new
-Tiffile.cpp example of converting TIFF files into a DIB on Win32 as per
-bug 143.
-
-</UL>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="lzwkit"><B><FONT SIZE=+3>C</FONT>HANGES IN THE LZW COMPRESSION
-KIT:</B></A>
-<UL>
-
-<li> LZW compression kit synchronized with actual libtiff version.
-
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2003/10/04 11:38:17 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.6.1.html b/src/3rdparty/libtiff/html/v3.6.1.html
deleted file mode 100644
index d10606225b..0000000000
--- a/src/3rdparty/libtiff/html/v3.6.1.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Changes in TIFF v3.6.1
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.6.1<BR>
-<B>Previous Version</B>: <A HREF=v3.6.0.html>v3.6.0</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-<LI><A HREF="#lzwkit">Changes in the LZW compression kit</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<ul>
- <li> New utility <a href="./man/tiff2pdf.1.html">tiff2pdf</a>
- for converting TIFF images directly into PDF.
- <li> New <a href="./man/TIFFcolor.3t.html">color conversion module</a>.
- <li> Full support for Orientation tag in
- <a href="./man/TIFFReadRGBAImage.3t.html">TIFFRGBAImage</a> interface.
- <li> Many bugs fixed.
-</ul>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-
-<li> libtiff/makefile.vc, tools/makefile.vc: Support for IJG JPEG library.
-
-<li> Makefile.in: Add an absolute path to the test_pics.sh call.
-
-<li> Makefile.in: Add an absolute path to the test_pics.sh call.
-
-<li> libtiff/tiffcomp.h: #define _BSDTYPES_DEFINED when defining BSD typedefs.
-
-<li> configure, libtiff/{Makefile.in, mkversion.c}: Relative buildings fixed.
-
-<li> Makefile.in: Add an absolute path to the test_pics.sh call.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-
-<li> libtiff/{tif_color.c, tif_getimage.c, tiffio.h}: Added support
-for ReferenceBlackWhite tag handling when converted from YCbCr color space as
-per bug 120.
-
-<li> libtiff/{tif_getimage.c, tif_aux.c}: Read WhitePoint tag from the
-file and properly use it for CIE Lab 1976 to RGB transform.
-
-<li> libtiff/{tif_getimage.c, tiffio.h}: Finally resolved problems with
-orientation handling. TIFFRGBAImage interface now properly supports all
-possible orientations, i.e. images will be flipped both in horizontal and
-vertical directions if required. 'Known bugs' section now removed from the
-appropriate manual pages.
-
-<li> libtiff/tif_luv.c: Fixed bug in 48-bit to 24-bit conversion routine,
-reported by Antonio Scuri.
-
-<li> libtiff/{tiffio.h, tif_codec.c}: Added new function
-TIFFIsCODECConfigured(), suggested by Ross Finlayson.
-
-<li> libtiff/tif_ojpeg.c: TIFFVGetField() function now can properly extract
-the fields from the OJPEG files. Patch supplied by Ross Finlayson.
-
-<li> libtiff/tif_dir.h: _TIFFFindOrRegisterdInfo declaration replaced
-with _TIFFFindOrRegisterFieldInfo as reported by Ross Finlayson.
-
-<li> libtiff/tif_dirinfo.c: Implemented binary search in _TIFFMergeFieldInfo().
-Patch supplied by Ross Finlayson.
-
-<li> tif_dirread.c: do not mark all anonymously defined tags to be IGNOREd (as
-it was done in 3.6.0).
-
-<li> libtiff/{tiff.h, tif_dirinfo.c}: Added support for IFD (13) datatype,
-intruduced in "Adobe PageMaker TIFF Technical Notes".
-
-<li> libtiff/{tif_color.c, tif_getimage.c, tiffio.h}: New color space
-conversion code: CIE L*a*b* 1976 images now supported by the TIFFRGBAImage
-interface. YCbCr to RGB conversion code also moved there and now has
-<a href="./man/TIFFcolor.3t.html">publicly available interface</a>. These
-routines currently used in TIFFRGBAImage interface only and not supported in
-other libtiff tools yet. So if you want, for example, to convert CIE Lab image
-into PostScript file you should do it in two steps: chnge colorspace to RGB
-using <a href="./man/tiff2rgba.1.html">tiff2rgba</a> utility abd then process
-it with the <a href="./man/tiff2ps.1.html">tiff2ps</a>.
-
-<li> libtiff/tif_tile.c: Remove spurious use of "s" (sample) in the
-planarconfig_contig case in TIFFComputeTile() as per bug 387
-
-<li> libtiff/tiffiop.h: New macros: TIFFmax and TIFFmin.
-
-<li> libtiff/{tiffio.h, tif_strip.c}: Added TIFFRawStripSize() function
-as suggested by Chris Hanson.
-
-<li> libtiff/{tif_lzw.c, tif_fax3.c}: Proper support for update mode
-as per bug 424.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-
-<li> <a href=./man/tiff2pdf.1.html>tiff2pdf</a>: New tool, written by
-Ross Finlayson, to directly convert TIFF files to PDF.
-
-<li> <a href=./man/tiffgt.1.html>tiffgt</a>: Unmaintained and platform
-dependent sgigt utility removed and replaced with the completely rewritten
-portable <a href=./man/tiffgt.1.html>tiffgt</a> tool (depend on OpenGL and
-GLUT). This tool will not build by default.
-
-<li> <a href=./man/ras2tiff.1.html>ras2tiff</a>: Properly determine
-SUN Rasterfiles with the reverse byte order (it is reported by the magic
-header field). Problem reported by Andreas Wiesmann.
-
-<li> <a href=./man/raw2tiff.1.html>raw2tiff</a>: Implemented image size
-guessing using correlation coefficient calculation between two neighbour
-lines.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-<UL>
-
-<li> contrib/pds/{tif_pdsdirread.c, tif_pdsdirwrite.c}: Use TIFFDataWidth()
-function insted of tiffDataWidth array.
-
-</UL>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="lzwkit"><B><FONT SIZE=+3>C</FONT>HANGES IN THE LZW COMPRESSION
-KIT:</B></A>
-<UL>
-
-<li> Proper support for update mode as per bug 424.
-
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2003/12/24 22:14:15 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.7.0.html b/src/3rdparty/libtiff/html/v3.7.0.html
deleted file mode 100644
index 413f2c6053..0000000000
--- a/src/3rdparty/libtiff/html/v3.7.0.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.7.0
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.7.0<BR>
-<B>Previous Version</B>: <A HREF=v3.7.0beta2.html>v3.7.0beta2</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-<LI><A HREF="#lzwkit">Changes in the LZW compression kit</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
-
- <li> Several bugs found after 3.7.0beta2 release were fixed.
-
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <li> ltmain.sh: Fix for MinGW compilation.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-
- <li> libtiff/{tif_dirread.c, tif_jpeg.c, tif_luv.c, tif_ojpeg.c,
- tif_pixarlog.c, tif_write.c}: Handle the zero strip/tile sizes
- properly (Dmitry V. Levin, Marcus Meissner).
-
- <li> libtiff/tif_dirinfo.c: Type of the TIFFTAG_SUBIFD field changed
- to TIFF_IFD.
-
- <li> Preliminary support for BigTIFF files: now libtiff can
- recognize and reject to open such images. ;-)
-
- <li> libtiff/tif_dir.c: Initialize td_tilewidth and td_tilelength fields
- of the TIFFDirectory structure with the 0 instead of -1 to avoid
- confusing integer overflows in TIFFTileRowSize() for striped images.
-
- <li> libtiff/tif_dir.c: Initialize td_tilewidth and td_tilelength fields
- of the TIFFDirectory structure with the 0 instead of -1 to avoid
- confusing integer overflows in TIFFTileRowSize() for striped images.
-
- <li> libtiff/tif_dirinfo.c: Fix bug with tif_foundfield and reallocation
- of tif_fieldinfo as per bug
- <A HREF="http://bugzilla.remotesensing.org/show_bug.cgi?id=630">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=630</A>
-
- <li> libtiff/tif_compress.c: Improved error reporting in
- TIFFGetConfiguredCODECs() (Dmitry V. Levin).
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> tiffcmp.c (leof): Renamed from 'eof' in order to avoid
- conflict noticed under MinGW.
-
- <li> tiff2pdf.c: Fixed TransferFunction tag handling reported
- by Ross A. Finlayson.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-
- <li> No changes.
-
-</UL>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="lzwkit"><B><FONT SIZE=+3>C</FONT>HANGES IN THE LZW COMPRESSION
-KIT:</B></A>
-<UL>
-
- <li> This one is not longer needed.
-
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2004/12/20 19:31:44 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.7.0alpha.html b/src/3rdparty/libtiff/html/v3.7.0alpha.html
deleted file mode 100644
index 95c633ca5d..0000000000
--- a/src/3rdparty/libtiff/html/v3.7.0alpha.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.7.0alpha
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.7.0alpha<BR>
-<B>Previous Version</B>: <A HREF=v3.6.1.html>v3.6.1</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-<LI><A HREF="#lzwkit">Changes in the LZW compression kit</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<ul>
- <li> Significant changes in software configuration: we are switched
- to GNU autotools now.
-
- <li> tiffset: tiffset now can set any libtiff supported tags. Tags
- can be supplied by the mnemonic name or number.
-</ul>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <li> Get rid of the old configuration system and switch to
- GNU autotools.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
- <li> libtiff/tif_ojpeg.c: Fixed problem with duplicated SOI and SOF
- markers as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=581"
- http://bugzilla.remotesensing.org/show_bug.cgi?id=581</a>.
-
- <li> libtiff/{tif_open.c, tiffio.h}: New function added:
- TIFFIsBigEndian(). Function returns nonzero if given was file written
- in big-endian order.
-
- <li> libtiff/tif_print.c: added (untested) support for printing
- SSHORT, SLONG and SRATIONAL fields.
-
- <li> libtiff/tif_fax3.c: Avoid reading CCITT compression options
- if compression type mismatches. See
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=565">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=565</a>.
-
- <li> libtiff/tif_strip.c: Never return 0 from the TIFFNumberOfStrips().
-
- <li> libtiff/tif_dirread.c: Workaround for broken TIFF writers which
- store single SampleFormat value for multisampled images. See
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=562">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=562</a>.
-
- <li> libtiff/tif_write.c: Allow in-place updating of the compressed
- images (don't work properly with all codecs). For details see GDAL bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=534">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=534</a>.
-
- <li> libtiff/tif_jpeg.c: Workaround for wrong sampling factors used
- in the Intergarph JPEG compressed TIFF images as per bug:
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=532">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=532</a>.
-
- <li> libtiff/tif_open.c: Use dummy mmap/munmap functions in
- TIFFClientOpen() when the appropriate client functions was not
- supplied by user.
-
- <li> libtiff/tif_dirread.c: Fixed problem with handling TIFF_UNDEFINED
- tag type in TIFFFetchNormalTag() as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=508"
- http://bugzilla.remotesensing.org/show_bug.cgi?id=508</a>.
-
- <li> libtiff/tif_codec.c: Fixed typo in TIFFInitPackBits name as per:
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=494">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=494</a>.
-
- <li> libtiff/tif_fax3.c: Fixed problem, introdiced in 3.6.1 release,
- with the CCITT encoding modes as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=483">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=483</a>.
- We need more work on fax codec to support update mode.
-
- <li> libtiff/tiff.h: Fixed tag definitions for TIFFTAG_YCLIPPATHUNITS
- and TIFFTAG_INDEXED as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=475">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=475</a>.
-
- <li> libtiff/{tif_win32.c, tif_unix.c}: Check whether the pointer is
- NULL before proceeding further as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=474">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=474</a>.
- Check results, returned by the TIFFFdOpen() before returning and close
- file if TIFFFdOpen() failed as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=468">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=468</a>.
-
- <li> libtiff/{libtiff.def, tif_close.c, tiffio.h, tif_open.c}:
- Separate TIFFCleanup() from the TIFFClose() in order to fix the bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=468">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=468</a>.
-
- <li> libtiff/tif_dirwrite.c: Fixed handling of writable ASCII tags
- that are field_passcount=TRUE properly. Arguably anonymous custom
- tags should be declared as passcount=FALSE, but I don't want to change
- that without a careful review.
-
- <li> libtiff/tif_write.c: Fixed reporting size of the buffer in case
- of stripped image in TIFFWriteBufferSetup(). As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=460">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=460</a>.
-
- <li> libtiff/tif_dir.c: Incomplete cleanup in TIFFFreeDirectory(),
- patch from Gerben Koopmans.
-
- <li> libtiff/tif_dirread.c: Check field_passcount value before setting
- the value of undefined type, patch from Gerben Koopmans.
-
- <li> libtiff/{tiff.h, tif_fax3.c}:Fixes for AMD 64 platform as
- suggested by Jeremy C. Reed.
-
- <li> libtiff/tif_win32.c: Fixed problem with _TIFFrealloc() when
- the NULL pointer passed. Patch supplied by Larry Grill.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> tiffset: tiffset now can set any libtiff supported tags. Tags
- can be supplied by the mnemonic name or number.
-
- <li> ycbcr.c: fixed main() declaration as per:
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=513">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=513</a>.
-
- <li> <a href=./man/tiffsplit.1.html>tiffsplit</a>: Don't forget
- to copy Photometric Interpretation tag.
-
- <li> <a href=./man/tiffsplit.1.html>tiffsplit</a>: Fixed problem with
- unproperly written multibyte files. Now output files will be written
- using the same byte order flag as in the input image. See
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=574"
- http://bugzilla.remotesensing.org/show_bug.cgi?id=574</a>.
-
- <li> <a href=./man/tiffsplit.1.html>tiffsplit</a>: Copy JPEGTables
- tag contents for JPEG compressed images. Reported by Artem Mirolubov.
-
- <li> <a href=./man/tiffcp.1.html>tiffcp</a>: Close output file
- on normal exit.
-
- <li> <a href=./man/tiffcp.1.html>tiffcp</a>: Don't emit warnings
- when Orientation tag does not present in the input image.
-
- <li> <a href=./man/tiffcp.1.html>tiffcp</a>: Properly set
- Photometric Interpretation in case of JPEG compression of grayscale
- images.
-
- <li> <a href=./man/tiffcp.1.html>tiffcp</a>: Fixed problem with wrong
- interpretation of the InkNames tag as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=466">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=466</a>.
- Memory leak fixed.
-
- <li> <a href=./man/tiffcp.1.html>tiffcp</a>: Fixed problem with
- wrong Photometric setting for non-RGB images.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-
- <li> Outdated stuff removed.
-
- <li> Almost all programs are sinchronized with the current libtiff
- and should compile without problems.
-
-</UL>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="lzwkit"><B><FONT SIZE=+3>C</FONT>HANGES IN THE LZW COMPRESSION
-KIT:</B></A>
-<UL>
-
-<li> No changes.
-
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2006/03/18 17:12:47 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.7.0beta.html b/src/3rdparty/libtiff/html/v3.7.0beta.html
deleted file mode 100644
index 7d7c868b08..0000000000
--- a/src/3rdparty/libtiff/html/v3.7.0beta.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.7.0beta
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.7.0beta<BR>
-<B>Previous Version</B>: <A HREF=v3.7.0alpha.html>v3.7.0alpha</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-<LI><A HREF="#lzwkit">Changes in the LZW compression kit</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<ul>
- <li> LZW compression enabled by default. You don't need the separate
- compression kit anymore.
-
- <li> bmp2tiff: Added new utility to convert Windows BMP files
- into TIFFs.
-
- <li> The first attempt to implement a test suite.
-</ul>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <li> Many portability fixes in the new autotooled build suite.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
- <li> libtiff/{tif_luv.c, tif_next.c, tif_thunder.c}: Several buffer
- overruns fixed, as noted by Chris Evans.
-
- <li> BSD data types (u_char, u_short, u_int, u_long) is no longer
- used internally in the libtiff. Should result in simpler configuration
- and better portability.
-
- <li> libtiff/tiff.h: Fix column tagging. Reference current Adobe XMP
- specification. Reference libtiff bug tracking system to submit
- private tag additions.
-
- <li> libtiff/tif_dirread.c: Don't reject to read tags of the
- SamplesPerPixel size when the tag count is greater than number of
- samples as per bug
- <A HREF="http://bugzilla.remotesensing.org/show_bug.cgi?id=576">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=576</A>.
-
- <li> libtiff/{tiffio.h, tif_open.c}: Applied patches from
- Joris Van Damme to avoid requirement for tiffiop.h inclusion in
- some applications. Look for details here:
- <A HREF="http://www.asmail.be/msg0054799560.html">
- http://www.asmail.be/msg0054799560.html</A>.
-
- <li> libtiff/{tiffiop.h, tif_dirinfo.c}: Fixed problem with the static
- variable as per bug
- <A HREF="http://bugzilla.remotesensing.org/show_bug.cgi?id=593">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=593</A>.
-
- <li> libtiff/tif_lzw.c: LZW compression code is merged back from the
- separate package. All libtiff tools are updated to not advertise an
- abcence of LZW support.
-
- <li> libtiff/tif_dir.c: Call TIFFError() instead of producing warnings
- when setting custom tags by value. Reported by Eric Fieleke.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> tiff2ps: Avoid zero division in setupPageState() function;
- properly initialize array in PSDataBW().
-
- <li> tiff2pdf: Multiple bugfixes.
-
- <li> ras2tiff: Fixed issue with missed big-endian checks as per bug
- </A HREF="http://bugzilla.remotesensing.org/show_bug.cgi?id=586">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=586</A>.
-
- <li> bmp2tiff: Added new utility to convert Windows BMP files
- into TIFFs.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-
- <li> No changes.
-
-</UL>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="lzwkit"><B><FONT SIZE=+3>C</FONT>HANGES IN THE LZW COMPRESSION
-KIT:</B></A>
-<UL>
-
- <li> This one is not longer needed.
-
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2006/03/18 17:12:47 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.7.0beta2.html b/src/3rdparty/libtiff/html/v3.7.0beta2.html
deleted file mode 100644
index 67dd8dad3f..0000000000
--- a/src/3rdparty/libtiff/html/v3.7.0beta2.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.7.0beta2
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.7.0beta2<BR>
-<B>Previous Version</B>: <A HREF=v3.7.0beta.html>v3.7.0beta</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-<LI><A HREF="#lzwkit">Changes in the LZW compression kit</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
-
- <li> The code has been reviewed by Dmitry Levin: added checks
- for values, returned by the space allocation functions, fixed
- problems with the possible integer overflows.
-
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <li> Several fixes in the test suite.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-
- <li> Preliminary support for BigTIFF files: now libtiff can
- recognize and reject to open such images. ;-)
-
- <li> libtiff/tif_dirinfo.c: changed type of XMLPacket (tag 700) to
- TIFFTAG_BYTE instead of TIFFTAG_UNDEFINED to comply with the info
- in the Adobe XMP Specification.
-
- <li> Added many checks for integer overflow and for successful space
- allocations in the different parts of library. Code review
- completed by Dmitry V. Levin.
-
- <li> libtiff/{tiffio.h, tif_compress.c}: Added
- TIFFGetConfiguredCODECs()function to get the list of configured codecs.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> tiff2bw: Write ImageWidth/Height tags to output file, as
- noted by Gennady Khokhorin.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-
- <li> No changes.
-
-</UL>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="lzwkit"><B><FONT SIZE=+3>C</FONT>HANGES IN THE LZW COMPRESSION
-KIT:</B></A>
-<UL>
-
- <li> This one is not longer needed.
-
-</UL>
-
-<A HREF="index.html"><IMG SRC="images/back.gif"></A> TIFF home page.<BR>
-
-<HR>
-
-Last updated $Date: 2006/03/18 17:12:47 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.7.1.html b/src/3rdparty/libtiff/html/v3.7.1.html
deleted file mode 100644
index b888792f21..0000000000
--- a/src/3rdparty/libtiff/html/v3.7.1.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.7.1
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.7.1<BR>
-<B>Previous Version</B>: <A HREF=v3.7.0.html>v3.7.0</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
-
- <li> This is mostly bugfix release. Most important fix is the one
- related to wrong custom tag read/write code.
-
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-
- <li> autogen.sh: aclocal and autoheader should be executed after
- libtoolize. Also add '-I .' to aclocal invocation to check
- current directory for macros.
-
- <li> nmake.opt: Link with the user32.lib in windowed mode. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=697">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=697</a>
-
- <li> nmake.opt, makefile.vc: make it easier to rename the libtiff DLL.
-
- <li> configure, configure.ac: Added --enable-rpath option to embed
- linker paths into library binary.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-
- <li> tiff.h: Revert back libtiff data type definitions as per
- bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=687">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=687</a>
-
- <li> tif_dirread.c: Do not forget about TIFF_VARIABLE2 when
- checking for tag count in TIFFReadDirectory() function. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=713">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=713</a>
-
- <li> tif_getimage.c: Support for multiple-alpha-channelled
- RGB-images as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=718">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=718</a>
-
- <li> tif_getimage.c: #define A1 bracketing for clean build on
- SunPro compiler.
-
- <li> tif_dirwrite.c: Always write TIFFTAG_SUBIFD using LONG type
- as per bugs
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=703">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=703</a> and
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=704">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=704</a>.
-
- <li> tif_win32.c: Use char* strings instead of TCHAR in windowed
- mode as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=697">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=697</a>
-
- <li> tif_dir.c, tif_dirread.c: Remove TIFFReassignTagToIgnore()
- call from the TIFFReadDirectory() function. TIFFReassignTagToIgnore
- must be removed in the future, as it was never used properly. As per
- bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=692">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=692</a>
-
- <li> tif_jpeg.c: Added a work-around in order to allow
- compilation with the heavily modified version of libjpeg delivered
- with Cygwin.
-
- <li> tif_dir.c: Properly handle tags, which have the uint32
- counts. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=693">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=693</a>
-
- <li> tif_unix.c: Make UNIX module compilable (and usable)
- on Windows.
-
- <li> tiff.h: Added Adobe DNG tags.
-
- <li> tif_aux.c: Set the appropriate ReferenceBlackWhite array for
- YCbCr image which lacks that tag (noted by Hans Petter Selasky).
-
- <li> tif_color.c: Division by zero fixed (Hans Petter Selasky).
-
- <li> tif_stream.cxx, tiffio.h: Added C++ stream interface
- contributed by Edward Lam (see
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=654">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=654</a>
- for details). Those who want to use C++ streams should
- #include <tiffio.hxx>.
-
- <li> tif_open.c: Removed close() in TIFFClientOpen() if file
- is bad. This is the callers responsibility.
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=651">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=651</a>
-
- <li> tiffio.h, tif_win32.c, libtiff.def}: Added TIFFOpenW()
- function to work with the double byte strings (used to represent
- filenames in some locales). As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=625">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=625</a>
-
- <li> tif_dirread.c: Fixed problem when fetching BitsPerSample and
- Compression tags of type LONG from broken TIFFS as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=662">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=662</a>
-
- <li> tif_dirinfo.c: Fixed definition for TIFFTAG_RICHTIFFIPTC,
- the writecount should have uint32 type. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=662">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=662</a>
-
- <li> tif_write.c: Fixed wrong if() statement in
- TIFFAppendToStrip() function as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=660">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=660</a>
-
- <li> tif_dirinfo.c: Change definition for TIFFTAG_EXTRASAMPLES
- field. The caller should supply a count when setting this field. As
- per bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=648">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=648</a>.
-
- <li> tif_jpeg.c, tif_ojpeg.c: TIFFTAG_JPEGTABLES should have
- uint32 count. Use this type everywhere.
-
- <li> tif_next.c: avoid use of u_long and u_char types.
-
- <li> tif_fax3.c: Fixed case with the wrong decode routines
- choosing when the incorrect Group4Options tag set. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=323">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=323</a>
-
- <li> tif_dirwrite.c: Fixed problem with passing count variable of
- wrong type when writing the TIFF_BYTE/TIFF_SBYTE tags in
- TIFFWriteNormalTag().
-
- <li> tif_compress.c: Zero division problem fixed (Vladimir Nadvornik,
- Dmitry V. Levin).
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-
- <li> fax2ps.c: Be able to extract the first page (#0). As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=690">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=690</a>
-
- <li> tiff2ps.c: Fixed wrong variable data type when read Position
- tags (Tristan Hill).
-
- <li> tiff2ps.c: Fixed wrong variable data type when read Resolution
- tags (Peter Fales).
-
- <li> tiffset.c: Check the malloc return value (Dmitry V. Levin).
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-
- <li> No changes.
-
-</UL>
-
-Last updated $Date: 2004/12/20 19:31:44 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.7.2.html b/src/3rdparty/libtiff/html/v3.7.2.html
deleted file mode 100644
index 6cb6f7cd3a..0000000000
--- a/src/3rdparty/libtiff/html/v3.7.2.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.7.2
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.7.2<BR>
-<B>Previous Version</B>: <A HREF=v3.7.1.html>v3.7.1</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
-
- <li> Maintainance release. Many bugfixes in the build environment
- and compatibility improvements.
-
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <li> configure.ac: Use -rpath option instead of -R as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=732">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=732</a>
-
- <li> tif_stream.cxx: Fixes for C++ stream interface from
- Michael Rinne and Edward Lam.
-
- <li> configure.ac: Make the documentation directory location
- configurable via the --with-docdir option (as suggested by
- Jeremy C. Reed).
-
- <li> Place the C++ stream API in the separate library called
- libtiffxx to avoid unneeded dependencies. Probably there will be
- more C++ API in the future. As per bugs
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=733">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=733</a>
- and <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=730">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=730</a>
-
- <li> configure, configure.ac: Replace --disable-c++ with the
- --disable-cxx option as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=730">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=730</a>.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-
- <li> Applied patch from Lee Howard to support a new tag TIFFTAG_FAXDCS
- (34911) used in HylaFax software. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=771">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=771</a>
-
- <li> tif_open.c: Remove unnesessary TIFFSeekFile() call as per
- bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=756">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=756</a>
-
- <li> tiff.h: Changed the int8 definition to be always signed char
- as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=727">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=727</a>
-
- <li> tiffio.h: Move TIFFOpenW() function into the extern "C"{}
- block as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=763">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=763</a>
-
- <li> tif_dirread.c: Estimate strip size in case of wrong or
- suspicious values in the tags. As per bugs
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=705">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=705</a>
- and <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=320">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=320</a>
-
- <li> tif_color.c: Use double as the second argument of pow()
- function in TIFFCIELabToRGBInit(). As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=741">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=741</a>
-
- <li> tif_pixarlog.c: Avoid warnings when converting float to
- integer as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=740">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=740</a>
-
- <li> tif_getimage.c: Always fill the error message buffer in
- TIFFRGBAImageBegin() as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=739">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=739</a>
-
- <li> tif_jpeg.c: Added ability to read/write the fax specific
- TIFFTAG_FAXRECVPARAMS, TIFFTAG_FAXSUBADDRESS and TIFFTAG_FAXRECVTIME
- tags as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=736">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=736</a>
-
- <li> tif_win32.c: Fixed message formatting in functions
- Win32WarningHandler() and Win32ErrorHandler() as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=735">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=735</a>
-
- <li> tiffio.h: Move the color conversion routines in the 'extern
- "C"' section as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=727">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=727</a>
-
- <li> tiff.h: Restore back the workaround for AIX Visual Age C
- compiler to avoid double definition of BSD types as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=39">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=39</a>
-
- <li> tif_getimage.c: More fixes for multiple-alpha-channelled
- RGB-images as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=713">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=713</a>
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-
- <li> tiffcmp.c: Added ability to compare the 32-bit integer and
- floating point data; complain on unsupported bit depths.
-
- <li> tiffcmp.c: Use properly sized buffer in short arrays comparison
- as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=785">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=785</a>
-
- <li> fax2ps.c: Replace insecure mktemp() function with the
- tmpfile() as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=786">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=786</a>
-
- <li> tiffgt.c: Fix problem on big-endian CPUs so that images
- display more correctly. Images display brighter than they should
- on a Sun workstation.
-
- <li> tiff2ps.c: Fixed problem with page sizes as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=742">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=742</a>
-
- <li> tiff2ps.c: Interpret the -w and -h options independently. As
- per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=689">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=689</a>
-
- <li> tiffdump.c: Fixed problem when read broken TIFFs with the
- wrong tag counts (Dmitry V. Levin, Martin Pitt).
-
- <li> tiffset.c: Convert character option to integer value as per
- bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=725">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=725</a>.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-
- <li> No changes.
-
-</UL>
-
-Last updated $Date: 2005/03/15 15:17:44 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.7.3.html b/src/3rdparty/libtiff/html/v3.7.3.html
deleted file mode 100644
index d69845176c..0000000000
--- a/src/3rdparty/libtiff/html/v3.7.3.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.7.3
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.7.3<BR>
-<B>Previous Version</B>: <A HREF=v3.7.2.html>v3.7.2</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
- <li> Replace runtime endianess check with the compile time one.
-
- <li> Added support for the new predictor type (floating point
- predictor), defined at the TIFF Technical Note 3.
-
- <li> Added Support for custom tags, passed by value.
- Added support for all DNG tags.
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <li> Do not use empty -R option when linking with --enable-rpath.
-
- <li> Added workaround for OpenBSD/MirOS soname problem as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=838">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=838</a>
-
- <li> Fixed parallel compilation of the libtiff and
- libtiffxx libraries as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=826">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=826</a>
-
- <li> configure.ac, libtiff/Makefile.am: Use libtool machinery to pass
- rpath option.
-
- <li> make.opt: Build with Win32 CRT library by default.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
- <li> tiffiop.h, tif_open.c: Added open option 'h' to avoid reading
- the first IFD when needed. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=875">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=875</a>
-
- <li> tiff.h: Use correct int size on Sparc 64bit/Sun compiler
- platform. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=855">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=855</a>
-
- <li> tif_dirinfo.c: Added support for ClipPath, XClipPathUnits
- and YClipPathUnits tags.
-
- <li> tif_dirinfo.c, tif_dir.h, tif_dir.c, tif_print.c: Make
- DocumentName, Artist, HostComputer, ImageDescription, Make, Model,
- Copyright, DateTime, PageName, TextureFormat, TextureWrapModes and
- TargetPrinter tags custom.
-
- <li> tif_jpeg.c: Cleanup the codec state depending on TIFF_CODERSETUP
- flag (to fix memory leaks).
-
- <li> tif_dirwrite.c: Use tdir_count when calling
- TIFFCvtNativeToIEEEDouble() in the TIFFWriteDoubleArray() function as
- per bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=845">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=845</a>
-
- <li> tif_dirinfo.c, tif_print.c: TIFFFetchByteArray() returns
- uint16 array when fetching the BYTE and SBYTE fields, so we should
- consider result as pointer to uint16 array and not as array of chars.
- As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=831">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=831</a>
-
- <li> tif_dir.c: More efficient custom tags retrieval as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=830">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=830</a>
-
- <li> tif_win32.c: Use FILE_SHARE_READ | FILE_SHARE_WRITE share
- mode in CreateFile() call as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=829">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=829</a>
-
- <li> tif_jpeg.c: Substantial fix for addtiffo problems with
- JPEG encoded TIFF files. Pre-allocate lots of space for jpegtables
- in directory.
-
- <li> tif_dirread.c: Changed the code that computes
- stripbytecount[0] if it appears bogus to ignore if stripoffset[0] is
- zero. This is a common case with GDAL indicating a "null" tile/strip.
-
- <li> tif_jpeg.c: added LIB_JPEG_MK1 support in JPEGDecodeRaw().
-
- <li> tif_dirread.c: Ensure that broken files with too many
- values in PerSampleShorts, TIFFFetchPerSampleLongs and
- TIFFFetchPerSampleAnys work ok instead of crashing.
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=843">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=843</a>
-
- <li> tif_predict.h, tif_predict.c: Added ability to decode and encode
- floating point predictor, as per TIFF Technical Note 3.
- See http://chriscox.org/TIFF_TN3_Draft2.pdf for details.
-
- <li> tiffio.h, tiffiop.h, tif_dir.c, tif_read.c, tif_swab.c:
- Added _TIFFSwab24BitData() and TIFFSwabArrayOfLong() functions used to
- swap 24-bit floating point values.
-
- <li> tiff.h: Added predictor constants.
-
- <li> tiffiop.h, tif_dir.c: Use uint32 type for appropriate values
- in _TIFFVSetField() function. Inspired by the bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=816">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=816</a>
-
- <li> tif_open.c: Do not read header in case the output file should
- be truncated (Ron).
-
- <li> tif_dirinfo.c, tif_config.h.vc: Use lfind() instead of bsearch()
- in _TIFFFindFieldInfoByName() function (Ron).
-
- <li> tif_dir.c, tif_print.c: Properly handle all data types in custom
- tags.
-
- <li> dirinfo.c: Added DNG tags.
-
- <li> tiff.h: Added missed DNG tag (LensInfo); added DNG 1.1.0.0 tags.
-
- <li> tif_dir.c, tif_print.c: Added Support for custom tags, passed
- by value.
-
- <li> tiff.h, tif_dirinfo.c, tiffiop.h: Added EXIF related tags.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> tiff2pdf.c: Print two characters per loop in the
- t2p_write_pdf_trailer(). As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=594">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=594</a>
-
- <li> tiffgt.c: Use MacOS X OpenGL framework when appropriate. As
- per bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=844">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=844</a>
-
- <li> ppm2tiff.c: Fixed format string when read PPM file header with
- the fscanf() function. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=861">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=861</a>
-
- <li> tiffsplit.c: Check for JPEGTables tag presence before copying.
-
- <li> tiff2pdfr.c: Calculate the tile width properly; added new
- option '-b' to use interpolation in output PDF files (Bruno Ledoux).
-
- <li> tiffdither.c: Copy the PhotometricInterpretation tag from the
- input file.
-
- <li> tif2pdf.c: Fixed problem with alpha channel handling as per
- bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=794">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=794</a>.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-
- <li> addtiffo/{tif_overview.c, tif_ovrcache.c, tif_ovrcache.h}:
- Make overviews working for contiguous images.
-
-</UL>
-
-Last updated $Date: 2006/01/04 22:04:46 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.7.4.html b/src/3rdparty/libtiff/html/v3.7.4.html
deleted file mode 100644
index 943732019e..0000000000
--- a/src/3rdparty/libtiff/html/v3.7.4.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.7.4
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.7.4<BR>
-<B>Previous Version</B>: <A HREF=v3.7.3.html>v3.7.3</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
- <li> Fixed important bug in custom tags handling code..
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <li> Applied patch from Patrick Welche (all scripts moved in the
- 'config' and 'm4' directories).
-
- <li> SConstruct, libtiff/SConstruct: Added the first very preliminary
- support for SCons software building tool (http://www.scons.org/).
- This is experimental infrastructure and it will exist along with the
- autotools stuff.
-
- <li> port/lfind.c: Added lfind() replacement module.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
- <li> tif_dir.c: When prefreeing tv->value in TIFFSetFieldV
- also set it to NULL to avoid double free when re-setting custom
- string fields as per:
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=922">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=922</a>
-
- <li> tif_dir.c: Fixed up support for swapping "double complex"
- values (128 bits as 2 64 bits doubles). GDAL gcore tests now
- pass on bigendian (macosx) system.
-
- <li> libtiff/{tif_dirread.c, tif_dirinfo.c}: Do not upcast BYTEs to
- SHORTs in the TIFFFetchByteArray(). Remove TIFFFetchExtraSamples()
- function, use TIFFFetchNormalTag() instead as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=831">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=831</a>
-
- Remove TIFFFetchExtraSamples() function, use TIFFFetchNormalTag()
- instead.
-
- <li> tif_print.c: Fixed printing of the BYTE and SBYTE arrays.
-
- <li> tif_write.c: Do not check the PlanarConfiguration field in
- the TIFFWriteCheck() function in case of single band images (as per
- TIFF spec).
-
- <li> libtiff/{tif_dir.c, tif_dir.h, tif_dirinfo.c, tif_print.c}:
- Make FieldOfViewCotangent, MatrixWorldToScreen, MatrixWorldToCamera,
- ImageFullWidth, ImageFullLength and PrimaryChromaticities tags custom.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> tiffcp.c: Fixed WhitePoint tag copying.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
- <li> tiffdump.c: Added support for TIFF_IFD datatype.
-
- <li> addtiffo/{tif_overview.c, tif_ovrcache.c, tif_ovrcache.h}:
- Make overviews working for contiguous images.
-
-</UL>
-
-Last updated $Date: 2005/11/03 14:18:43 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.8.0.html b/src/3rdparty/libtiff/html/v3.8.0.html
deleted file mode 100644
index 914dcb0c55..0000000000
--- a/src/3rdparty/libtiff/html/v3.8.0.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.8.0
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.8.0<BR>
-<B>Previous Version</B>: <A HREF=v3.7.4.html>v3.7.4</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
- <li> Read-only support for custom directories (e.g. EXIF directory).
-
- <li> Preliminary support for MS MDI format.
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <li> Make the default strip size configurable via the
- --with-default-strip-size and STRIP_SIZE_DEFAULT options.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
- <li> tiffio.h: Added VC_EXTRALEAN definition before including
- windows.h, to reduce the compile time.
-
- <li> tif_jpeg.c: Improve compilation under MinGW.
-
- <li> {tif_aux.c, tif_dir.c, tif_dir.h, tif_dirwrite.c,
- tif_print.c, tif_getimage.c}: Make InkSet, NumberOfInks, DotRange and
- StoNits tags custom.
-
- <li> {tif_aux.c, tif_dir.c, tif_dir.h, tif_print.c}: Make
- WhitePoint tag custom.
-
- <li> tiffio.h: fixed typo that potentially resulted in
- redefininition of USE_WIN32_FILEIO
-
- <li> {tif_dir.c, tif_dir.h, tif_print.c}: Make RichTIFFIPTC,
- Photoshop and ICCProfile tags custom.
-
- <li> libtiff/*, contrib/*: Added 'dual-mode' error handling, enabling
- newer code to get context indicator in error handler and still
- remain compatible with older code: Done TIFFError calls everywhere
- except in tools.
-
- <li> tiffinfo.c: Print EXIF directory contents if exist.
-
- <li> {tif_dirinfo.c, tif_dirread.c, tif_dir.h, tif_dir.c}:
- Custom directory read-only support.
-
- <li> {tif_aux.c, tif_dirinfo.c, tif_dirread.c, tif_dir.h,
- tif_dir.c, tif_print.c}: Make YCbCrCoefficients and ReferenceBlackWhite
- tags custom.
-
- <li> tif_dirread.c: One more workaround for broken StripByteCounts
- tag. Handle the case when StripByteCounts array filled with
- completely wrong values.
-
- <li> tif_dirinfo.c: Release file descriptor in case of failure
- in the TIFFOpenW() function as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1003">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1003</a>
-
- <li> tif_dirinfo.c: Correctly yse bsearch() and lfind()
- functions as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1008">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1008</a>
-
- <li> tif_open.c, tiff.h, tiffdump.c: Incorporate preliminary support
- for MS MDI format.
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1002">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1002</a>
-
- <li> libtiff.def, tiffiop.h, tiffio.h: Made TIFFFreeDirectory
- public.
-
- <li> /tif_dirinfo.c: Make XResolution, YResolution and
- ResolutionUnit tags modifiable during write process. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=977">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=977</a>
-
- <li> if_dirread.c: Don't try and split single strips into "0" strips
- in ChopUpSingleUncompressedStrip. This happens in some degenerate
- cases (like 1x1 files with stripbytecounts==0 (gtsmall.jp2 embed tiff)
-
- <li> tif_fax3.c: changed 'at scanline ...' style warning/errors
- with incorrect use of tif_row, to 'at line ... of
- strip/tile ...' style.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> tiffcp.c: Added many error reporting messages; fixed integer
- overflow as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=789">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=789</a>
-
- <li> tiffcp.c: Return non-zero status when reading fails.
-
- <li> fax2tiff.c: Properly calculate sizes of temporary arrays
- as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=943">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=943</a>
-
- <li> fax2tiff.c: Added option '-r' to set RowsPerStrip parameter
- as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=944">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=944</a>
-
- <li> tiffdump.c: Fixed typeshift and typemask arrays initialization
- problem as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=946">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=946</a>
-
- <li> bmp2tiff.c: Fixed possible integer overflow error as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=965">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=965</a>
-
- <li> tiffsplit.c: Copy fax related fields over splitted parts
- as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=983">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=983</a>
-
- <li> tiffdump.c: Fixed crash when reading malformed tags.
-
- <li> tiff2pdf.c: Added missed 'break' statement as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=932">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=932</a>
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
- <li> contrib/addtiffo/*: Major upgrade by Joris to support subsampled
- YCbCr images in jpeg compressed TIFF files.
-
-</UL>
-
-Last updated $Date: 2006/01/04 23:38:38 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.8.1.html b/src/3rdparty/libtiff/html/v3.8.1.html
deleted file mode 100644
index 9fea1407e6..0000000000
--- a/src/3rdparty/libtiff/html/v3.8.1.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.8.1
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.8.1<BR>
-<B>Previous Version</B>: <A HREF=v3.8.0.html>v3.8.0</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
- <li> Bug-fix release.
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
- <li> libtool related stuff updated from the 2.1a branch.
-
- <li> Fix with_default_strip_size comparison as reported by
- Norihiko Murase.
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
-
- <li> tif_dirread.c: Fixed error reporting in TIFFFetchAnyArray()
- function as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1102">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1102</a>
-
- <li> tif_jpeg.c, tif_pixarlog.c, tif_fax3.c, tif_zip.c:
- Properly restore setfield/getfield methods in cleanup functions. As
- per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1102">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1102</a>
-
- <li> tif_lzw.c, tif_pixarlog.c, tif_zip.c: Use
- TIFFPredictorCleanup() in codec cleanup methods. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1102">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1102</a>
-
- <li> tif_predict.c, tif_predict.h: Added new function
- TIFFPredictorCleanup() to restore parent decode/encode/field methods.
-
- <li> tif_dirread.c: Fixed integer overflow condition in
- TIFFFetchData() function. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1102">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1102</a>
-
- <li> tif_ojpeg.c: Set the ReferenceBlackWhite with the
- TIFFSetField() method, not directly. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1043">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1043</a>
-
- <li> tif_write.c: Small code rearrangement in TIFFWriteScanline()
- to avoid crash as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1081">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1081</a>
-
- <li> tif_dirwrite.c: Properly write TIFFTAG_DOTRANGE tag as per
- bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1088">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1088</a>
-
- <li> tif_print.c: Properly read TIFFTAG_PAGENUMBER,
- TIFFTAG_HALFTONEHINTS, TIFFTAG_YCBCRSUBSAMPLING and TIFFTAG_DOTRANGE
- tags as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1088">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1088</a>
-
- <li> tif_tile.c: Fix error reporting in TIFFCheckTile() as per
- bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1063">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1063</a>
-
- <li> tif_color.c: Avoid overflow in case of wrong input as per
- bug <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1065">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1065</a>
-
- <li> tif_dirinfo.c: Use TIFF_NOTYPE instead of 0 when
- appropriate. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1033">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1033</a>
-
- <li> tif_aux.c: Fixed type of temporary variable in
- _TIFFCheckMalloc() as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=103">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=103</a>
-
- <li> tif_aux.c: Return static array when fetching default
- YCbCrCoefficients (another problem, reported a the
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1029">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1029</a>
- entry).
-
- <li> tif_dir.c: Special handling for PageNumber, HalftoneHints,
- YCbCrSubsampling and DotRange tags as per bugs
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1029">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1029</a>
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1034">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1034</a>
-
- <li> tif_dirread.c: Use _TIFFGetExifFieldInfo() instead of
- _TIFFGetFieldInfo() in TIFFReadEXIFDirectory() call as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1026">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1026</a>
-
- <li> tif_dirinfo.c: Change definitions for TIFFTAG_ICCPROFILE,
- TIFFTAG_PHOTOSHOP, TIFFTAG_RICHTIFFIPTC, TIFFTAG_XMLPACKET:
- readcount should be uint32 value.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> ppm2tiff.c: Added support for PBM files as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1044">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1044</a>
-
- <li> tiff2pdf.c: Functions t2p_sample_rgbaa_to_rgb() and
- t2p_sample_rgba_to_rgb() was used in place of each other, that was
- resulted in problems with RGBA images with associated alpha.
- As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1097">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1097</a>
-
- <li> tiff2ps.c: Properly scale all the pages when converting
- multipage TIFF with /width/height/center options set. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1080">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1080</a>
-
- <li> tiff2pdf.c: Do not create output file until all option checks
- will be done. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1072">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1072</a>
-
- <li> bmp2tiff.c: Added ability to create multipage TIFFs from the
- list of input files as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1077">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1077</a>
-
- <li> tiffgt.c: Avoid crashing in case of image unsupported by
- TIFFRGBAImage interface.
-
- <li> tiff2pdf.c: Fixed support for non-YCbCr encoded JPEG
- compressed TIFF files, per submission from Dan Cobra.
-
- <li> bmp2tiff, pal2rgb, ppm2tiff, ras2tiff, raw2tiff, sgi2tiff,
- tiff2bw, tiffcp: Fixed jpeg option processing so -c jpeg:r:50 works
- properly as per bug:
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1025">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1025</a>
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-</UL>
-
-Last updated $Date: 2006/03/13 14:52:12 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.8.2.html b/src/3rdparty/libtiff/html/v3.8.2.html
deleted file mode 100644
index e648127586..0000000000
--- a/src/3rdparty/libtiff/html/v3.8.2.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.8.2
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.8.2<BR>
-<B>Previous Version</B>: <A HREF=v3.8.1.html>v3.8.1</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
- <li> Bug-fix release.
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-
- <li> tools/Makefile.am: Use runtime paths linker flags when rpath
- option enabled.
-
- <li> Makefiles improvements as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1128">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1128</a>
-
- <li> Fixed win32 I/O functions usage as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1127">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1127</a>
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
- <li> tif_strip.c: Take subsampling in account when calculating
- TIFFScanlineSize().
-
- <li> tif_jpeg.c, tif_fax3.c, tif_zip.c, tif_pixarlog.c,
- tif_lzw.c, tif_luv.c: Use _TIFFSetDefaultCompressionState() in all
- codec cleanup methods. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1120">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1120</a>
-
- <li> tif_jpeg.c: Do not cleanup codec state in TIFFInitJPEG(). As
- per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1119">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1119</a>
-
- <li> tif_dir.c: Use double type instead of dblparam_t.
-
- <li> tif_dirread.c: Do not check the PlanarConfig tag presence
- in TIFFReadDirectory, because it is always set at the start of
- function and we allow TIFFs without that tag set.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> tiffcp.c: Do not set RowsPerStrip bigger than image length.
-
- <li> fax2tiff.c: Fixed wrong TIFFerror() invocations as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1125">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1125</a>
-
- <li> fax2ps.c: Fixed reading the input stream from stdin as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1124">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1124</a>
-
- <li> raw2tiff.c: Do not set RowsPerStrip larger than ImageLength.
- As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1110">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1110</a>
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-</UL>
-
-Last updated $Date: 2006/03/23 14:54:01 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.9.0beta.html b/src/3rdparty/libtiff/html/v3.9.0beta.html
deleted file mode 100644
index 053b34ab52..0000000000
--- a/src/3rdparty/libtiff/html/v3.9.0beta.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.9.0beta
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.9.0beta<BR>
-<B>Previous Version</B>: <A HREF=v3.8.2.html>v3.8.2</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above).
-If you don't find something listed here, then it was not done in this
-timeframe, or it was not considered important enough to be mentioned.
-The following information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
- <li> New <b>tiffcrop</b> utility contributed by Richard Nolde.
- <b>tiffcrop</b> does the same as <b>tiffcp</b>, but also can crop,
- extract, rotate and mirror images.
-
- <li> tif_jbig.c: Added support for JBIG compression scheme
- (34661 code), contributed by Lee Howard.
-
- <li> Totally new implementation of OJPEG module from
- Joris Van Damme. No need to patch libjpeg anymore. Many OJPEG files
- should be supported now that was not supported previously.
-
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-
- <li> tif_config.wince.h, tiffconf.wince.h, tif_wince.c: WinCE-specific
- compatibility stuff from Mateusz Loskot.
-
- <li> Rename config.h.vc and tif_config.h.vc to config.vc.h and
- tif_config.vc.h for easier identification by folks using an IDE.
-
- <li> configure, configure.ac: OJPEG support enabled by default (i.e.,
- whe the conformant JPEG support enabled).
-
- <li> README.vms, Makefile.am, configure.com, libtiff/{Makefile.am,
- tif_config.h-vms, tif_stream.cxx, tif_vms.c, tiffconf.h-vms}:
- Added support for OpenVMS by Alexey Chupahin.
-
- <li> nmake.opt: use /EHsc for VS2005 compatibility. Also define
- _CRT_SECURE_NO_DEPRECATE to avoid noise on VS2005.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
- <li> tif_dirinfo.c (_TIFFFindFieldInfo): Don't attempt to
- bsearch() on a NULL fieldinfo list.
- (_TIFFFindFieldInfoByName): Don't attempt to lfind() on a NULL
- fieldinfo list.
-
- <li> tif_jpeg.c: Changed JPEGInitializeLibJPEG() so that it
- will convert from decompressor to compressor or compress to decompress
- if required by the force arguments. This works around a problem in
- where the JPEGFixupTestSubsampling() may cause a decompressor to
- be setup on a directory when later a compressor is required with the
- force flag set. Occurs with the addtiffo program for instance.
-
- <li> tif_dirwrite.c: Fixed swapping of byte arrays stored
- in-place in tag offsets as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1363">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1363</a>
-
- <li> tif_getimage.c: workaround for 'Fractional scanline' error
- reading OJPEG images with rowsperstrip that is not a multiple of
- vertical subsampling factor. This bug is mentioned in
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1390">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1390</a> and
- <a href="http://www.asmail.be/msg0054766825.html">
- http://www.asmail.be/msg0054766825.html</a>
-
- <li> tif_dirread.c: Added special function to handle
- SubjectDistance EXIF tag as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1362">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1362</a>
-
- <li> tif_dirread.c, tif_read.c: Type of the byte counters
- changed from tsize_t to uint32 to be able to work with data arrays
- larger than 2GB. Fixes bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=890">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=89</a>
- Idea submitted by Matt Hancher.
-
- <li> tif_dir.c: Workaround for incorrect TIFFs with
- ExtraSamples == 999 produced by Corel Draw. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1490">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1490</a>
-
- <li> tif_write.c: TIFFAppendToStrip() - clear sorted flag if
- we move a strip.
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1359">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1359</a>
-
- <li> tif_fax3.c: Save the state of printdir codec dependent method.
-
- <li> tif_jpeg.c: Save the state of printdir codec dependent method
- as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1273">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1273</a>
-
- <li> tif_win32.c: Fixed problem with offset value manipulation
- as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1322">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1322</a>
-
- <li> tif_fax3.c, tif_next.c, tif_pixarlog.c: Fixed multiple
- vulnerabilities, as per Gentoo bug ():
- <a href="http://bugs.gentoo.org/show_bug.cgi?id=142383">
- http://bugs.gentoo.org/show_bug.cgi?id=142383</a>
-
- <li> tif_lzw.c, tif_zip.c: Fixed problems with mixing
- encoding and decoding on the same read-write TIFF handle. The LZW
- code can now maintain encode and decode state at the same time. The
- ZIP code will switch back and forth as needed.
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=757">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=757</a>
-
- <li> tif_msdos.c: Avoid handle leak for failed opens.
- c/o Thierry Pierron
-
- <li> tif_dirwrite.c: take care not to flush out buffer of strip/tile
- data in _TIFFWriteDirectory if TIFF_BEENWRITING not set. Relates
- to bug report by Peng Gao with black strip at bottom of images.
-
- <li> tif_dirwrite.c: make sure to use uint32 for wordcount in
- TIFFWriteNormanTag if writecount is VARIABLE2 for ASCII fields.
- It already seems to have been done for other field types. Needed
- for "tiffset" on files with geotiff ascii text.
-
- <li> tif_dirinfo.c: Added missed EXIF tag ColorSpace (40961).
-
- <li> tif_dirread.c: Move IFD fetching code in the separate
- function TIFFFetchDirectory() avoiding code duplication in
- TIFFReadDirectory() and TIFFReadCustomDirectory().
-
- <li>tif_readdir.c: Added case in EstimateStripByteCounts() for tiled
- files. Modified TIFFReadDirectory() to not invoke
- EstimateStripByteCounts() for case where entry 0 and 1 are unequal but
- one of them is zero.
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1204">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1204</a>
-
- <li> tif_open.c, tif_dirread.c, tiffiop.h: Move IFD looping
- checking code in the separate function TIFFCheckDirOffset().
-
- <li> tif_aux.c: Added _TIFFCheckRealloc() function.
-
- <li> tif_fax3.c: Fixed problems in fax decoder as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1194">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1194</a>
-
- <li> tif_jbig.c: Added support for JBIG compression scheme
- (34661 code) contributed by Lee Howard. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=896">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=896</a>
-
- <li> tif_getimage.c: Added support for planarconfig separate
- non-subsampled YCbCr (i.e. separate YCbCr with subsampling [1,1]).
-
- <li> tif_getimage.c: Revision of all RGB(A) put routines:
- <ul>
- <li> Conversion of unassociated alpha to associated alpha
- now done with more performant LUT, and calculation more
- correct.
- <li> Conversion of 16bit data to 8bit data now done with
- more performant LUT, and calculation more correct
- <li> Bugfix of handling of 16bit RGB with unassociated alpha
- </ul>
-
- <li> tif_ojpeg.c: totally new implementation
-
- <li> tif_getimage.c: removed TIFFTAG_JPEGCOLORMODE handling
- of OJPEG images in favor of tif_getimage.c native handling of
- YCbCr and desubsampling.
-
- <li> tif_jpeg.c: JPEGVSetField() so that altering the photometric
- interpretation causes the "upsampled" flag to be recomputed. Fixes
- peculiar bug where photometric flag had to be set before jpegcolormode
- flag.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> tiff2ps.c: Added support 16-bit images as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1566">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1566</a>.
- Patch from William Bader.
-
- <li> tiff2pdf.c: Fix for TIFFTAG_JPEGTABLES tag fetching and
- significant upgrade of the whole utility as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1560">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1560</a>.
- Now we don't need tiffiop.h in tiff2pdf anymore and will open output
- PDF file using TIFFClientOpen() machinery as it is implemented
- by Leon Bottou.
-
- <li> tiffcrop.c: New tiffcrop utility contributed
- by Richard Nolde. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1383">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1383</a>
-
- <li> tiff2pdf.c: Do not assume inches when the resolution units
- do not specified. As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1366">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1366</a>
-
- <li> tiffset.c: Properly handle tags with TIFF_VARIABLE writecount.
- As per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1350">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1350</a>
-
- <li> tif2rgba.c: This utility does not work properly on big-endian
- architectures. It was fixed including the bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1149">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1149</a>
-
- <li> tiff2pdf.c: Fix handling of -q values.
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=587">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=587</a>
-
- <li> tiffcmp.c: Fixed floating point comparison logic as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1191">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1191</a>
-
- <li> tiff2pdf.c: Fixed buffer overflow condition in
- t2p_write_pdf_string() as per bug
- <a href="http://bugzilla.remotesensing.org/show_bug.cgi?id=1196">
- http://bugzilla.remotesensing.org/show_bug.cgi?id=1196</a>
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-
- <li> contrib/addtiffo/tif_overview.c: Fix problems with odd sized
- output blocks in TIFF_DownSample_Subsampled() (bug 1542).
-
- <li> contrib/dbs/xtiff/xtiff.c: Make xtiff utility compilable.
- Though it is still far from the state of being working and useful.
-
-</UL>
-
-Last updated $Date: 2007/07/13 13:40:12 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.9.1.html b/src/3rdparty/libtiff/html/v3.9.1.html
deleted file mode 100644
index 93228483bd..0000000000
--- a/src/3rdparty/libtiff/html/v3.9.1.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.9.1
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.9.1<BR>
-<B>Previous Version</B>: <A HREF=v3.9.1.html>v3.9.1</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above). If you don't
-find something listed here, then it was not done in this timeframe, or
-it was not considered important enough to be mentioned. The following
-information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
- <li> This is a bug-fix release for several bugs (two of which
- are dire) which were discovered in the 3.9.0 release.
-
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-
- <li> Several defines were missing from tif_config.vc.h which
- are necessary to compile the library using MSVC.
-
- <li> Colorized tests were actually not enabled as expected.
- Parallel tests mode is now also enabled so that tests can be
- run in parallel, and test output is sent to .log files.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
- <li> libtiff/tif_write.c (TIFFAppendToStrip): Remove cast
- which caused libtiff to output a wrong last strip with
- byte-count and strip-offset of zero. This cast was added on
- the day of the 3.9.0 release.
-
- <li> libtiff/tif_dirwrite.c: Back out changes from 2007-11-22
- that resulted in the final strip not being written in some
- circumstances.
- http://bugzilla.maptools.org/show_bug.cgi?id=2088
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
- <li> None
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-
- <li> None
-
-</UL>
-
-Last updated $Date: 2009-08-28 18:49:02 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/html/v3.9.2.html b/src/3rdparty/libtiff/html/v3.9.2.html
deleted file mode 100644
index 2f390c838d..0000000000
--- a/src/3rdparty/libtiff/html/v3.9.2.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
- Changes in TIFF v3.9.2
-</TITLE>
-</HEAD>
-
-<BODY BGCOLOR=white>
-<FONT FACE="Helvetica, Arial, Sans">
-<FONT FACE="Helvetica, Arial, Sans">
-
-<BASEFONT SIZE=4>
-<B><FONT SIZE=+3>T</FONT>IFF <FONT SIZE=+2>C</FONT>HANGE <FONT SIZE=+2>I</FONT>NFORMATION</B>
-<BASEFONT SIZE=3>
-
-<UL>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-<B>Current Version</B>: v3.9.2<BR>
-<B>Previous Version</B>: <A HREF=v3.9.1.html>v3.9.1</a><BR>
-<B>Master FTP Site</B>: <A HREF="ftp://ftp.remotesensing.org/pub/libtiff">
-ftp.remotesensing.org</a>, directory pub/libtiff</A><BR>
-<B>Master HTTP Site</B>: <A HREF="http://www.remotesensing.org/libtiff">
-http://www.remotesensing.org/libtiff</a>
-<HR SIZE=4 WIDTH=65% ALIGN=left>
-</UL>
-
-<P>
-This document describes the changes made to the software between the
-<I>previous</I> and <I>current</I> versions (see above). If you don't
-find something listed here, then it was not done in this timeframe, or
-it was not considered important enough to be mentioned. The following
-information is located here:
-<UL>
-<LI><A HREF="#hightlights">Major Changes</A>
-<LI><A HREF="#configure">Changes in the software configuration</A>
-<LI><A HREF="#libtiff">Changes in libtiff</A>
-<LI><A HREF="#tools">Changes in the tools</A>
-<LI><A HREF="#contrib">Changes in the contrib area</A>
-</UL>
-<p>
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="highlights"><B><FONT SIZE=+3>M</FONT>AJOR CHANGES:</B></A>
-
-<UL>
-
- <li> Fixes a number of bugs present in the 3.9.1 release.
-
- <li> OJPEG support updated to work with IJG JPEG 7 release.
-
- <li> Tiffcrop validated for most TIFF storage subformats and sample depths.
-
-</UL>
-
-
-<P><HR WIDTH=65% ALIGN=left>
-<!--------------------------------------------------------------------------->
-
-<A NAME="configure"><B><FONT SIZE=+3>C</FONT>HANGES IN THE SOFTWARE CONFIGURATION:</B></A>
-
-<UL>
-
- <li> x86_64 now uses the same default fill order as i386.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="libtiff"><B><FONT SIZE=+3>C</FONT>HANGES IN LIBTIFF:</B></A>
-
-<UL>
- <li> Writing tags with an array value of type TIFF_DOUBLE now
- returns correct error status. The TIFFTAG_SMINSAMPLEVALUE and
- TIFFTAG_SMAXSAMPLEVALUE tags failed to write without this fix.
-
- <li> OJPEG decoder now works with IJG JPEG 7. Resolves "Bug
- 2090 - OJPEG crash with libjpeg v7".
- http://bugzilla.maptools.org/show_bug.cgi?id=2090
-
- <li> Eliminate most GCC "dereferencing type-punned pointer"
- warnings.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!-------------------------------------------------------------------------->
-
-<A NAME="tools"><B><FONT SIZE=+3>C</FONT>HANGES IN THE TOOLS:</B></A>
-
-<UL>
-
- <li> New tiffcrop from Richard Nolde. Major updates to add
- significant functionality for reading and writing tile based
- images with bit depths not a multiple of 8 which cannot be
- handled by tiffcp.
-
- <li> Allow building tools with GCC using the "-Wformat
- -Werror=format-security" flags.
-
-</UL>
-
-<P><HR WIDTH=65% ALIGN=left>
-
-<!--------------------------------------------------------------------------->
-
-<A NAME="contrib"><B><FONT SIZE=+3>C</FONT>HANGES IN THE CONTRIB AREA:</B></A>
-
-<UL>
-
- <li> None
-
-</UL>
-
-Last updated $Date: 2009-08-28 18:49:02 $.
-
-</BODY>
-</HTML>
diff --git a/src/3rdparty/libtiff/libtiff/SConstruct b/src/3rdparty/libtiff/libtiff/SConstruct
deleted file mode 100644
index cb6a7cc957..0000000000
--- a/src/3rdparty/libtiff/libtiff/SConstruct
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: SConstruct,v 1.4 2007/02/24 15:03:50 dron Exp $
-
-# Tag Image File Format (TIFF) Software
-#
-# Copyright (C) 2005, Andrey Kiselev <dron@ak4719.spb.edu>
-#
-# Permission to use, copy, modify, distribute, and sell this software and
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-#
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-#
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-# OF THIS SOFTWARE.
-
-# This file contains rules to build software with the SCons tool
-# (see the http://www.scons.org/ for details on SCons).
-
-# Import globally defined options
-Import([ 'env', 'idir_lib' ])
-
-SRCS = [ \
- 'tif_aux.c', \
- 'tif_close.c', \
- 'tif_codec.c', \
- 'tif_color.c', \
- 'tif_compress.c', \
- 'tif_dir.c', \
- 'tif_dirinfo.c', \
- 'tif_dirread.c', \
- 'tif_dirwrite.c', \
- 'tif_dumpmode.c', \
- 'tif_error.c', \
- 'tif_extension.c', \
- 'tif_fax3.c', \
- 'tif_fax3sm.c', \
- 'tif_flush.c', \
- 'tif_getimage.c', \
- 'tif_jbig.c', \
- 'tif_jpeg.c', \
- 'tif_luv.c', \
- 'tif_lzw.c', \
- 'tif_next.c', \
- 'tif_ojpeg.c', \
- 'tif_open.c', \
- 'tif_packbits.c', \
- 'tif_pixarlog.c', \
- 'tif_predict.c', \
- 'tif_print.c', \
- 'tif_read.c', \
- 'tif_strip.c', \
- 'tif_swab.c', \
- 'tif_thunder.c', \
- 'tif_tile.c', \
- 'tif_unix.c', \
- 'tif_version.c', \
- 'tif_warning.c', \
- 'tif_write.c', \
- 'tif_zip.c' ]
-
-StaticLibrary('tiff', SRCS)
-SharedLibrary('tiff', SRCS)
-
diff --git a/src/3rdparty/libtiff/libtiff/libtiff.def b/src/3rdparty/libtiff/libtiff/libtiff.def
deleted file mode 100644
index 3caefd8365..0000000000
--- a/src/3rdparty/libtiff/libtiff/libtiff.def
+++ /dev/null
@@ -1,140 +0,0 @@
-EXPORTS TIFFOpen
- TIFFOpenW
- TIFFGetVersion
- TIFFCleanup
- TIFFClose
- TIFFFlush
- TIFFFlushData
- TIFFGetField
- TIFFVGetField
- TIFFGetFieldDefaulted
- TIFFVGetFieldDefaulted
- TIFFGetTagListEntry
- TIFFGetTagListCount
- TIFFReadDirectory
- TIFFScanlineSize
- TIFFStripSize
- TIFFVStripSize
- TIFFRawStripSize
- TIFFTileRowSize
- TIFFTileSize
- TIFFVTileSize
- TIFFFileno
- TIFFSetFileno
- TIFFGetMode
- TIFFIsTiled
- TIFFIsByteSwapped
- TIFFIsBigEndian
- TIFFIsMSB2LSB
- TIFFIsUpSampled
- TIFFCIELabToRGBInit
- TIFFCIELabToXYZ
- TIFFXYZToRGB
- TIFFYCbCrToRGBInit
- TIFFYCbCrtoRGB
- TIFFCurrentRow
- TIFFCurrentDirectory
- TIFFCurrentStrip
- TIFFCurrentTile
- TIFFDataWidth
- TIFFReadBufferSetup
- TIFFWriteBufferSetup
- TIFFSetupStrips
- TIFFLastDirectory
- TIFFSetDirectory
- TIFFSetSubDirectory
- TIFFUnlinkDirectory
- TIFFSetField
- TIFFVSetField
- TIFFCheckpointDirectory
- TIFFWriteDirectory
- TIFFRewriteDirectory
- TIFFPrintDirectory
- TIFFReadScanline
- TIFFWriteScanline
- TIFFReadRGBAImage
- TIFFReadRGBAImageOriented
- TIFFFdOpen
- TIFFClientOpen
- TIFFFileName
- TIFFError
- TIFFErrorExt
- TIFFWarning
- TIFFWarningExt
- TIFFSetErrorHandler
- TIFFSetErrorHandlerExt
- TIFFSetWarningHandler
- TIFFSetWarningHandlerExt
- TIFFComputeTile
- TIFFCheckTile
- TIFFNumberOfTiles
- TIFFReadTile
- TIFFWriteTile
- TIFFComputeStrip
- TIFFNumberOfStrips
- TIFFRGBAImageBegin
- TIFFRGBAImageGet
- TIFFRGBAImageEnd
- TIFFReadEncodedStrip
- TIFFReadRawStrip
- TIFFReadEncodedTile
- TIFFReadRawTile
- TIFFReadRGBATile
- TIFFReadRGBAStrip
- TIFFWriteEncodedStrip
- TIFFWriteRawStrip
- TIFFWriteEncodedTile
- TIFFWriteRawTile
- TIFFSetWriteOffset
- TIFFSwabDouble
- TIFFSwabShort
- TIFFSwabLong
- TIFFSwabArrayOfShort
- TIFFSwabArrayOfLong
- TIFFSwabArrayOfDouble
- TIFFSwabArrayOfTriples
- TIFFReverseBits
- TIFFGetBitRevTable
- TIFFDefaultStripSize
- TIFFDefaultTileSize
- TIFFRasterScanlineSize
- _TIFFmalloc
- _TIFFrealloc
- _TIFFfree
- _TIFFmemset
- _TIFFmemcpy
- _TIFFmemcmp
- TIFFCreateDirectory
- TIFFSetTagExtender
- TIFFMergeFieldInfo
- TIFFFindFieldInfo
- TIFFFindFieldInfoByName
- TIFFFieldWithName
- TIFFFieldWithTag
- TIFFCurrentDirOffset
- TIFFWriteCheck
- TIFFRGBAImageOK
- TIFFNumberOfDirectories
- TIFFSetFileName
- TIFFSetClientdata
- TIFFSetMode
- TIFFClientdata
- TIFFGetReadProc
- TIFFGetWriteProc
- TIFFGetSeekProc
- TIFFGetCloseProc
- TIFFGetSizeProc
- TIFFGetMapFileProc
- TIFFGetUnmapFileProc
- TIFFIsCODECConfigured
- TIFFGetConfiguredCODECs
- TIFFFindCODEC
- TIFFRegisterCODEC
- TIFFUnRegisterCODEC
- TIFFFreeDirectory
- TIFFReadCustomDirectory
- TIFFReadEXIFDirectory
- TIFFAccessTagMethods
- TIFFGetClientInfo
- TIFFSetClientInfo
- TIFFReassignTagToIgnore
diff --git a/src/3rdparty/libtiff/libtiff/mkg3states.c b/src/3rdparty/libtiff/libtiff/mkg3states.c
deleted file mode 100644
index dd29ec82b7..0000000000
--- a/src/3rdparty/libtiff/libtiff/mkg3states.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/* "$Id: mkg3states.c,v 1.10 2007/02/22 11:27:17 dron Exp $ */
-
-/*
- * Copyright (c) 1991-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/* Initialise fax decoder tables
- * Decoder support is derived, with permission, from the code
- * in Frank Cringle's viewfax program;
- * Copyright (C) 1990, 1995 Frank D. Cringle.
- */
-#include "tif_config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include "tif_fax3.h"
-
-#ifndef HAVE_GETOPT
-extern int getopt(int, char**, char*);
-#endif
-
-#define streq(a,b) (strcmp(a,b) == 0)
-
-/* NB: can't use names in tif_fax3.h 'cuz they are declared const */
-TIFFFaxTabEnt MainTable[128];
-TIFFFaxTabEnt WhiteTable[4096];
-TIFFFaxTabEnt BlackTable[8192];
-
-struct proto {
- uint16 code; /* right justified, lsb-first, zero filled */
- uint16 val; /* (pixel count)<<4 + code width */
-};
-
-static struct proto Pass[] = {
-{ 0x0008, 4 },
-{ 0, 0 }
-};
-
-static struct proto Horiz[] = {
-{ 0x0004, 3 },
-{ 0, 0 }
-};
-
-static struct proto V0[] = {
-{ 0x0001, 1 },
-{ 0, 0 }
-};
-
-static struct proto VR[] = {
-{ 0x0006, (1<<4)+3 },
-{ 0x0030, (2<<4)+6 },
-{ 0x0060, (3<<4)+7 },
-{ 0, 0 }
-};
-
-static struct proto VL[] = {
-{ 0x0002, (1<<4)+3 },
-{ 0x0010, (2<<4)+6 },
-{ 0x0020, (3<<4)+7 },
-{ 0, 0 }
-};
-
-static struct proto Ext[] = {
-{ 0x0040, 7 },
-{ 0, 0 }
-};
-
-static struct proto EOLV[] = {
-{ 0x0000, 7 },
-{ 0, 0 }
-};
-
-static struct proto MakeUpW[] = {
-{ 0x001b, 1029 },
-{ 0x0009, 2053 },
-{ 0x003a, 3078 },
-{ 0x0076, 4103 },
-{ 0x006c, 5128 },
-{ 0x00ec, 6152 },
-{ 0x0026, 7176 },
-{ 0x00a6, 8200 },
-{ 0x0016, 9224 },
-{ 0x00e6, 10248 },
-{ 0x0066, 11273 },
-{ 0x0166, 12297 },
-{ 0x0096, 13321 },
-{ 0x0196, 14345 },
-{ 0x0056, 15369 },
-{ 0x0156, 16393 },
-{ 0x00d6, 17417 },
-{ 0x01d6, 18441 },
-{ 0x0036, 19465 },
-{ 0x0136, 20489 },
-{ 0x00b6, 21513 },
-{ 0x01b6, 22537 },
-{ 0x0032, 23561 },
-{ 0x0132, 24585 },
-{ 0x00b2, 25609 },
-{ 0x0006, 26630 },
-{ 0x01b2, 27657 },
-{ 0, 0 }
-};
-
-static struct proto MakeUpB[] = {
-{ 0x03c0, 1034 },
-{ 0x0130, 2060 },
-{ 0x0930, 3084 },
-{ 0x0da0, 4108 },
-{ 0x0cc0, 5132 },
-{ 0x02c0, 6156 },
-{ 0x0ac0, 7180 },
-{ 0x06c0, 8205 },
-{ 0x16c0, 9229 },
-{ 0x0a40, 10253 },
-{ 0x1a40, 11277 },
-{ 0x0640, 12301 },
-{ 0x1640, 13325 },
-{ 0x09c0, 14349 },
-{ 0x19c0, 15373 },
-{ 0x05c0, 16397 },
-{ 0x15c0, 17421 },
-{ 0x0dc0, 18445 },
-{ 0x1dc0, 19469 },
-{ 0x0940, 20493 },
-{ 0x1940, 21517 },
-{ 0x0540, 22541 },
-{ 0x1540, 23565 },
-{ 0x0b40, 24589 },
-{ 0x1b40, 25613 },
-{ 0x04c0, 26637 },
-{ 0x14c0, 27661 },
-{ 0, 0 }
-};
-
-static struct proto MakeUp[] = {
-{ 0x0080, 28683 },
-{ 0x0180, 29707 },
-{ 0x0580, 30731 },
-{ 0x0480, 31756 },
-{ 0x0c80, 32780 },
-{ 0x0280, 33804 },
-{ 0x0a80, 34828 },
-{ 0x0680, 35852 },
-{ 0x0e80, 36876 },
-{ 0x0380, 37900 },
-{ 0x0b80, 38924 },
-{ 0x0780, 39948 },
-{ 0x0f80, 40972 },
-{ 0, 0 }
-};
-
-static struct proto TermW[] = {
-{ 0x00ac, 8 },
-{ 0x0038, 22 },
-{ 0x000e, 36 },
-{ 0x0001, 52 },
-{ 0x000d, 68 },
-{ 0x0003, 84 },
-{ 0x0007, 100 },
-{ 0x000f, 116 },
-{ 0x0019, 133 },
-{ 0x0005, 149 },
-{ 0x001c, 165 },
-{ 0x0002, 181 },
-{ 0x0004, 198 },
-{ 0x0030, 214 },
-{ 0x000b, 230 },
-{ 0x002b, 246 },
-{ 0x0015, 262 },
-{ 0x0035, 278 },
-{ 0x0072, 295 },
-{ 0x0018, 311 },
-{ 0x0008, 327 },
-{ 0x0074, 343 },
-{ 0x0060, 359 },
-{ 0x0010, 375 },
-{ 0x000a, 391 },
-{ 0x006a, 407 },
-{ 0x0064, 423 },
-{ 0x0012, 439 },
-{ 0x000c, 455 },
-{ 0x0040, 472 },
-{ 0x00c0, 488 },
-{ 0x0058, 504 },
-{ 0x00d8, 520 },
-{ 0x0048, 536 },
-{ 0x00c8, 552 },
-{ 0x0028, 568 },
-{ 0x00a8, 584 },
-{ 0x0068, 600 },
-{ 0x00e8, 616 },
-{ 0x0014, 632 },
-{ 0x0094, 648 },
-{ 0x0054, 664 },
-{ 0x00d4, 680 },
-{ 0x0034, 696 },
-{ 0x00b4, 712 },
-{ 0x0020, 728 },
-{ 0x00a0, 744 },
-{ 0x0050, 760 },
-{ 0x00d0, 776 },
-{ 0x004a, 792 },
-{ 0x00ca, 808 },
-{ 0x002a, 824 },
-{ 0x00aa, 840 },
-{ 0x0024, 856 },
-{ 0x00a4, 872 },
-{ 0x001a, 888 },
-{ 0x009a, 904 },
-{ 0x005a, 920 },
-{ 0x00da, 936 },
-{ 0x0052, 952 },
-{ 0x00d2, 968 },
-{ 0x004c, 984 },
-{ 0x00cc, 1000 },
-{ 0x002c, 1016 },
-{ 0, 0 }
-};
-
-static struct proto TermB[] = {
-{ 0x03b0, 10 },
-{ 0x0002, 19 },
-{ 0x0003, 34 },
-{ 0x0001, 50 },
-{ 0x0006, 67 },
-{ 0x000c, 84 },
-{ 0x0004, 100 },
-{ 0x0018, 117 },
-{ 0x0028, 134 },
-{ 0x0008, 150 },
-{ 0x0010, 167 },
-{ 0x0050, 183 },
-{ 0x0070, 199 },
-{ 0x0020, 216 },
-{ 0x00e0, 232 },
-{ 0x0030, 249 },
-{ 0x03a0, 266 },
-{ 0x0060, 282 },
-{ 0x0040, 298 },
-{ 0x0730, 315 },
-{ 0x00b0, 331 },
-{ 0x01b0, 347 },
-{ 0x0760, 363 },
-{ 0x00a0, 379 },
-{ 0x0740, 395 },
-{ 0x00c0, 411 },
-{ 0x0530, 428 },
-{ 0x0d30, 444 },
-{ 0x0330, 460 },
-{ 0x0b30, 476 },
-{ 0x0160, 492 },
-{ 0x0960, 508 },
-{ 0x0560, 524 },
-{ 0x0d60, 540 },
-{ 0x04b0, 556 },
-{ 0x0cb0, 572 },
-{ 0x02b0, 588 },
-{ 0x0ab0, 604 },
-{ 0x06b0, 620 },
-{ 0x0eb0, 636 },
-{ 0x0360, 652 },
-{ 0x0b60, 668 },
-{ 0x05b0, 684 },
-{ 0x0db0, 700 },
-{ 0x02a0, 716 },
-{ 0x0aa0, 732 },
-{ 0x06a0, 748 },
-{ 0x0ea0, 764 },
-{ 0x0260, 780 },
-{ 0x0a60, 796 },
-{ 0x04a0, 812 },
-{ 0x0ca0, 828 },
-{ 0x0240, 844 },
-{ 0x0ec0, 860 },
-{ 0x01c0, 876 },
-{ 0x0e40, 892 },
-{ 0x0140, 908 },
-{ 0x01a0, 924 },
-{ 0x09a0, 940 },
-{ 0x0d40, 956 },
-{ 0x0340, 972 },
-{ 0x05a0, 988 },
-{ 0x0660, 1004 },
-{ 0x0e60, 1020 },
-{ 0, 0 }
-};
-
-static struct proto EOLH[] = {
-{ 0x0000, 11 },
-{ 0, 0 }
-};
-
-static void
-FillTable(TIFFFaxTabEnt *T, int Size, struct proto *P, int State)
-{
- int limit = 1 << Size;
-
- while (P->val) {
- int width = P->val & 15;
- int param = P->val >> 4;
- int incr = 1 << width;
- int code;
- for (code = P->code; code < limit; code += incr) {
- TIFFFaxTabEnt *E = T+code;
- E->State = State;
- E->Width = width;
- E->Param = param;
- }
- P++;
- }
-}
-
-static char* storage_class = "";
-static char* const_class = "";
-static int packoutput = 1;
-static char* prebrace = "";
-static char* postbrace = "";
-
-void
-WriteTable(FILE* fd, const TIFFFaxTabEnt* T, int Size, const char* name)
-{
- int i;
- char* sep;
-
- fprintf(fd, "%s %s TIFFFaxTabEnt %s[%d] = {",
- storage_class, const_class, name, Size);
- if (packoutput) {
- sep = "\n";
- for (i = 0; i < Size; i++) {
- fprintf(fd, "%s%s%d,%d,%d%s",
- sep, prebrace, T->State, T->Width, (int) T->Param, postbrace);
- if (((i+1) % 10) == 0)
- sep = ",\n";
- else
- sep = ",";
- T++;
- }
- } else {
- sep = "\n ";
- for (i = 0; i < Size; i++) {
- fprintf(fd, "%s%s%3d,%3d,%4d%s",
- sep, prebrace, T->State, T->Width, (int) T->Param, postbrace);
- if (((i+1) % 6) == 0)
- sep = ",\n ";
- else
- sep = ",";
- T++;
- }
- }
- fprintf(fd, "\n};\n");
-}
-
-/* initialise the huffman code tables */
-int
-main(int argc, char* argv[])
-{
- FILE* fd;
- char* outputfile;
- int c;
- extern int optind;
- extern char* optarg;
-
- while ((c = getopt(argc, argv, "c:s:bp")) != -1)
- switch (c) {
- case 'c':
- const_class = optarg;
- break;
- case 's':
- storage_class = optarg;
- break;
- case 'p':
- packoutput = 0;
- break;
- case 'b':
- prebrace = "{";
- postbrace = "}";
- break;
- case '?':
- fprintf(stderr,
- "usage: %s [-c const] [-s storage] [-p] [-b] file\n",
- argv[0]);
- return (-1);
- }
- outputfile = optind < argc ? argv[optind] : "g3states.h";
- fd = fopen(outputfile, "w");
- if (fd == NULL) {
- fprintf(stderr, "%s: %s: Cannot create output file.\n",
- argv[0], outputfile);
- return (-2);
- }
- FillTable(MainTable, 7, Pass, S_Pass);
- FillTable(MainTable, 7, Horiz, S_Horiz);
- FillTable(MainTable, 7, V0, S_V0);
- FillTable(MainTable, 7, VR, S_VR);
- FillTable(MainTable, 7, VL, S_VL);
- FillTable(MainTable, 7, Ext, S_Ext);
- FillTable(MainTable, 7, EOLV, S_EOL);
- FillTable(WhiteTable, 12, MakeUpW, S_MakeUpW);
- FillTable(WhiteTable, 12, MakeUp, S_MakeUp);
- FillTable(WhiteTable, 12, TermW, S_TermW);
- FillTable(WhiteTable, 12, EOLH, S_EOL);
- FillTable(BlackTable, 13, MakeUpB, S_MakeUpB);
- FillTable(BlackTable, 13, MakeUp, S_MakeUp);
- FillTable(BlackTable, 13, TermB, S_TermB);
- FillTable(BlackTable, 13, EOLH, S_EOL);
-
- fprintf(fd, "/* WARNING, this file was automatically generated by the\n");
- fprintf(fd, " mkg3states program */\n");
- fprintf(fd, "#include \"tiff.h\"\n");
- fprintf(fd, "#include \"tif_fax3.h\"\n");
- WriteTable(fd, MainTable, 128, "TIFFFaxMainTable");
- WriteTable(fd, WhiteTable, 4096, "TIFFFaxWhiteTable");
- WriteTable(fd, BlackTable, 8192, "TIFFFaxBlackTable");
- fclose(fd);
- return (0);
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/t4.h b/src/3rdparty/libtiff/libtiff/t4.h
deleted file mode 100644
index 10bb17a5cb..0000000000
--- a/src/3rdparty/libtiff/libtiff/t4.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/* $Id: t4.h,v 1.1.1.1 1999/07/27 21:50:27 mike Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _T4_
-#define _T4_
-/*
- * CCITT T.4 1D Huffman runlength codes and
- * related definitions. Given the small sizes
- * of these tables it does not seem
- * worthwhile to make code & length 8 bits.
- */
-typedef struct tableentry {
- unsigned short length; /* bit length of g3 code */
- unsigned short code; /* g3 code */
- short runlen; /* run length in bits */
-} tableentry;
-
-#define EOL 0x001 /* EOL code value - 0000 0000 0000 1 */
-
-/* status values returned instead of a run length */
-#define G3CODE_EOL -1 /* NB: ACT_EOL - ACT_WRUNT */
-#define G3CODE_INVALID -2 /* NB: ACT_INVALID - ACT_WRUNT */
-#define G3CODE_EOF -3 /* end of input data */
-#define G3CODE_INCOMP -4 /* incomplete run code */
-
-/*
- * Note that these tables are ordered such that the
- * index into the table is known to be either the
- * run length, or (run length / 64) + a fixed offset.
- *
- * NB: The G3CODE_INVALID entries are only used
- * during state generation (see mkg3states.c).
- */
-#ifdef G3CODES
-const tableentry TIFFFaxWhiteCodes[] = {
- { 8, 0x35, 0 }, /* 0011 0101 */
- { 6, 0x7, 1 }, /* 0001 11 */
- { 4, 0x7, 2 }, /* 0111 */
- { 4, 0x8, 3 }, /* 1000 */
- { 4, 0xB, 4 }, /* 1011 */
- { 4, 0xC, 5 }, /* 1100 */
- { 4, 0xE, 6 }, /* 1110 */
- { 4, 0xF, 7 }, /* 1111 */
- { 5, 0x13, 8 }, /* 1001 1 */
- { 5, 0x14, 9 }, /* 1010 0 */
- { 5, 0x7, 10 }, /* 0011 1 */
- { 5, 0x8, 11 }, /* 0100 0 */
- { 6, 0x8, 12 }, /* 0010 00 */
- { 6, 0x3, 13 }, /* 0000 11 */
- { 6, 0x34, 14 }, /* 1101 00 */
- { 6, 0x35, 15 }, /* 1101 01 */
- { 6, 0x2A, 16 }, /* 1010 10 */
- { 6, 0x2B, 17 }, /* 1010 11 */
- { 7, 0x27, 18 }, /* 0100 111 */
- { 7, 0xC, 19 }, /* 0001 100 */
- { 7, 0x8, 20 }, /* 0001 000 */
- { 7, 0x17, 21 }, /* 0010 111 */
- { 7, 0x3, 22 }, /* 0000 011 */
- { 7, 0x4, 23 }, /* 0000 100 */
- { 7, 0x28, 24 }, /* 0101 000 */
- { 7, 0x2B, 25 }, /* 0101 011 */
- { 7, 0x13, 26 }, /* 0010 011 */
- { 7, 0x24, 27 }, /* 0100 100 */
- { 7, 0x18, 28 }, /* 0011 000 */
- { 8, 0x2, 29 }, /* 0000 0010 */
- { 8, 0x3, 30 }, /* 0000 0011 */
- { 8, 0x1A, 31 }, /* 0001 1010 */
- { 8, 0x1B, 32 }, /* 0001 1011 */
- { 8, 0x12, 33 }, /* 0001 0010 */
- { 8, 0x13, 34 }, /* 0001 0011 */
- { 8, 0x14, 35 }, /* 0001 0100 */
- { 8, 0x15, 36 }, /* 0001 0101 */
- { 8, 0x16, 37 }, /* 0001 0110 */
- { 8, 0x17, 38 }, /* 0001 0111 */
- { 8, 0x28, 39 }, /* 0010 1000 */
- { 8, 0x29, 40 }, /* 0010 1001 */
- { 8, 0x2A, 41 }, /* 0010 1010 */
- { 8, 0x2B, 42 }, /* 0010 1011 */
- { 8, 0x2C, 43 }, /* 0010 1100 */
- { 8, 0x2D, 44 }, /* 0010 1101 */
- { 8, 0x4, 45 }, /* 0000 0100 */
- { 8, 0x5, 46 }, /* 0000 0101 */
- { 8, 0xA, 47 }, /* 0000 1010 */
- { 8, 0xB, 48 }, /* 0000 1011 */
- { 8, 0x52, 49 }, /* 0101 0010 */
- { 8, 0x53, 50 }, /* 0101 0011 */
- { 8, 0x54, 51 }, /* 0101 0100 */
- { 8, 0x55, 52 }, /* 0101 0101 */
- { 8, 0x24, 53 }, /* 0010 0100 */
- { 8, 0x25, 54 }, /* 0010 0101 */
- { 8, 0x58, 55 }, /* 0101 1000 */
- { 8, 0x59, 56 }, /* 0101 1001 */
- { 8, 0x5A, 57 }, /* 0101 1010 */
- { 8, 0x5B, 58 }, /* 0101 1011 */
- { 8, 0x4A, 59 }, /* 0100 1010 */
- { 8, 0x4B, 60 }, /* 0100 1011 */
- { 8, 0x32, 61 }, /* 0011 0010 */
- { 8, 0x33, 62 }, /* 0011 0011 */
- { 8, 0x34, 63 }, /* 0011 0100 */
- { 5, 0x1B, 64 }, /* 1101 1 */
- { 5, 0x12, 128 }, /* 1001 0 */
- { 6, 0x17, 192 }, /* 0101 11 */
- { 7, 0x37, 256 }, /* 0110 111 */
- { 8, 0x36, 320 }, /* 0011 0110 */
- { 8, 0x37, 384 }, /* 0011 0111 */
- { 8, 0x64, 448 }, /* 0110 0100 */
- { 8, 0x65, 512 }, /* 0110 0101 */
- { 8, 0x68, 576 }, /* 0110 1000 */
- { 8, 0x67, 640 }, /* 0110 0111 */
- { 9, 0xCC, 704 }, /* 0110 0110 0 */
- { 9, 0xCD, 768 }, /* 0110 0110 1 */
- { 9, 0xD2, 832 }, /* 0110 1001 0 */
- { 9, 0xD3, 896 }, /* 0110 1001 1 */
- { 9, 0xD4, 960 }, /* 0110 1010 0 */
- { 9, 0xD5, 1024 }, /* 0110 1010 1 */
- { 9, 0xD6, 1088 }, /* 0110 1011 0 */
- { 9, 0xD7, 1152 }, /* 0110 1011 1 */
- { 9, 0xD8, 1216 }, /* 0110 1100 0 */
- { 9, 0xD9, 1280 }, /* 0110 1100 1 */
- { 9, 0xDA, 1344 }, /* 0110 1101 0 */
- { 9, 0xDB, 1408 }, /* 0110 1101 1 */
- { 9, 0x98, 1472 }, /* 0100 1100 0 */
- { 9, 0x99, 1536 }, /* 0100 1100 1 */
- { 9, 0x9A, 1600 }, /* 0100 1101 0 */
- { 6, 0x18, 1664 }, /* 0110 00 */
- { 9, 0x9B, 1728 }, /* 0100 1101 1 */
- { 11, 0x8, 1792 }, /* 0000 0001 000 */
- { 11, 0xC, 1856 }, /* 0000 0001 100 */
- { 11, 0xD, 1920 }, /* 0000 0001 101 */
- { 12, 0x12, 1984 }, /* 0000 0001 0010 */
- { 12, 0x13, 2048 }, /* 0000 0001 0011 */
- { 12, 0x14, 2112 }, /* 0000 0001 0100 */
- { 12, 0x15, 2176 }, /* 0000 0001 0101 */
- { 12, 0x16, 2240 }, /* 0000 0001 0110 */
- { 12, 0x17, 2304 }, /* 0000 0001 0111 */
- { 12, 0x1C, 2368 }, /* 0000 0001 1100 */
- { 12, 0x1D, 2432 }, /* 0000 0001 1101 */
- { 12, 0x1E, 2496 }, /* 0000 0001 1110 */
- { 12, 0x1F, 2560 }, /* 0000 0001 1111 */
- { 12, 0x1, G3CODE_EOL }, /* 0000 0000 0001 */
- { 9, 0x1, G3CODE_INVALID }, /* 0000 0000 1 */
- { 10, 0x1, G3CODE_INVALID }, /* 0000 0000 01 */
- { 11, 0x1, G3CODE_INVALID }, /* 0000 0000 001 */
- { 12, 0x0, G3CODE_INVALID }, /* 0000 0000 0000 */
-};
-
-const tableentry TIFFFaxBlackCodes[] = {
- { 10, 0x37, 0 }, /* 0000 1101 11 */
- { 3, 0x2, 1 }, /* 010 */
- { 2, 0x3, 2 }, /* 11 */
- { 2, 0x2, 3 }, /* 10 */
- { 3, 0x3, 4 }, /* 011 */
- { 4, 0x3, 5 }, /* 0011 */
- { 4, 0x2, 6 }, /* 0010 */
- { 5, 0x3, 7 }, /* 0001 1 */
- { 6, 0x5, 8 }, /* 0001 01 */
- { 6, 0x4, 9 }, /* 0001 00 */
- { 7, 0x4, 10 }, /* 0000 100 */
- { 7, 0x5, 11 }, /* 0000 101 */
- { 7, 0x7, 12 }, /* 0000 111 */
- { 8, 0x4, 13 }, /* 0000 0100 */
- { 8, 0x7, 14 }, /* 0000 0111 */
- { 9, 0x18, 15 }, /* 0000 1100 0 */
- { 10, 0x17, 16 }, /* 0000 0101 11 */
- { 10, 0x18, 17 }, /* 0000 0110 00 */
- { 10, 0x8, 18 }, /* 0000 0010 00 */
- { 11, 0x67, 19 }, /* 0000 1100 111 */
- { 11, 0x68, 20 }, /* 0000 1101 000 */
- { 11, 0x6C, 21 }, /* 0000 1101 100 */
- { 11, 0x37, 22 }, /* 0000 0110 111 */
- { 11, 0x28, 23 }, /* 0000 0101 000 */
- { 11, 0x17, 24 }, /* 0000 0010 111 */
- { 11, 0x18, 25 }, /* 0000 0011 000 */
- { 12, 0xCA, 26 }, /* 0000 1100 1010 */
- { 12, 0xCB, 27 }, /* 0000 1100 1011 */
- { 12, 0xCC, 28 }, /* 0000 1100 1100 */
- { 12, 0xCD, 29 }, /* 0000 1100 1101 */
- { 12, 0x68, 30 }, /* 0000 0110 1000 */
- { 12, 0x69, 31 }, /* 0000 0110 1001 */
- { 12, 0x6A, 32 }, /* 0000 0110 1010 */
- { 12, 0x6B, 33 }, /* 0000 0110 1011 */
- { 12, 0xD2, 34 }, /* 0000 1101 0010 */
- { 12, 0xD3, 35 }, /* 0000 1101 0011 */
- { 12, 0xD4, 36 }, /* 0000 1101 0100 */
- { 12, 0xD5, 37 }, /* 0000 1101 0101 */
- { 12, 0xD6, 38 }, /* 0000 1101 0110 */
- { 12, 0xD7, 39 }, /* 0000 1101 0111 */
- { 12, 0x6C, 40 }, /* 0000 0110 1100 */
- { 12, 0x6D, 41 }, /* 0000 0110 1101 */
- { 12, 0xDA, 42 }, /* 0000 1101 1010 */
- { 12, 0xDB, 43 }, /* 0000 1101 1011 */
- { 12, 0x54, 44 }, /* 0000 0101 0100 */
- { 12, 0x55, 45 }, /* 0000 0101 0101 */
- { 12, 0x56, 46 }, /* 0000 0101 0110 */
- { 12, 0x57, 47 }, /* 0000 0101 0111 */
- { 12, 0x64, 48 }, /* 0000 0110 0100 */
- { 12, 0x65, 49 }, /* 0000 0110 0101 */
- { 12, 0x52, 50 }, /* 0000 0101 0010 */
- { 12, 0x53, 51 }, /* 0000 0101 0011 */
- { 12, 0x24, 52 }, /* 0000 0010 0100 */
- { 12, 0x37, 53 }, /* 0000 0011 0111 */
- { 12, 0x38, 54 }, /* 0000 0011 1000 */
- { 12, 0x27, 55 }, /* 0000 0010 0111 */
- { 12, 0x28, 56 }, /* 0000 0010 1000 */
- { 12, 0x58, 57 }, /* 0000 0101 1000 */
- { 12, 0x59, 58 }, /* 0000 0101 1001 */
- { 12, 0x2B, 59 }, /* 0000 0010 1011 */
- { 12, 0x2C, 60 }, /* 0000 0010 1100 */
- { 12, 0x5A, 61 }, /* 0000 0101 1010 */
- { 12, 0x66, 62 }, /* 0000 0110 0110 */
- { 12, 0x67, 63 }, /* 0000 0110 0111 */
- { 10, 0xF, 64 }, /* 0000 0011 11 */
- { 12, 0xC8, 128 }, /* 0000 1100 1000 */
- { 12, 0xC9, 192 }, /* 0000 1100 1001 */
- { 12, 0x5B, 256 }, /* 0000 0101 1011 */
- { 12, 0x33, 320 }, /* 0000 0011 0011 */
- { 12, 0x34, 384 }, /* 0000 0011 0100 */
- { 12, 0x35, 448 }, /* 0000 0011 0101 */
- { 13, 0x6C, 512 }, /* 0000 0011 0110 0 */
- { 13, 0x6D, 576 }, /* 0000 0011 0110 1 */
- { 13, 0x4A, 640 }, /* 0000 0010 0101 0 */
- { 13, 0x4B, 704 }, /* 0000 0010 0101 1 */
- { 13, 0x4C, 768 }, /* 0000 0010 0110 0 */
- { 13, 0x4D, 832 }, /* 0000 0010 0110 1 */
- { 13, 0x72, 896 }, /* 0000 0011 1001 0 */
- { 13, 0x73, 960 }, /* 0000 0011 1001 1 */
- { 13, 0x74, 1024 }, /* 0000 0011 1010 0 */
- { 13, 0x75, 1088 }, /* 0000 0011 1010 1 */
- { 13, 0x76, 1152 }, /* 0000 0011 1011 0 */
- { 13, 0x77, 1216 }, /* 0000 0011 1011 1 */
- { 13, 0x52, 1280 }, /* 0000 0010 1001 0 */
- { 13, 0x53, 1344 }, /* 0000 0010 1001 1 */
- { 13, 0x54, 1408 }, /* 0000 0010 1010 0 */
- { 13, 0x55, 1472 }, /* 0000 0010 1010 1 */
- { 13, 0x5A, 1536 }, /* 0000 0010 1101 0 */
- { 13, 0x5B, 1600 }, /* 0000 0010 1101 1 */
- { 13, 0x64, 1664 }, /* 0000 0011 0010 0 */
- { 13, 0x65, 1728 }, /* 0000 0011 0010 1 */
- { 11, 0x8, 1792 }, /* 0000 0001 000 */
- { 11, 0xC, 1856 }, /* 0000 0001 100 */
- { 11, 0xD, 1920 }, /* 0000 0001 101 */
- { 12, 0x12, 1984 }, /* 0000 0001 0010 */
- { 12, 0x13, 2048 }, /* 0000 0001 0011 */
- { 12, 0x14, 2112 }, /* 0000 0001 0100 */
- { 12, 0x15, 2176 }, /* 0000 0001 0101 */
- { 12, 0x16, 2240 }, /* 0000 0001 0110 */
- { 12, 0x17, 2304 }, /* 0000 0001 0111 */
- { 12, 0x1C, 2368 }, /* 0000 0001 1100 */
- { 12, 0x1D, 2432 }, /* 0000 0001 1101 */
- { 12, 0x1E, 2496 }, /* 0000 0001 1110 */
- { 12, 0x1F, 2560 }, /* 0000 0001 1111 */
- { 12, 0x1, G3CODE_EOL }, /* 0000 0000 0001 */
- { 9, 0x1, G3CODE_INVALID }, /* 0000 0000 1 */
- { 10, 0x1, G3CODE_INVALID }, /* 0000 0000 01 */
- { 11, 0x1, G3CODE_INVALID }, /* 0000 0000 001 */
- { 12, 0x0, G3CODE_INVALID }, /* 0000 0000 0000 */
-};
-#else
-extern const tableentry TIFFFaxWhiteCodes[];
-extern const tableentry TIFFFaxBlackCodes[];
-#endif
-#endif /* _T4_ */
diff --git a/src/3rdparty/libtiff/libtiff/tif_acorn.c b/src/3rdparty/libtiff/libtiff/tif_acorn.c
deleted file mode 100644
index 478390fc59..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_acorn.c
+++ /dev/null
@@ -1,519 +0,0 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_acorn.c,v 1.2 2005/12/21 12:23:13 joris Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library RISC OS specific Routines.
- * Developed out of the Unix version.
- * Peter Greenham, May 1995
- */
-#include "tiffiop.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-/*
-Low-level file handling
-~~~~~~~~~~~~~~~~~~~~~~~
-The functions in osfcn.h are unavailable when compiling under C, as it's a
-C++ header. Therefore they have been implemented here.
-
-Now, why have I done it this way?
-
-The definitive API library for RISC OS is Jonathan Coxhead's OSLib, which
-uses heavily optimised ARM assembler or even plain inline SWI calls for
-maximum performance and minimum runtime size. However, I don't want to make
-LIBTIFF need that to survive. Therefore I have also emulated the functions
-using macros to _swi() and _swix() defined in the swis.h header, and
-borrowing types from kernel.h, which is less efficient but doesn't need any
-third-party libraries.
- */
-
-#ifdef INCLUDE_OSLIB
-
-#include "osfile.h"
-#include "osgbpb.h"
-#include "osargs.h"
-#include "osfind.h"
-
-#else
-
-/* OSLIB EMULATION STARTS */
-
-#include "kernel.h"
-#include "swis.h"
-
-/* From oslib:types.h */
-typedef unsigned int bits;
-typedef unsigned char byte;
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifndef NULL
-#define NULL 0
-#endif
-#ifndef SKIP
-#define SKIP 0
-#endif
-
-/* From oslib:os.h */
-typedef _kernel_oserror os_error;
-typedef byte os_f;
-
-/* From oslib:osfile.h */
-#undef OS_File
-#define OS_File 0x8
-
-/* From oslib:osgbpb.h */
-#undef OS_GBPB
-#define OS_GBPB 0xC
-#undef OSGBPB_Write
-#define OSGBPB_Write 0x2
-#undef OSGBPB_Read
-#define OSGBPB_Read 0x4
-
-extern os_error *xosgbpb_write (os_f file,
- byte *data,
- int size,
- int *unwritten);
-extern int osgbpb_write (os_f file,
- byte *data,
- int size);
-
-#define xosgbpb_write(file, data, size, unwritten) \
- (os_error*) _swix(OS_GBPB, _IN(0)|_IN(1)|_IN(2)|_IN(3)|_IN(4)|_OUT(3), \
- OSGBPB_WriteAt, \
- file, \
- data, \
- size, \
- unwritten)
-
-#define osgbpb_write(file, data, size) \
- _swi(OS_GBPB, _IN(0)|_IN(1)|_IN(2)|_IN(3)|_RETURN(3), \
- OSGBPB_Write, \
- file, \
- data, \
- size)
-
-extern os_error *xosgbpb_read (os_f file,
- byte *buffer,
- int size,
- int *unread);
-extern int osgbpb_read (os_f file,
- byte *buffer,
- int size);
-
-#define xosgbpb_read(file, buffer, size, unread) \
- (os_error*) _swix(OS_GBPB, _IN(0)|_IN(1)|_IN(2)|_IN(3)|_OUT(3), \
- OSGBPB_Read, \
- file, \
- buffer, \
- size, \
- unread)
-
-#define osgbpb_read(file, buffer, size) \
- _swi(OS_GBPB, _IN(0)|_IN(1)|_IN(2)|_IN(3)|_RETURN(3), \
- OSGBPB_Read, \
- file, \
- buffer, \
- size)
-
-/* From oslib:osfind.h */
-#undef OS_Find
-#define OS_Find 0xD
-#undef OSFind_Openin
-#define OSFind_Openin 0x40
-#undef OSFind_Openout
-#define OSFind_Openout 0x80
-#undef OSFind_Openup
-#define OSFind_Openup 0xC0
-#undef OSFind_Close
-#define OSFind_Close 0x0
-
-#define xosfind_open(reason, file_name, path, file) \
- (os_error*) _swix(OS_Find, _IN(0)|_IN(1)|_IN(2)|_OUT(0), \
- reason, file_name, path, file)
-
-#define osfind_open(reason, file_name, path) \
- (os_f) _swi(OS_Find, _IN(0)|_IN(1)|_IN(2)|_RETURN(0), \
- reason, file_name, path)
-
-extern os_error *xosfind_openin (bits flags,
- char *file_name,
- char *path,
- os_f *file);
-extern os_f osfind_openin (bits flags,
- char *file_name,
- char *path);
-
-#define xosfind_openin(flags, file_name, path, file) \
- xosfind_open(flags | OSFind_Openin, file_name, path, file)
-
-#define osfind_openin(flags, file_name, path) \
- osfind_open(flags | OSFind_Openin, file_name, path)
-
-extern os_error *xosfind_openout (bits flags,
- char *file_name,
- char *path,
- os_f *file);
-extern os_f osfind_openout (bits flags,
- char *file_name,
- char *path);
-
-#define xosfind_openout(flags, file_name, path, file) \
- xosfind_open(flags | OSFind_Openout, file_name, path, file)
-
-#define osfind_openout(flags, file_name, path) \
- osfind_open(flags | OSFind_Openout, file_name, path)
-
-extern os_error *xosfind_openup (bits flags,
- char *file_name,
- char *path,
- os_f *file);
-extern os_f osfind_openup (bits flags,
- char *file_name,
- char *path);
-
-#define xosfind_openup(flags, file_name, path, file) \
- xosfind_open(flags | OSFind_Openup, file_name, path, file)
-
-#define osfind_openup(flags, file_name, path) \
- osfind_open(flags | OSFind_Openup, file_name, path)
-
-extern os_error *xosfind_close (os_f file);
-extern void osfind_close (os_f file);
-
-#define xosfind_close(file) \
- (os_error*) _swix(OS_Find, _IN(0)|_IN(1), \
- OSFind_Close, \
- file)
-
-#define osfind_close(file) \
- (void) _swi(OS_Find, _IN(0)|_IN(1), \
- OSFind_Close, \
- file)
-
-/* From oslib:osargs.h */
-#undef OS_Args
-#define OS_Args 0x9
-#undef OSArgs_ReadPtr
-#define OSArgs_ReadPtr 0x0
-#undef OSArgs_SetPtr
-#define OSArgs_SetPtr 0x1
-#undef OSArgs_ReadExt
-#define OSArgs_ReadExt 0x2
-
-extern os_error *xosargs_read_ptr (os_f file,
- int *ptr);
-extern int osargs_read_ptr (os_f file);
-
-#define xosargs_read_ptr(file, ptr) \
- (os_error*) _swix(OS_Args, _IN(0)|_IN(1)|_OUT(2), \
- OSArgs_ReadPtr, \
- file, \
- ptr)
-
-#define osargs_read_ptr(file) \
- _swi(OS_Args, _IN(0)|_IN(1)|_RETURN(2), \
- OSArgs_ReadPtr, \
- file)
-
-extern os_error *xosargs_set_ptr (os_f file,
- int ptr);
-extern void osargs_set_ptr (os_f file,
- int ptr);
-
-#define xosargs_set_ptr(file, ptr) \
- (os_error*) _swix(OS_Args, _IN(0)|_IN(1)|_IN(2), \
- OSArgs_SetPtr, \
- file, \
- ptr)
-
-#define osargs_set_ptr(file, ptr) \
- (void) _swi(OS_Args, _IN(0)|_IN(1)|_IN(2), \
- OSArgs_SetPtr, \
- file, \
- ptr)
-
-extern os_error *xosargs_read_ext (os_f file,
- int *ext);
-extern int osargs_read_ext (os_f file);
-
-#define xosargs_read_ext(file, ext) \
- (os_error*) _swix(OS_Args, _IN(0)|_IN(1)|_OUT(2), \
- OSArgs_ReadExt, \
- file, \
- ext)
-
-#define osargs_read_ext(file) \
- _swi(OS_Args, _IN(0)|_IN(1)|_RETURN(2), \
- OSArgs_ReadExt, \
- file)
-
-/* OSLIB EMULATION ENDS */
-
-#endif
-
-#ifndef __osfcn_h
-/* Will be set or not during tiffcomp.h */
-/* You get this to compile under C++? Please say how! */
-
-extern int open(const char* name, int flags, int mode)
-{
- /* From what I can tell, should return <0 for failure */
- os_error* e = (os_error*) 1; /* Cheeky way to use a pointer eh? :-) */
- os_f file = (os_f) -1;
-
- flags = flags;
-
- switch(mode)
- {
- case O_RDONLY:
- {
- e = xosfind_openin(SKIP, name, SKIP, &file);
- break;
- }
- case O_WRONLY:
- case O_RDWR|O_CREAT:
- case O_RDWR|O_CREAT|O_TRUNC:
- {
- e = xosfind_openout(SKIP, name, SKIP, &file);
- break;
- }
- case O_RDWR:
- {
- e = xosfind_openup(SKIP, name, SKIP, &file);
- break;
- }
- }
- if (e)
- {
- file = (os_f) -1;
- }
- return (file);
-}
-
-extern int close(int fd)
-{
- return ((int) xosfind_close((os_f) fd));
-}
-
-extern int write(int fd, const char *buf, int nbytes)
-{
- /* Returns number of bytes written */
- return (nbytes - osgbpb_write((os_f) fd, (const byte*) buf, nbytes));
-}
-
-extern int read(int fd, char *buf, int nbytes)
-{
- /* Returns number of bytes read */
- return (nbytes - osgbpb_read((os_f) fd, (byte*) buf, nbytes));
-}
-
-extern off_t lseek(int fd, off_t offset, int whence)
-{
- int absolute = 0;
-
- switch (whence)
- {
- case SEEK_SET:
- {
- absolute = (int) offset;
- break;
- }
- case SEEK_CUR:
- {
- absolute = osargs_read_ptr((os_f) fd) + (int) offset;
- break;
- }
- case SEEK_END:
- {
- absolute = osargs_read_ext((os_f) fd) + (int) offset;
- break;
- }
- }
-
- osargs_set_ptr((os_f) fd, absolute);
-
- return ((off_t) osargs_read_ptr((os_f) fd));
-}
-#endif
-
-static tsize_t
-_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- return ((tsize_t) read((int) fd, buf, (size_t) size));
-}
-
-static tsize_t
-_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- return ((tsize_t) write((int) fd, buf, (size_t) size));
-}
-
-static toff_t
-_tiffSeekProc(thandle_t fd, toff_t off, int whence)
-{
- return ((toff_t) lseek((int) fd, (off_t) off, whence));
-}
-
-static int
-_tiffCloseProc(thandle_t fd)
-{
- return (close((int) fd));
-}
-
-static toff_t
-_tiffSizeProc(thandle_t fd)
-{
- return (lseek((int) fd, SEEK_END, SEEK_SET));
-}
-
-#ifdef HAVE_MMAP
-#error "I didn't know Acorn had that!"
-#endif
-
-/* !HAVE_MMAP */
-static int
-_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
-{
- (void) fd; (void) pbase; (void) psize;
- return (0);
-}
-
-static void
-_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
-{
- (void) fd; (void) base; (void) size;
-}
-
-/*
- * Open a TIFF file descriptor for read/writing.
- */
-TIFF*
-TIFFFdOpen(int fd, const char* name, const char* mode)
-{
- TIFF* tif;
-
- tif = TIFFClientOpen(name, mode,
- (thandle_t) fd,
- _tiffReadProc, _tiffWriteProc,
- _tiffSeekProc, _tiffCloseProc, _tiffSizeProc,
- _tiffMapProc, _tiffUnmapProc);
- if (tif)
- {
- tif->tif_fd = fd;
- }
- return (tif);
-}
-
-/*
- * Open a TIFF file for read/writing.
- */
-TIFF*
-TIFFOpen(const char* name, const char* mode)
-{
- static const char module[] = "TIFFOpen";
- int m, fd;
-
- m = _TIFFgetMode(mode, module);
-
- if (m == -1)
- {
- return ((TIFF*) 0);
- }
-
- fd = open(name, 0, m);
-
- if (fd < 0)
- {
- TIFFErrorExt(0, module, "%s: Cannot open", name);
- return ((TIFF *)0);
- }
- return (TIFFFdOpen(fd, name, mode));
-}
-
-void*
-_TIFFmalloc(tsize_t s)
-{
- return (malloc((size_t) s));
-}
-
-void
-_TIFFfree(tdata_t p)
-{
- free(p);
-}
-
-void*
-_TIFFrealloc(tdata_t p, tsize_t s)
-{
- return (realloc(p, (size_t) s));
-}
-
-void
-_TIFFmemset(tdata_t p, int v, tsize_t c)
-{
- memset(p, v, (size_t) c);
-}
-
-void
-_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
-{
- memcpy(d, s, (size_t) c);
-}
-
-int
-_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
-{
- return (memcmp(p1, p2, (size_t) c));
-}
-
-static void
-acornWarningHandler(const char* module, const char* fmt, va_list ap)
-{
- if (module != NULL)
- {
- fprintf(stderr, "%s: ", module);
- }
- fprintf(stderr, "Warning, ");
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-}
-TIFFErrorHandler _TIFFwarningHandler = acornWarningHandler;
-
-static void
-acornErrorHandler(const char* module, const char* fmt, va_list ap)
-{
- if (module != NULL)
- {
- fprintf(stderr, "%s: ", module);
- }
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-}
-TIFFErrorHandler _TIFFerrorHandler = acornErrorHandler;
diff --git a/src/3rdparty/libtiff/libtiff/tif_apple.c b/src/3rdparty/libtiff/libtiff/tif_apple.c
deleted file mode 100644
index 47e0e0767f..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_apple.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_apple.c,v 1.3 2005/12/21 12:23:13 joris Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library Macintosh-specific routines.
- *
- * These routines use only Toolbox and high-level File Manager traps.
- * They make no calls to the THINK C "unix" compatibility library. Also,
- * malloc is not used directly but it is still referenced internally by
- * the ANSI library in rare cases. Heap fragmentation by the malloc ring
- * buffer is therefore minimized.
- *
- * O_RDONLY and O_RDWR are treated identically here. The tif_mode flag is
- * checked in TIFFWriteCheck().
- *
- * Create below fills in a blank creator signature and sets the file type
- * to 'TIFF'. It is much better for the application to do this by Create'ing
- * the file first and TIFFOpen'ing it later.
- * ---------
- * This code has been "Carbonized", and may not work with older MacOS versions.
- * If so, grab the tif_apple.c out of an older libtiff distribution, like
- * 3.5.5 from www.libtiff.org.
- */
-
-#include "tiffiop.h"
-#include <Errors.h>
-#include <Files.h>
-#include <Memory.h>
-#include <Script.h>
-
-#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__) || defined(applec)
-#define CtoPstr c2pstr
-#endif
-
-static tsize_t
-_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- return (FSRead((short) fd, (long*) &size, (char*) buf) == noErr ?
- size : (tsize_t) -1);
-}
-
-static tsize_t
-_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- return (FSWrite((short) fd, (long*) &size, (char*) buf) == noErr ?
- size : (tsize_t) -1);
-}
-
-static toff_t
-_tiffSeekProc(thandle_t fd, toff_t off, int whence)
-{
- long fpos, size;
-
- if (GetEOF((short) fd, &size) != noErr)
- return EOF;
- (void) GetFPos((short) fd, &fpos);
-
- switch (whence) {
- case SEEK_CUR:
- if (off + fpos > size)
- SetEOF((short) fd, off + fpos);
- if (SetFPos((short) fd, fsFromMark, off) != noErr)
- return EOF;
- break;
- case SEEK_END:
- if (off > 0)
- SetEOF((short) fd, off + size);
- if (SetFPos((short) fd, fsFromStart, off + size) != noErr)
- return EOF;
- break;
- case SEEK_SET:
- if (off > size)
- SetEOF((short) fd, off);
- if (SetFPos((short) fd, fsFromStart, off) != noErr)
- return EOF;
- break;
- }
-
- return (toff_t)(GetFPos((short) fd, &fpos) == noErr ? fpos : EOF);
-}
-
-static int
-_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
-{
- return (0);
-}
-
-static void
-_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
-{
-}
-
-static int
-_tiffCloseProc(thandle_t fd)
-{
- return (FSClose((short) fd));
-}
-
-static toff_t
-_tiffSizeProc(thandle_t fd)
-{
- long size;
-
- if (GetEOF((short) fd, &size) != noErr) {
- TIFFErrorExt(fd, "_tiffSizeProc", "%s: Cannot get file size");
- return (-1L);
- }
- return ((toff_t) size);
-}
-
-/*
- * Open a TIFF file descriptor for read/writing.
- */
-TIFF*
-TIFFFdOpen(int fd, const char* name, const char* mode)
-{
- TIFF* tif;
-
- tif = TIFFClientOpen(name, mode, (thandle_t) fd,
- _tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
- _tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
- if (tif)
- tif->tif_fd = fd;
- return (tif);
-}
-
-static void ourc2pstr( char* inString )
-{
- int sLen = strlen( inString );
- BlockMoveData( inString, &inString[1], sLen );
- inString[0] = sLen;
-}
-
-/*
- * Open a TIFF file for read/writing.
- */
-TIFF*
-TIFFOpen(const char* name, const char* mode)
-{
- static const char module[] = "TIFFOpen";
- Str255 pname;
- FInfo finfo;
- short fref;
- OSErr err;
- FSSpec fSpec;
-
- strcpy((char*) pname, name);
- ourc2pstr((char*) pname);
-
- err = FSMakeFSSpec( 0, 0, pname, &fSpec );
-
- switch (_TIFFgetMode(mode, module)) {
- default:
- return ((TIFF*) 0);
- case O_RDWR | O_CREAT | O_TRUNC:
- if (FSpGetFInfo(&fSpec, &finfo) == noErr)
- FSpDelete(&fSpec);
- /* fall through */
- case O_RDWR | O_CREAT:
- if ((err = FSpGetFInfo(&fSpec, &finfo)) == fnfErr) {
- if (FSpCreate(&fSpec, ' ', 'TIFF', smSystemScript) != noErr)
- goto badCreate;
- if (FSpOpenDF(&fSpec, fsRdWrPerm, &fref) != noErr)
- goto badOpen;
- } else if (err == noErr) {
- if (FSpOpenDF(&fSpec, fsRdWrPerm, &fref) != noErr)
- goto badOpen;
- } else
- goto badOpen;
- break;
- case O_RDONLY:
- if (FSpOpenDF(&fSpec, fsRdPerm, &fref) != noErr)
- goto badOpen;
- break;
- case O_RDWR:
- if (FSpOpenDF(&fSpec, fsRdWrPerm, &fref) != noErr)
- goto badOpen;
- break;
- }
- return (TIFFFdOpen((int) fref, name, mode));
-badCreate:
- TIFFErrorExt(0, module, "%s: Cannot create", name);
- return ((TIFF*) 0);
-badOpen:
- TIFFErrorExt(0, module, "%s: Cannot open", name);
- return ((TIFF*) 0);
-}
-
-void
-_TIFFmemset(tdata_t p, int v, tsize_t c)
-{
- memset(p, v, (size_t) c);
-}
-
-void
-_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
-{
- memcpy(d, s, (size_t) c);
-}
-
-int
-_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
-{
- return (memcmp(p1, p2, (size_t) c));
-}
-
-tdata_t
-_TIFFmalloc(tsize_t s)
-{
- return (NewPtr((size_t) s));
-}
-
-void
-_TIFFfree(tdata_t p)
-{
- DisposePtr(p);
-}
-
-tdata_t
-_TIFFrealloc(tdata_t p, tsize_t s)
-{
- Ptr n = p;
-
- SetPtrSize(p, (size_t) s);
- if (MemError() && (n = NewPtr((size_t) s)) != NULL) {
- BlockMove(p, n, GetPtrSize(p));
- DisposePtr(p);
- }
- return ((tdata_t) n);
-}
-
-static void
-appleWarningHandler(const char* module, const char* fmt, va_list ap)
-{
- if (module != NULL)
- fprintf(stderr, "%s: ", module);
- fprintf(stderr, "Warning, ");
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-}
-TIFFErrorHandler _TIFFwarningHandler = appleWarningHandler;
-
-static void
-appleErrorHandler(const char* module, const char* fmt, va_list ap)
-{
- if (module != NULL)
- fprintf(stderr, "%s: ", module);
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-}
-TIFFErrorHandler _TIFFerrorHandler = appleErrorHandler;
diff --git a/src/3rdparty/libtiff/libtiff/tif_atari.c b/src/3rdparty/libtiff/libtiff/tif_atari.c
deleted file mode 100644
index a519fa4426..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_atari.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/* "$Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_atari.c,v 1.2 2005/12/21 12:23:13 joris Exp $" */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library ATARI-specific Routines.
- */
-#include "tiffiop.h"
-#if defined(__TURBOC__)
-#include <tos.h>
-#include <stdio.h>
-#else
-#include <osbind.h>
-#include <fcntl.h>
-#endif
-
-#ifndef O_ACCMODE
-#define O_ACCMODE 3
-#endif
-
-#include <errno.h>
-
-#define AEFILNF -33
-
-static tsize_t
-_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- long r;
-
- r = Fread((int) fd, size, buf);
- if (r < 0) {
- errno = (int)-r;
- r = -1;
- }
- return r;
-}
-
-static tsize_t
-_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- long r;
-
- r = Fwrite((int) fd, size, buf);
- if (r < 0) {
- errno = (int)-r;
- r = -1;
- }
- return r;
-}
-
-static toff_t
-_tiffSeekProc(thandle_t fd, off_t off, int whence)
-{
- char buf[256];
- long current_off, expected_off, new_off;
-
- if (whence == SEEK_END || off <= 0)
- return Fseek(off, (int) fd, whence);
- current_off = Fseek(0, (int) fd, SEEK_CUR); /* find out where we are */
- if (whence == SEEK_SET)
- expected_off = off;
- else
- expected_off = off + current_off;
- new_off = Fseek(off, (int) fd, whence);
- if (new_off == expected_off)
- return new_off;
- /* otherwise extend file -- zero filling the hole */
- if (new_off < 0) /* error? */
- new_off = Fseek(0, (int) fd, SEEK_END); /* go to eof */
- _TIFFmemset(buf, 0, sizeof(buf));
- while (expected_off > new_off) {
- off = expected_off - new_off;
- if (off > sizeof(buf))
- off = sizeof(buf);
- if ((current_off = Fwrite((int) fd, off, buf)) != off)
- return (current_off > 0) ?
- new_off + current_off : new_off;
- new_off += off;
- }
- return new_off;
-}
-
-static int
-_tiffCloseProc(thandle_t fd)
-{
- long r;
-
- r = Fclose((int) fd);
- if (r < 0) {
- errno = (int)-r;
- r = -1;
- }
- return (int)r;
-}
-
-static toff_t
-_tiffSizeProc(thandle_t fd)
-{
- long pos, eof;
-
- pos = Fseek(0, (int) fd, SEEK_CUR);
- eof = Fseek(0, (int) fd, SEEK_END);
- Fseek(pos, (int) fd, SEEK_SET);
- return eof;
-}
-
-static int
-_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
-{
- return (0);
-}
-
-static void
-_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
-{
-}
-
-/*
-* Open a TIFF file descriptor for read/writing.
-*/
-TIFF*
-TIFFFdOpen(int fd, const char* name, const char* mode)
-{
- TIFF* tif;
-
- tif = TIFFClientOpen(name, mode,
- (thandle_t) fd,
- _tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
- _tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
- if (tif)
- tif->tif_fd = fd;
- return (tif);
-}
-
-/*
-* Open a TIFF file for read/writing.
-*/
-TIFF*
-TIFFOpen(const char* name, const char* mode)
-{
- static const char module[] = "TIFFOpen";
- int m;
- long fd;
-
- m = _TIFFgetMode(mode, module);
- if (m == -1)
- return ((TIFF*)0);
- if (m & O_TRUNC) {
- fd = Fcreate(name, 0);
- } else {
- fd = Fopen(name, m & O_ACCMODE);
- if (fd == AEFILNF && m & O_CREAT)
- fd = Fcreate(name, 0);
- }
- if (fd < 0)
- errno = (int)fd;
- if (fd < 0) {
- TIFFErrorExt(0, module, "%s: Cannot open", name);
- return ((TIFF*)0);
- }
- return (TIFFFdOpen(fd, name, mode));
-}
-
-#include <stdlib.h>
-
-tdata_t
-_TIFFmalloc(tsize_t s)
-{
- return (malloc((size_t) s));
-}
-
-void
-_TIFFfree(tdata_t p)
-{
- free(p);
-}
-
-tdata_t
-_TIFFrealloc(tdata_t p, tsize_t s)
-{
- return (realloc(p, (size_t) s));
-}
-
-void
-_TIFFmemset(tdata_t p, int v, size_t c)
-{
- memset(p, v, (size_t) c);
-}
-
-void
-_TIFFmemcpy(tdata_t d, const tdata_t s, size_t c)
-{
- memcpy(d, s, (size_t) c);
-}
-
-int
-_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
-{
- return (memcmp(p1, p2, (size_t) c));
-}
-
-static void
-atariWarningHandler(const char* module, const char* fmt, va_list ap)
-{
- if (module != NULL)
- fprintf(stderr, "%s: ", module);
- fprintf(stderr, "Warning, ");
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-}
-TIFFErrorHandler _TIFFwarningHandler = atariWarningHandler;
-
-static void
-atariErrorHandler(const char* module, const char* fmt, va_list ap)
-{
- if (module != NULL)
- fprintf(stderr, "%s: ", module);
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-}
-TIFFErrorHandler _TIFFerrorHandler = atariErrorHandler;
diff --git a/src/3rdparty/libtiff/libtiff/tif_aux.c b/src/3rdparty/libtiff/libtiff/tif_aux.c
deleted file mode 100644
index 43d591b38a..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_aux.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/* $Id: tif_aux.c,v 1.20 2006/06/08 14:24:13 dron Exp $ */
-
-/*
- * Copyright (c) 1991-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Auxiliary Support Routines.
- */
-#include "tiffiop.h"
-#include "tif_predict.h"
-#include <math.h>
-
-tdata_t
-_TIFFCheckRealloc(TIFF* tif, tdata_t buffer,
- size_t nmemb, size_t elem_size, const char* what)
-{
- tdata_t cp = NULL;
- tsize_t bytes = nmemb * elem_size;
-
- /*
- * XXX: Check for integer overflow.
- */
- if (nmemb && elem_size && bytes / elem_size == nmemb)
- cp = _TIFFrealloc(buffer, bytes);
-
- if (cp == NULL)
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "No space %s", what);
-
- return cp;
-}
-
-tdata_t
-_TIFFCheckMalloc(TIFF* tif, size_t nmemb, size_t elem_size, const char* what)
-{
- return _TIFFCheckRealloc(tif, NULL, nmemb, elem_size, what);
-}
-
-static int
-TIFFDefaultTransferFunction(TIFFDirectory* td)
-{
- uint16 **tf = td->td_transferfunction;
- tsize_t i, n, nbytes;
-
- tf[0] = tf[1] = tf[2] = 0;
- if (td->td_bitspersample >= sizeof(tsize_t) * 8 - 2)
- return 0;
-
- n = 1<<td->td_bitspersample;
- nbytes = n * sizeof (uint16);
- if (!(tf[0] = (uint16 *)_TIFFmalloc(nbytes)))
- return 0;
- tf[0][0] = 0;
- for (i = 1; i < n; i++) {
- double t = (double)i/((double) n-1.);
- tf[0][i] = (uint16)floor(65535.*pow(t, 2.2) + .5);
- }
-
- if (td->td_samplesperpixel - td->td_extrasamples > 1) {
- if (!(tf[1] = (uint16 *)_TIFFmalloc(nbytes)))
- goto bad;
- _TIFFmemcpy(tf[1], tf[0], nbytes);
- if (!(tf[2] = (uint16 *)_TIFFmalloc(nbytes)))
- goto bad;
- _TIFFmemcpy(tf[2], tf[0], nbytes);
- }
- return 1;
-
-bad:
- if (tf[0])
- _TIFFfree(tf[0]);
- if (tf[1])
- _TIFFfree(tf[1]);
- if (tf[2])
- _TIFFfree(tf[2]);
- tf[0] = tf[1] = tf[2] = 0;
- return 0;
-}
-
-/*
- * Like TIFFGetField, but return any default
- * value if the tag is not present in the directory.
- *
- * NB: We use the value in the directory, rather than
- * explcit values so that defaults exist only one
- * place in the library -- in TIFFDefaultDirectory.
- */
-int
-TIFFVGetFieldDefaulted(TIFF* tif, ttag_t tag, va_list ap)
-{
- TIFFDirectory *td = &tif->tif_dir;
-
- if (TIFFVGetField(tif, tag, ap))
- return (1);
- switch (tag) {
- case TIFFTAG_SUBFILETYPE:
- *va_arg(ap, uint32 *) = td->td_subfiletype;
- return (1);
- case TIFFTAG_BITSPERSAMPLE:
- *va_arg(ap, uint16 *) = td->td_bitspersample;
- return (1);
- case TIFFTAG_THRESHHOLDING:
- *va_arg(ap, uint16 *) = td->td_threshholding;
- return (1);
- case TIFFTAG_FILLORDER:
- *va_arg(ap, uint16 *) = td->td_fillorder;
- return (1);
- case TIFFTAG_ORIENTATION:
- *va_arg(ap, uint16 *) = td->td_orientation;
- return (1);
- case TIFFTAG_SAMPLESPERPIXEL:
- *va_arg(ap, uint16 *) = td->td_samplesperpixel;
- return (1);
- case TIFFTAG_ROWSPERSTRIP:
- *va_arg(ap, uint32 *) = td->td_rowsperstrip;
- return (1);
- case TIFFTAG_MINSAMPLEVALUE:
- *va_arg(ap, uint16 *) = td->td_minsamplevalue;
- return (1);
- case TIFFTAG_MAXSAMPLEVALUE:
- *va_arg(ap, uint16 *) = td->td_maxsamplevalue;
- return (1);
- case TIFFTAG_PLANARCONFIG:
- *va_arg(ap, uint16 *) = td->td_planarconfig;
- return (1);
- case TIFFTAG_RESOLUTIONUNIT:
- *va_arg(ap, uint16 *) = td->td_resolutionunit;
- return (1);
- case TIFFTAG_PREDICTOR:
- {
- TIFFPredictorState* sp = (TIFFPredictorState*) tif->tif_data;
- *va_arg(ap, uint16*) = (uint16) sp->predictor;
- return 1;
- }
- case TIFFTAG_DOTRANGE:
- *va_arg(ap, uint16 *) = 0;
- *va_arg(ap, uint16 *) = (1<<td->td_bitspersample)-1;
- return (1);
- case TIFFTAG_INKSET:
- *va_arg(ap, uint16 *) = INKSET_CMYK;
- return 1;
- case TIFFTAG_NUMBEROFINKS:
- *va_arg(ap, uint16 *) = 4;
- return (1);
- case TIFFTAG_EXTRASAMPLES:
- *va_arg(ap, uint16 *) = td->td_extrasamples;
- *va_arg(ap, uint16 **) = td->td_sampleinfo;
- return (1);
- case TIFFTAG_MATTEING:
- *va_arg(ap, uint16 *) =
- (td->td_extrasamples == 1 &&
- td->td_sampleinfo[0] == EXTRASAMPLE_ASSOCALPHA);
- return (1);
- case TIFFTAG_TILEDEPTH:
- *va_arg(ap, uint32 *) = td->td_tiledepth;
- return (1);
- case TIFFTAG_DATATYPE:
- *va_arg(ap, uint16 *) = td->td_sampleformat-1;
- return (1);
- case TIFFTAG_SAMPLEFORMAT:
- *va_arg(ap, uint16 *) = td->td_sampleformat;
- return(1);
- case TIFFTAG_IMAGEDEPTH:
- *va_arg(ap, uint32 *) = td->td_imagedepth;
- return (1);
- case TIFFTAG_YCBCRCOEFFICIENTS:
- {
- /* defaults are from CCIR Recommendation 601-1 */
- static float ycbcrcoeffs[] = { 0.299f, 0.587f, 0.114f };
- *va_arg(ap, float **) = ycbcrcoeffs;
- return 1;
- }
- case TIFFTAG_YCBCRSUBSAMPLING:
- *va_arg(ap, uint16 *) = td->td_ycbcrsubsampling[0];
- *va_arg(ap, uint16 *) = td->td_ycbcrsubsampling[1];
- return (1);
- case TIFFTAG_YCBCRPOSITIONING:
- *va_arg(ap, uint16 *) = td->td_ycbcrpositioning;
- return (1);
- case TIFFTAG_WHITEPOINT:
- {
- static float whitepoint[2];
-
- /* TIFF 6.0 specification tells that it is no default
- value for the WhitePoint, but AdobePhotoshop TIFF
- Technical Note tells that it should be CIE D50. */
- whitepoint[0] = D50_X0 / (D50_X0 + D50_Y0 + D50_Z0);
- whitepoint[1] = D50_Y0 / (D50_X0 + D50_Y0 + D50_Z0);
- *va_arg(ap, float **) = whitepoint;
- return 1;
- }
- case TIFFTAG_TRANSFERFUNCTION:
- if (!td->td_transferfunction[0] &&
- !TIFFDefaultTransferFunction(td)) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "No space for \"TransferFunction\" tag");
- return (0);
- }
- *va_arg(ap, uint16 **) = td->td_transferfunction[0];
- if (td->td_samplesperpixel - td->td_extrasamples > 1) {
- *va_arg(ap, uint16 **) = td->td_transferfunction[1];
- *va_arg(ap, uint16 **) = td->td_transferfunction[2];
- }
- return (1);
- case TIFFTAG_REFERENCEBLACKWHITE:
- {
- int i;
- static float ycbcr_refblackwhite[] =
- { 0.0F, 255.0F, 128.0F, 255.0F, 128.0F, 255.0F };
- static float rgb_refblackwhite[6];
-
- for (i = 0; i < 3; i++) {
- rgb_refblackwhite[2 * i + 0] = 0.0F;
- rgb_refblackwhite[2 * i + 1] =
- (float)((1L<<td->td_bitspersample)-1L);
- }
-
- if (td->td_photometric == PHOTOMETRIC_YCBCR) {
- /*
- * YCbCr (Class Y) images must have the
- * ReferenceBlackWhite tag set. Fix the
- * broken images, which lacks that tag.
- */
- *va_arg(ap, float **) = ycbcr_refblackwhite;
- } else {
- /*
- * Assume RGB (Class R)
- */
- *va_arg(ap, float **) = rgb_refblackwhite;
- }
- return 1;
- }
- }
- return 0;
-}
-
-/*
- * Like TIFFGetField, but return any default
- * value if the tag is not present in the directory.
- */
-int
-TIFFGetFieldDefaulted(TIFF* tif, ttag_t tag, ...)
-{
- int ok;
- va_list ap;
-
- va_start(ap, tag);
- ok = TIFFVGetFieldDefaulted(tif, tag, ap);
- va_end(ap);
- return (ok);
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_close.c b/src/3rdparty/libtiff/libtiff/tif_close.c
deleted file mode 100644
index 3623277414..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_close.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* $Id: tif_close.c,v 1.10 2006/03/25 03:09:24 joris Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- */
-#include "tiffiop.h"
-
-/************************************************************************/
-/* TIFFCleanup() */
-/************************************************************************/
-
-/**
- * Auxiliary function to free the TIFF structure. Given structure will be
- * completetly freed, so you should save opened file handle and pointer
- * to the close procedure in external variables before calling
- * _TIFFCleanup(), if you will need these ones to close the file.
- *
- * @param tif A TIFF pointer.
- */
-
-void
-TIFFCleanup(TIFF* tif)
-{
- if (tif->tif_mode != O_RDONLY)
- /*
- * Flush buffered data and directory (if dirty).
- */
- TIFFFlush(tif);
- (*tif->tif_cleanup)(tif);
- TIFFFreeDirectory(tif);
-
- if (tif->tif_dirlist)
- _TIFFfree(tif->tif_dirlist);
-
- /* Clean up client info links */
- while( tif->tif_clientinfo )
- {
- TIFFClientInfoLink *link = tif->tif_clientinfo;
-
- tif->tif_clientinfo = link->next;
- _TIFFfree( link->name );
- _TIFFfree( link );
- }
-
- if (tif->tif_rawdata && (tif->tif_flags&TIFF_MYBUFFER))
- _TIFFfree(tif->tif_rawdata);
- if (isMapped(tif))
- TIFFUnmapFileContents(tif, tif->tif_base, tif->tif_size);
-
- /* Clean up custom fields */
- if (tif->tif_nfields > 0)
- {
- size_t i;
-
- for (i = 0; i < tif->tif_nfields; i++)
- {
- TIFFFieldInfo *fld = tif->tif_fieldinfo[i];
- if (fld->field_bit == FIELD_CUSTOM &&
- strncmp("Tag ", fld->field_name, 4) == 0)
- {
- _TIFFfree(fld->field_name);
- _TIFFfree(fld);
- }
- }
-
- _TIFFfree(tif->tif_fieldinfo);
- }
-
- _TIFFfree(tif);
-}
-
-/************************************************************************/
-/* TIFFClose() */
-/************************************************************************/
-
-/**
- * Close a previously opened TIFF file.
- *
- * TIFFClose closes a file that was previously opened with TIFFOpen().
- * Any buffered data are flushed to the file, including the contents of
- * the current directory (if modified); and all resources are reclaimed.
- *
- * @param tif A TIFF pointer.
- */
-
-void
-TIFFClose(TIFF* tif)
-{
- TIFFCloseProc closeproc = tif->tif_closeproc;
- thandle_t fd = tif->tif_clientdata;
-
- TIFFCleanup(tif);
- (void) (*closeproc)(fd);
-}
-
diff --git a/src/3rdparty/libtiff/libtiff/tif_codec.c b/src/3rdparty/libtiff/libtiff/tif_codec.c
deleted file mode 100644
index 02fb839b2f..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_codec.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* $Id: tif_codec.c,v 1.10.2.1 2008-12-18 19:50:41 fwarmerdam Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library
- *
- * Builtin Compression Scheme Configuration Support.
- */
-#include "tiffiop.h"
-
-static int NotConfigured(TIFF*, int);
-
-#ifndef LZW_SUPPORT
-#define TIFFInitLZW NotConfigured
-#endif
-#ifndef PACKBITS_SUPPORT
-#define TIFFInitPackBits NotConfigured
-#endif
-#ifndef THUNDER_SUPPORT
-#define TIFFInitThunderScan NotConfigured
-#endif
-#ifndef NEXT_SUPPORT
-#define TIFFInitNeXT NotConfigured
-#endif
-#ifndef JPEG_SUPPORT
-#define TIFFInitJPEG NotConfigured
-#endif
-#ifndef OJPEG_SUPPORT
-#define TIFFInitOJPEG NotConfigured
-#endif
-#ifndef CCITT_SUPPORT
-#define TIFFInitCCITTRLE NotConfigured
-#define TIFFInitCCITTRLEW NotConfigured
-#define TIFFInitCCITTFax3 NotConfigured
-#define TIFFInitCCITTFax4 NotConfigured
-#endif
-#ifndef JBIG_SUPPORT
-#define TIFFInitJBIG NotConfigured
-#endif
-#ifndef ZIP_SUPPORT
-#define TIFFInitZIP NotConfigured
-#endif
-#ifndef PIXARLOG_SUPPORT
-#define TIFFInitPixarLog NotConfigured
-#endif
-#ifndef LOGLUV_SUPPORT
-#define TIFFInitSGILog NotConfigured
-#endif
-
-/*
- * Compression schemes statically built into the library.
- */
-#ifdef VMS
-const TIFFCodec _TIFFBuiltinCODECS[] = {
-#else
-TIFFCodec _TIFFBuiltinCODECS[] = {
-#endif
- { "None", COMPRESSION_NONE, TIFFInitDumpMode },
- { "LZW", COMPRESSION_LZW, TIFFInitLZW },
- { "PackBits", COMPRESSION_PACKBITS, TIFFInitPackBits },
- { "ThunderScan", COMPRESSION_THUNDERSCAN,TIFFInitThunderScan },
- { "NeXT", COMPRESSION_NEXT, TIFFInitNeXT },
- { "JPEG", COMPRESSION_JPEG, TIFFInitJPEG },
- { "Old-style JPEG", COMPRESSION_OJPEG, TIFFInitOJPEG },
- { "CCITT RLE", COMPRESSION_CCITTRLE, TIFFInitCCITTRLE },
- { "CCITT RLE/W", COMPRESSION_CCITTRLEW, TIFFInitCCITTRLEW },
- { "CCITT Group 3", COMPRESSION_CCITTFAX3, TIFFInitCCITTFax3 },
- { "CCITT Group 4", COMPRESSION_CCITTFAX4, TIFFInitCCITTFax4 },
- { "ISO JBIG", COMPRESSION_JBIG, TIFFInitJBIG },
- { "Deflate", COMPRESSION_DEFLATE, TIFFInitZIP },
- { "AdobeDeflate", COMPRESSION_ADOBE_DEFLATE , TIFFInitZIP },
- { "PixarLog", COMPRESSION_PIXARLOG, TIFFInitPixarLog },
- { "SGILog", COMPRESSION_SGILOG, TIFFInitSGILog },
- { "SGILog24", COMPRESSION_SGILOG24, TIFFInitSGILog },
- { NULL, 0, NULL }
-};
-
-static int
-_notConfigured(TIFF* tif)
-{
- const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression);
- char compression_code[20];
-
- sprintf( compression_code, "%d", tif->tif_dir.td_compression );
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%s compression support is not configured",
- c ? c->name : compression_code );
- return (0);
-}
-
-static int
-NotConfigured(TIFF* tif, int scheme)
-{
- (void) scheme;
-
- tif->tif_decodestatus = FALSE;
- tif->tif_setupdecode = _notConfigured;
- tif->tif_encodestatus = FALSE;
- tif->tif_setupencode = _notConfigured;
- return (1);
-}
-
-/************************************************************************/
-/* TIFFIsCODECConfigured() */
-/************************************************************************/
-
-/**
- * Check whether we have working codec for the specific coding scheme.
- *
- * @return returns 1 if the codec is configured and working. Otherwise
- * 0 will be returned.
- */
-
-int
-TIFFIsCODECConfigured(uint16 scheme)
-{
- const TIFFCodec* codec = TIFFFindCODEC(scheme);
-
- if(codec == NULL) {
- return 0;
- }
- if(codec->init == NULL) {
- return 0;
- }
- if(codec->init != NotConfigured){
- return 1;
- }
- return 0;
-}
-
diff --git a/src/3rdparty/libtiff/libtiff/tif_color.c b/src/3rdparty/libtiff/libtiff/tif_color.c
deleted file mode 100644
index 0f484aa7cc..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_color.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/* $Id: tif_color.c,v 1.12 2006/02/09 15:42:20 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * CIE L*a*b* to CIE XYZ and CIE XYZ to RGB conversion routines are taken
- * from the VIPS library (http://www.vips.ecs.soton.ac.uk) with
- * the permission of John Cupitt, the VIPS author.
- */
-
-/*
- * TIFF Library.
- *
- * Color space conversion routines.
- */
-
-#include "tiffiop.h"
-#include <math.h>
-
-/*
- * Convert color value from the CIE L*a*b* 1976 space to CIE XYZ.
- */
-void
-TIFFCIELabToXYZ(TIFFCIELabToRGB *cielab, uint32 l, int32 a, int32 b,
- float *X, float *Y, float *Z)
-{
- float L = (float)l * 100.0F / 255.0F;
- float cby, tmp;
-
- if( L < 8.856F ) {
- *Y = (L * cielab->Y0) / 903.292F;
- cby = 7.787F * (*Y / cielab->Y0) + 16.0F / 116.0F;
- } else {
- cby = (L + 16.0F) / 116.0F;
- *Y = cielab->Y0 * cby * cby * cby;
- }
-
- tmp = (float)a / 500.0F + cby;
- if( tmp < 0.2069F )
- *X = cielab->X0 * (tmp - 0.13793F) / 7.787F;
- else
- *X = cielab->X0 * tmp * tmp * tmp;
-
- tmp = cby - (float)b / 200.0F;
- if( tmp < 0.2069F )
- *Z = cielab->Z0 * (tmp - 0.13793F) / 7.787F;
- else
- *Z = cielab->Z0 * tmp * tmp * tmp;
-}
-
-#define RINT(R) ((uint32)((R)>0?((R)+0.5):((R)-0.5)))
-/*
- * Convert color value from the XYZ space to RGB.
- */
-void
-TIFFXYZToRGB(TIFFCIELabToRGB *cielab, float X, float Y, float Z,
- uint32 *r, uint32 *g, uint32 *b)
-{
- int i;
- float Yr, Yg, Yb;
- float *matrix = &cielab->display.d_mat[0][0];
-
- /* Multiply through the matrix to get luminosity values. */
- Yr = matrix[0] * X + matrix[1] * Y + matrix[2] * Z;
- Yg = matrix[3] * X + matrix[4] * Y + matrix[5] * Z;
- Yb = matrix[6] * X + matrix[7] * Y + matrix[8] * Z;
-
- /* Clip input */
- Yr = TIFFmax(Yr, cielab->display.d_Y0R);
- Yg = TIFFmax(Yg, cielab->display.d_Y0G);
- Yb = TIFFmax(Yb, cielab->display.d_Y0B);
-
- /* Avoid overflow in case of wrong input values */
- Yr = TIFFmin(Yr, cielab->display.d_YCR);
- Yg = TIFFmin(Yg, cielab->display.d_YCG);
- Yb = TIFFmin(Yb, cielab->display.d_YCB);
-
- /* Turn luminosity to colour value. */
- i = (int)((Yr - cielab->display.d_Y0R) / cielab->rstep);
- i = TIFFmin(cielab->range, i);
- *r = RINT(cielab->Yr2r[i]);
-
- i = (int)((Yg - cielab->display.d_Y0G) / cielab->gstep);
- i = TIFFmin(cielab->range, i);
- *g = RINT(cielab->Yg2g[i]);
-
- i = (int)((Yb - cielab->display.d_Y0B) / cielab->bstep);
- i = TIFFmin(cielab->range, i);
- *b = RINT(cielab->Yb2b[i]);
-
- /* Clip output. */
- *r = TIFFmin(*r, cielab->display.d_Vrwr);
- *g = TIFFmin(*g, cielab->display.d_Vrwg);
- *b = TIFFmin(*b, cielab->display.d_Vrwb);
-}
-#undef RINT
-
-/*
- * Allocate conversion state structures and make look_up tables for
- * the Yr,Yb,Yg <=> r,g,b conversions.
- */
-int
-TIFFCIELabToRGBInit(TIFFCIELabToRGB* cielab,
- TIFFDisplay *display, float *refWhite)
-{
- int i;
- double gamma;
-
- cielab->range = CIELABTORGB_TABLE_RANGE;
-
- _TIFFmemcpy(&cielab->display, display, sizeof(TIFFDisplay));
-
- /* Red */
- gamma = 1.0 / cielab->display.d_gammaR ;
- cielab->rstep =
- (cielab->display.d_YCR - cielab->display.d_Y0R) / cielab->range;
- for(i = 0; i <= cielab->range; i++) {
- cielab->Yr2r[i] = cielab->display.d_Vrwr
- * ((float)pow((double)i / cielab->range, gamma));
- }
-
- /* Green */
- gamma = 1.0 / cielab->display.d_gammaG ;
- cielab->gstep =
- (cielab->display.d_YCR - cielab->display.d_Y0R) / cielab->range;
- for(i = 0; i <= cielab->range; i++) {
- cielab->Yg2g[i] = cielab->display.d_Vrwg
- * ((float)pow((double)i / cielab->range, gamma));
- }
-
- /* Blue */
- gamma = 1.0 / cielab->display.d_gammaB ;
- cielab->bstep =
- (cielab->display.d_YCR - cielab->display.d_Y0R) / cielab->range;
- for(i = 0; i <= cielab->range; i++) {
- cielab->Yb2b[i] = cielab->display.d_Vrwb
- * ((float)pow((double)i / cielab->range, gamma));
- }
-
- /* Init reference white point */
- cielab->X0 = refWhite[0];
- cielab->Y0 = refWhite[1];
- cielab->Z0 = refWhite[2];
-
- return 0;
-}
-
-/*
- * Convert color value from the YCbCr space to CIE XYZ.
- * The colorspace conversion algorithm comes from the IJG v5a code;
- * see below for more information on how it works.
- */
-#define SHIFT 16
-#define FIX(x) ((int32)((x) * (1L<<SHIFT) + 0.5))
-#define ONE_HALF ((int32)(1<<(SHIFT-1)))
-#define Code2V(c, RB, RW, CR) ((((c)-(int32)(RB))*(float)(CR))/(float)(((RW)-(RB)) ? ((RW)-(RB)) : 1))
-#define CLAMP(f,min,max) ((f)<(min)?(min):(f)>(max)?(max):(f))
-#define HICLAMP(f,max) ((f)>(max)?(max):(f))
-
-void
-TIFFYCbCrtoRGB(TIFFYCbCrToRGB *ycbcr, uint32 Y, int32 Cb, int32 Cr,
- uint32 *r, uint32 *g, uint32 *b)
-{
- /* XXX: Only 8-bit YCbCr input supported for now */
- Y = HICLAMP(Y, 255), Cb = CLAMP(Cb, 0, 255), Cr = CLAMP(Cr, 0, 255);
-
- *r = ycbcr->clamptab[ycbcr->Y_tab[Y] + ycbcr->Cr_r_tab[Cr]];
- *g = ycbcr->clamptab[ycbcr->Y_tab[Y]
- + (int)((ycbcr->Cb_g_tab[Cb] + ycbcr->Cr_g_tab[Cr]) >> SHIFT)];
- *b = ycbcr->clamptab[ycbcr->Y_tab[Y] + ycbcr->Cb_b_tab[Cb]];
-}
-
-/*
- * Initialize the YCbCr->RGB conversion tables. The conversion
- * is done according to the 6.0 spec:
- *
- * R = Y + Cr*(2 - 2*LumaRed)
- * B = Y + Cb*(2 - 2*LumaBlue)
- * G = Y
- * - LumaBlue*Cb*(2-2*LumaBlue)/LumaGreen
- * - LumaRed*Cr*(2-2*LumaRed)/LumaGreen
- *
- * To avoid floating point arithmetic the fractional constants that
- * come out of the equations are represented as fixed point values
- * in the range 0...2^16. We also eliminate multiplications by
- * pre-calculating possible values indexed by Cb and Cr (this code
- * assumes conversion is being done for 8-bit samples).
- */
-int
-TIFFYCbCrToRGBInit(TIFFYCbCrToRGB* ycbcr, float *luma, float *refBlackWhite)
-{
- TIFFRGBValue* clamptab;
- int i;
-
-#define LumaRed luma[0]
-#define LumaGreen luma[1]
-#define LumaBlue luma[2]
-
- clamptab = (TIFFRGBValue*)(
- (tidata_t) ycbcr+TIFFroundup(sizeof (TIFFYCbCrToRGB), sizeof (long)));
- _TIFFmemset(clamptab, 0, 256); /* v < 0 => 0 */
- ycbcr->clamptab = (clamptab += 256);
- for (i = 0; i < 256; i++)
- clamptab[i] = (TIFFRGBValue) i;
- _TIFFmemset(clamptab+256, 255, 2*256); /* v > 255 => 255 */
- ycbcr->Cr_r_tab = (int*) (clamptab + 3*256);
- ycbcr->Cb_b_tab = ycbcr->Cr_r_tab + 256;
- ycbcr->Cr_g_tab = (int32*) (ycbcr->Cb_b_tab + 256);
- ycbcr->Cb_g_tab = ycbcr->Cr_g_tab + 256;
- ycbcr->Y_tab = ycbcr->Cb_g_tab + 256;
-
- { float f1 = 2-2*LumaRed; int32 D1 = FIX(f1);
- float f2 = LumaRed*f1/LumaGreen; int32 D2 = -FIX(f2);
- float f3 = 2-2*LumaBlue; int32 D3 = FIX(f3);
- float f4 = LumaBlue*f3/LumaGreen; int32 D4 = -FIX(f4);
- int x;
-
-#undef LumaBlue
-#undef LumaGreen
-#undef LumaRed
-
- /*
- * i is the actual input pixel value in the range 0..255
- * Cb and Cr values are in the range -128..127 (actually
- * they are in a range defined by the ReferenceBlackWhite
- * tag) so there is some range shifting to do here when
- * constructing tables indexed by the raw pixel data.
- */
- for (i = 0, x = -128; i < 256; i++, x++) {
- int32 Cr = (int32)Code2V(x, refBlackWhite[4] - 128.0F,
- refBlackWhite[5] - 128.0F, 127);
- int32 Cb = (int32)Code2V(x, refBlackWhite[2] - 128.0F,
- refBlackWhite[3] - 128.0F, 127);
-
- ycbcr->Cr_r_tab[i] = (int32)((D1*Cr + ONE_HALF)>>SHIFT);
- ycbcr->Cb_b_tab[i] = (int32)((D3*Cb + ONE_HALF)>>SHIFT);
- ycbcr->Cr_g_tab[i] = D2*Cr;
- ycbcr->Cb_g_tab[i] = D4*Cb + ONE_HALF;
- ycbcr->Y_tab[i] =
- (int32)Code2V(x + 128, refBlackWhite[0], refBlackWhite[1], 255);
- }
- }
-
- return 0;
-}
-#undef HICLAMP
-#undef CLAMP
-#undef Code2V
-#undef SHIFT
-#undef ONE_HALF
-#undef FIX
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_compress.c b/src/3rdparty/libtiff/libtiff/tif_compress.c
deleted file mode 100644
index 6c3f322cf7..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_compress.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/* $Id: tif_compress.c,v 1.13 2007/02/24 15:03:50 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library
- *
- * Compression Scheme Configuration Support.
- */
-#include "tiffiop.h"
-
-static int
-TIFFNoEncode(TIFF* tif, const char* method)
-{
- const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression);
-
- if (c) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%s %s encoding is not implemented",
- c->name, method);
- } else {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Compression scheme %u %s encoding is not implemented",
- tif->tif_dir.td_compression, method);
- }
- return (-1);
-}
-
-int
-_TIFFNoRowEncode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
-{
- (void) pp; (void) cc; (void) s;
- return (TIFFNoEncode(tif, "scanline"));
-}
-
-int
-_TIFFNoStripEncode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
-{
- (void) pp; (void) cc; (void) s;
- return (TIFFNoEncode(tif, "strip"));
-}
-
-int
-_TIFFNoTileEncode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
-{
- (void) pp; (void) cc; (void) s;
- return (TIFFNoEncode(tif, "tile"));
-}
-
-static int
-TIFFNoDecode(TIFF* tif, const char* method)
-{
- const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression);
-
- if (c)
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%s %s decoding is not implemented",
- c->name, method);
- else
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Compression scheme %u %s decoding is not implemented",
- tif->tif_dir.td_compression, method);
- return (-1);
-}
-
-int
-_TIFFNoRowDecode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
-{
- (void) pp; (void) cc; (void) s;
- return (TIFFNoDecode(tif, "scanline"));
-}
-
-int
-_TIFFNoStripDecode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
-{
- (void) pp; (void) cc; (void) s;
- return (TIFFNoDecode(tif, "strip"));
-}
-
-int
-_TIFFNoTileDecode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
-{
- (void) pp; (void) cc; (void) s;
- return (TIFFNoDecode(tif, "tile"));
-}
-
-int
-_TIFFNoSeek(TIFF* tif, uint32 off)
-{
- (void) off;
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Compression algorithm does not support random access");
- return (0);
-}
-
-int
-_TIFFNoPreCode(TIFF* tif, tsample_t s)
-{
- (void) tif; (void) s;
- return (1);
-}
-
-static int _TIFFtrue(TIFF* tif) { (void) tif; return (1); }
-static void _TIFFvoid(TIFF* tif) { (void) tif; }
-
-void
-_TIFFSetDefaultCompressionState(TIFF* tif)
-{
- tif->tif_decodestatus = TRUE;
- tif->tif_setupdecode = _TIFFtrue;
- tif->tif_predecode = _TIFFNoPreCode;
- tif->tif_decoderow = _TIFFNoRowDecode;
- tif->tif_decodestrip = _TIFFNoStripDecode;
- tif->tif_decodetile = _TIFFNoTileDecode;
- tif->tif_encodestatus = TRUE;
- tif->tif_setupencode = _TIFFtrue;
- tif->tif_preencode = _TIFFNoPreCode;
- tif->tif_postencode = _TIFFtrue;
- tif->tif_encoderow = _TIFFNoRowEncode;
- tif->tif_encodestrip = _TIFFNoStripEncode;
- tif->tif_encodetile = _TIFFNoTileEncode;
- tif->tif_close = _TIFFvoid;
- tif->tif_seek = _TIFFNoSeek;
- tif->tif_cleanup = _TIFFvoid;
- tif->tif_defstripsize = _TIFFDefaultStripSize;
- tif->tif_deftilesize = _TIFFDefaultTileSize;
- tif->tif_flags &= ~(TIFF_NOBITREV|TIFF_NOREADRAW);
-}
-
-int
-TIFFSetCompressionScheme(TIFF* tif, int scheme)
-{
- const TIFFCodec *c = TIFFFindCODEC((uint16) scheme);
-
- _TIFFSetDefaultCompressionState(tif);
- /*
- * Don't treat an unknown compression scheme as an error.
- * This permits applications to open files with data that
- * the library does not have builtin support for, but which
- * may still be meaningful.
- */
- return (c ? (*c->init)(tif, scheme) : 1);
-}
-
-/*
- * Other compression schemes may be registered. Registered
- * schemes can also override the builtin versions provided
- * by this library.
- */
-typedef struct _codec {
- struct _codec* next;
- TIFFCodec* info;
-} codec_t;
-static codec_t* registeredCODECS = NULL;
-
-const TIFFCodec*
-TIFFFindCODEC(uint16 scheme)
-{
- const TIFFCodec* c;
- codec_t* cd;
-
- for (cd = registeredCODECS; cd; cd = cd->next)
- if (cd->info->scheme == scheme)
- return ((const TIFFCodec*) cd->info);
- for (c = _TIFFBuiltinCODECS; c->name; c++)
- if (c->scheme == scheme)
- return (c);
- return ((const TIFFCodec*) 0);
-}
-
-TIFFCodec*
-TIFFRegisterCODEC(uint16 scheme, const char* name, TIFFInitMethod init)
-{
- codec_t* cd = (codec_t*)
- _TIFFmalloc(sizeof (codec_t) + sizeof (TIFFCodec) + strlen(name)+1);
-
- if (cd != NULL) {
- cd->info = (TIFFCodec*) ((tidata_t) cd + sizeof (codec_t));
- cd->info->name = (char*)
- ((tidata_t) cd->info + sizeof (TIFFCodec));
- strcpy(cd->info->name, name);
- cd->info->scheme = scheme;
- cd->info->init = init;
- cd->next = registeredCODECS;
- registeredCODECS = cd;
- } else {
- TIFFErrorExt(0, "TIFFRegisterCODEC",
- "No space to register compression scheme %s", name);
- return NULL;
- }
- return (cd->info);
-}
-
-void
-TIFFUnRegisterCODEC(TIFFCodec* c)
-{
- codec_t* cd;
- codec_t** pcd;
-
- for (pcd = &registeredCODECS; (cd = *pcd); pcd = &cd->next)
- if (cd->info == c) {
- *pcd = cd->next;
- _TIFFfree(cd);
- return;
- }
- TIFFErrorExt(0, "TIFFUnRegisterCODEC",
- "Cannot remove compression scheme %s; not registered", c->name);
-}
-
-/************************************************************************/
-/* TIFFGetConfisuredCODECs() */
-/************************************************************************/
-
-/**
- * Get list of configured codecs, both built-in and registered by user.
- * Caller is responsible to free this structure.
- *
- * @return returns array of TIFFCodec records (the last record should be NULL)
- * or NULL if function failed.
- */
-
-TIFFCodec*
-TIFFGetConfiguredCODECs()
-{
- int i = 1;
- codec_t *cd;
- const TIFFCodec *c;
- TIFFCodec *codecs = NULL, *new_codecs;
-
- for (cd = registeredCODECS; cd; cd = cd->next) {
- new_codecs = (TIFFCodec *)
- _TIFFrealloc(codecs, i * sizeof(TIFFCodec));
- if (!new_codecs) {
- _TIFFfree (codecs);
- return NULL;
- }
- codecs = new_codecs;
- _TIFFmemcpy(codecs + i - 1, cd, sizeof(TIFFCodec));
- i++;
- }
- for (c = _TIFFBuiltinCODECS; c->name; c++) {
- if (TIFFIsCODECConfigured(c->scheme)) {
- new_codecs = (TIFFCodec *)
- _TIFFrealloc(codecs, i * sizeof(TIFFCodec));
- if (!new_codecs) {
- _TIFFfree (codecs);
- return NULL;
- }
- codecs = new_codecs;
- _TIFFmemcpy(codecs + i - 1, (const tdata_t)c, sizeof(TIFFCodec));
- i++;
- }
- }
-
- new_codecs = (TIFFCodec *) _TIFFrealloc(codecs, i * sizeof(TIFFCodec));
- if (!new_codecs) {
- _TIFFfree (codecs);
- return NULL;
- }
- codecs = new_codecs;
- _TIFFmemset(codecs + i - 1, 0, sizeof(TIFFCodec));
-
- return codecs;
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h
deleted file mode 100644
index f851384379..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_config.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- Configuration defines for Qt.
-*/
-
-#include <qglobal.h>
-#if defined(Q_OS_WINCE)
-# include <qfunctions_wince.h>
-#endif
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* Support CCITT Group 3 & 4 algorithms */
-#define CCITT_SUPPORT 1
-
-/* Pick up YCbCr subsampling info from the JPEG data stream to support files
- lacking the tag (default enabled). */
-#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
-
-/* Support C++ stream API (requires C++ compiler) */
-/* #undef CXX_SUPPORT */
-
-/* Treat extra sample as alpha (default enabled). The RGBA interface will
- treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
- packages produce RGBA files but don't mark the alpha properly. */
-#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
-
-/* Use the Apple OpenGL framework. */
-/* #undef HAVE_APPLE_OPENGL_FRAMEWORK */
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#if !defined(Q_OS_WINCE)
-#define HAVE_FCNTL_H 1
-#endif
-
-/* Define to 1 if you have the `floor' function. */
-/* #undef HAVE_FLOOR */
-
-/* Define to 1 if you have the `getopt' function. */
-/* #undef HAVE_GETOPT */
-
-/* Define as 0 or 1 according to the floating point format suported by the
- machine */
-#define HAVE_IEEEFP 1
-
-/* Define to 1 if the system has the type `int16'. */
-#ifdef Q_OS_AIX
-#define HAVE_INT16 1
-#endif
-
-/* Define to 1 if the system has the type `int32'. */
-#ifdef Q_OS_AIX
-#define HAVE_INT32 1
-#endif
-
-/* Define to 1 if the system has the type `int8'. */
-#ifdef Q_OS_AIX
-#define HAVE_INT8 1
-#endif
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-
-/* Define to 1 if you have the <io.h> header file. */
-/* #undef HAVE_IO_H */
-
-/* Define to 1 if you have the `isascii' function. */
-/* #undef HAVE_ISASCII */
-
-/* Define to 1 if you have the `jbg_newlen' function. */
-/* #undef HAVE_JBG_NEWLEN */
-
-/* Define to 1 if you have the `lfind' function. */
-/* #undef HAVE_LFIND */
-
-/* Define to 1 if you have the `c' library (-lc). */
-/* #undef HAVE_LIBC */
-
-/* Define to 1 if you have the `m' library (-lm). */
-/* #undef HAVE_LIBM */
-
-/* Define to 1 if you have the <limits.h> header file. */
-/* #undef HAVE_LIMITS_H */
-
-/* Define to 1 if you have the <malloc.h> header file. */
-/* #undef HAVE_MALLOC_H */
-
-/* Define to 1 if you have the `memmove' function. */
-/* #undef HAVE_MEMMOVE */
-
-/* Define to 1 if you have the <memory.h> header file. */
-/* #undef HAVE_MEMORY_H */
-
-/* Define to 1 if you have the `memset' function. */
-/* #undef HAVE_MEMSET */
-
-/* Define to 1 if you have the `mmap' function. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if you have the `pow' function. */
-/* #undef HAVE_POW */
-
-/* Define if you have POSIX threads libraries and header files. */
-/* #undef HAVE_PTHREAD */
-
-/* Define to 1 if you have the <search.h> header file. */
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS)
-#define HAVE_SEARCH_H 1
-#endif
-
-/* Define to 1 if you have the `setmode' function. */
-/* #undef HAVE_SETMODE */
-
-/* Define to 1 if you have the `sqrt' function. */
-/* #undef HAVE_SQRT */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-/* #undef HAVE_STDLIB_H */
-
-/* Define to 1 if you have the `strcasecmp' function. */
-/* #undef HAVE_STRCASECMP */
-
-/* Define to 1 if you have the `strchr' function. */
-/* #undef HAVE_STRCHR */
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strrchr' function. */
-/* #undef HAVE_STRRCHR */
-
-/* Define to 1 if you have the `strstr' function. */
-/* #undef HAVE_STRSTR */
-
-/* Define to 1 if you have the `strtol' function. */
-/* #undef HAVE_STRTOL */
-
-/* Define to 1 if you have the `strtoul' function. */
-/* #undef HAVE_STRTOUL */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-/* #undef HAVE_SYS_STAT_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-/* #undef HAVE_SYS_TIME_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#if !defined(Q_OS_WIN)
-#define HAVE_UNISTD_H 1
-#endif
-
-/* Define to 1 if you have the <windows.h> header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
- (Intel) */
-#if (Q_BYTE_ORDER == Q_BIG_ENDIAN)
-#define HOST_BIGENDIAN 1
-#else
-#define HOST_BIGENDIAN 0
-#endif
-
-/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
-#define HOST_FILLORDER FILLORDER_LSB2MSB
-
-/* Support ISO JBIG compression (requires JBIG-KIT library) */
-/* #undef JBIG_SUPPORT */
-
-/* Support JPEG compression (requires IJG JPEG library) */
-/* #undef JPEG_SUPPORT */
-
-/* Support LogLuv high dynamic range encoding */
-#define LOGLUV_SUPPORT 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-/* #undef LT_OBJDIR */
-
-/* Support LZW algorithm */
-#define LZW_SUPPORT 1
-
-/* Support Microsoft Document Imaging format */
-#define MDI_SUPPORT 1
-
-/* Support NeXT 2-bit RLE algorithm */
-#define NEXT_SUPPORT 1
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* Support Old JPEG compresson (read-only) */
-/* #undef OJPEG_SUPPORT */
-
-/* Name of package */
-/* #undef PACKAGE */
-
-/* Define to the address where bug reports for this package should be sent. */
-/* #undef PACKAGE_BUGREPORT */
-
-/* Define to the full name of this package. */
-/* #undef PACKAGE_NAME */
-
-/* Define to the full name and version of this package. */
-/* #undef PACKAGE_STRING */
-
-/* Define to the one symbol short name of this package. */
-/* #undef PACKAGE_TARNAME */
-
-/* Define to the home page for this package. */
-/* #undef PACKAGE_URL */
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.9.2"
-
-/* Support Macintosh PackBits algorithm */
-#define PACKBITS_SUPPORT 1
-
-/* Support Pixar log-format algorithm (requires Zlib) */
-#define PIXARLOG_SUPPORT 1
-
-/* Define to necessary symbol if this constant uses a non-standard name on
- your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#if (QT_POINTER_SIZE == 8) && !defined(Q_OS_WIN64)
-#define SIZEOF_LONG 8
-#else
-#define SIZEOF_LONG 4
-#endif
-
-/* The size of `signed long', as computed by sizeof. */
-/* #undef SIZEOF_SIGNED_LONG */
-
-/* The size of `signed long long', as computed by sizeof. */
-/* #undef SIZEOF_SIGNED_LONG_LONG */
-
-/* The size of `unsigned long', as computed by sizeof. */
-/* #undef SIZEOF_UNSIGNED_LONG */
-
-/* The size of `unsigned long long', as computed by sizeof. */
-/* #undef SIZEOF_UNSIGNED_LONG_LONG */
-
-/* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
-
-/* Support strip chopping (whether or not to convert single-strip uncompressed
- images to mutiple strips of specified size to reduce memory usage) */
-#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
-
-/* Default size of the strip in bytes (when strip chopping enabled) */
-/* #undef STRIP_SIZE_DEFAULT */
-
-/* Enable SubIFD tag (330) support */
-#define SUBIFD_SUPPORT 1
-
-/* Support ThunderScan 4-bit RLE algorithm */
-#define THUNDER_SUPPORT 1
-
-/* Signed 64-bit type formatter */
-/* #undef TIFF_INT64_FORMAT */
-
-/* Signed 64-bit type */
-#define TIFF_INT64_T qint64
-
-/* Unsigned 64-bit type formatter */
-/* #undef TIFF_UINT64_FORMAT */
-
-/* Unsigned 64-bit type */
-#define TIFF_UINT64_T quint64
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-/* #undef TIME_WITH_SYS_TIME */
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Version number of package */
-/* #undef VERSION */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
- significant byte first (like Motorola and SPARC, unlike Intel). */
-#if (Q_BYTE_ORDER == Q_BIG_ENDIAN)
-#define WORDS_BIGENDIAN 1
-#endif
-
-/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
-
-/* Support Deflate compression */
-#define ZIP_SUPPORT 1
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef Q_OS_SYMBIAN
-#ifndef __cplusplus
-#undef inline
-#define inline
-#endif
-#endif
-
-/* Define to `long int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-#ifdef Q_OS_WIN
-#define TIF_PLATFORM_CONSOLE
-#endif
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h-vms b/src/3rdparty/libtiff/libtiff/tif_config.h-vms
deleted file mode 100644
index d653bd8270..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_config.h-vms
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define as 0 or 1 according to the floating point format suported by the
- machine */
-#define HAVE_IEEEFP 1
-
-#define HAVE_UNISTD_H 1
-
-#define HAVE_STRING_H 1
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <io.h> header file. */
-//#define HAVE_IO_H 1
-
-/* Define to 1 if you have the <search.h> header file. */
-//#define HAVE_SEARCH_H 1
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* Set the native cpu bit order */
-#define HOST_FILLORDER FILLORDER_LSB2MSB
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-/*
-#ifndef __cplusplus
-# ifndef inline
-# define inline __inline
-# endif
-#endif
-*/
-
-// #define lfind _lfind
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h.in b/src/3rdparty/libtiff/libtiff/tif_config.h.in
deleted file mode 100644
index 01e54de878..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_config.h.in
+++ /dev/null
@@ -1,309 +0,0 @@
-/* libtiff/tif_config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* Support CCITT Group 3 & 4 algorithms */
-#undef CCITT_SUPPORT
-
-/* Pick up YCbCr subsampling info from the JPEG data stream to support files
- lacking the tag (default enabled). */
-#undef CHECK_JPEG_YCBCR_SUBSAMPLING
-
-/* Support C++ stream API (requires C++ compiler) */
-#undef CXX_SUPPORT
-
-/* Treat extra sample as alpha (default enabled). The RGBA interface will
- treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
- packages produce RGBA files but don't mark the alpha properly. */
-#undef DEFAULT_EXTRASAMPLE_AS_ALPHA
-
-/* Use the Apple OpenGL framework. */
-#undef HAVE_APPLE_OPENGL_FRAMEWORK
-
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `floor' function. */
-#undef HAVE_FLOOR
-
-/* Define to 1 if you have the `getopt' function. */
-#undef HAVE_GETOPT
-
-/* Define as 0 or 1 according to the floating point format suported by the
- machine */
-#undef HAVE_IEEEFP
-
-/* Define to 1 if the system has the type `int16'. */
-#undef HAVE_INT16
-
-/* Define to 1 if the system has the type `int32'. */
-#undef HAVE_INT32
-
-/* Define to 1 if the system has the type `int8'. */
-#undef HAVE_INT8
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <io.h> header file. */
-#undef HAVE_IO_H
-
-/* Define to 1 if you have the `isascii' function. */
-#undef HAVE_ISASCII
-
-/* Define to 1 if you have the `jbg_newlen' function. */
-#undef HAVE_JBG_NEWLEN
-
-/* Define to 1 if you have the `lfind' function. */
-#undef HAVE_LFIND
-
-/* Define to 1 if you have the `c' library (-lc). */
-#undef HAVE_LIBC
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the `mmap' function. */
-#undef HAVE_MMAP
-
-/* Define to 1 if you have the `pow' function. */
-#undef HAVE_POW
-
-/* Define if you have POSIX threads libraries and header files. */
-#undef HAVE_PTHREAD
-
-/* Define to 1 if you have the <search.h> header file. */
-#undef HAVE_SEARCH_H
-
-/* Define to 1 if you have the `setmode' function. */
-#undef HAVE_SETMODE
-
-/* Define to 1 if you have the `sqrt' function. */
-#undef HAVE_SQRT
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strrchr' function. */
-#undef HAVE_STRRCHR
-
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
-
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the <windows.h> header file. */
-#undef HAVE_WINDOWS_H
-
-/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
- (Intel) */
-#undef HOST_BIGENDIAN
-
-/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
-#undef HOST_FILLORDER
-
-/* Support ISO JBIG compression (requires JBIG-KIT library) */
-#undef JBIG_SUPPORT
-
-/* Support JPEG compression (requires IJG JPEG library) */
-#undef JPEG_SUPPORT
-
-/* Support LogLuv high dynamic range encoding */
-#undef LOGLUV_SUPPORT
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
-/* Support LZW algorithm */
-#undef LZW_SUPPORT
-
-/* Support Microsoft Document Imaging format */
-#undef MDI_SUPPORT
-
-/* Support NeXT 2-bit RLE algorithm */
-#undef NEXT_SUPPORT
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Support Old JPEG compresson (read-only) */
-#undef OJPEG_SUPPORT
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Support Macintosh PackBits algorithm */
-#undef PACKBITS_SUPPORT
-
-/* Support Pixar log-format algorithm (requires Zlib) */
-#undef PIXARLOG_SUPPORT
-
-/* Define to necessary symbol if this constant uses a non-standard name on
- your system. */
-#undef PTHREAD_CREATE_JOINABLE
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `signed long', as computed by sizeof. */
-#undef SIZEOF_SIGNED_LONG
-
-/* The size of `signed long long', as computed by sizeof. */
-#undef SIZEOF_SIGNED_LONG_LONG
-
-/* The size of `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
-/* The size of `unsigned long long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Support strip chopping (whether or not to convert single-strip uncompressed
- images to mutiple strips of specified size to reduce memory usage) */
-#undef STRIPCHOP_DEFAULT
-
-/* Default size of the strip in bytes (when strip chopping enabled) */
-#undef STRIP_SIZE_DEFAULT
-
-/* Enable SubIFD tag (330) support */
-#undef SUBIFD_SUPPORT
-
-/* Support ThunderScan 4-bit RLE algorithm */
-#undef THUNDER_SUPPORT
-
-/* Signed 64-bit type formatter */
-#undef TIFF_INT64_FORMAT
-
-/* Signed 64-bit type */
-#undef TIFF_INT64_T
-
-/* Unsigned 64-bit type formatter */
-#undef TIFF_UINT64_FORMAT
-
-/* Unsigned 64-bit type */
-#undef TIFF_UINT64_T
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* Version number of package */
-#undef VERSION
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
- significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-# undef WORDS_BIGENDIAN
-# endif
-#endif
-
-/* Define to 1 if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
-
-/* Support Deflate compression */
-#undef ZIP_SUPPORT
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `long int' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.vc.h b/src/3rdparty/libtiff/libtiff/tif_config.vc.h
deleted file mode 100644
index d9caecf5fa..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_config.vc.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define as 0 or 1 according to the floating point format suported by the
- machine */
-#define HAVE_IEEEFP 1
-
-/* Define to 1 if you have the `jbg_newlen' function. */
-#define HAVE_JBG_NEWLEN 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <io.h> header file. */
-#define HAVE_IO_H 1
-
-/* Define to 1 if you have the <search.h> header file. */
-#define HAVE_SEARCH_H 1
-
-/* Define to 1 if you have the `setmode' function. */
-#define HAVE_SETMODE 1
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* Signed 64-bit type */
-#define TIFF_INT64_T signed __int64
-
-/* Unsigned 64-bit type */
-#define TIFF_UINT64_T unsigned __int64
-
-/* Set the native cpu bit order */
-#define HOST_FILLORDER FILLORDER_LSB2MSB
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-# ifndef inline
-# define inline __inline
-# endif
-#endif
-
-#define lfind _lfind
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.wince.h b/src/3rdparty/libtiff/libtiff/tif_config.wince.h
deleted file mode 100644
index a50b01681f..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_config.wince.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $Id: tif_config.wince.h,v 1.1 2007/01/15 18:40:39 mloskot Exp $ */
-
-/*
- * TIFF library configuration header for Windows CE platform.
- */
-#ifndef _WIN32_WCE
-# error This version of tif_config.h header is dedicated for Windows CE platform!
-#endif
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define as 0 or 1 according to the floating point format suported by the
- machine */
-#define HAVE_IEEEFP 1
-
-/* Define to 1 if you have the `jbg_newlen' function. */
-#define HAVE_JBG_NEWLEN 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <io.h> header file. */
-#define HAVE_IO_H 1
-
-/* Define to 1 if you have the <search.h> header file. */
-#define HAVE_SEARCH_H 1
-
-/* Define to 1 if you have the `setmode' function. */
-#define HAVE_SETMODE 1
-
-/* Define to 1 if you have the `bsearch' function. */
-#define HAVE_BSEARCH 1
-#define bsearch wceex_bsearch
-
-/* Define to 1 if you have the `lfind' function. */
-#define HAVE_LFIND 1
-#define lfind wceex_lfind
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* Set the native cpu bit order */
-#define HOST_FILLORDER FILLORDER_LSB2MSB
-
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-# ifndef inline
-# define inline __inline
-# endif
-#endif
-
-
diff --git a/src/3rdparty/libtiff/libtiff/tif_dir.c b/src/3rdparty/libtiff/libtiff/tif_dir.c
deleted file mode 100644
index 102c9a85cd..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_dir.c
+++ /dev/null
@@ -1,1369 +0,0 @@
-/* $Id: tif_dir.c,v 1.75.2.2 2009-01-01 00:10:43 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Directory Tag Get & Set Routines.
- * (and also some miscellaneous stuff)
- */
-#include "tiffiop.h"
-
-/*
- * These are used in the backwards compatibility code...
- */
-#define DATATYPE_VOID 0 /* !untyped data */
-#define DATATYPE_INT 1 /* !signed integer data */
-#define DATATYPE_UINT 2 /* !unsigned integer data */
-#define DATATYPE_IEEEFP 3 /* !IEEE floating point data */
-
-static void
-setByteArray(void** vpp, void* vp, size_t nmemb, size_t elem_size)
-{
- if (*vpp)
- _TIFFfree(*vpp), *vpp = 0;
- if (vp) {
- tsize_t bytes = nmemb * elem_size;
- if (elem_size && bytes / elem_size == nmemb)
- *vpp = (void*) _TIFFmalloc(bytes);
- if (*vpp)
- _TIFFmemcpy(*vpp, vp, bytes);
- }
-}
-void _TIFFsetByteArray(void** vpp, void* vp, uint32 n)
- { setByteArray(vpp, vp, n, 1); }
-void _TIFFsetString(char** cpp, char* cp)
- { setByteArray((void**) cpp, (void*) cp, strlen(cp)+1, 1); }
-void _TIFFsetNString(char** cpp, char* cp, uint32 n)
- { setByteArray((void**) cpp, (void*) cp, n, 1); }
-void _TIFFsetShortArray(uint16** wpp, uint16* wp, uint32 n)
- { setByteArray((void**) wpp, (void*) wp, n, sizeof (uint16)); }
-void _TIFFsetLongArray(uint32** lpp, uint32* lp, uint32 n)
- { setByteArray((void**) lpp, (void*) lp, n, sizeof (uint32)); }
-void _TIFFsetFloatArray(float** fpp, float* fp, uint32 n)
- { setByteArray((void**) fpp, (void*) fp, n, sizeof (float)); }
-void _TIFFsetDoubleArray(double** dpp, double* dp, uint32 n)
- { setByteArray((void**) dpp, (void*) dp, n, sizeof (double)); }
-
-/*
- * Install extra samples information.
- */
-static int
-setExtraSamples(TIFFDirectory* td, va_list ap, uint32* v)
-{
-/* XXX: Unassociated alpha data == 999 is a known Corel Draw bug, see below */
-#define EXTRASAMPLE_COREL_UNASSALPHA 999
-
- uint16* va;
- uint32 i;
-
- *v = va_arg(ap, uint32);
- if ((uint16) *v > td->td_samplesperpixel)
- return 0;
- va = va_arg(ap, uint16*);
- if (*v > 0 && va == NULL) /* typically missing param */
- return 0;
- for (i = 0; i < *v; i++) {
- if (va[i] > EXTRASAMPLE_UNASSALPHA) {
- /*
- * XXX: Corel Draw is known to produce incorrect
- * ExtraSamples tags which must be patched here if we
- * want to be able to open some of the damaged TIFF
- * files:
- */
- if (va[i] == EXTRASAMPLE_COREL_UNASSALPHA)
- va[i] = EXTRASAMPLE_UNASSALPHA;
- else
- return 0;
- }
- }
- td->td_extrasamples = (uint16) *v;
- _TIFFsetShortArray(&td->td_sampleinfo, va, td->td_extrasamples);
- return 1;
-
-#undef EXTRASAMPLE_COREL_UNASSALPHA
-}
-
-static uint32
-checkInkNamesString(TIFF* tif, uint32 slen, const char* s)
-{
- TIFFDirectory* td = &tif->tif_dir;
- uint16 i = td->td_samplesperpixel;
-
- if (slen > 0) {
- const char* ep = s+slen;
- const char* cp = s;
- for (; i > 0; i--) {
- for (; *cp != '\0'; cp++)
- if (cp >= ep)
- goto bad;
- cp++; /* skip \0 */
- }
- return (cp-s);
- }
-bad:
- TIFFErrorExt(tif->tif_clientdata, "TIFFSetField",
- "%s: Invalid InkNames value; expecting %d names, found %d",
- tif->tif_name,
- td->td_samplesperpixel,
- td->td_samplesperpixel-i);
- return (0);
-}
-
-static int
-_TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- static const char module[] = "_TIFFVSetField";
-
- TIFFDirectory* td = &tif->tif_dir;
- int status = 1;
- uint32 v32, i, v;
- char* s;
-
- switch (tag) {
- case TIFFTAG_SUBFILETYPE:
- td->td_subfiletype = va_arg(ap, uint32);
- break;
- case TIFFTAG_IMAGEWIDTH:
- td->td_imagewidth = va_arg(ap, uint32);
- break;
- case TIFFTAG_IMAGELENGTH:
- td->td_imagelength = va_arg(ap, uint32);
- break;
- case TIFFTAG_BITSPERSAMPLE:
- td->td_bitspersample = (uint16) va_arg(ap, int);
- /*
- * If the data require post-decoding processing to byte-swap
- * samples, set it up here. Note that since tags are required
- * to be ordered, compression code can override this behaviour
- * in the setup method if it wants to roll the post decoding
- * work in with its normal work.
- */
- if (tif->tif_flags & TIFF_SWAB) {
- if (td->td_bitspersample == 16)
- tif->tif_postdecode = _TIFFSwab16BitData;
- else if (td->td_bitspersample == 24)
- tif->tif_postdecode = _TIFFSwab24BitData;
- else if (td->td_bitspersample == 32)
- tif->tif_postdecode = _TIFFSwab32BitData;
- else if (td->td_bitspersample == 64)
- tif->tif_postdecode = _TIFFSwab64BitData;
- else if (td->td_bitspersample == 128) /* two 64's */
- tif->tif_postdecode = _TIFFSwab64BitData;
- }
- break;
- case TIFFTAG_COMPRESSION:
- v = va_arg(ap, uint32) & 0xffff;
- /*
- * If we're changing the compression scheme, the notify the
- * previous module so that it can cleanup any state it's
- * setup.
- */
- if (TIFFFieldSet(tif, FIELD_COMPRESSION)) {
- if (td->td_compression == v)
- break;
- (*tif->tif_cleanup)(tif);
- tif->tif_flags &= ~TIFF_CODERSETUP;
- }
- /*
- * Setup new compression routine state.
- */
- if( (status = TIFFSetCompressionScheme(tif, v)) != 0 )
- td->td_compression = (uint16) v;
- else
- status = 0;
- break;
- case TIFFTAG_PHOTOMETRIC:
- td->td_photometric = (uint16) va_arg(ap, int);
- break;
- case TIFFTAG_THRESHHOLDING:
- td->td_threshholding = (uint16) va_arg(ap, int);
- break;
- case TIFFTAG_FILLORDER:
- v = va_arg(ap, uint32);
- if (v != FILLORDER_LSB2MSB && v != FILLORDER_MSB2LSB)
- goto badvalue;
- td->td_fillorder = (uint16) v;
- break;
- case TIFFTAG_ORIENTATION:
- v = va_arg(ap, uint32);
- if (v < ORIENTATION_TOPLEFT || ORIENTATION_LEFTBOT < v)
- goto badvalue;
- else
- td->td_orientation = (uint16) v;
- break;
- case TIFFTAG_SAMPLESPERPIXEL:
- /* XXX should cross check -- e.g. if pallette, then 1 */
- v = va_arg(ap, uint32);
- if (v == 0)
- goto badvalue;
- td->td_samplesperpixel = (uint16) v;
- break;
- case TIFFTAG_ROWSPERSTRIP:
- v32 = va_arg(ap, uint32);
- if (v32 == 0)
- goto badvalue32;
- td->td_rowsperstrip = v32;
- if (!TIFFFieldSet(tif, FIELD_TILEDIMENSIONS)) {
- td->td_tilelength = v32;
- td->td_tilewidth = td->td_imagewidth;
- }
- break;
- case TIFFTAG_MINSAMPLEVALUE:
- td->td_minsamplevalue = (uint16) va_arg(ap, int);
- break;
- case TIFFTAG_MAXSAMPLEVALUE:
- td->td_maxsamplevalue = (uint16) va_arg(ap, int);
- break;
- case TIFFTAG_SMINSAMPLEVALUE:
- td->td_sminsamplevalue = va_arg(ap, double);
- break;
- case TIFFTAG_SMAXSAMPLEVALUE:
- td->td_smaxsamplevalue = va_arg(ap, double);
- break;
- case TIFFTAG_XRESOLUTION:
- td->td_xresolution = (float) va_arg(ap, double);
- break;
- case TIFFTAG_YRESOLUTION:
- td->td_yresolution = (float) va_arg(ap, double);
- break;
- case TIFFTAG_PLANARCONFIG:
- v = va_arg(ap, uint32);
- if (v != PLANARCONFIG_CONTIG && v != PLANARCONFIG_SEPARATE)
- goto badvalue;
- td->td_planarconfig = (uint16) v;
- break;
- case TIFFTAG_XPOSITION:
- td->td_xposition = (float) va_arg(ap, double);
- break;
- case TIFFTAG_YPOSITION:
- td->td_yposition = (float) va_arg(ap, double);
- break;
- case TIFFTAG_RESOLUTIONUNIT:
- v = va_arg(ap, uint32);
- if (v < RESUNIT_NONE || RESUNIT_CENTIMETER < v)
- goto badvalue;
- td->td_resolutionunit = (uint16) v;
- break;
- case TIFFTAG_PAGENUMBER:
- td->td_pagenumber[0] = (uint16) va_arg(ap, int);
- td->td_pagenumber[1] = (uint16) va_arg(ap, int);
- break;
- case TIFFTAG_HALFTONEHINTS:
- td->td_halftonehints[0] = (uint16) va_arg(ap, int);
- td->td_halftonehints[1] = (uint16) va_arg(ap, int);
- break;
- case TIFFTAG_COLORMAP:
- v32 = (uint32)(1L<<td->td_bitspersample);
- _TIFFsetShortArray(&td->td_colormap[0], va_arg(ap, uint16*), v32);
- _TIFFsetShortArray(&td->td_colormap[1], va_arg(ap, uint16*), v32);
- _TIFFsetShortArray(&td->td_colormap[2], va_arg(ap, uint16*), v32);
- break;
- case TIFFTAG_EXTRASAMPLES:
- if (!setExtraSamples(td, ap, &v))
- goto badvalue;
- break;
- case TIFFTAG_MATTEING:
- td->td_extrasamples = (uint16) (va_arg(ap, int) != 0);
- if (td->td_extrasamples) {
- uint16 sv = EXTRASAMPLE_ASSOCALPHA;
- _TIFFsetShortArray(&td->td_sampleinfo, &sv, 1);
- }
- break;
- case TIFFTAG_TILEWIDTH:
- v32 = va_arg(ap, uint32);
- if (v32 % 16) {
- if (tif->tif_mode != O_RDONLY)
- goto badvalue32;
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "Nonstandard tile width %d, convert file", v32);
- }
- td->td_tilewidth = v32;
- tif->tif_flags |= TIFF_ISTILED;
- break;
- case TIFFTAG_TILELENGTH:
- v32 = va_arg(ap, uint32);
- if (v32 % 16) {
- if (tif->tif_mode != O_RDONLY)
- goto badvalue32;
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "Nonstandard tile length %d, convert file", v32);
- }
- td->td_tilelength = v32;
- tif->tif_flags |= TIFF_ISTILED;
- break;
- case TIFFTAG_TILEDEPTH:
- v32 = va_arg(ap, uint32);
- if (v32 == 0)
- goto badvalue32;
- td->td_tiledepth = v32;
- break;
- case TIFFTAG_DATATYPE:
- v = va_arg(ap, uint32);
- switch (v) {
- case DATATYPE_VOID: v = SAMPLEFORMAT_VOID; break;
- case DATATYPE_INT: v = SAMPLEFORMAT_INT; break;
- case DATATYPE_UINT: v = SAMPLEFORMAT_UINT; break;
- case DATATYPE_IEEEFP: v = SAMPLEFORMAT_IEEEFP;break;
- default: goto badvalue;
- }
- td->td_sampleformat = (uint16) v;
- break;
- case TIFFTAG_SAMPLEFORMAT:
- v = va_arg(ap, uint32);
- if (v < SAMPLEFORMAT_UINT || SAMPLEFORMAT_COMPLEXIEEEFP < v)
- goto badvalue;
- td->td_sampleformat = (uint16) v;
-
- /* Try to fix up the SWAB function for complex data. */
- if( td->td_sampleformat == SAMPLEFORMAT_COMPLEXINT
- && td->td_bitspersample == 32
- && tif->tif_postdecode == _TIFFSwab32BitData )
- tif->tif_postdecode = _TIFFSwab16BitData;
- else if( (td->td_sampleformat == SAMPLEFORMAT_COMPLEXINT
- || td->td_sampleformat == SAMPLEFORMAT_COMPLEXIEEEFP)
- && td->td_bitspersample == 64
- && tif->tif_postdecode == _TIFFSwab64BitData )
- tif->tif_postdecode = _TIFFSwab32BitData;
- break;
- case TIFFTAG_IMAGEDEPTH:
- td->td_imagedepth = va_arg(ap, uint32);
- break;
- case TIFFTAG_SUBIFD:
- if ((tif->tif_flags & TIFF_INSUBIFD) == 0) {
- td->td_nsubifd = (uint16) va_arg(ap, int);
- _TIFFsetLongArray(&td->td_subifd, va_arg(ap, uint32*),
- (long) td->td_nsubifd);
- } else {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Sorry, cannot nest SubIFDs",
- tif->tif_name);
- status = 0;
- }
- break;
- case TIFFTAG_YCBCRPOSITIONING:
- td->td_ycbcrpositioning = (uint16) va_arg(ap, int);
- break;
- case TIFFTAG_YCBCRSUBSAMPLING:
- td->td_ycbcrsubsampling[0] = (uint16) va_arg(ap, int);
- td->td_ycbcrsubsampling[1] = (uint16) va_arg(ap, int);
- break;
- case TIFFTAG_TRANSFERFUNCTION:
- v = (td->td_samplesperpixel - td->td_extrasamples) > 1 ? 3 : 1;
- for (i = 0; i < v; i++)
- _TIFFsetShortArray(&td->td_transferfunction[i],
- va_arg(ap, uint16*), 1L<<td->td_bitspersample);
- break;
- case TIFFTAG_INKNAMES:
- v = va_arg(ap, uint32);
- s = va_arg(ap, char*);
- v = checkInkNamesString(tif, v, s);
- status = v > 0;
- if( v > 0 ) {
- _TIFFsetNString(&td->td_inknames, s, v);
- td->td_inknameslen = v;
- }
- break;
- default: {
- TIFFTagValue *tv;
- int tv_size, iCustom;
- const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
-
- /*
- * This can happen if multiple images are open with different
- * codecs which have private tags. The global tag information
- * table may then have tags that are valid for one file but not
- * the other. If the client tries to set a tag that is not valid
- * for the image's codec then we'll arrive here. This
- * happens, for example, when tiffcp is used to convert between
- * compression schemes and codec-specific tags are blindly copied.
- */
- if(fip == NULL || fip->field_bit != FIELD_CUSTOM) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Invalid %stag \"%s\" (not supported by codec)",
- tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
- fip ? fip->field_name : "Unknown");
- status = 0;
- break;
- }
-
- /*
- * Find the existing entry for this custom value.
- */
- tv = NULL;
- for (iCustom = 0; iCustom < td->td_customValueCount; iCustom++) {
- if (td->td_customValues[iCustom].info->field_tag == tag) {
- tv = td->td_customValues + iCustom;
- if (tv->value != NULL) {
- _TIFFfree(tv->value);
- tv->value = NULL;
- }
- break;
- }
- }
-
- /*
- * Grow the custom list if the entry was not found.
- */
- if(tv == NULL) {
- TIFFTagValue *new_customValues;
-
- td->td_customValueCount++;
- new_customValues = (TIFFTagValue *)
- _TIFFrealloc(td->td_customValues,
- sizeof(TIFFTagValue) * td->td_customValueCount);
- if (!new_customValues) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Failed to allocate space for list of custom values",
- tif->tif_name);
- status = 0;
- goto end;
- }
-
- td->td_customValues = new_customValues;
-
- tv = td->td_customValues + (td->td_customValueCount - 1);
- tv->info = fip;
- tv->value = NULL;
- tv->count = 0;
- }
-
- /*
- * Set custom value ... save a copy of the custom tag value.
- */
- tv_size = _TIFFDataSize(fip->field_type);
- if (tv_size == 0) {
- status = 0;
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Bad field type %d for \"%s\"",
- tif->tif_name, fip->field_type,
- fip->field_name);
- goto end;
- }
-
- if(fip->field_passcount) {
- if (fip->field_writecount == TIFF_VARIABLE2)
- tv->count = (uint32) va_arg(ap, uint32);
- else
- tv->count = (int) va_arg(ap, int);
- } else if (fip->field_writecount == TIFF_VARIABLE
- || fip->field_writecount == TIFF_VARIABLE2)
- tv->count = 1;
- else if (fip->field_writecount == TIFF_SPP)
- tv->count = td->td_samplesperpixel;
- else
- tv->count = fip->field_writecount;
-
-
- if (fip->field_type == TIFF_ASCII)
- _TIFFsetString((char **)&tv->value, va_arg(ap, char *));
- else {
- tv->value = _TIFFCheckMalloc(tif, tv_size, tv->count,
- "Tag Value");
- if (!tv->value) {
- status = 0;
- goto end;
- }
-
- if ((fip->field_passcount
- || fip->field_writecount == TIFF_VARIABLE
- || fip->field_writecount == TIFF_VARIABLE2
- || fip->field_writecount == TIFF_SPP
- || tv->count > 1)
- && fip->field_tag != TIFFTAG_PAGENUMBER
- && fip->field_tag != TIFFTAG_HALFTONEHINTS
- && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
- && fip->field_tag != TIFFTAG_DOTRANGE) {
- _TIFFmemcpy(tv->value, va_arg(ap, void *),
- tv->count * tv_size);
- } else {
- /*
- * XXX: The following loop required to handle
- * TIFFTAG_PAGENUMBER, TIFFTAG_HALFTONEHINTS,
- * TIFFTAG_YCBCRSUBSAMPLING and TIFFTAG_DOTRANGE tags.
- * These tags are actually arrays and should be passed as
- * array pointers to TIFFSetField() function, but actually
- * passed as a list of separate values. This behaviour
- * must be changed in the future!
- */
- int i;
- char *val = (char *)tv->value;
-
- for (i = 0; i < tv->count; i++, val += tv_size) {
- switch (fip->field_type) {
- case TIFF_BYTE:
- case TIFF_UNDEFINED:
- {
- uint8 v = (uint8)va_arg(ap, int);
- _TIFFmemcpy(val, &v, tv_size);
- }
- break;
- case TIFF_SBYTE:
- {
- int8 v = (int8)va_arg(ap, int);
- _TIFFmemcpy(val, &v, tv_size);
- }
- break;
- case TIFF_SHORT:
- {
- uint16 v = (uint16)va_arg(ap, int);
- _TIFFmemcpy(val, &v, tv_size);
- }
- break;
- case TIFF_SSHORT:
- {
- int16 v = (int16)va_arg(ap, int);
- _TIFFmemcpy(val, &v, tv_size);
- }
- break;
- case TIFF_LONG:
- case TIFF_IFD:
- {
- uint32 v = va_arg(ap, uint32);
- _TIFFmemcpy(val, &v, tv_size);
- }
- break;
- case TIFF_SLONG:
- {
- int32 v = va_arg(ap, int32);
- _TIFFmemcpy(val, &v, tv_size);
- }
- break;
- case TIFF_RATIONAL:
- case TIFF_SRATIONAL:
- case TIFF_FLOAT:
- {
- float v = (float)va_arg(ap, double);
- _TIFFmemcpy(val, &v, tv_size);
- }
- break;
- case TIFF_DOUBLE:
- {
- double v = va_arg(ap, double);
- _TIFFmemcpy(val, &v, tv_size);
- }
- break;
- default:
- _TIFFmemset(val, 0, tv_size);
- status = 0;
- break;
- }
- }
- }
- }
- }
- }
- if (status) {
- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
- tif->tif_flags |= TIFF_DIRTYDIRECT;
- }
-
-end:
- va_end(ap);
- return (status);
-badvalue:
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Bad value %d for \"%s\" tag",
- tif->tif_name, v,
- _TIFFFieldWithTag(tif, tag)->field_name);
- va_end(ap);
- return (0);
-badvalue32:
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Bad value %u for \"%s\" tag",
- tif->tif_name, v32,
- _TIFFFieldWithTag(tif, tag)->field_name);
- va_end(ap);
- return (0);
-}
-
-/*
- * Return 1/0 according to whether or not
- * it is permissible to set the tag's value.
- * Note that we allow ImageLength to be changed
- * so that we can append and extend to images.
- * Any other tag may not be altered once writing
- * has commenced, unless its value has no effect
- * on the format of the data that is written.
- */
-static int
-OkToChangeTag(TIFF* tif, ttag_t tag)
-{
- const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
- if (!fip) { /* unknown tag */
- TIFFErrorExt(tif->tif_clientdata, "TIFFSetField", "%s: Unknown %stag %u",
- tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "", tag);
- return (0);
- }
- if (tag != TIFFTAG_IMAGELENGTH && (tif->tif_flags & TIFF_BEENWRITING) &&
- !fip->field_oktochange) {
- /*
- * Consult info table to see if tag can be changed
- * after we've started writing. We only allow changes
- * to those tags that don't/shouldn't affect the
- * compression and/or format of the data.
- */
- TIFFErrorExt(tif->tif_clientdata, "TIFFSetField",
- "%s: Cannot modify tag \"%s\" while writing",
- tif->tif_name, fip->field_name);
- return (0);
- }
- return (1);
-}
-
-/*
- * Record the value of a field in the
- * internal directory structure. The
- * field will be written to the file
- * when/if the directory structure is
- * updated.
- */
-int
-TIFFSetField(TIFF* tif, ttag_t tag, ...)
-{
- va_list ap;
- int status;
-
- va_start(ap, tag);
- status = TIFFVSetField(tif, tag, ap);
- va_end(ap);
- return (status);
-}
-
-/*
- * Like TIFFSetField, but taking a varargs
- * parameter list. This routine is useful
- * for building higher-level interfaces on
- * top of the library.
- */
-int
-TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- return OkToChangeTag(tif, tag) ?
- (*tif->tif_tagmethods.vsetfield)(tif, tag, ap) : 0;
-}
-
-static int
-_TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- TIFFDirectory* td = &tif->tif_dir;
- int ret_val = 1;
-
- switch (tag) {
- case TIFFTAG_SUBFILETYPE:
- *va_arg(ap, uint32*) = td->td_subfiletype;
- break;
- case TIFFTAG_IMAGEWIDTH:
- *va_arg(ap, uint32*) = td->td_imagewidth;
- break;
- case TIFFTAG_IMAGELENGTH:
- *va_arg(ap, uint32*) = td->td_imagelength;
- break;
- case TIFFTAG_BITSPERSAMPLE:
- *va_arg(ap, uint16*) = td->td_bitspersample;
- break;
- case TIFFTAG_COMPRESSION:
- *va_arg(ap, uint16*) = td->td_compression;
- break;
- case TIFFTAG_PHOTOMETRIC:
- *va_arg(ap, uint16*) = td->td_photometric;
- break;
- case TIFFTAG_THRESHHOLDING:
- *va_arg(ap, uint16*) = td->td_threshholding;
- break;
- case TIFFTAG_FILLORDER:
- *va_arg(ap, uint16*) = td->td_fillorder;
- break;
- case TIFFTAG_ORIENTATION:
- *va_arg(ap, uint16*) = td->td_orientation;
- break;
- case TIFFTAG_SAMPLESPERPIXEL:
- *va_arg(ap, uint16*) = td->td_samplesperpixel;
- break;
- case TIFFTAG_ROWSPERSTRIP:
- *va_arg(ap, uint32*) = td->td_rowsperstrip;
- break;
- case TIFFTAG_MINSAMPLEVALUE:
- *va_arg(ap, uint16*) = td->td_minsamplevalue;
- break;
- case TIFFTAG_MAXSAMPLEVALUE:
- *va_arg(ap, uint16*) = td->td_maxsamplevalue;
- break;
- case TIFFTAG_SMINSAMPLEVALUE:
- *va_arg(ap, double*) = td->td_sminsamplevalue;
- break;
- case TIFFTAG_SMAXSAMPLEVALUE:
- *va_arg(ap, double*) = td->td_smaxsamplevalue;
- break;
- case TIFFTAG_XRESOLUTION:
- *va_arg(ap, float*) = td->td_xresolution;
- break;
- case TIFFTAG_YRESOLUTION:
- *va_arg(ap, float*) = td->td_yresolution;
- break;
- case TIFFTAG_PLANARCONFIG:
- *va_arg(ap, uint16*) = td->td_planarconfig;
- break;
- case TIFFTAG_XPOSITION:
- *va_arg(ap, float*) = td->td_xposition;
- break;
- case TIFFTAG_YPOSITION:
- *va_arg(ap, float*) = td->td_yposition;
- break;
- case TIFFTAG_RESOLUTIONUNIT:
- *va_arg(ap, uint16*) = td->td_resolutionunit;
- break;
- case TIFFTAG_PAGENUMBER:
- *va_arg(ap, uint16*) = td->td_pagenumber[0];
- *va_arg(ap, uint16*) = td->td_pagenumber[1];
- break;
- case TIFFTAG_HALFTONEHINTS:
- *va_arg(ap, uint16*) = td->td_halftonehints[0];
- *va_arg(ap, uint16*) = td->td_halftonehints[1];
- break;
- case TIFFTAG_COLORMAP:
- *va_arg(ap, uint16**) = td->td_colormap[0];
- *va_arg(ap, uint16**) = td->td_colormap[1];
- *va_arg(ap, uint16**) = td->td_colormap[2];
- break;
- case TIFFTAG_STRIPOFFSETS:
- case TIFFTAG_TILEOFFSETS:
- *va_arg(ap, uint32**) = td->td_stripoffset;
- break;
- case TIFFTAG_STRIPBYTECOUNTS:
- case TIFFTAG_TILEBYTECOUNTS:
- *va_arg(ap, uint32**) = td->td_stripbytecount;
- break;
- case TIFFTAG_MATTEING:
- *va_arg(ap, uint16*) =
- (td->td_extrasamples == 1 &&
- td->td_sampleinfo[0] == EXTRASAMPLE_ASSOCALPHA);
- break;
- case TIFFTAG_EXTRASAMPLES:
- *va_arg(ap, uint16*) = td->td_extrasamples;
- *va_arg(ap, uint16**) = td->td_sampleinfo;
- break;
- case TIFFTAG_TILEWIDTH:
- *va_arg(ap, uint32*) = td->td_tilewidth;
- break;
- case TIFFTAG_TILELENGTH:
- *va_arg(ap, uint32*) = td->td_tilelength;
- break;
- case TIFFTAG_TILEDEPTH:
- *va_arg(ap, uint32*) = td->td_tiledepth;
- break;
- case TIFFTAG_DATATYPE:
- switch (td->td_sampleformat) {
- case SAMPLEFORMAT_UINT:
- *va_arg(ap, uint16*) = DATATYPE_UINT;
- break;
- case SAMPLEFORMAT_INT:
- *va_arg(ap, uint16*) = DATATYPE_INT;
- break;
- case SAMPLEFORMAT_IEEEFP:
- *va_arg(ap, uint16*) = DATATYPE_IEEEFP;
- break;
- case SAMPLEFORMAT_VOID:
- *va_arg(ap, uint16*) = DATATYPE_VOID;
- break;
- }
- break;
- case TIFFTAG_SAMPLEFORMAT:
- *va_arg(ap, uint16*) = td->td_sampleformat;
- break;
- case TIFFTAG_IMAGEDEPTH:
- *va_arg(ap, uint32*) = td->td_imagedepth;
- break;
- case TIFFTAG_SUBIFD:
- *va_arg(ap, uint16*) = td->td_nsubifd;
- *va_arg(ap, uint32**) = td->td_subifd;
- break;
- case TIFFTAG_YCBCRPOSITIONING:
- *va_arg(ap, uint16*) = td->td_ycbcrpositioning;
- break;
- case TIFFTAG_YCBCRSUBSAMPLING:
- *va_arg(ap, uint16*) = td->td_ycbcrsubsampling[0];
- *va_arg(ap, uint16*) = td->td_ycbcrsubsampling[1];
- break;
- case TIFFTAG_TRANSFERFUNCTION:
- *va_arg(ap, uint16**) = td->td_transferfunction[0];
- if (td->td_samplesperpixel - td->td_extrasamples > 1) {
- *va_arg(ap, uint16**) = td->td_transferfunction[1];
- *va_arg(ap, uint16**) = td->td_transferfunction[2];
- }
- break;
- case TIFFTAG_INKNAMES:
- *va_arg(ap, char**) = td->td_inknames;
- break;
- default:
- {
- const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
- int i;
-
- /*
- * This can happen if multiple images are open with different
- * codecs which have private tags. The global tag information
- * table may then have tags that are valid for one file but not
- * the other. If the client tries to get a tag that is not valid
- * for the image's codec then we'll arrive here.
- */
- if( fip == NULL || fip->field_bit != FIELD_CUSTOM )
- {
- TIFFErrorExt(tif->tif_clientdata, "_TIFFVGetField",
- "%s: Invalid %stag \"%s\" "
- "(not supported by codec)",
- tif->tif_name,
- isPseudoTag(tag) ? "pseudo-" : "",
- fip ? fip->field_name : "Unknown");
- ret_val = 0;
- break;
- }
-
- /*
- * Do we have a custom value?
- */
- ret_val = 0;
- for (i = 0; i < td->td_customValueCount; i++) {
- TIFFTagValue *tv = td->td_customValues + i;
-
- if (tv->info->field_tag != tag)
- continue;
-
- if (fip->field_passcount) {
- if (fip->field_readcount == TIFF_VARIABLE2)
- *va_arg(ap, uint32*) = (uint32)tv->count;
- else /* Assume TIFF_VARIABLE */
- *va_arg(ap, uint16*) = (uint16)tv->count;
- *va_arg(ap, void **) = tv->value;
- ret_val = 1;
- } else {
- if ((fip->field_type == TIFF_ASCII
- || fip->field_readcount == TIFF_VARIABLE
- || fip->field_readcount == TIFF_VARIABLE2
- || fip->field_readcount == TIFF_SPP
- || tv->count > 1)
- && fip->field_tag != TIFFTAG_PAGENUMBER
- && fip->field_tag != TIFFTAG_HALFTONEHINTS
- && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
- && fip->field_tag != TIFFTAG_DOTRANGE) {
- *va_arg(ap, void **) = tv->value;
- ret_val = 1;
- } else {
- int j;
- char *val = (char *)tv->value;
-
- for (j = 0; j < tv->count;
- j++, val += _TIFFDataSize(tv->info->field_type)) {
- switch (fip->field_type) {
- case TIFF_BYTE:
- case TIFF_UNDEFINED:
- *va_arg(ap, uint8*) =
- *(uint8 *)val;
- ret_val = 1;
- break;
- case TIFF_SBYTE:
- *va_arg(ap, int8*) =
- *(int8 *)val;
- ret_val = 1;
- break;
- case TIFF_SHORT:
- *va_arg(ap, uint16*) =
- *(uint16 *)val;
- ret_val = 1;
- break;
- case TIFF_SSHORT:
- *va_arg(ap, int16*) =
- *(int16 *)val;
- ret_val = 1;
- break;
- case TIFF_LONG:
- case TIFF_IFD:
- *va_arg(ap, uint32*) =
- *(uint32 *)val;
- ret_val = 1;
- break;
- case TIFF_SLONG:
- *va_arg(ap, int32*) =
- *(int32 *)val;
- ret_val = 1;
- break;
- case TIFF_RATIONAL:
- case TIFF_SRATIONAL:
- case TIFF_FLOAT:
- *va_arg(ap, float*) =
- *(float *)val;
- ret_val = 1;
- break;
- case TIFF_DOUBLE:
- *va_arg(ap, double*) =
- *(double *)val;
- ret_val = 1;
- break;
- default:
- ret_val = 0;
- break;
- }
- }
- }
- }
- break;
- }
- }
- }
- return(ret_val);
-}
-
-/*
- * Return the value of a field in the
- * internal directory structure.
- */
-int
-TIFFGetField(TIFF* tif, ttag_t tag, ...)
-{
- int status;
- va_list ap;
-
- va_start(ap, tag);
- status = TIFFVGetField(tif, tag, ap);
- va_end(ap);
- return (status);
-}
-
-/*
- * Like TIFFGetField, but taking a varargs
- * parameter list. This routine is useful
- * for building higher-level interfaces on
- * top of the library.
- */
-int
-TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
- return (fip && (isPseudoTag(tag) || TIFFFieldSet(tif, fip->field_bit)) ?
- (*tif->tif_tagmethods.vgetfield)(tif, tag, ap) : 0);
-}
-
-#define CleanupField(member) { \
- if (td->member) { \
- _TIFFfree(td->member); \
- td->member = 0; \
- } \
-}
-
-/*
- * Release storage associated with a directory.
- */
-void
-TIFFFreeDirectory(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- int i;
-
- _TIFFmemset(td->td_fieldsset, 0, FIELD_SETLONGS);
- CleanupField(td_colormap[0]);
- CleanupField(td_colormap[1]);
- CleanupField(td_colormap[2]);
- CleanupField(td_sampleinfo);
- CleanupField(td_subifd);
- CleanupField(td_inknames);
- CleanupField(td_transferfunction[0]);
- CleanupField(td_transferfunction[1]);
- CleanupField(td_transferfunction[2]);
- CleanupField(td_stripoffset);
- CleanupField(td_stripbytecount);
- TIFFClrFieldBit(tif, FIELD_YCBCRSUBSAMPLING);
- TIFFClrFieldBit(tif, FIELD_YCBCRPOSITIONING);
-
- /* Cleanup custom tag values */
- for( i = 0; i < td->td_customValueCount; i++ ) {
- if (td->td_customValues[i].value)
- _TIFFfree(td->td_customValues[i].value);
- }
-
- td->td_customValueCount = 0;
- CleanupField(td_customValues);
-}
-#undef CleanupField
-
-/*
- * Client Tag extension support (from Niles Ritter).
- */
-static TIFFExtendProc _TIFFextender = (TIFFExtendProc) NULL;
-
-TIFFExtendProc
-TIFFSetTagExtender(TIFFExtendProc extender)
-{
- TIFFExtendProc prev = _TIFFextender;
- _TIFFextender = extender;
- return (prev);
-}
-
-/*
- * Setup for a new directory. Should we automatically call
- * TIFFWriteDirectory() if the current one is dirty?
- *
- * The newly created directory will not exist on the file till
- * TIFFWriteDirectory(), TIFFFlush() or TIFFClose() is called.
- */
-int
-TIFFCreateDirectory(TIFF* tif)
-{
- TIFFDefaultDirectory(tif);
- tif->tif_diroff = 0;
- tif->tif_nextdiroff = 0;
- tif->tif_curoff = 0;
- tif->tif_row = (uint32) -1;
- tif->tif_curstrip = (tstrip_t) -1;
-
- return 0;
-}
-
-/*
- * Setup a default directory structure.
- */
-int
-TIFFDefaultDirectory(TIFF* tif)
-{
- register TIFFDirectory* td = &tif->tif_dir;
-
- size_t tiffFieldInfoCount;
- const TIFFFieldInfo *tiffFieldInfo =
- _TIFFGetFieldInfo(&tiffFieldInfoCount);
- _TIFFSetupFieldInfo(tif, tiffFieldInfo, tiffFieldInfoCount);
-
- _TIFFmemset(td, 0, sizeof (*td));
- td->td_fillorder = FILLORDER_MSB2LSB;
- td->td_bitspersample = 1;
- td->td_threshholding = THRESHHOLD_BILEVEL;
- td->td_orientation = ORIENTATION_TOPLEFT;
- td->td_samplesperpixel = 1;
- td->td_rowsperstrip = (uint32) -1;
- td->td_tilewidth = 0;
- td->td_tilelength = 0;
- td->td_tiledepth = 1;
- td->td_stripbytecountsorted = 1; /* Our own arrays always sorted. */
- td->td_resolutionunit = RESUNIT_INCH;
- td->td_sampleformat = SAMPLEFORMAT_UINT;
- td->td_imagedepth = 1;
- td->td_ycbcrsubsampling[0] = 2;
- td->td_ycbcrsubsampling[1] = 2;
- td->td_ycbcrpositioning = YCBCRPOSITION_CENTERED;
- tif->tif_postdecode = _TIFFNoPostDecode;
- tif->tif_foundfield = NULL;
- tif->tif_tagmethods.vsetfield = _TIFFVSetField;
- tif->tif_tagmethods.vgetfield = _TIFFVGetField;
- tif->tif_tagmethods.printdir = NULL;
- /*
- * Give client code a chance to install their own
- * tag extensions & methods, prior to compression overloads.
- */
- if (_TIFFextender)
- (*_TIFFextender)(tif);
- (void) TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
- /*
- * NB: The directory is marked dirty as a result of setting
- * up the default compression scheme. However, this really
- * isn't correct -- we want TIFF_DIRTYDIRECT to be set only
- * if the user does something. We could just do the setup
- * by hand, but it seems better to use the normal mechanism
- * (i.e. TIFFSetField).
- */
- tif->tif_flags &= ~TIFF_DIRTYDIRECT;
-
- /*
- * As per http://bugzilla.remotesensing.org/show_bug.cgi?id=19
- * we clear the ISTILED flag when setting up a new directory.
- * Should we also be clearing stuff like INSUBIFD?
- */
- tif->tif_flags &= ~TIFF_ISTILED;
-
- return (1);
-}
-
-static int
-TIFFAdvanceDirectory(TIFF* tif, uint32* nextdir, toff_t* off)
-{
- static const char module[] = "TIFFAdvanceDirectory";
- uint16 dircount;
- if (isMapped(tif))
- {
- toff_t poff=*nextdir;
- if (poff+sizeof(uint16) > tif->tif_size)
- {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Error fetching directory count",
- tif->tif_name);
- return (0);
- }
- _TIFFmemcpy(&dircount, tif->tif_base+poff, sizeof (uint16));
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabShort(&dircount);
- poff+=sizeof (uint16)+dircount*sizeof (TIFFDirEntry);
- if (off != NULL)
- *off = poff;
- if (((toff_t) (poff+sizeof (uint32))) > tif->tif_size)
- {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Error fetching directory link",
- tif->tif_name);
- return (0);
- }
- _TIFFmemcpy(nextdir, tif->tif_base+poff, sizeof (uint32));
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabLong(nextdir);
- return (1);
- }
- else
- {
- if (!SeekOK(tif, *nextdir) ||
- !ReadOK(tif, &dircount, sizeof (uint16))) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Error fetching directory count",
- tif->tif_name);
- return (0);
- }
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabShort(&dircount);
- if (off != NULL)
- *off = TIFFSeekFile(tif,
- dircount*sizeof (TIFFDirEntry), SEEK_CUR);
- else
- (void) TIFFSeekFile(tif,
- dircount*sizeof (TIFFDirEntry), SEEK_CUR);
- if (!ReadOK(tif, nextdir, sizeof (uint32))) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Error fetching directory link",
- tif->tif_name);
- return (0);
- }
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabLong(nextdir);
- return (1);
- }
-}
-
-/*
- * Count the number of directories in a file.
- */
-tdir_t
-TIFFNumberOfDirectories(TIFF* tif)
-{
- toff_t nextdir = tif->tif_header.tiff_diroff;
- tdir_t n = 0;
-
- while (nextdir != 0 && TIFFAdvanceDirectory(tif, &nextdir, NULL))
- n++;
- return (n);
-}
-
-/*
- * Set the n-th directory as the current directory.
- * NB: Directories are numbered starting at 0.
- */
-int
-TIFFSetDirectory(TIFF* tif, tdir_t dirn)
-{
- toff_t nextdir;
- tdir_t n;
-
- nextdir = tif->tif_header.tiff_diroff;
- for (n = dirn; n > 0 && nextdir != 0; n--)
- if (!TIFFAdvanceDirectory(tif, &nextdir, NULL))
- return (0);
- tif->tif_nextdiroff = nextdir;
- /*
- * Set curdir to the actual directory index. The
- * -1 is because TIFFReadDirectory will increment
- * tif_curdir after successfully reading the directory.
- */
- tif->tif_curdir = (dirn - n) - 1;
- /*
- * Reset tif_dirnumber counter and start new list of seen directories.
- * We need this to prevent IFD loops.
- */
- tif->tif_dirnumber = 0;
- return (TIFFReadDirectory(tif));
-}
-
-/*
- * Set the current directory to be the directory
- * located at the specified file offset. This interface
- * is used mainly to access directories linked with
- * the SubIFD tag (e.g. thumbnail images).
- */
-int
-TIFFSetSubDirectory(TIFF* tif, uint32 diroff)
-{
- tif->tif_nextdiroff = diroff;
- /*
- * Reset tif_dirnumber counter and start new list of seen directories.
- * We need this to prevent IFD loops.
- */
- tif->tif_dirnumber = 0;
- return (TIFFReadDirectory(tif));
-}
-
-/*
- * Return file offset of the current directory.
- */
-uint32
-TIFFCurrentDirOffset(TIFF* tif)
-{
- return (tif->tif_diroff);
-}
-
-/*
- * Return an indication of whether or not we are
- * at the last directory in the file.
- */
-int
-TIFFLastDirectory(TIFF* tif)
-{
- return (tif->tif_nextdiroff == 0);
-}
-
-/*
- * Unlink the specified directory from the directory chain.
- */
-int
-TIFFUnlinkDirectory(TIFF* tif, tdir_t dirn)
-{
- static const char module[] = "TIFFUnlinkDirectory";
- toff_t nextdir;
- toff_t off;
- tdir_t n;
-
- if (tif->tif_mode == O_RDONLY) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Can not unlink directory in read-only file");
- return (0);
- }
- /*
- * Go to the directory before the one we want
- * to unlink and nab the offset of the link
- * field we'll need to patch.
- */
- nextdir = tif->tif_header.tiff_diroff;
- off = sizeof (uint16) + sizeof (uint16);
- for (n = dirn-1; n > 0; n--) {
- if (nextdir == 0) {
- TIFFErrorExt(tif->tif_clientdata, module, "Directory %d does not exist", dirn);
- return (0);
- }
- if (!TIFFAdvanceDirectory(tif, &nextdir, &off))
- return (0);
- }
- /*
- * Advance to the directory to be unlinked and fetch
- * the offset of the directory that follows.
- */
- if (!TIFFAdvanceDirectory(tif, &nextdir, NULL))
- return (0);
- /*
- * Go back and patch the link field of the preceding
- * directory to point to the offset of the directory
- * that follows.
- */
- (void) TIFFSeekFile(tif, off, SEEK_SET);
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabLong(&nextdir);
- if (!WriteOK(tif, &nextdir, sizeof (uint32))) {
- TIFFErrorExt(tif->tif_clientdata, module, "Error writing directory link");
- return (0);
- }
- /*
- * Leave directory state setup safely. We don't have
- * facilities for doing inserting and removing directories,
- * so it's safest to just invalidate everything. This
- * means that the caller can only append to the directory
- * chain.
- */
- (*tif->tif_cleanup)(tif);
- if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata) {
- _TIFFfree(tif->tif_rawdata);
- tif->tif_rawdata = NULL;
- tif->tif_rawcc = 0;
- }
- tif->tif_flags &= ~(TIFF_BEENWRITING|TIFF_BUFFERSETUP|TIFF_POSTENCODE);
- TIFFFreeDirectory(tif);
- TIFFDefaultDirectory(tif);
- tif->tif_diroff = 0; /* force link on next write */
- tif->tif_nextdiroff = 0; /* next write must be at end */
- tif->tif_curoff = 0;
- tif->tif_row = (uint32) -1;
- tif->tif_curstrip = (tstrip_t) -1;
- return (1);
-}
-
-/* [BFC]
- *
- * Author: Bruce Cameron <cameron@petris.com>
- *
- * Set a table of tags that are to be replaced during directory process by the
- * 'IGNORE' state - or return TRUE/FALSE for the requested tag such that
- * 'ReadDirectory' can use the stored information.
- *
- * FIXME: this is never used properly. Should be removed in the future.
- */
-int
-TIFFReassignTagToIgnore (enum TIFFIgnoreSense task, int TIFFtagID)
-{
- static int TIFFignoretags [FIELD_LAST];
- static int tagcount = 0 ;
- int i; /* Loop index */
- int j; /* Loop index */
-
- switch (task)
- {
- case TIS_STORE:
- if ( tagcount < (FIELD_LAST - 1) )
- {
- for ( j = 0 ; j < tagcount ; ++j )
- { /* Do not add duplicate tag */
- if ( TIFFignoretags [j] == TIFFtagID )
- return (TRUE) ;
- }
- TIFFignoretags [tagcount++] = TIFFtagID ;
- return (TRUE) ;
- }
- break ;
-
- case TIS_EXTRACT:
- for ( i = 0 ; i < tagcount ; ++i )
- {
- if ( TIFFignoretags [i] == TIFFtagID )
- return (TRUE) ;
- }
- break;
-
- case TIS_EMPTY:
- tagcount = 0 ; /* Clear the list */
- return (TRUE) ;
-
- default:
- break;
- }
-
- return (FALSE);
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_dir.h b/src/3rdparty/libtiff/libtiff/tif_dir.h
deleted file mode 100644
index e2aeea2917..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_dir.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/* $Id: tif_dir.h,v 1.30.2.1 2007/04/07 14:58:30 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _TIFFDIR_
-#define _TIFFDIR_
-/*
- * ``Library-private'' Directory-related Definitions.
- */
-
-/*
- * Internal format of a TIFF directory entry.
- */
-typedef struct {
-#define FIELD_SETLONGS 4
- /* bit vector of fields that are set */
- unsigned long td_fieldsset[FIELD_SETLONGS];
-
- uint32 td_imagewidth, td_imagelength, td_imagedepth;
- uint32 td_tilewidth, td_tilelength, td_tiledepth;
- uint32 td_subfiletype;
- uint16 td_bitspersample;
- uint16 td_sampleformat;
- uint16 td_compression;
- uint16 td_photometric;
- uint16 td_threshholding;
- uint16 td_fillorder;
- uint16 td_orientation;
- uint16 td_samplesperpixel;
- uint32 td_rowsperstrip;
- uint16 td_minsamplevalue, td_maxsamplevalue;
- double td_sminsamplevalue, td_smaxsamplevalue;
- float td_xresolution, td_yresolution;
- uint16 td_resolutionunit;
- uint16 td_planarconfig;
- float td_xposition, td_yposition;
- uint16 td_pagenumber[2];
- uint16* td_colormap[3];
- uint16 td_halftonehints[2];
- uint16 td_extrasamples;
- uint16* td_sampleinfo;
- /* even though the name is misleading, td_stripsperimage is the number
- * of striles (=strips or tiles) per plane, and td_nstrips the total
- * number of striles */
- tstrile_t td_stripsperimage;
- tstrile_t td_nstrips; /* size of offset & bytecount arrays */
- toff_t* td_stripoffset;
- toff_t* td_stripbytecount; /* FIXME: it should be tsize_t array */
- int td_stripbytecountsorted; /* is the bytecount array sorted ascending? */
- uint16 td_nsubifd;
- uint32* td_subifd;
- /* YCbCr parameters */
- uint16 td_ycbcrsubsampling[2];
- uint16 td_ycbcrpositioning;
- /* Colorimetry parameters */
- uint16* td_transferfunction[3];
- /* CMYK parameters */
- int td_inknameslen;
- char* td_inknames;
-
- int td_customValueCount;
- TIFFTagValue *td_customValues;
-} TIFFDirectory;
-
-/*
- * Field flags used to indicate fields that have
- * been set in a directory, and to reference fields
- * when manipulating a directory.
- */
-
-/*
- * FIELD_IGNORE is used to signify tags that are to
- * be processed but otherwise ignored. This permits
- * antiquated tags to be quietly read and discarded.
- * Note that a bit *is* allocated for ignored tags;
- * this is understood by the directory reading logic
- * which uses this fact to avoid special-case handling
- */
-#define FIELD_IGNORE 0
-
-/* multi-item fields */
-#define FIELD_IMAGEDIMENSIONS 1
-#define FIELD_TILEDIMENSIONS 2
-#define FIELD_RESOLUTION 3
-#define FIELD_POSITION 4
-
-/* single-item fields */
-#define FIELD_SUBFILETYPE 5
-#define FIELD_BITSPERSAMPLE 6
-#define FIELD_COMPRESSION 7
-#define FIELD_PHOTOMETRIC 8
-#define FIELD_THRESHHOLDING 9
-#define FIELD_FILLORDER 10
-#define FIELD_ORIENTATION 15
-#define FIELD_SAMPLESPERPIXEL 16
-#define FIELD_ROWSPERSTRIP 17
-#define FIELD_MINSAMPLEVALUE 18
-#define FIELD_MAXSAMPLEVALUE 19
-#define FIELD_PLANARCONFIG 20
-#define FIELD_RESOLUTIONUNIT 22
-#define FIELD_PAGENUMBER 23
-#define FIELD_STRIPBYTECOUNTS 24
-#define FIELD_STRIPOFFSETS 25
-#define FIELD_COLORMAP 26
-#define FIELD_EXTRASAMPLES 31
-#define FIELD_SAMPLEFORMAT 32
-#define FIELD_SMINSAMPLEVALUE 33
-#define FIELD_SMAXSAMPLEVALUE 34
-#define FIELD_IMAGEDEPTH 35
-#define FIELD_TILEDEPTH 36
-#define FIELD_HALFTONEHINTS 37
-#define FIELD_YCBCRSUBSAMPLING 39
-#define FIELD_YCBCRPOSITIONING 40
-#define FIELD_TRANSFERFUNCTION 44
-#define FIELD_INKNAMES 46
-#define FIELD_SUBIFD 49
-/* FIELD_CUSTOM (see tiffio.h) 65 */
-/* end of support for well-known tags; codec-private tags follow */
-#define FIELD_CODEC 66 /* base of codec-private tags */
-
-
-/*
- * Pseudo-tags don't normally need field bits since they
- * are not written to an output file (by definition).
- * The library also has express logic to always query a
- * codec for a pseudo-tag so allocating a field bit for
- * one is a waste. If codec wants to promote the notion
- * of a pseudo-tag being ``set'' or ``unset'' then it can
- * do using internal state flags without polluting the
- * field bit space defined for real tags.
- */
-#define FIELD_PSEUDO 0
-
-#define FIELD_LAST (32*FIELD_SETLONGS-1)
-
-#define TIFFExtractData(tif, type, v) \
- ((uint32) ((tif)->tif_header.tiff_magic == TIFF_BIGENDIAN ? \
- ((v) >> (tif)->tif_typeshift[type]) & (tif)->tif_typemask[type] : \
- (v) & (tif)->tif_typemask[type]))
-#define TIFFInsertData(tif, type, v) \
- ((uint32) ((tif)->tif_header.tiff_magic == TIFF_BIGENDIAN ? \
- ((v) & (tif)->tif_typemask[type]) << (tif)->tif_typeshift[type] : \
- (v) & (tif)->tif_typemask[type]))
-
-
-#define BITn(n) (((unsigned long)1L)<<((n)&0x1f))
-#define BITFIELDn(tif, n) ((tif)->tif_dir.td_fieldsset[(n)/32])
-#define TIFFFieldSet(tif, field) (BITFIELDn(tif, field) & BITn(field))
-#define TIFFSetFieldBit(tif, field) (BITFIELDn(tif, field) |= BITn(field))
-#define TIFFClrFieldBit(tif, field) (BITFIELDn(tif, field) &= ~BITn(field))
-
-#define FieldSet(fields, f) (fields[(f)/32] & BITn(f))
-#define ResetFieldBit(fields, f) (fields[(f)/32] &= ~BITn(f))
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-extern const TIFFFieldInfo *_TIFFGetFieldInfo(size_t *);
-extern const TIFFFieldInfo *_TIFFGetExifFieldInfo(size_t *);
-extern void _TIFFSetupFieldInfo(TIFF*, const TIFFFieldInfo[], size_t);
-extern int _TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int);
-extern void _TIFFPrintFieldInfo(TIFF*, FILE*);
-extern TIFFDataType _TIFFSampleToTagType(TIFF*);
-extern const TIFFFieldInfo* _TIFFFindOrRegisterFieldInfo( TIFF *tif,
- ttag_t tag,
- TIFFDataType dt );
-extern TIFFFieldInfo* _TIFFCreateAnonFieldInfo( TIFF *tif, ttag_t tag,
- TIFFDataType dt );
-
-#define _TIFFFindFieldInfo TIFFFindFieldInfo
-#define _TIFFFindFieldInfoByName TIFFFindFieldInfoByName
-#define _TIFFFieldWithTag TIFFFieldWithTag
-#define _TIFFFieldWithName TIFFFieldWithName
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* _TIFFDIR_ */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_dirinfo.c b/src/3rdparty/libtiff/libtiff/tif_dirinfo.c
deleted file mode 100644
index 99a871cc37..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_dirinfo.c
+++ /dev/null
@@ -1,881 +0,0 @@
-/* $Id: tif_dirinfo.c,v 1.65.2.7 2009-09-17 18:00:28 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Core Directory Tag Support.
- */
-#include "tiffiop.h"
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * NB: NB: THIS ARRAY IS ASSUMED TO BE SORTED BY TAG.
- * If a tag can have both LONG and SHORT types then the LONG must be
- * placed before the SHORT for writing to work properly.
- *
- * NOTE: The second field (field_readcount) and third field (field_writecount)
- * sometimes use the values TIFF_VARIABLE (-1), TIFF_VARIABLE2 (-3)
- * and TIFFTAG_SPP (-2). The macros should be used but would throw off
- * the formatting of the code, so please interprete the -1, -2 and -3
- * values accordingly.
- */
-static const TIFFFieldInfo
-tiffFieldInfo[] = {
- { TIFFTAG_SUBFILETYPE, 1, 1, TIFF_LONG, FIELD_SUBFILETYPE,
- 1, 0, "SubfileType" },
-/* XXX SHORT for compatibility w/ old versions of the library */
- { TIFFTAG_SUBFILETYPE, 1, 1, TIFF_SHORT, FIELD_SUBFILETYPE,
- 1, 0, "SubfileType" },
- { TIFFTAG_OSUBFILETYPE, 1, 1, TIFF_SHORT, FIELD_SUBFILETYPE,
- 1, 0, "OldSubfileType" },
- { TIFFTAG_IMAGEWIDTH, 1, 1, TIFF_LONG, FIELD_IMAGEDIMENSIONS,
- 0, 0, "ImageWidth" },
- { TIFFTAG_IMAGEWIDTH, 1, 1, TIFF_SHORT, FIELD_IMAGEDIMENSIONS,
- 0, 0, "ImageWidth" },
- { TIFFTAG_IMAGELENGTH, 1, 1, TIFF_LONG, FIELD_IMAGEDIMENSIONS,
- 1, 0, "ImageLength" },
- { TIFFTAG_IMAGELENGTH, 1, 1, TIFF_SHORT, FIELD_IMAGEDIMENSIONS,
- 1, 0, "ImageLength" },
- { TIFFTAG_BITSPERSAMPLE, -1,-1, TIFF_SHORT, FIELD_BITSPERSAMPLE,
- 0, 0, "BitsPerSample" },
-/* XXX LONG for compatibility with some broken TIFF writers */
- { TIFFTAG_BITSPERSAMPLE, -1,-1, TIFF_LONG, FIELD_BITSPERSAMPLE,
- 0, 0, "BitsPerSample" },
- { TIFFTAG_COMPRESSION, -1, 1, TIFF_SHORT, FIELD_COMPRESSION,
- 0, 0, "Compression" },
-/* XXX LONG for compatibility with some broken TIFF writers */
- { TIFFTAG_COMPRESSION, -1, 1, TIFF_LONG, FIELD_COMPRESSION,
- 0, 0, "Compression" },
- { TIFFTAG_PHOTOMETRIC, 1, 1, TIFF_SHORT, FIELD_PHOTOMETRIC,
- 0, 0, "PhotometricInterpretation" },
-/* XXX LONG for compatibility with some broken TIFF writers */
- { TIFFTAG_PHOTOMETRIC, 1, 1, TIFF_LONG, FIELD_PHOTOMETRIC,
- 0, 0, "PhotometricInterpretation" },
- { TIFFTAG_THRESHHOLDING, 1, 1, TIFF_SHORT, FIELD_THRESHHOLDING,
- 1, 0, "Threshholding" },
- { TIFFTAG_CELLWIDTH, 1, 1, TIFF_SHORT, FIELD_IGNORE,
- 1, 0, "CellWidth" },
- { TIFFTAG_CELLLENGTH, 1, 1, TIFF_SHORT, FIELD_IGNORE,
- 1, 0, "CellLength" },
- { TIFFTAG_FILLORDER, 1, 1, TIFF_SHORT, FIELD_FILLORDER,
- 0, 0, "FillOrder" },
- { TIFFTAG_DOCUMENTNAME, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "DocumentName" },
- { TIFFTAG_IMAGEDESCRIPTION, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "ImageDescription" },
- { TIFFTAG_MAKE, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "Make" },
- { TIFFTAG_MODEL, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "Model" },
- { TIFFTAG_STRIPOFFSETS, -1,-1, TIFF_LONG, FIELD_STRIPOFFSETS,
- 0, 0, "StripOffsets" },
- { TIFFTAG_STRIPOFFSETS, -1,-1, TIFF_SHORT, FIELD_STRIPOFFSETS,
- 0, 0, "StripOffsets" },
- { TIFFTAG_ORIENTATION, 1, 1, TIFF_SHORT, FIELD_ORIENTATION,
- 0, 0, "Orientation" },
- { TIFFTAG_SAMPLESPERPIXEL, 1, 1, TIFF_SHORT, FIELD_SAMPLESPERPIXEL,
- 0, 0, "SamplesPerPixel" },
- { TIFFTAG_ROWSPERSTRIP, 1, 1, TIFF_LONG, FIELD_ROWSPERSTRIP,
- 0, 0, "RowsPerStrip" },
- { TIFFTAG_ROWSPERSTRIP, 1, 1, TIFF_SHORT, FIELD_ROWSPERSTRIP,
- 0, 0, "RowsPerStrip" },
- { TIFFTAG_STRIPBYTECOUNTS, -1,-1, TIFF_LONG, FIELD_STRIPBYTECOUNTS,
- 0, 0, "StripByteCounts" },
- { TIFFTAG_STRIPBYTECOUNTS, -1,-1, TIFF_SHORT, FIELD_STRIPBYTECOUNTS,
- 0, 0, "StripByteCounts" },
- { TIFFTAG_MINSAMPLEVALUE, -2,-1, TIFF_SHORT, FIELD_MINSAMPLEVALUE,
- 1, 0, "MinSampleValue" },
- { TIFFTAG_MAXSAMPLEVALUE, -2,-1, TIFF_SHORT, FIELD_MAXSAMPLEVALUE,
- 1, 0, "MaxSampleValue" },
- { TIFFTAG_XRESOLUTION, 1, 1, TIFF_RATIONAL, FIELD_RESOLUTION,
- 1, 0, "XResolution" },
- { TIFFTAG_YRESOLUTION, 1, 1, TIFF_RATIONAL, FIELD_RESOLUTION,
- 1, 0, "YResolution" },
- { TIFFTAG_PLANARCONFIG, 1, 1, TIFF_SHORT, FIELD_PLANARCONFIG,
- 0, 0, "PlanarConfiguration" },
- { TIFFTAG_PAGENAME, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "PageName" },
- { TIFFTAG_XPOSITION, 1, 1, TIFF_RATIONAL, FIELD_POSITION,
- 1, 0, "XPosition" },
- { TIFFTAG_YPOSITION, 1, 1, TIFF_RATIONAL, FIELD_POSITION,
- 1, 0, "YPosition" },
- { TIFFTAG_FREEOFFSETS, -1,-1, TIFF_LONG, FIELD_IGNORE,
- 0, 0, "FreeOffsets" },
- { TIFFTAG_FREEBYTECOUNTS, -1,-1, TIFF_LONG, FIELD_IGNORE,
- 0, 0, "FreeByteCounts" },
- { TIFFTAG_GRAYRESPONSEUNIT, 1, 1, TIFF_SHORT, FIELD_IGNORE,
- 1, 0, "GrayResponseUnit" },
- { TIFFTAG_GRAYRESPONSECURVE,-1,-1, TIFF_SHORT, FIELD_IGNORE,
- 1, 0, "GrayResponseCurve" },
- { TIFFTAG_RESOLUTIONUNIT, 1, 1, TIFF_SHORT, FIELD_RESOLUTIONUNIT,
- 1, 0, "ResolutionUnit" },
- { TIFFTAG_PAGENUMBER, 2, 2, TIFF_SHORT, FIELD_PAGENUMBER,
- 1, 0, "PageNumber" },
- { TIFFTAG_COLORRESPONSEUNIT, 1, 1, TIFF_SHORT, FIELD_IGNORE,
- 1, 0, "ColorResponseUnit" },
- { TIFFTAG_TRANSFERFUNCTION, -1,-1, TIFF_SHORT, FIELD_TRANSFERFUNCTION,
- 1, 0, "TransferFunction" },
- { TIFFTAG_SOFTWARE, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "Software" },
- { TIFFTAG_DATETIME, 20,20, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "DateTime" },
- { TIFFTAG_ARTIST, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "Artist" },
- { TIFFTAG_HOSTCOMPUTER, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "HostComputer" },
- { TIFFTAG_WHITEPOINT, 2, 2, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "WhitePoint" },
- { TIFFTAG_PRIMARYCHROMATICITIES,6,6,TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "PrimaryChromaticities" },
- { TIFFTAG_COLORMAP, -1,-1, TIFF_SHORT, FIELD_COLORMAP,
- 1, 0, "ColorMap" },
- { TIFFTAG_HALFTONEHINTS, 2, 2, TIFF_SHORT, FIELD_HALFTONEHINTS,
- 1, 0, "HalftoneHints" },
- { TIFFTAG_TILEWIDTH, 1, 1, TIFF_LONG, FIELD_TILEDIMENSIONS,
- 0, 0, "TileWidth" },
- { TIFFTAG_TILEWIDTH, 1, 1, TIFF_SHORT, FIELD_TILEDIMENSIONS,
- 0, 0, "TileWidth" },
- { TIFFTAG_TILELENGTH, 1, 1, TIFF_LONG, FIELD_TILEDIMENSIONS,
- 0, 0, "TileLength" },
- { TIFFTAG_TILELENGTH, 1, 1, TIFF_SHORT, FIELD_TILEDIMENSIONS,
- 0, 0, "TileLength" },
- { TIFFTAG_TILEOFFSETS, -1, 1, TIFF_LONG, FIELD_STRIPOFFSETS,
- 0, 0, "TileOffsets" },
- { TIFFTAG_TILEBYTECOUNTS, -1, 1, TIFF_LONG, FIELD_STRIPBYTECOUNTS,
- 0, 0, "TileByteCounts" },
- { TIFFTAG_TILEBYTECOUNTS, -1, 1, TIFF_SHORT, FIELD_STRIPBYTECOUNTS,
- 0, 0, "TileByteCounts" },
- { TIFFTAG_SUBIFD, -1,-1, TIFF_IFD, FIELD_SUBIFD,
- 1, 1, "SubIFD" },
- { TIFFTAG_SUBIFD, -1,-1, TIFF_LONG, FIELD_SUBIFD,
- 1, 1, "SubIFD" },
- { TIFFTAG_INKSET, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "InkSet" },
- { TIFFTAG_INKNAMES, -1,-1, TIFF_ASCII, FIELD_INKNAMES,
- 1, 1, "InkNames" },
- { TIFFTAG_NUMBEROFINKS, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "NumberOfInks" },
- { TIFFTAG_DOTRANGE, 2, 2, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "DotRange" },
- { TIFFTAG_DOTRANGE, 2, 2, TIFF_BYTE, FIELD_CUSTOM,
- 0, 0, "DotRange" },
- { TIFFTAG_TARGETPRINTER, -1,-1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "TargetPrinter" },
- { TIFFTAG_EXTRASAMPLES, -1,-1, TIFF_SHORT, FIELD_EXTRASAMPLES,
- 0, 1, "ExtraSamples" },
-/* XXX for bogus Adobe Photoshop v2.5 files */
- { TIFFTAG_EXTRASAMPLES, -1,-1, TIFF_BYTE, FIELD_EXTRASAMPLES,
- 0, 1, "ExtraSamples" },
- { TIFFTAG_SAMPLEFORMAT, -1,-1, TIFF_SHORT, FIELD_SAMPLEFORMAT,
- 0, 0, "SampleFormat" },
- { TIFFTAG_SMINSAMPLEVALUE, -2,-1, TIFF_ANY, FIELD_SMINSAMPLEVALUE,
- 1, 0, "SMinSampleValue" },
- { TIFFTAG_SMAXSAMPLEVALUE, -2,-1, TIFF_ANY, FIELD_SMAXSAMPLEVALUE,
- 1, 0, "SMaxSampleValue" },
- { TIFFTAG_CLIPPATH, -1, -3, TIFF_BYTE, FIELD_CUSTOM,
- 0, 1, "ClipPath" },
- { TIFFTAG_XCLIPPATHUNITS, 1, 1, TIFF_SLONG, FIELD_CUSTOM,
- 0, 0, "XClipPathUnits" },
- { TIFFTAG_XCLIPPATHUNITS, 1, 1, TIFF_SSHORT, FIELD_CUSTOM,
- 0, 0, "XClipPathUnits" },
- { TIFFTAG_XCLIPPATHUNITS, 1, 1, TIFF_SBYTE, FIELD_CUSTOM,
- 0, 0, "XClipPathUnits" },
- { TIFFTAG_YCLIPPATHUNITS, 1, 1, TIFF_SLONG, FIELD_CUSTOM,
- 0, 0, "YClipPathUnits" },
- { TIFFTAG_YCLIPPATHUNITS, 1, 1, TIFF_SSHORT, FIELD_CUSTOM,
- 0, 0, "YClipPathUnits" },
- { TIFFTAG_YCLIPPATHUNITS, 1, 1, TIFF_SBYTE, FIELD_CUSTOM,
- 0, 0, "YClipPathUnits" },
- { TIFFTAG_YCBCRCOEFFICIENTS, 3, 3, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "YCbCrCoefficients" },
- { TIFFTAG_YCBCRSUBSAMPLING, 2, 2, TIFF_SHORT, FIELD_YCBCRSUBSAMPLING,
- 0, 0, "YCbCrSubsampling" },
- { TIFFTAG_YCBCRPOSITIONING, 1, 1, TIFF_SHORT, FIELD_YCBCRPOSITIONING,
- 0, 0, "YCbCrPositioning" },
- { TIFFTAG_REFERENCEBLACKWHITE, 6, 6, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "ReferenceBlackWhite" },
-/* XXX temporarily accept LONG for backwards compatibility */
- { TIFFTAG_REFERENCEBLACKWHITE, 6, 6, TIFF_LONG, FIELD_CUSTOM,
- 1, 0, "ReferenceBlackWhite" },
- { TIFFTAG_XMLPACKET, -3,-3, TIFF_BYTE, FIELD_CUSTOM,
- 0, 1, "XMLPacket" },
-/* begin SGI tags */
- { TIFFTAG_MATTEING, 1, 1, TIFF_SHORT, FIELD_EXTRASAMPLES,
- 0, 0, "Matteing" },
- { TIFFTAG_DATATYPE, -2,-1, TIFF_SHORT, FIELD_SAMPLEFORMAT,
- 0, 0, "DataType" },
- { TIFFTAG_IMAGEDEPTH, 1, 1, TIFF_LONG, FIELD_IMAGEDEPTH,
- 0, 0, "ImageDepth" },
- { TIFFTAG_IMAGEDEPTH, 1, 1, TIFF_SHORT, FIELD_IMAGEDEPTH,
- 0, 0, "ImageDepth" },
- { TIFFTAG_TILEDEPTH, 1, 1, TIFF_LONG, FIELD_TILEDEPTH,
- 0, 0, "TileDepth" },
- { TIFFTAG_TILEDEPTH, 1, 1, TIFF_SHORT, FIELD_TILEDEPTH,
- 0, 0, "TileDepth" },
-/* end SGI tags */
-/* begin Pixar tags */
- { TIFFTAG_PIXAR_IMAGEFULLWIDTH, 1, 1, TIFF_LONG, FIELD_CUSTOM,
- 1, 0, "ImageFullWidth" },
- { TIFFTAG_PIXAR_IMAGEFULLLENGTH, 1, 1, TIFF_LONG, FIELD_CUSTOM,
- 1, 0, "ImageFullLength" },
- { TIFFTAG_PIXAR_TEXTUREFORMAT, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "TextureFormat" },
- { TIFFTAG_PIXAR_WRAPMODES, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "TextureWrapModes" },
- { TIFFTAG_PIXAR_FOVCOT, 1, 1, TIFF_FLOAT, FIELD_CUSTOM,
- 1, 0, "FieldOfViewCotangent" },
- { TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN, 16,16, TIFF_FLOAT,
- FIELD_CUSTOM, 1, 0, "MatrixWorldToScreen" },
- { TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA, 16,16, TIFF_FLOAT,
- FIELD_CUSTOM, 1, 0, "MatrixWorldToCamera" },
- { TIFFTAG_COPYRIGHT, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "Copyright" },
-/* end Pixar tags */
- { TIFFTAG_RICHTIFFIPTC, -3, -3, TIFF_LONG, FIELD_CUSTOM,
- 0, 1, "RichTIFFIPTC" },
- { TIFFTAG_PHOTOSHOP, -3, -3, TIFF_BYTE, FIELD_CUSTOM,
- 0, 1, "Photoshop" },
- { TIFFTAG_EXIFIFD, 1, 1, TIFF_LONG, FIELD_CUSTOM,
- 0, 0, "EXIFIFDOffset" },
- { TIFFTAG_ICCPROFILE, -3, -3, TIFF_UNDEFINED, FIELD_CUSTOM,
- 0, 1, "ICC Profile" },
- { TIFFTAG_GPSIFD, 1, 1, TIFF_LONG, FIELD_CUSTOM,
- 0, 0, "GPSIFDOffset" },
- { TIFFTAG_STONITS, 1, 1, TIFF_DOUBLE, FIELD_CUSTOM,
- 0, 0, "StoNits" },
- { TIFFTAG_INTEROPERABILITYIFD, 1, 1, TIFF_LONG, FIELD_CUSTOM,
- 0, 0, "InteroperabilityIFDOffset" },
-/* begin DNG tags */
- { TIFFTAG_DNGVERSION, 4, 4, TIFF_BYTE, FIELD_CUSTOM,
- 0, 0, "DNGVersion" },
- { TIFFTAG_DNGBACKWARDVERSION, 4, 4, TIFF_BYTE, FIELD_CUSTOM,
- 0, 0, "DNGBackwardVersion" },
- { TIFFTAG_UNIQUECAMERAMODEL, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "UniqueCameraModel" },
- { TIFFTAG_LOCALIZEDCAMERAMODEL, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "LocalizedCameraModel" },
- { TIFFTAG_LOCALIZEDCAMERAMODEL, -1, -1, TIFF_BYTE, FIELD_CUSTOM,
- 1, 1, "LocalizedCameraModel" },
- { TIFFTAG_CFAPLANECOLOR, -1, -1, TIFF_BYTE, FIELD_CUSTOM,
- 0, 1, "CFAPlaneColor" },
- { TIFFTAG_CFALAYOUT, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "CFALayout" },
- { TIFFTAG_LINEARIZATIONTABLE, -1, -1, TIFF_SHORT, FIELD_CUSTOM,
- 0, 1, "LinearizationTable" },
- { TIFFTAG_BLACKLEVELREPEATDIM, 2, 2, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "BlackLevelRepeatDim" },
- { TIFFTAG_BLACKLEVEL, -1, -1, TIFF_LONG, FIELD_CUSTOM,
- 0, 1, "BlackLevel" },
- { TIFFTAG_BLACKLEVEL, -1, -1, TIFF_SHORT, FIELD_CUSTOM,
- 0, 1, "BlackLevel" },
- { TIFFTAG_BLACKLEVEL, -1, -1, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 1, "BlackLevel" },
- { TIFFTAG_BLACKLEVELDELTAH, -1, -1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 1, "BlackLevelDeltaH" },
- { TIFFTAG_BLACKLEVELDELTAV, -1, -1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 1, "BlackLevelDeltaV" },
- { TIFFTAG_WHITELEVEL, -2, -2, TIFF_LONG, FIELD_CUSTOM,
- 0, 0, "WhiteLevel" },
- { TIFFTAG_WHITELEVEL, -2, -2, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "WhiteLevel" },
- { TIFFTAG_DEFAULTSCALE, 2, 2, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "DefaultScale" },
- { TIFFTAG_BESTQUALITYSCALE, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "BestQualityScale" },
- { TIFFTAG_DEFAULTCROPORIGIN, 2, 2, TIFF_LONG, FIELD_CUSTOM,
- 0, 0, "DefaultCropOrigin" },
- { TIFFTAG_DEFAULTCROPORIGIN, 2, 2, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "DefaultCropOrigin" },
- { TIFFTAG_DEFAULTCROPORIGIN, 2, 2, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "DefaultCropOrigin" },
- { TIFFTAG_DEFAULTCROPSIZE, 2, 2, TIFF_LONG, FIELD_CUSTOM,
- 0, 0, "DefaultCropSize" },
- { TIFFTAG_DEFAULTCROPSIZE, 2, 2, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "DefaultCropSize" },
- { TIFFTAG_DEFAULTCROPSIZE, 2, 2, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "DefaultCropSize" },
- { TIFFTAG_COLORMATRIX1, -1, -1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 1, "ColorMatrix1" },
- { TIFFTAG_COLORMATRIX2, -1, -1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 1, "ColorMatrix2" },
- { TIFFTAG_CAMERACALIBRATION1, -1, -1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 1, "CameraCalibration1" },
- { TIFFTAG_CAMERACALIBRATION2, -1, -1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 1, "CameraCalibration2" },
- { TIFFTAG_REDUCTIONMATRIX1, -1, -1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 1, "ReductionMatrix1" },
- { TIFFTAG_REDUCTIONMATRIX2, -1, -1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 1, "ReductionMatrix2" },
- { TIFFTAG_ANALOGBALANCE, -1, -1, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 1, "AnalogBalance" },
- { TIFFTAG_ASSHOTNEUTRAL, -1, -1, TIFF_SHORT, FIELD_CUSTOM,
- 0, 1, "AsShotNeutral" },
- { TIFFTAG_ASSHOTNEUTRAL, -1, -1, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 1, "AsShotNeutral" },
- { TIFFTAG_ASSHOTWHITEXY, 2, 2, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "AsShotWhiteXY" },
- { TIFFTAG_BASELINEEXPOSURE, 1, 1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 0, "BaselineExposure" },
- { TIFFTAG_BASELINENOISE, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "BaselineNoise" },
- { TIFFTAG_BASELINESHARPNESS, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "BaselineSharpness" },
- { TIFFTAG_BAYERGREENSPLIT, 1, 1, TIFF_LONG, FIELD_CUSTOM,
- 0, 0, "BayerGreenSplit" },
- { TIFFTAG_LINEARRESPONSELIMIT, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "LinearResponseLimit" },
- { TIFFTAG_CAMERASERIALNUMBER, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "CameraSerialNumber" },
- { TIFFTAG_LENSINFO, 4, 4, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "LensInfo" },
- { TIFFTAG_CHROMABLURRADIUS, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "ChromaBlurRadius" },
- { TIFFTAG_ANTIALIASSTRENGTH, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "AntiAliasStrength" },
- { TIFFTAG_SHADOWSCALE, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 0, 0, "ShadowScale" },
- { TIFFTAG_DNGPRIVATEDATA, -1, -1, TIFF_BYTE, FIELD_CUSTOM,
- 0, 1, "DNGPrivateData" },
- { TIFFTAG_MAKERNOTESAFETY, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "MakerNoteSafety" },
- { TIFFTAG_CALIBRATIONILLUMINANT1, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "CalibrationIlluminant1" },
- { TIFFTAG_CALIBRATIONILLUMINANT2, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "CalibrationIlluminant2" },
- { TIFFTAG_RAWDATAUNIQUEID, 16, 16, TIFF_BYTE, FIELD_CUSTOM,
- 0, 0, "RawDataUniqueID" },
- { TIFFTAG_ORIGINALRAWFILENAME, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "OriginalRawFileName" },
- { TIFFTAG_ORIGINALRAWFILENAME, -1, -1, TIFF_BYTE, FIELD_CUSTOM,
- 1, 1, "OriginalRawFileName" },
- { TIFFTAG_ORIGINALRAWFILEDATA, -1, -1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 0, 1, "OriginalRawFileData" },
- { TIFFTAG_ACTIVEAREA, 4, 4, TIFF_LONG, FIELD_CUSTOM,
- 0, 0, "ActiveArea" },
- { TIFFTAG_ACTIVEAREA, 4, 4, TIFF_SHORT, FIELD_CUSTOM,
- 0, 0, "ActiveArea" },
- { TIFFTAG_MASKEDAREAS, -1, -1, TIFF_LONG, FIELD_CUSTOM,
- 0, 1, "MaskedAreas" },
- { TIFFTAG_ASSHOTICCPROFILE, -1, -1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 0, 1, "AsShotICCProfile" },
- { TIFFTAG_ASSHOTPREPROFILEMATRIX, -1, -1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 1, "AsShotPreProfileMatrix" },
- { TIFFTAG_CURRENTICCPROFILE, -1, -1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 0, 1, "CurrentICCProfile" },
- { TIFFTAG_CURRENTPREPROFILEMATRIX, -1, -1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 0, 1, "CurrentPreProfileMatrix" },
-/* end DNG tags */
-};
-
-static const TIFFFieldInfo
-exifFieldInfo[] = {
- { EXIFTAG_EXPOSURETIME, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "ExposureTime" },
- { EXIFTAG_FNUMBER, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "FNumber" },
- { EXIFTAG_EXPOSUREPROGRAM, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "ExposureProgram" },
- { EXIFTAG_SPECTRALSENSITIVITY, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "SpectralSensitivity" },
- { EXIFTAG_ISOSPEEDRATINGS, -1, -1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 1, "ISOSpeedRatings" },
- { EXIFTAG_OECF, -1, -1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 1, "OptoelectricConversionFactor" },
- { EXIFTAG_EXIFVERSION, 4, 4, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 0, "ExifVersion" },
- { EXIFTAG_DATETIMEORIGINAL, 20, 20, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "DateTimeOriginal" },
- { EXIFTAG_DATETIMEDIGITIZED, 20, 20, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "DateTimeDigitized" },
- { EXIFTAG_COMPONENTSCONFIGURATION, 4, 4, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 0, "ComponentsConfiguration" },
- { EXIFTAG_COMPRESSEDBITSPERPIXEL, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "CompressedBitsPerPixel" },
- { EXIFTAG_SHUTTERSPEEDVALUE, 1, 1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 1, 0, "ShutterSpeedValue" },
- { EXIFTAG_APERTUREVALUE, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "ApertureValue" },
- { EXIFTAG_BRIGHTNESSVALUE, 1, 1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 1, 0, "BrightnessValue" },
- { EXIFTAG_EXPOSUREBIASVALUE, 1, 1, TIFF_SRATIONAL, FIELD_CUSTOM,
- 1, 0, "ExposureBiasValue" },
- { EXIFTAG_MAXAPERTUREVALUE, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "MaxApertureValue" },
- { EXIFTAG_SUBJECTDISTANCE, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "SubjectDistance" },
- { EXIFTAG_METERINGMODE, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "MeteringMode" },
- { EXIFTAG_LIGHTSOURCE, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "LightSource" },
- { EXIFTAG_FLASH, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "Flash" },
- { EXIFTAG_FOCALLENGTH, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "FocalLength" },
- { EXIFTAG_SUBJECTAREA, -1, -1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 1, "SubjectArea" },
- { EXIFTAG_MAKERNOTE, -1, -1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 1, "MakerNote" },
- { EXIFTAG_USERCOMMENT, -1, -1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 1, "UserComment" },
- { EXIFTAG_SUBSECTIME, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "SubSecTime" },
- { EXIFTAG_SUBSECTIMEORIGINAL, -1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "SubSecTimeOriginal" },
- { EXIFTAG_SUBSECTIMEDIGITIZED,-1, -1, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "SubSecTimeDigitized" },
- { EXIFTAG_FLASHPIXVERSION, 4, 4, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 0, "FlashpixVersion" },
- { EXIFTAG_COLORSPACE, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "ColorSpace" },
- { EXIFTAG_PIXELXDIMENSION, 1, 1, TIFF_LONG, FIELD_CUSTOM,
- 1, 0, "PixelXDimension" },
- { EXIFTAG_PIXELXDIMENSION, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "PixelXDimension" },
- { EXIFTAG_PIXELYDIMENSION, 1, 1, TIFF_LONG, FIELD_CUSTOM,
- 1, 0, "PixelYDimension" },
- { EXIFTAG_PIXELYDIMENSION, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "PixelYDimension" },
- { EXIFTAG_RELATEDSOUNDFILE, 13, 13, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "RelatedSoundFile" },
- { EXIFTAG_FLASHENERGY, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "FlashEnergy" },
- { EXIFTAG_SPATIALFREQUENCYRESPONSE, -1, -1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 1, "SpatialFrequencyResponse" },
- { EXIFTAG_FOCALPLANEXRESOLUTION, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "FocalPlaneXResolution" },
- { EXIFTAG_FOCALPLANEYRESOLUTION, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "FocalPlaneYResolution" },
- { EXIFTAG_FOCALPLANERESOLUTIONUNIT, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "FocalPlaneResolutionUnit" },
- { EXIFTAG_SUBJECTLOCATION, 2, 2, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "SubjectLocation" },
- { EXIFTAG_EXPOSUREINDEX, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "ExposureIndex" },
- { EXIFTAG_SENSINGMETHOD, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "SensingMethod" },
- { EXIFTAG_FILESOURCE, 1, 1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 0, "FileSource" },
- { EXIFTAG_SCENETYPE, 1, 1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 0, "SceneType" },
- { EXIFTAG_CFAPATTERN, -1, -1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 1, "CFAPattern" },
- { EXIFTAG_CUSTOMRENDERED, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "CustomRendered" },
- { EXIFTAG_EXPOSUREMODE, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "ExposureMode" },
- { EXIFTAG_WHITEBALANCE, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "WhiteBalance" },
- { EXIFTAG_DIGITALZOOMRATIO, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "DigitalZoomRatio" },
- { EXIFTAG_FOCALLENGTHIN35MMFILM, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "FocalLengthIn35mmFilm" },
- { EXIFTAG_SCENECAPTURETYPE, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "SceneCaptureType" },
- { EXIFTAG_GAINCONTROL, 1, 1, TIFF_RATIONAL, FIELD_CUSTOM,
- 1, 0, "GainControl" },
- { EXIFTAG_CONTRAST, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "Contrast" },
- { EXIFTAG_SATURATION, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "Saturation" },
- { EXIFTAG_SHARPNESS, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "Sharpness" },
- { EXIFTAG_DEVICESETTINGDESCRIPTION, -1, -1, TIFF_UNDEFINED, FIELD_CUSTOM,
- 1, 1, "DeviceSettingDescription" },
- { EXIFTAG_SUBJECTDISTANCERANGE, 1, 1, TIFF_SHORT, FIELD_CUSTOM,
- 1, 0, "SubjectDistanceRange" },
- { EXIFTAG_IMAGEUNIQUEID, 33, 33, TIFF_ASCII, FIELD_CUSTOM,
- 1, 0, "ImageUniqueID" }
-};
-
-const TIFFFieldInfo *
-_TIFFGetFieldInfo(size_t *size)
-{
- *size = TIFFArrayCount(tiffFieldInfo);
- return tiffFieldInfo;
-}
-
-const TIFFFieldInfo *
-_TIFFGetExifFieldInfo(size_t *size)
-{
- *size = TIFFArrayCount(exifFieldInfo);
- return exifFieldInfo;
-}
-
-void
-_TIFFSetupFieldInfo(TIFF* tif, const TIFFFieldInfo info[], size_t n)
-{
- if (tif->tif_fieldinfo) {
- size_t i;
-
- for (i = 0; i < tif->tif_nfields; i++)
- {
- TIFFFieldInfo *fld = tif->tif_fieldinfo[i];
- if (fld->field_bit == FIELD_CUSTOM &&
- strncmp("Tag ", fld->field_name, 4) == 0) {
- _TIFFfree(fld->field_name);
- _TIFFfree(fld);
- }
- }
-
- _TIFFfree(tif->tif_fieldinfo);
- tif->tif_nfields = 0;
- }
- if (!_TIFFMergeFieldInfo(tif, info, n))
- {
- TIFFErrorExt(tif->tif_clientdata, "_TIFFSetupFieldInfo",
- "Setting up field info failed");
- }
-}
-
-static int
-tagCompare(const void* a, const void* b)
-{
- const TIFFFieldInfo* ta = *(const TIFFFieldInfo**) a;
- const TIFFFieldInfo* tb = *(const TIFFFieldInfo**) b;
- /* NB: be careful of return values for 16-bit platforms */
- if (ta->field_tag != tb->field_tag)
- return (int)ta->field_tag - (int)tb->field_tag;
- else
- return (ta->field_type == TIFF_ANY) ?
- 0 : ((int)tb->field_type - (int)ta->field_type);
-}
-
-static int
-tagNameCompare(const void* a, const void* b)
-{
- const TIFFFieldInfo* ta = *(const TIFFFieldInfo**) a;
- const TIFFFieldInfo* tb = *(const TIFFFieldInfo**) b;
- int ret = strcmp(ta->field_name, tb->field_name);
-
- if (ret)
- return ret;
- else
- return (ta->field_type == TIFF_ANY) ?
- 0 : ((int)tb->field_type - (int)ta->field_type);
-}
-
-void
-TIFFMergeFieldInfo(TIFF* tif, const TIFFFieldInfo info[], int n)
-{
- if (_TIFFMergeFieldInfo(tif, info, n) < 0)
- {
- TIFFErrorExt(tif->tif_clientdata, "TIFFMergeFieldInfo",
- "Merging block of %d fields failed", n);
- }
-}
-
-int
-_TIFFMergeFieldInfo(TIFF* tif, const TIFFFieldInfo info[], int n)
-{
- static const char module[] = "_TIFFMergeFieldInfo";
- static const char reason[] = "for field info array";
- TIFFFieldInfo** tp;
- int i;
-
- tif->tif_foundfield = NULL;
-
- if (tif->tif_nfields > 0) {
- tif->tif_fieldinfo = (TIFFFieldInfo**)
- _TIFFCheckRealloc(tif, tif->tif_fieldinfo,
- (tif->tif_nfields + n),
- sizeof (TIFFFieldInfo*), reason);
- } else {
- tif->tif_fieldinfo = (TIFFFieldInfo**)
- _TIFFCheckMalloc(tif, n, sizeof (TIFFFieldInfo*),
- reason);
- }
- if (!tif->tif_fieldinfo) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Failed to allocate field info array");
- return 0;
- }
- tp = tif->tif_fieldinfo + tif->tif_nfields;
- for (i = 0; i < n; i++)
- {
- const TIFFFieldInfo *fip =
- _TIFFFindFieldInfo(tif, info[i].field_tag, info[i].field_type);
-
- /* only add definitions that aren't already present */
- if (!fip) {
- *tp++ = (TIFFFieldInfo*) (info + i);
- tif->tif_nfields++;
- }
- }
-
- /* Sort the field info by tag number */
- qsort(tif->tif_fieldinfo, tif->tif_nfields,
- sizeof (TIFFFieldInfo*), tagCompare);
-
- return n;
-}
-
-void
-_TIFFPrintFieldInfo(TIFF* tif, FILE* fd)
-{
- size_t i;
-
- fprintf(fd, "%s: \n", tif->tif_name);
- for (i = 0; i < tif->tif_nfields; i++) {
- const TIFFFieldInfo* fip = tif->tif_fieldinfo[i];
- fprintf(fd, "field[%2d] %5lu, %2d, %2d, %d, %2d, %5s, %5s, %s\n"
- , (int)i
- , (unsigned long) fip->field_tag
- , fip->field_readcount, fip->field_writecount
- , fip->field_type
- , fip->field_bit
- , fip->field_oktochange ? "TRUE" : "FALSE"
- , fip->field_passcount ? "TRUE" : "FALSE"
- , fip->field_name
- );
- }
-}
-
-/*
- * Return size of TIFFDataType in bytes
- */
-int
-TIFFDataWidth(TIFFDataType type)
-{
- switch(type)
- {
- case 0: /* nothing */
- case 1: /* TIFF_BYTE */
- case 2: /* TIFF_ASCII */
- case 6: /* TIFF_SBYTE */
- case 7: /* TIFF_UNDEFINED */
- return 1;
- case 3: /* TIFF_SHORT */
- case 8: /* TIFF_SSHORT */
- return 2;
- case 4: /* TIFF_LONG */
- case 9: /* TIFF_SLONG */
- case 11: /* TIFF_FLOAT */
- case 13: /* TIFF_IFD */
- return 4;
- case 5: /* TIFF_RATIONAL */
- case 10: /* TIFF_SRATIONAL */
- case 12: /* TIFF_DOUBLE */
- return 8;
- default:
- return 0; /* will return 0 for unknown types */
- }
-}
-
-/*
- * Return size of TIFFDataType in bytes.
- *
- * XXX: We need a separate function to determine the space needed
- * to store the value. For TIFF_RATIONAL values TIFFDataWidth() returns 8,
- * but we use 4-byte float to represent rationals.
- */
-int
-_TIFFDataSize(TIFFDataType type)
-{
- switch (type) {
- case TIFF_BYTE:
- case TIFF_SBYTE:
- case TIFF_ASCII:
- case TIFF_UNDEFINED:
- return 1;
- case TIFF_SHORT:
- case TIFF_SSHORT:
- return 2;
- case TIFF_LONG:
- case TIFF_SLONG:
- case TIFF_FLOAT:
- case TIFF_IFD:
- case TIFF_RATIONAL:
- case TIFF_SRATIONAL:
- return 4;
- case TIFF_DOUBLE:
- return 8;
- default:
- return 0;
- }
-}
-
-/*
- * Return nearest TIFFDataType to the sample type of an image.
- */
-TIFFDataType
-_TIFFSampleToTagType(TIFF* tif)
-{
- uint32 bps = TIFFhowmany8(tif->tif_dir.td_bitspersample);
-
- switch (tif->tif_dir.td_sampleformat) {
- case SAMPLEFORMAT_IEEEFP:
- return (bps == 4 ? TIFF_FLOAT : TIFF_DOUBLE);
- case SAMPLEFORMAT_INT:
- return (bps <= 1 ? TIFF_SBYTE :
- bps <= 2 ? TIFF_SSHORT : TIFF_SLONG);
- case SAMPLEFORMAT_UINT:
- return (bps <= 1 ? TIFF_BYTE :
- bps <= 2 ? TIFF_SHORT : TIFF_LONG);
- case SAMPLEFORMAT_VOID:
- return (TIFF_UNDEFINED);
- }
- /*NOTREACHED*/
- return (TIFF_UNDEFINED);
-}
-
-const TIFFFieldInfo*
-_TIFFFindFieldInfo(TIFF* tif, ttag_t tag, TIFFDataType dt)
-{
- TIFFFieldInfo key = {0, 0, 0, TIFF_NOTYPE, 0, 0, 0, 0};
- TIFFFieldInfo* pkey = &key;
- const TIFFFieldInfo **ret;
-
- if (tif->tif_foundfield && tif->tif_foundfield->field_tag == tag &&
- (dt == TIFF_ANY || dt == tif->tif_foundfield->field_type))
- return tif->tif_foundfield;
-
- /* If we are invoked with no field information, then just return. */
- if ( !tif->tif_fieldinfo ) {
- return NULL;
- }
-
- /* NB: use sorted search (e.g. binary search) */
- key.field_tag = tag;
- key.field_type = dt;
-
- ret = (const TIFFFieldInfo **) bsearch(&pkey,
- tif->tif_fieldinfo,
- tif->tif_nfields,
- sizeof(TIFFFieldInfo *),
- tagCompare);
- return tif->tif_foundfield = (ret ? *ret : NULL);
-}
-
-const TIFFFieldInfo*
-_TIFFFindFieldInfoByName(TIFF* tif, const char *field_name, TIFFDataType dt)
-{
- TIFFFieldInfo key = {0, 0, 0, TIFF_NOTYPE, 0, 0, 0, 0};
- TIFFFieldInfo* pkey = &key;
- const TIFFFieldInfo **ret;
-
- if (tif->tif_foundfield
- && streq(tif->tif_foundfield->field_name, field_name)
- && (dt == TIFF_ANY || dt == tif->tif_foundfield->field_type))
- return (tif->tif_foundfield);
-
- /* If we are invoked with no field information, then just return. */
- if ( !tif->tif_fieldinfo ) {
- return NULL;
- }
-
- /* NB: use sorted search (e.g. binary search) */
- key.field_name = (char *)field_name;
- key.field_type = dt;
-
- ret = (const TIFFFieldInfo **) lfind(&pkey,
- tif->tif_fieldinfo,
- &tif->tif_nfields,
- sizeof(TIFFFieldInfo *),
- tagNameCompare);
- return tif->tif_foundfield = (ret ? *ret : NULL);
-}
-
-const TIFFFieldInfo*
-_TIFFFieldWithTag(TIFF* tif, ttag_t tag)
-{
- const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
- if (!fip) {
- TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithTag",
- "Internal error, unknown tag 0x%x",
- (unsigned int) tag);
- assert(fip != NULL);
- /*NOTREACHED*/
- }
- return (fip);
-}
-
-const TIFFFieldInfo*
-_TIFFFieldWithName(TIFF* tif, const char *field_name)
-{
- const TIFFFieldInfo* fip =
- _TIFFFindFieldInfoByName(tif, field_name, TIFF_ANY);
- if (!fip) {
- TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithName",
- "Internal error, unknown tag %s", field_name);
- assert(fip != NULL);
- /*NOTREACHED*/
- }
- return (fip);
-}
-
-const TIFFFieldInfo*
-_TIFFFindOrRegisterFieldInfo( TIFF *tif, ttag_t tag, TIFFDataType dt )
-
-{
- const TIFFFieldInfo *fld;
-
- fld = _TIFFFindFieldInfo( tif, tag, dt );
- if( fld == NULL )
- {
- fld = _TIFFCreateAnonFieldInfo( tif, tag, dt );
- if (!_TIFFMergeFieldInfo(tif, fld, 1))
- return NULL;
- }
-
- return fld;
-}
-
-TIFFFieldInfo*
-_TIFFCreateAnonFieldInfo(TIFF *tif, ttag_t tag, TIFFDataType field_type)
-{
- TIFFFieldInfo *fld;
- (void) tif;
-
- fld = (TIFFFieldInfo *) _TIFFmalloc(sizeof (TIFFFieldInfo));
- if (fld == NULL)
- return NULL;
- _TIFFmemset( fld, 0, sizeof(TIFFFieldInfo) );
-
- fld->field_tag = tag;
- fld->field_readcount = TIFF_VARIABLE2;
- fld->field_writecount = TIFF_VARIABLE2;
- fld->field_type = field_type;
- fld->field_bit = FIELD_CUSTOM;
- fld->field_oktochange = TRUE;
- fld->field_passcount = TRUE;
- fld->field_name = (char *) _TIFFmalloc(32);
- if (fld->field_name == NULL) {
- _TIFFfree(fld);
- return NULL;
- }
-
- /*
- * note that this name is a special sign to TIFFClose() and
- * _TIFFSetupFieldInfo() to free the field
- */
- sprintf(fld->field_name, "Tag %d", (int) tag);
-
- return fld;
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_dirread.c b/src/3rdparty/libtiff/libtiff/tif_dirread.c
deleted file mode 100644
index 52d53fc3ce..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_dirread.c
+++ /dev/null
@@ -1,2016 +0,0 @@
-/* $Id: tif_dirread.c,v 1.92.2.6 2009-10-29 20:04:32 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Directory Read Support Routines.
- */
-#include "tiffiop.h"
-
-#define IGNORE 0 /* tag placeholder used below */
-
-#ifdef HAVE_IEEEFP
-# define TIFFCvtIEEEFloatToNative(tif, n, fp)
-# define TIFFCvtIEEEDoubleToNative(tif, n, dp)
-#else
-extern void TIFFCvtIEEEFloatToNative(TIFF*, uint32, float*);
-extern void TIFFCvtIEEEDoubleToNative(TIFF*, uint32, double*);
-#endif
-
-static TIFFDirEntry* TIFFReadDirectoryFind(TIFFDirEntry* dir,
- uint16 dircount, uint16 tagid);
-static int EstimateStripByteCounts(TIFF*, TIFFDirEntry*, uint16);
-static void MissingRequired(TIFF*, const char*);
-static int TIFFCheckDirOffset(TIFF*, toff_t);
-static int CheckDirCount(TIFF*, TIFFDirEntry*, uint32);
-static uint16 TIFFFetchDirectory(TIFF*, toff_t, TIFFDirEntry**, toff_t *);
-static tsize_t TIFFFetchData(TIFF*, TIFFDirEntry*, char*);
-static tsize_t TIFFFetchString(TIFF*, TIFFDirEntry*, char*);
-static float TIFFFetchRational(TIFF*, TIFFDirEntry*);
-static int TIFFFetchNormalTag(TIFF*, TIFFDirEntry*);
-static int TIFFFetchPerSampleShorts(TIFF*, TIFFDirEntry*, uint16*);
-static int TIFFFetchPerSampleLongs(TIFF*, TIFFDirEntry*, uint32*);
-static int TIFFFetchPerSampleAnys(TIFF*, TIFFDirEntry*, double*);
-static int TIFFFetchShortArray(TIFF*, TIFFDirEntry*, uint16*);
-static int TIFFFetchStripThing(TIFF*, TIFFDirEntry*, long, uint32**);
-static int TIFFFetchRefBlackWhite(TIFF*, TIFFDirEntry*);
-static int TIFFFetchSubjectDistance(TIFF*, TIFFDirEntry*);
-static float TIFFFetchFloat(TIFF*, TIFFDirEntry*);
-static int TIFFFetchFloatArray(TIFF*, TIFFDirEntry*, float*);
-static int TIFFFetchDoubleArray(TIFF*, TIFFDirEntry*, double*);
-static int TIFFFetchAnyArray(TIFF*, TIFFDirEntry*, double*);
-static int TIFFFetchShortPair(TIFF*, TIFFDirEntry*);
-static void ChopUpSingleUncompressedStrip(TIFF*);
-
-/*
- * Read the next TIFF directory from a file and convert it to the internal
- * format. We read directories sequentially.
- */
-int
-TIFFReadDirectory(TIFF* tif)
-{
- static const char module[] = "TIFFReadDirectory";
-
- int n;
- TIFFDirectory* td;
- TIFFDirEntry *dp, *dir = NULL;
- uint16 iv;
- uint32 v;
- const TIFFFieldInfo* fip;
- size_t fix;
- uint16 dircount;
- int diroutoforderwarning = 0, compressionknown = 0;
-
- tif->tif_diroff = tif->tif_nextdiroff;
- /*
- * Check whether we have the last offset or bad offset (IFD looping).
- */
- if (!TIFFCheckDirOffset(tif, tif->tif_nextdiroff))
- return 0;
- /*
- * Cleanup any previous compression state.
- */
- (*tif->tif_cleanup)(tif);
- tif->tif_curdir++;
- dircount = TIFFFetchDirectory(tif, tif->tif_nextdiroff,
- &dir, &tif->tif_nextdiroff);
- if (!dircount) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Failed to read directory at offset %u",
- tif->tif_name, tif->tif_nextdiroff);
- return 0;
- }
-
- tif->tif_flags &= ~TIFF_BEENWRITING; /* reset before new dir */
- /*
- * Setup default value and then make a pass over
- * the fields to check type and tag information,
- * and to extract info required to size data
- * structures. A second pass is made afterwards
- * to read in everthing not taken in the first pass.
- */
- td = &tif->tif_dir;
- /* free any old stuff and reinit */
- TIFFFreeDirectory(tif);
- TIFFDefaultDirectory(tif);
- /*
- * Electronic Arts writes gray-scale TIFF files
- * without a PlanarConfiguration directory entry.
- * Thus we setup a default value here, even though
- * the TIFF spec says there is no default value.
- */
- TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-
- /*
- * Sigh, we must make a separate pass through the
- * directory for the following reason:
- *
- * We must process the Compression tag in the first pass
- * in order to merge in codec-private tag definitions (otherwise
- * we may get complaints about unknown tags). However, the
- * Compression tag may be dependent on the SamplesPerPixel
- * tag value because older TIFF specs permited Compression
- * to be written as a SamplesPerPixel-count tag entry.
- * Thus if we don't first figure out the correct SamplesPerPixel
- * tag value then we may end up ignoring the Compression tag
- * value because it has an incorrect count value (if the
- * true value of SamplesPerPixel is not 1).
- *
- * It sure would have been nice if Aldus had really thought
- * this stuff through carefully.
- */
- for (dp = dir, n = dircount; n > 0; n--, dp++) {
- if (tif->tif_flags & TIFF_SWAB) {
- TIFFSwabArrayOfShort(&dp->tdir_tag, 2);
- TIFFSwabArrayOfLong(&dp->tdir_count, 2);
- }
- if (dp->tdir_tag == TIFFTAG_SAMPLESPERPIXEL) {
- if (!TIFFFetchNormalTag(tif, dp))
- goto bad;
- dp->tdir_tag = IGNORE;
- }
- }
- /*
- * First real pass over the directory.
- */
- fix = 0;
- for (dp = dir, n = dircount; n > 0; n--, dp++) {
-
- if (fix >= tif->tif_nfields || dp->tdir_tag == IGNORE)
- continue;
-
- /*
- * Silicon Beach (at least) writes unordered
- * directory tags (violating the spec). Handle
- * it here, but be obnoxious (maybe they'll fix it?).
- */
- if (dp->tdir_tag < tif->tif_fieldinfo[fix]->field_tag) {
- if (!diroutoforderwarning) {
- TIFFWarningExt(tif->tif_clientdata, module,
- "%s: invalid TIFF directory; tags are not sorted in ascending order",
- tif->tif_name);
- diroutoforderwarning = 1;
- }
- fix = 0; /* O(n^2) */
- }
- while (fix < tif->tif_nfields &&
- tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
- fix++;
- if (fix >= tif->tif_nfields ||
- tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) {
-
- TIFFWarningExt(tif->tif_clientdata,
- module,
- "%s: unknown field with tag %d (0x%x) encountered",
- tif->tif_name,
- dp->tdir_tag,
- dp->tdir_tag);
-
- if (!_TIFFMergeFieldInfo(tif,
- _TIFFCreateAnonFieldInfo(tif,
- dp->tdir_tag,
- (TIFFDataType) dp->tdir_type),
- 1))
- {
- TIFFWarningExt(tif->tif_clientdata,
- module,
- "Registering anonymous field with tag %d (0x%x) failed",
- dp->tdir_tag,
- dp->tdir_tag);
- goto ignore;
- }
- fix = 0;
- while (fix < tif->tif_nfields &&
- tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
- fix++;
- }
- /*
- * Null out old tags that we ignore.
- */
- if (tif->tif_fieldinfo[fix]->field_bit == FIELD_IGNORE) {
- ignore:
- dp->tdir_tag = IGNORE;
- continue;
- }
- /*
- * Check data type.
- */
- fip = tif->tif_fieldinfo[fix];
- while (dp->tdir_type != (unsigned short) fip->field_type
- && fix < tif->tif_nfields) {
- if (fip->field_type == TIFF_ANY) /* wildcard */
- break;
- fip = tif->tif_fieldinfo[++fix];
- if (fix >= tif->tif_nfields ||
- fip->field_tag != dp->tdir_tag) {
- TIFFWarningExt(tif->tif_clientdata, module,
- "%s: wrong data type %d for \"%s\"; tag ignored",
- tif->tif_name, dp->tdir_type,
- tif->tif_fieldinfo[fix-1]->field_name);
- goto ignore;
- }
- }
- /*
- * Check count if known in advance.
- */
- if (fip->field_readcount != TIFF_VARIABLE
- && fip->field_readcount != TIFF_VARIABLE2) {
- uint32 expected = (fip->field_readcount == TIFF_SPP) ?
- (uint32) td->td_samplesperpixel :
- (uint32) fip->field_readcount;
- if (!CheckDirCount(tif, dp, expected))
- goto ignore;
- }
-
- switch (dp->tdir_tag) {
- case TIFFTAG_COMPRESSION:
- /*
- * The 5.0 spec says the Compression tag has
- * one value, while earlier specs say it has
- * one value per sample. Because of this, we
- * accept the tag if one value is supplied.
- */
- if (dp->tdir_count == 1) {
- v = TIFFExtractData(tif,
- dp->tdir_type, dp->tdir_offset);
- if (!TIFFSetField(tif, dp->tdir_tag, (uint16)v))
- goto bad;
- else
- compressionknown = 1;
- break;
- /* XXX: workaround for broken TIFFs */
- } else if (dp->tdir_type == TIFF_LONG) {
- if (!TIFFFetchPerSampleLongs(tif, dp, &v) ||
- !TIFFSetField(tif, dp->tdir_tag, (uint16)v))
- goto bad;
- } else {
- if (!TIFFFetchPerSampleShorts(tif, dp, &iv)
- || !TIFFSetField(tif, dp->tdir_tag, iv))
- goto bad;
- }
- dp->tdir_tag = IGNORE;
- break;
- case TIFFTAG_STRIPOFFSETS:
- case TIFFTAG_STRIPBYTECOUNTS:
- case TIFFTAG_TILEOFFSETS:
- case TIFFTAG_TILEBYTECOUNTS:
- TIFFSetFieldBit(tif, fip->field_bit);
- break;
- case TIFFTAG_IMAGEWIDTH:
- case TIFFTAG_IMAGELENGTH:
- case TIFFTAG_IMAGEDEPTH:
- case TIFFTAG_TILELENGTH:
- case TIFFTAG_TILEWIDTH:
- case TIFFTAG_TILEDEPTH:
- case TIFFTAG_PLANARCONFIG:
- case TIFFTAG_ROWSPERSTRIP:
- case TIFFTAG_EXTRASAMPLES:
- if (!TIFFFetchNormalTag(tif, dp))
- goto bad;
- dp->tdir_tag = IGNORE;
- break;
- }
- }
-
- /*
- * XXX: OJPEG hack.
- * If a) compression is OJPEG, b) planarconfig tag says it's separate,
- * c) strip offsets/bytecounts tag are both present and
- * d) both contain exactly one value, then we consistently find
- * that the buggy implementation of the buggy compression scheme
- * matches contig planarconfig best. So we 'fix-up' the tag here
- */
- if ((td->td_compression==COMPRESSION_OJPEG) &&
- (td->td_planarconfig==PLANARCONFIG_SEPARATE)) {
- dp = TIFFReadDirectoryFind(dir,dircount,TIFFTAG_STRIPOFFSETS);
- if ((dp!=0) && (dp->tdir_count==1)) {
- dp = TIFFReadDirectoryFind(dir, dircount,
- TIFFTAG_STRIPBYTECOUNTS);
- if ((dp!=0) && (dp->tdir_count==1)) {
- td->td_planarconfig=PLANARCONFIG_CONTIG;
- TIFFWarningExt(tif->tif_clientdata,
- "TIFFReadDirectory",
- "Planarconfig tag value assumed incorrect, "
- "assuming data is contig instead of chunky");
- }
- }
- }
-
- /*
- * Allocate directory structure and setup defaults.
- */
- if (!TIFFFieldSet(tif, FIELD_IMAGEDIMENSIONS)) {
- MissingRequired(tif, "ImageLength");
- goto bad;
- }
- /*
- * Setup appropriate structures (by strip or by tile)
- */
- if (!TIFFFieldSet(tif, FIELD_TILEDIMENSIONS)) {
- td->td_nstrips = TIFFNumberOfStrips(tif);
- td->td_tilewidth = td->td_imagewidth;
- td->td_tilelength = td->td_rowsperstrip;
- td->td_tiledepth = td->td_imagedepth;
- tif->tif_flags &= ~TIFF_ISTILED;
- } else {
- td->td_nstrips = TIFFNumberOfTiles(tif);
- tif->tif_flags |= TIFF_ISTILED;
- }
- if (!td->td_nstrips) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: cannot handle zero number of %s",
- tif->tif_name, isTiled(tif) ? "tiles" : "strips");
- goto bad;
- }
- td->td_stripsperimage = td->td_nstrips;
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
- td->td_stripsperimage /= td->td_samplesperpixel;
- if (!TIFFFieldSet(tif, FIELD_STRIPOFFSETS)) {
- if ((td->td_compression==COMPRESSION_OJPEG) &&
- (isTiled(tif)==0) &&
- (td->td_nstrips==1)) {
- /*
- * XXX: OJPEG hack.
- * If a) compression is OJPEG, b) it's not a tiled TIFF,
- * and c) the number of strips is 1,
- * then we tolerate the absence of stripoffsets tag,
- * because, presumably, all required data is in the
- * JpegInterchangeFormat stream.
- */
- TIFFSetFieldBit(tif, FIELD_STRIPOFFSETS);
- } else {
- MissingRequired(tif,
- isTiled(tif) ? "TileOffsets" : "StripOffsets");
- goto bad;
- }
- }
-
- /*
- * Second pass: extract other information.
- */
- for (dp = dir, n = dircount; n > 0; n--, dp++) {
- if (dp->tdir_tag == IGNORE)
- continue;
- switch (dp->tdir_tag) {
- case TIFFTAG_MINSAMPLEVALUE:
- case TIFFTAG_MAXSAMPLEVALUE:
- case TIFFTAG_BITSPERSAMPLE:
- case TIFFTAG_DATATYPE:
- case TIFFTAG_SAMPLEFORMAT:
- /*
- * The 5.0 spec says the Compression tag has
- * one value, while earlier specs say it has
- * one value per sample. Because of this, we
- * accept the tag if one value is supplied.
- *
- * The MinSampleValue, MaxSampleValue, BitsPerSample
- * DataType and SampleFormat tags are supposed to be
- * written as one value/sample, but some vendors
- * incorrectly write one value only -- so we accept
- * that as well (yech). Other vendors write correct
- * value for NumberOfSamples, but incorrect one for
- * BitsPerSample and friends, and we will read this
- * too.
- */
- if (dp->tdir_count == 1) {
- v = TIFFExtractData(tif,
- dp->tdir_type, dp->tdir_offset);
- if (!TIFFSetField(tif, dp->tdir_tag, (uint16)v))
- goto bad;
- /* XXX: workaround for broken TIFFs */
- } else if (dp->tdir_tag == TIFFTAG_BITSPERSAMPLE
- && dp->tdir_type == TIFF_LONG) {
- if (!TIFFFetchPerSampleLongs(tif, dp, &v) ||
- !TIFFSetField(tif, dp->tdir_tag, (uint16)v))
- goto bad;
- } else {
- if (!TIFFFetchPerSampleShorts(tif, dp, &iv) ||
- !TIFFSetField(tif, dp->tdir_tag, iv))
- goto bad;
- }
- break;
- case TIFFTAG_SMINSAMPLEVALUE:
- case TIFFTAG_SMAXSAMPLEVALUE:
- {
- double dv = 0.0;
- if (!TIFFFetchPerSampleAnys(tif, dp, &dv) ||
- !TIFFSetField(tif, dp->tdir_tag, dv))
- goto bad;
- }
- break;
- case TIFFTAG_STRIPOFFSETS:
- case TIFFTAG_TILEOFFSETS:
- if (!TIFFFetchStripThing(tif, dp,
- td->td_nstrips, &td->td_stripoffset))
- goto bad;
- break;
- case TIFFTAG_STRIPBYTECOUNTS:
- case TIFFTAG_TILEBYTECOUNTS:
- if (!TIFFFetchStripThing(tif, dp,
- td->td_nstrips, &td->td_stripbytecount))
- goto bad;
- break;
- case TIFFTAG_COLORMAP:
- case TIFFTAG_TRANSFERFUNCTION:
- {
- char* cp;
- /*
- * TransferFunction can have either 1x or 3x
- * data values; Colormap can have only 3x
- * items.
- */
- v = 1L<<td->td_bitspersample;
- if (dp->tdir_tag == TIFFTAG_COLORMAP ||
- dp->tdir_count != v) {
- if (!CheckDirCount(tif, dp, 3 * v))
- break;
- }
- v *= sizeof(uint16);
- cp = (char *)_TIFFCheckMalloc(tif,
- dp->tdir_count,
- sizeof (uint16),
- "to read \"TransferFunction\" tag");
- if (cp != NULL) {
- if (TIFFFetchData(tif, dp, cp)) {
- /*
- * This deals with there being
- * only one array to apply to
- * all samples.
- */
- uint32 c = 1L << td->td_bitspersample;
- if (dp->tdir_count == c)
- v = 0L;
- TIFFSetField(tif, dp->tdir_tag,
- cp, cp+v, cp+2*v);
- }
- _TIFFfree(cp);
- }
- break;
- }
- case TIFFTAG_PAGENUMBER:
- case TIFFTAG_HALFTONEHINTS:
- case TIFFTAG_YCBCRSUBSAMPLING:
- case TIFFTAG_DOTRANGE:
- (void) TIFFFetchShortPair(tif, dp);
- break;
- case TIFFTAG_REFERENCEBLACKWHITE:
- (void) TIFFFetchRefBlackWhite(tif, dp);
- break;
-/* BEGIN REV 4.0 COMPATIBILITY */
- case TIFFTAG_OSUBFILETYPE:
- v = 0L;
- switch (TIFFExtractData(tif, dp->tdir_type,
- dp->tdir_offset)) {
- case OFILETYPE_REDUCEDIMAGE:
- v = FILETYPE_REDUCEDIMAGE;
- break;
- case OFILETYPE_PAGE:
- v = FILETYPE_PAGE;
- break;
- }
- if (v)
- TIFFSetField(tif, TIFFTAG_SUBFILETYPE, v);
- break;
-/* END REV 4.0 COMPATIBILITY */
- default:
- (void) TIFFFetchNormalTag(tif, dp);
- break;
- }
- }
- /*
- * OJPEG hack:
- * - If a) compression is OJPEG, and b) photometric tag is missing,
- * then we consistently find that photometric should be YCbCr
- * - If a) compression is OJPEG, and b) photometric tag says it's RGB,
- * then we consistently find that the buggy implementation of the
- * buggy compression scheme matches photometric YCbCr instead.
- * - If a) compression is OJPEG, and b) bitspersample tag is missing,
- * then we consistently find bitspersample should be 8.
- * - If a) compression is OJPEG, b) samplesperpixel tag is missing,
- * and c) photometric is RGB or YCbCr, then we consistently find
- * samplesperpixel should be 3
- * - If a) compression is OJPEG, b) samplesperpixel tag is missing,
- * and c) photometric is MINISWHITE or MINISBLACK, then we consistently
- * find samplesperpixel should be 3
- */
- if (td->td_compression==COMPRESSION_OJPEG)
- {
- if (!TIFFFieldSet(tif,FIELD_PHOTOMETRIC))
- {
- TIFFWarningExt(tif->tif_clientdata, "TIFFReadDirectory",
- "Photometric tag is missing, assuming data is YCbCr");
- if (!TIFFSetField(tif,TIFFTAG_PHOTOMETRIC,PHOTOMETRIC_YCBCR))
- goto bad;
- }
- else if (td->td_photometric==PHOTOMETRIC_RGB)
- {
- td->td_photometric=PHOTOMETRIC_YCBCR;
- TIFFWarningExt(tif->tif_clientdata, "TIFFReadDirectory",
- "Photometric tag value assumed incorrect, "
- "assuming data is YCbCr instead of RGB");
- }
- if (!TIFFFieldSet(tif,FIELD_BITSPERSAMPLE))
- {
- TIFFWarningExt(tif->tif_clientdata,"TIFFReadDirectory",
- "BitsPerSample tag is missing, assuming 8 bits per sample");
- if (!TIFFSetField(tif,TIFFTAG_BITSPERSAMPLE,8))
- goto bad;
- }
- if (!TIFFFieldSet(tif,FIELD_SAMPLESPERPIXEL))
- {
- if ((td->td_photometric==PHOTOMETRIC_RGB)
- || (td->td_photometric==PHOTOMETRIC_YCBCR))
- {
- TIFFWarningExt(tif->tif_clientdata,
- "TIFFReadDirectory",
- "SamplesPerPixel tag is missing, "
- "assuming correct SamplesPerPixel value is 3");
- if (!TIFFSetField(tif,TIFFTAG_SAMPLESPERPIXEL,3))
- goto bad;
- }
- else if ((td->td_photometric==PHOTOMETRIC_MINISWHITE)
- || (td->td_photometric==PHOTOMETRIC_MINISBLACK))
- {
- TIFFWarningExt(tif->tif_clientdata,
- "TIFFReadDirectory",
- "SamplesPerPixel tag is missing, "
- "assuming correct SamplesPerPixel value is 1");
- if (!TIFFSetField(tif,TIFFTAG_SAMPLESPERPIXEL,1))
- goto bad;
- }
- }
- }
- /*
- * Verify Palette image has a Colormap.
- */
- if (td->td_photometric == PHOTOMETRIC_PALETTE &&
- !TIFFFieldSet(tif, FIELD_COLORMAP)) {
- MissingRequired(tif, "Colormap");
- goto bad;
- }
- /*
- * OJPEG hack:
- * We do no further messing with strip/tile offsets/bytecounts in OJPEG
- * TIFFs
- */
- if (td->td_compression!=COMPRESSION_OJPEG)
- {
- /*
- * Attempt to deal with a missing StripByteCounts tag.
- */
- if (!TIFFFieldSet(tif, FIELD_STRIPBYTECOUNTS)) {
- /*
- * Some manufacturers violate the spec by not giving
- * the size of the strips. In this case, assume there
- * is one uncompressed strip of data.
- */
- if ((td->td_planarconfig == PLANARCONFIG_CONTIG &&
- td->td_nstrips > 1) ||
- (td->td_planarconfig == PLANARCONFIG_SEPARATE &&
- td->td_nstrips != td->td_samplesperpixel)) {
- MissingRequired(tif, "StripByteCounts");
- goto bad;
- }
- TIFFWarningExt(tif->tif_clientdata, module,
- "%s: TIFF directory is missing required "
- "\"%s\" field, calculating from imagelength",
- tif->tif_name,
- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
- if (EstimateStripByteCounts(tif, dir, dircount) < 0)
- goto bad;
- /*
- * Assume we have wrong StripByteCount value (in case
- * of single strip) in following cases:
- * - it is equal to zero along with StripOffset;
- * - it is larger than file itself (in case of uncompressed
- * image);
- * - it is smaller than the size of the bytes per row
- * multiplied on the number of rows. The last case should
- * not be checked in the case of writing new image,
- * because we may do not know the exact strip size
- * until the whole image will be written and directory
- * dumped out.
- */
- #define BYTECOUNTLOOKSBAD \
- ( (td->td_stripbytecount[0] == 0 && td->td_stripoffset[0] != 0) || \
- (td->td_compression == COMPRESSION_NONE && \
- td->td_stripbytecount[0] > TIFFGetFileSize(tif) - td->td_stripoffset[0]) || \
- (tif->tif_mode == O_RDONLY && \
- td->td_compression == COMPRESSION_NONE && \
- td->td_stripbytecount[0] < TIFFScanlineSize(tif) * td->td_imagelength) )
-
- } else if (td->td_nstrips == 1
- && td->td_stripoffset[0] != 0
- && BYTECOUNTLOOKSBAD) {
- /*
- * XXX: Plexus (and others) sometimes give a value of
- * zero for a tag when they don't know what the
- * correct value is! Try and handle the simple case
- * of estimating the size of a one strip image.
- */
- TIFFWarningExt(tif->tif_clientdata, module,
- "%s: Bogus \"%s\" field, ignoring and calculating from imagelength",
- tif->tif_name,
- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
- if(EstimateStripByteCounts(tif, dir, dircount) < 0)
- goto bad;
- } else if (td->td_planarconfig == PLANARCONFIG_CONTIG
- && td->td_nstrips > 2
- && td->td_compression == COMPRESSION_NONE
- && td->td_stripbytecount[0] != td->td_stripbytecount[1]
- && td->td_stripbytecount[0] != 0
- && td->td_stripbytecount[1] != 0 ) {
- /*
- * XXX: Some vendors fill StripByteCount array with
- * absolutely wrong values (it can be equal to
- * StripOffset array, for example). Catch this case
- * here.
- */
- TIFFWarningExt(tif->tif_clientdata, module,
- "%s: Wrong \"%s\" field, ignoring and calculating from imagelength",
- tif->tif_name,
- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
- if (EstimateStripByteCounts(tif, dir, dircount) < 0)
- goto bad;
- }
- }
- if (dir) {
- _TIFFfree((char *)dir);
- dir = NULL;
- }
- if (!TIFFFieldSet(tif, FIELD_MAXSAMPLEVALUE))
- td->td_maxsamplevalue = (uint16)((1L<<td->td_bitspersample)-1);
- /*
- * Setup default compression scheme.
- */
-
- /*
- * XXX: We can optimize checking for the strip bounds using the sorted
- * bytecounts array. See also comments for TIFFAppendToStrip()
- * function in tif_write.c.
- */
- if (td->td_nstrips > 1) {
- tstrip_t strip;
-
- td->td_stripbytecountsorted = 1;
- for (strip = 1; strip < td->td_nstrips; strip++) {
- if (td->td_stripoffset[strip - 1] >
- td->td_stripoffset[strip]) {
- td->td_stripbytecountsorted = 0;
- break;
- }
- }
- }
-
- if (!TIFFFieldSet(tif, FIELD_COMPRESSION))
- TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
- /*
- * Some manufacturers make life difficult by writing
- * large amounts of uncompressed data as a single strip.
- * This is contrary to the recommendations of the spec.
- * The following makes an attempt at breaking such images
- * into strips closer to the recommended 8k bytes. A
- * side effect, however, is that the RowsPerStrip tag
- * value may be changed.
- */
- if (td->td_nstrips == 1 && td->td_compression == COMPRESSION_NONE &&
- (tif->tif_flags & (TIFF_STRIPCHOP|TIFF_ISTILED)) == TIFF_STRIPCHOP)
- ChopUpSingleUncompressedStrip(tif);
-
- /*
- * Reinitialize i/o since we are starting on a new directory.
- */
- tif->tif_row = (uint32) -1;
- tif->tif_curstrip = (tstrip_t) -1;
- tif->tif_col = (uint32) -1;
- tif->tif_curtile = (ttile_t) -1;
- tif->tif_tilesize = (tsize_t) -1;
-
- tif->tif_scanlinesize = TIFFScanlineSize(tif);
- if (!tif->tif_scanlinesize) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: cannot handle zero scanline size",
- tif->tif_name);
- return (0);
- }
-
- if (isTiled(tif)) {
- tif->tif_tilesize = TIFFTileSize(tif);
- if (!tif->tif_tilesize) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: cannot handle zero tile size",
- tif->tif_name);
- return (0);
- }
- } else {
- if (!TIFFStripSize(tif)) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: cannot handle zero strip size",
- tif->tif_name);
- return (0);
- }
- }
- return (1);
-bad:
- if (dir)
- _TIFFfree(dir);
- return (0);
-}
-
-static TIFFDirEntry*
-TIFFReadDirectoryFind(TIFFDirEntry* dir, uint16 dircount, uint16 tagid)
-{
- TIFFDirEntry* m;
- uint16 n;
- for (m=dir, n=0; n<dircount; m++, n++)
- {
- if (m->tdir_tag==tagid)
- return(m);
- }
- return(0);
-}
-
-/*
- * Read custom directory from the arbitarry offset.
- * The code is very similar to TIFFReadDirectory().
- */
-int
-TIFFReadCustomDirectory(TIFF* tif, toff_t diroff,
- const TIFFFieldInfo info[], size_t n)
-{
- static const char module[] = "TIFFReadCustomDirectory";
-
- TIFFDirectory* td = &tif->tif_dir;
- TIFFDirEntry *dp, *dir = NULL;
- const TIFFFieldInfo* fip;
- size_t fix;
- uint16 i, dircount;
-
- _TIFFSetupFieldInfo(tif, info, n);
-
- dircount = TIFFFetchDirectory(tif, diroff, &dir, NULL);
- if (!dircount) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Failed to read custom directory at offset %u",
- tif->tif_name, diroff);
- return 0;
- }
-
- TIFFFreeDirectory(tif);
- _TIFFmemset(&tif->tif_dir, 0, sizeof(TIFFDirectory));
-
- fix = 0;
- for (dp = dir, i = dircount; i > 0; i--, dp++) {
- if (tif->tif_flags & TIFF_SWAB) {
- TIFFSwabArrayOfShort(&dp->tdir_tag, 2);
- TIFFSwabArrayOfLong(&dp->tdir_count, 2);
- }
-
- if (fix >= tif->tif_nfields || dp->tdir_tag == IGNORE)
- continue;
-
- while (fix < tif->tif_nfields &&
- tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
- fix++;
-
- if (fix >= tif->tif_nfields ||
- tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) {
-
- TIFFWarningExt(tif->tif_clientdata, module,
- "%s: unknown field with tag %d (0x%x) encountered",
- tif->tif_name, dp->tdir_tag, dp->tdir_tag);
- if (!_TIFFMergeFieldInfo(tif,
- _TIFFCreateAnonFieldInfo(tif,
- dp->tdir_tag,
- (TIFFDataType) dp->tdir_type),
- 1))
- {
- TIFFWarningExt(tif->tif_clientdata, module,
- "Registering anonymous field with tag %d (0x%x) failed",
- dp->tdir_tag, dp->tdir_tag);
- goto ignore;
- }
-
- fix = 0;
- while (fix < tif->tif_nfields &&
- tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
- fix++;
- }
- /*
- * Null out old tags that we ignore.
- */
- if (tif->tif_fieldinfo[fix]->field_bit == FIELD_IGNORE) {
- ignore:
- dp->tdir_tag = IGNORE;
- continue;
- }
- /*
- * Check data type.
- */
- fip = tif->tif_fieldinfo[fix];
- while (dp->tdir_type != (unsigned short) fip->field_type
- && fix < tif->tif_nfields) {
- if (fip->field_type == TIFF_ANY) /* wildcard */
- break;
- fip = tif->tif_fieldinfo[++fix];
- if (fix >= tif->tif_nfields ||
- fip->field_tag != dp->tdir_tag) {
- TIFFWarningExt(tif->tif_clientdata, module,
- "%s: wrong data type %d for \"%s\"; tag ignored",
- tif->tif_name, dp->tdir_type,
- tif->tif_fieldinfo[fix-1]->field_name);
- goto ignore;
- }
- }
- /*
- * Check count if known in advance.
- */
- if (fip->field_readcount != TIFF_VARIABLE
- && fip->field_readcount != TIFF_VARIABLE2) {
- uint32 expected = (fip->field_readcount == TIFF_SPP) ?
- (uint32) td->td_samplesperpixel :
- (uint32) fip->field_readcount;
- if (!CheckDirCount(tif, dp, expected))
- goto ignore;
- }
-
- /*
- * EXIF tags which need to be specifically processed.
- */
- switch (dp->tdir_tag) {
- case EXIFTAG_SUBJECTDISTANCE:
- (void) TIFFFetchSubjectDistance(tif, dp);
- break;
- default:
- (void) TIFFFetchNormalTag(tif, dp);
- break;
- }
- }
-
- if (dir)
- _TIFFfree(dir);
- return 1;
-}
-
-/*
- * EXIF is important special case of custom IFD, so we have a special
- * function to read it.
- */
-int
-TIFFReadEXIFDirectory(TIFF* tif, toff_t diroff)
-{
- size_t exifFieldInfoCount;
- const TIFFFieldInfo *exifFieldInfo =
- _TIFFGetExifFieldInfo(&exifFieldInfoCount);
- return TIFFReadCustomDirectory(tif, diroff, exifFieldInfo,
- exifFieldInfoCount);
-}
-
-static int
-EstimateStripByteCounts(TIFF* tif, TIFFDirEntry* dir, uint16 dircount)
-{
- static const char module[] = "EstimateStripByteCounts";
-
- TIFFDirEntry *dp;
- TIFFDirectory *td = &tif->tif_dir;
- uint32 strip;
-
- if (td->td_stripbytecount)
- _TIFFfree(td->td_stripbytecount);
- td->td_stripbytecount = (uint32*)
- _TIFFCheckMalloc(tif, td->td_nstrips, sizeof (uint32),
- "for \"StripByteCounts\" array");
- if( td->td_stripbytecount == NULL )
- return -1;
-
- if (td->td_compression != COMPRESSION_NONE) {
- uint32 space = (uint32)(sizeof (TIFFHeader)
- + sizeof (uint16)
- + (dircount * sizeof (TIFFDirEntry))
- + sizeof (uint32));
- toff_t filesize = TIFFGetFileSize(tif);
- uint16 n;
-
- /* calculate amount of space used by indirect values */
- for (dp = dir, n = dircount; n > 0; n--, dp++)
- {
- uint32 cc = TIFFDataWidth((TIFFDataType) dp->tdir_type);
- if (cc == 0) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Cannot determine size of unknown tag type %d",
- tif->tif_name, dp->tdir_type);
- return -1;
- }
- cc = cc * dp->tdir_count;
- if (cc > sizeof (uint32))
- space += cc;
- }
- space = filesize - space;
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
- space /= td->td_samplesperpixel;
- for (strip = 0; strip < td->td_nstrips; strip++)
- td->td_stripbytecount[strip] = space;
- /*
- * This gross hack handles the case were the offset to
- * the last strip is past the place where we think the strip
- * should begin. Since a strip of data must be contiguous,
- * it's safe to assume that we've overestimated the amount
- * of data in the strip and trim this number back accordingly.
- */
- strip--;
- if (((toff_t)(td->td_stripoffset[strip]+
- td->td_stripbytecount[strip])) > filesize)
- td->td_stripbytecount[strip] =
- filesize - td->td_stripoffset[strip];
- } else if (isTiled(tif)) {
- uint32 bytespertile = TIFFTileSize(tif);
-
- for (strip = 0; strip < td->td_nstrips; strip++)
- td->td_stripbytecount[strip] = bytespertile;
- } else {
- uint32 rowbytes = TIFFScanlineSize(tif);
- uint32 rowsperstrip = td->td_imagelength/td->td_stripsperimage;
- for (strip = 0; strip < td->td_nstrips; strip++)
- td->td_stripbytecount[strip] = rowbytes * rowsperstrip;
- }
- TIFFSetFieldBit(tif, FIELD_STRIPBYTECOUNTS);
- if (!TIFFFieldSet(tif, FIELD_ROWSPERSTRIP))
- td->td_rowsperstrip = td->td_imagelength;
- return 1;
-}
-
-static void
-MissingRequired(TIFF* tif, const char* tagname)
-{
- static const char module[] = "MissingRequired";
-
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: TIFF directory is missing required \"%s\" field",
- tif->tif_name, tagname);
-}
-
-/*
- * Check the directory offset against the list of already seen directory
- * offsets. This is a trick to prevent IFD looping. The one can create TIFF
- * file with looped directory pointers. We will maintain a list of already
- * seen directories and check every IFD offset against that list.
- */
-static int
-TIFFCheckDirOffset(TIFF* tif, toff_t diroff)
-{
- uint16 n;
-
- if (diroff == 0) /* no more directories */
- return 0;
-
- for (n = 0; n < tif->tif_dirnumber && tif->tif_dirlist; n++) {
- if (tif->tif_dirlist[n] == diroff)
- return 0;
- }
-
- tif->tif_dirnumber++;
-
- if (tif->tif_dirnumber > tif->tif_dirlistsize) {
- toff_t* new_dirlist;
-
- /*
- * XXX: Reduce memory allocation granularity of the dirlist
- * array.
- */
- new_dirlist = (toff_t *)_TIFFCheckRealloc(tif,
- tif->tif_dirlist,
- tif->tif_dirnumber,
- 2 * sizeof(toff_t),
- "for IFD list");
- if (!new_dirlist)
- return 0;
- tif->tif_dirlistsize = 2 * tif->tif_dirnumber;
- tif->tif_dirlist = new_dirlist;
- }
-
- tif->tif_dirlist[tif->tif_dirnumber - 1] = diroff;
-
- return 1;
-}
-
-/*
- * Check the count field of a directory entry against a known value. The
- * caller is expected to skip/ignore the tag if there is a mismatch.
- */
-static int
-CheckDirCount(TIFF* tif, TIFFDirEntry* dir, uint32 count)
-{
- if (count > dir->tdir_count) {
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "incorrect count for field \"%s\" (%u, expecting %u); tag ignored",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
- dir->tdir_count, count);
- return (0);
- } else if (count < dir->tdir_count) {
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "incorrect count for field \"%s\" (%u, expecting %u); tag trimmed",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
- dir->tdir_count, count);
- return (1);
- }
- return (1);
-}
-
-/*
- * Read IFD structure from the specified offset. If the pointer to
- * nextdiroff variable has been specified, read it too. Function returns a
- * number of fields in the directory or 0 if failed.
- */
-static uint16
-TIFFFetchDirectory(TIFF* tif, toff_t diroff, TIFFDirEntry **pdir,
- toff_t *nextdiroff)
-{
- static const char module[] = "TIFFFetchDirectory";
-
- TIFFDirEntry *dir;
- uint16 dircount;
-
- assert(pdir);
-
- tif->tif_diroff = diroff;
- if (nextdiroff)
- *nextdiroff = 0;
- if (!isMapped(tif)) {
- if (!SeekOK(tif, tif->tif_diroff)) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Seek error accessing TIFF directory",
- tif->tif_name);
- return 0;
- }
- if (!ReadOK(tif, &dircount, sizeof (uint16))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Can not read TIFF directory count",
- tif->tif_name);
- return 0;
- }
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabShort(&dircount);
- dir = (TIFFDirEntry *)_TIFFCheckMalloc(tif, dircount,
- sizeof (TIFFDirEntry),
- "to read TIFF directory");
- if (dir == NULL)
- return 0;
- if (!ReadOK(tif, dir, dircount*sizeof (TIFFDirEntry))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%.100s: Can not read TIFF directory",
- tif->tif_name);
- _TIFFfree(dir);
- return 0;
- }
- /*
- * Read offset to next directory for sequential scans if
- * needed.
- */
- if (nextdiroff)
- (void) ReadOK(tif, nextdiroff, sizeof(uint32));
- } else {
- toff_t off = tif->tif_diroff;
-
- /*
- * Check for integer overflow when validating the dir_off,
- * otherwise a very high offset may cause an OOB read and
- * crash the client. Make two comparisons instead of
- *
- * off + sizeof(uint16) > tif->tif_size
- *
- * to avoid overflow.
- */
- if (tif->tif_size < sizeof (uint16) ||
- off > tif->tif_size - sizeof(uint16)) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Can not read TIFF directory count",
- tif->tif_name);
- return 0;
- } else {
- _TIFFmemcpy(&dircount, tif->tif_base + off,
- sizeof(uint16));
- }
- off += sizeof (uint16);
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabShort(&dircount);
- dir = (TIFFDirEntry *)_TIFFCheckMalloc(tif, dircount,
- sizeof(TIFFDirEntry),
- "to read TIFF directory");
- if (dir == NULL)
- return 0;
- if (off + dircount * sizeof (TIFFDirEntry) > tif->tif_size) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Can not read TIFF directory",
- tif->tif_name);
- _TIFFfree(dir);
- return 0;
- } else {
- _TIFFmemcpy(dir, tif->tif_base + off,
- dircount * sizeof(TIFFDirEntry));
- }
- if (nextdiroff) {
- off += dircount * sizeof (TIFFDirEntry);
- if (off + sizeof (uint32) <= tif->tif_size) {
- _TIFFmemcpy(nextdiroff, tif->tif_base + off,
- sizeof (uint32));
- }
- }
- }
- if (nextdiroff && tif->tif_flags & TIFF_SWAB)
- TIFFSwabLong(nextdiroff);
- *pdir = dir;
- return dircount;
-}
-
-/*
- * Fetch a contiguous directory item.
- */
-static tsize_t
-TIFFFetchData(TIFF* tif, TIFFDirEntry* dir, char* cp)
-{
- uint32 w = TIFFDataWidth((TIFFDataType) dir->tdir_type);
- /*
- * FIXME: butecount should have tsize_t type, but for now libtiff
- * defines tsize_t as a signed 32-bit integer and we are losing
- * ability to read arrays larger than 2^31 bytes. So we are using
- * uint32 instead of tsize_t here.
- */
- uint32 cc = dir->tdir_count * w;
-
- /* Check for overflow. */
- if (!dir->tdir_count || !w || cc / w != dir->tdir_count)
- goto bad;
-
- if (!isMapped(tif)) {
- if (!SeekOK(tif, dir->tdir_offset))
- goto bad;
- if (!ReadOK(tif, cp, cc))
- goto bad;
- } else {
- /* Check for overflow. */
- if (dir->tdir_offset + cc < dir->tdir_offset
- || dir->tdir_offset + cc < cc
- || dir->tdir_offset + cc > tif->tif_size)
- goto bad;
- _TIFFmemcpy(cp, tif->tif_base + dir->tdir_offset, cc);
- }
- if (tif->tif_flags & TIFF_SWAB) {
- switch (dir->tdir_type) {
- case TIFF_SHORT:
- case TIFF_SSHORT:
- TIFFSwabArrayOfShort((uint16*) cp, dir->tdir_count);
- break;
- case TIFF_LONG:
- case TIFF_SLONG:
- case TIFF_FLOAT:
- TIFFSwabArrayOfLong((uint32*) cp, dir->tdir_count);
- break;
- case TIFF_RATIONAL:
- case TIFF_SRATIONAL:
- TIFFSwabArrayOfLong((uint32*) cp, 2*dir->tdir_count);
- break;
- case TIFF_DOUBLE:
- TIFFSwabArrayOfDouble((double*) cp, dir->tdir_count);
- break;
- }
- }
- return (cc);
-bad:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error fetching data for field \"%s\"",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
- return (tsize_t) 0;
-}
-
-/*
- * Fetch an ASCII item from the file.
- */
-static tsize_t
-TIFFFetchString(TIFF* tif, TIFFDirEntry* dir, char* cp)
-{
- if (dir->tdir_count <= 4) {
- uint32 l = dir->tdir_offset;
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabLong(&l);
- _TIFFmemcpy(cp, &l, dir->tdir_count);
- return (1);
- }
- return (TIFFFetchData(tif, dir, cp));
-}
-
-/*
- * Convert numerator+denominator to float.
- */
-static int
-cvtRational(TIFF* tif, TIFFDirEntry* dir, uint32 num, uint32 denom, float* rv)
-{
- if (denom == 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%s: Rational with zero denominator (num = %u)",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, num);
- return (0);
- } else {
- if (dir->tdir_type == TIFF_RATIONAL)
- *rv = ((float)num / (float)denom);
- else
- *rv = ((float)(int32)num / (float)(int32)denom);
- return (1);
- }
-}
-
-/*
- * Fetch a rational item from the file at offset off and return the value as a
- * floating point number.
- */
-static float
-TIFFFetchRational(TIFF* tif, TIFFDirEntry* dir)
-{
- uint32 l[2];
- float v;
-
- return (!TIFFFetchData(tif, dir, (char *)l) ||
- !cvtRational(tif, dir, l[0], l[1], &v) ? 1.0f : v);
-}
-
-/*
- * Fetch a single floating point value from the offset field and return it as
- * a native float.
- */
-static float
-TIFFFetchFloat(TIFF* tif, TIFFDirEntry* dir)
-{
- float v;
- int32 l = TIFFExtractData(tif, dir->tdir_type, dir->tdir_offset);
- _TIFFmemcpy(&v, &l, sizeof(float));
- TIFFCvtIEEEFloatToNative(tif, 1, &v);
- return (v);
-}
-
-/*
- * Fetch an array of BYTE or SBYTE values.
- */
-static int
-TIFFFetchByteArray(TIFF* tif, TIFFDirEntry* dir, uint8* v)
-{
- if (dir->tdir_count <= 4) {
- /*
- * Extract data from offset field.
- */
- if (tif->tif_header.tiff_magic == TIFF_BIGENDIAN) {
- if (dir->tdir_type == TIFF_SBYTE)
- switch (dir->tdir_count) {
- case 4: v[3] = dir->tdir_offset & 0xff;
- case 3: v[2] = (dir->tdir_offset >> 8) & 0xff;
- case 2: v[1] = (dir->tdir_offset >> 16) & 0xff;
- case 1: v[0] = dir->tdir_offset >> 24;
- }
- else
- switch (dir->tdir_count) {
- case 4: v[3] = dir->tdir_offset & 0xff;
- case 3: v[2] = (dir->tdir_offset >> 8) & 0xff;
- case 2: v[1] = (dir->tdir_offset >> 16) & 0xff;
- case 1: v[0] = dir->tdir_offset >> 24;
- }
- } else {
- if (dir->tdir_type == TIFF_SBYTE)
- switch (dir->tdir_count) {
- case 4: v[3] = dir->tdir_offset >> 24;
- case 3: v[2] = (dir->tdir_offset >> 16) & 0xff;
- case 2: v[1] = (dir->tdir_offset >> 8) & 0xff;
- case 1: v[0] = dir->tdir_offset & 0xff;
- }
- else
- switch (dir->tdir_count) {
- case 4: v[3] = dir->tdir_offset >> 24;
- case 3: v[2] = (dir->tdir_offset >> 16) & 0xff;
- case 2: v[1] = (dir->tdir_offset >> 8) & 0xff;
- case 1: v[0] = dir->tdir_offset & 0xff;
- }
- }
- return (1);
- } else
- return (TIFFFetchData(tif, dir, (char*) v) != 0); /* XXX */
-}
-
-/*
- * Fetch an array of SHORT or SSHORT values.
- */
-static int
-TIFFFetchShortArray(TIFF* tif, TIFFDirEntry* dir, uint16* v)
-{
- if (dir->tdir_count <= 2) {
- if (tif->tif_header.tiff_magic == TIFF_BIGENDIAN) {
- switch (dir->tdir_count) {
- case 2: v[1] = (uint16) (dir->tdir_offset & 0xffff);
- case 1: v[0] = (uint16) (dir->tdir_offset >> 16);
- }
- } else {
- switch (dir->tdir_count) {
- case 2: v[1] = (uint16) (dir->tdir_offset >> 16);
- case 1: v[0] = (uint16) (dir->tdir_offset & 0xffff);
- }
- }
- return (1);
- } else
- return (TIFFFetchData(tif, dir, (char *)v) != 0);
-}
-
-/*
- * Fetch a pair of SHORT or BYTE values. Some tags may have either BYTE
- * or SHORT type and this function works with both ones.
- */
-static int
-TIFFFetchShortPair(TIFF* tif, TIFFDirEntry* dir)
-{
- /*
- * Prevent overflowing the v stack arrays below by performing a sanity
- * check on tdir_count, this should never be greater than two.
- */
- if (dir->tdir_count > 2) {
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "unexpected count for field \"%s\", %u, expected 2; ignored",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
- dir->tdir_count);
- return 0;
- }
-
- switch (dir->tdir_type) {
- case TIFF_BYTE:
- case TIFF_SBYTE:
- {
- uint8 v[4];
- return TIFFFetchByteArray(tif, dir, v)
- && TIFFSetField(tif, dir->tdir_tag, v[0], v[1]);
- }
- case TIFF_SHORT:
- case TIFF_SSHORT:
- {
- uint16 v[2];
- return TIFFFetchShortArray(tif, dir, v)
- && TIFFSetField(tif, dir->tdir_tag, v[0], v[1]);
- }
- default:
- return 0;
- }
-}
-
-/*
- * Fetch an array of LONG or SLONG values.
- */
-static int
-TIFFFetchLongArray(TIFF* tif, TIFFDirEntry* dir, uint32* v)
-{
- if (dir->tdir_count == 1) {
- v[0] = dir->tdir_offset;
- return (1);
- } else
- return (TIFFFetchData(tif, dir, (char*) v) != 0);
-}
-
-/*
- * Fetch an array of RATIONAL or SRATIONAL values.
- */
-static int
-TIFFFetchRationalArray(TIFF* tif, TIFFDirEntry* dir, float* v)
-{
- int ok = 0;
- uint32* l;
-
- l = (uint32*)_TIFFCheckMalloc(tif,
- dir->tdir_count, TIFFDataWidth((TIFFDataType) dir->tdir_type),
- "to fetch array of rationals");
- if (l) {
- if (TIFFFetchData(tif, dir, (char *)l)) {
- uint32 i;
- for (i = 0; i < dir->tdir_count; i++) {
- ok = cvtRational(tif, dir,
- l[2*i+0], l[2*i+1], &v[i]);
- if (!ok)
- break;
- }
- }
- _TIFFfree((char *)l);
- }
- return (ok);
-}
-
-/*
- * Fetch an array of FLOAT values.
- */
-static int
-TIFFFetchFloatArray(TIFF* tif, TIFFDirEntry* dir, float* v)
-{
-
- if (dir->tdir_count == 1) {
- union
- {
- float f;
- uint32 i;
- } float_union;
-
- float_union.i=dir->tdir_offset;
- v[0]=float_union.f;
- TIFFCvtIEEEFloatToNative(tif, dir->tdir_count, v);
- return (1);
- } else if (TIFFFetchData(tif, dir, (char*) v)) {
- TIFFCvtIEEEFloatToNative(tif, dir->tdir_count, v);
- return (1);
- } else
- return (0);
-}
-
-/*
- * Fetch an array of DOUBLE values.
- */
-static int
-TIFFFetchDoubleArray(TIFF* tif, TIFFDirEntry* dir, double* v)
-{
- if (TIFFFetchData(tif, dir, (char*) v)) {
- TIFFCvtIEEEDoubleToNative(tif, dir->tdir_count, v);
- return (1);
- } else
- return (0);
-}
-
-/*
- * Fetch an array of ANY values. The actual values are returned as doubles
- * which should be able hold all the types. Yes, there really should be an
- * tany_t to avoid this potential non-portability ... Note in particular that
- * we assume that the double return value vector is large enough to read in
- * any fundamental type. We use that vector as a buffer to read in the base
- * type vector and then convert it in place to double (from end to front of
- * course).
- */
-static int
-TIFFFetchAnyArray(TIFF* tif, TIFFDirEntry* dir, double* v)
-{
- int i;
-
- switch (dir->tdir_type) {
- case TIFF_BYTE:
- case TIFF_SBYTE:
- if (!TIFFFetchByteArray(tif, dir, (uint8*) v))
- return (0);
- if (dir->tdir_type == TIFF_BYTE) {
- uint8* vp = (uint8*) v;
- for (i = dir->tdir_count-1; i >= 0; i--)
- v[i] = vp[i];
- } else {
- int8* vp = (int8*) v;
- for (i = dir->tdir_count-1; i >= 0; i--)
- v[i] = vp[i];
- }
- break;
- case TIFF_SHORT:
- case TIFF_SSHORT:
- if (!TIFFFetchShortArray(tif, dir, (uint16*) v))
- return (0);
- if (dir->tdir_type == TIFF_SHORT) {
- uint16* vp = (uint16*) v;
- for (i = dir->tdir_count-1; i >= 0; i--)
- v[i] = vp[i];
- } else {
- int16* vp = (int16*) v;
- for (i = dir->tdir_count-1; i >= 0; i--)
- v[i] = vp[i];
- }
- break;
- case TIFF_LONG:
- case TIFF_SLONG:
- if (!TIFFFetchLongArray(tif, dir, (uint32*) v))
- return (0);
- if (dir->tdir_type == TIFF_LONG) {
- uint32* vp = (uint32*) v;
- for (i = dir->tdir_count-1; i >= 0; i--)
- v[i] = vp[i];
- } else {
- int32* vp = (int32*) v;
- for (i = dir->tdir_count-1; i >= 0; i--)
- v[i] = vp[i];
- }
- break;
- case TIFF_RATIONAL:
- case TIFF_SRATIONAL:
- if (!TIFFFetchRationalArray(tif, dir, (float*) v))
- return (0);
- { float* vp = (float*) v;
- for (i = dir->tdir_count-1; i >= 0; i--)
- v[i] = vp[i];
- }
- break;
- case TIFF_FLOAT:
- if (!TIFFFetchFloatArray(tif, dir, (float*) v))
- return (0);
- { float* vp = (float*) v;
- for (i = dir->tdir_count-1; i >= 0; i--)
- v[i] = vp[i];
- }
- break;
- case TIFF_DOUBLE:
- return (TIFFFetchDoubleArray(tif, dir, (double*) v));
- default:
- /* TIFF_NOTYPE */
- /* TIFF_ASCII */
- /* TIFF_UNDEFINED */
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "cannot read TIFF_ANY type %d for field \"%s\"",
- dir->tdir_type,
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
- return (0);
- }
- return (1);
-}
-
-/*
- * Fetch a tag that is not handled by special case code.
- */
-static int
-TIFFFetchNormalTag(TIFF* tif, TIFFDirEntry* dp)
-{
- static const char mesg[] = "to fetch tag value";
- int ok = 0;
- const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dp->tdir_tag);
-
- if (dp->tdir_count > 1) { /* array of values */
- char* cp = NULL;
-
- switch (dp->tdir_type) {
- case TIFF_BYTE:
- case TIFF_SBYTE:
- cp = (char *)_TIFFCheckMalloc(tif,
- dp->tdir_count, sizeof (uint8), mesg);
- ok = cp && TIFFFetchByteArray(tif, dp, (uint8*) cp);
- break;
- case TIFF_SHORT:
- case TIFF_SSHORT:
- cp = (char *)_TIFFCheckMalloc(tif,
- dp->tdir_count, sizeof (uint16), mesg);
- ok = cp && TIFFFetchShortArray(tif, dp, (uint16*) cp);
- break;
- case TIFF_LONG:
- case TIFF_SLONG:
- cp = (char *)_TIFFCheckMalloc(tif,
- dp->tdir_count, sizeof (uint32), mesg);
- ok = cp && TIFFFetchLongArray(tif, dp, (uint32*) cp);
- break;
- case TIFF_RATIONAL:
- case TIFF_SRATIONAL:
- cp = (char *)_TIFFCheckMalloc(tif,
- dp->tdir_count, sizeof (float), mesg);
- ok = cp && TIFFFetchRationalArray(tif, dp, (float*) cp);
- break;
- case TIFF_FLOAT:
- cp = (char *)_TIFFCheckMalloc(tif,
- dp->tdir_count, sizeof (float), mesg);
- ok = cp && TIFFFetchFloatArray(tif, dp, (float*) cp);
- break;
- case TIFF_DOUBLE:
- cp = (char *)_TIFFCheckMalloc(tif,
- dp->tdir_count, sizeof (double), mesg);
- ok = cp && TIFFFetchDoubleArray(tif, dp, (double*) cp);
- break;
- case TIFF_ASCII:
- case TIFF_UNDEFINED: /* bit of a cheat... */
- /*
- * Some vendors write strings w/o the trailing
- * NULL byte, so always append one just in case.
- */
- cp = (char *)_TIFFCheckMalloc(tif, dp->tdir_count + 1,
- 1, mesg);
- if( (ok = (cp && TIFFFetchString(tif, dp, cp))) != 0 )
- cp[dp->tdir_count] = '\0'; /* XXX */
- break;
- }
- if (ok) {
- ok = (fip->field_passcount ?
- TIFFSetField(tif, dp->tdir_tag, dp->tdir_count, cp)
- : TIFFSetField(tif, dp->tdir_tag, cp));
- }
- if (cp != NULL)
- _TIFFfree(cp);
- } else if (CheckDirCount(tif, dp, 1)) { /* singleton value */
- switch (dp->tdir_type) {
- case TIFF_BYTE:
- case TIFF_SBYTE:
- case TIFF_SHORT:
- case TIFF_SSHORT:
- /*
- * If the tag is also acceptable as a LONG or SLONG
- * then TIFFSetField will expect an uint32 parameter
- * passed to it (through varargs). Thus, for machines
- * where sizeof (int) != sizeof (uint32) we must do
- * a careful check here. It's hard to say if this
- * is worth optimizing.
- *
- * NB: We use TIFFFieldWithTag here knowing that
- * it returns us the first entry in the table
- * for the tag and that that entry is for the
- * widest potential data type the tag may have.
- */
- { TIFFDataType type = fip->field_type;
- if (type != TIFF_LONG && type != TIFF_SLONG) {
- uint16 v = (uint16)
- TIFFExtractData(tif, dp->tdir_type, dp->tdir_offset);
- ok = (fip->field_passcount ?
- TIFFSetField(tif, dp->tdir_tag, 1, &v)
- : TIFFSetField(tif, dp->tdir_tag, v));
- break;
- }
- }
- /* fall thru... */
- case TIFF_LONG:
- case TIFF_SLONG:
- { uint32 v32 =
- TIFFExtractData(tif, dp->tdir_type, dp->tdir_offset);
- ok = (fip->field_passcount ?
- TIFFSetField(tif, dp->tdir_tag, 1, &v32)
- : TIFFSetField(tif, dp->tdir_tag, v32));
- }
- break;
- case TIFF_RATIONAL:
- case TIFF_SRATIONAL:
- case TIFF_FLOAT:
- { float v = (dp->tdir_type == TIFF_FLOAT ?
- TIFFFetchFloat(tif, dp)
- : TIFFFetchRational(tif, dp));
- ok = (fip->field_passcount ?
- TIFFSetField(tif, dp->tdir_tag, 1, &v)
- : TIFFSetField(tif, dp->tdir_tag, v));
- }
- break;
- case TIFF_DOUBLE:
- { double v;
- ok = (TIFFFetchDoubleArray(tif, dp, &v) &&
- (fip->field_passcount ?
- TIFFSetField(tif, dp->tdir_tag, 1, &v)
- : TIFFSetField(tif, dp->tdir_tag, v))
- );
- }
- break;
- case TIFF_ASCII:
- case TIFF_UNDEFINED: /* bit of a cheat... */
- { char c[2];
- if( (ok = (TIFFFetchString(tif, dp, c) != 0)) != 0 ) {
- c[1] = '\0'; /* XXX paranoid */
- ok = (fip->field_passcount ?
- TIFFSetField(tif, dp->tdir_tag, 1, c)
- : TIFFSetField(tif, dp->tdir_tag, c));
- }
- }
- break;
- }
- }
- return (ok);
-}
-
-#define NITEMS(x) (sizeof (x) / sizeof (x[0]))
-/*
- * Fetch samples/pixel short values for
- * the specified tag and verify that
- * all values are the same.
- */
-static int
-TIFFFetchPerSampleShorts(TIFF* tif, TIFFDirEntry* dir, uint16* pl)
-{
- uint16 samples = tif->tif_dir.td_samplesperpixel;
- int status = 0;
-
- if (CheckDirCount(tif, dir, (uint32) samples)) {
- uint16 buf[10];
- uint16* v = buf;
-
- if (dir->tdir_count > NITEMS(buf))
- v = (uint16*) _TIFFCheckMalloc(tif, dir->tdir_count, sizeof(uint16),
- "to fetch per-sample values");
- if (v && TIFFFetchShortArray(tif, dir, v)) {
- uint16 i;
- int check_count = dir->tdir_count;
- if( samples < check_count )
- check_count = samples;
-
- for (i = 1; i < check_count; i++)
- if (v[i] != v[0]) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
- goto bad;
- }
- *pl = v[0];
- status = 1;
- }
- bad:
- if (v && v != buf)
- _TIFFfree(v);
- }
- return (status);
-}
-
-/*
- * Fetch samples/pixel long values for
- * the specified tag and verify that
- * all values are the same.
- */
-static int
-TIFFFetchPerSampleLongs(TIFF* tif, TIFFDirEntry* dir, uint32* pl)
-{
- uint16 samples = tif->tif_dir.td_samplesperpixel;
- int status = 0;
-
- if (CheckDirCount(tif, dir, (uint32) samples)) {
- uint32 buf[10];
- uint32* v = buf;
-
- if (dir->tdir_count > NITEMS(buf))
- v = (uint32*) _TIFFCheckMalloc(tif, dir->tdir_count, sizeof(uint32),
- "to fetch per-sample values");
- if (v && TIFFFetchLongArray(tif, dir, v)) {
- uint16 i;
- int check_count = dir->tdir_count;
-
- if( samples < check_count )
- check_count = samples;
- for (i = 1; i < check_count; i++)
- if (v[i] != v[0]) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
- goto bad;
- }
- *pl = v[0];
- status = 1;
- }
- bad:
- if (v && v != buf)
- _TIFFfree(v);
- }
- return (status);
-}
-
-/*
- * Fetch samples/pixel ANY values for the specified tag and verify that all
- * values are the same.
- */
-static int
-TIFFFetchPerSampleAnys(TIFF* tif, TIFFDirEntry* dir, double* pl)
-{
- uint16 samples = tif->tif_dir.td_samplesperpixel;
- int status = 0;
-
- if (CheckDirCount(tif, dir, (uint32) samples)) {
- double buf[10];
- double* v = buf;
-
- if (dir->tdir_count > NITEMS(buf))
- v = (double*) _TIFFCheckMalloc(tif, dir->tdir_count, sizeof (double),
- "to fetch per-sample values");
- if (v && TIFFFetchAnyArray(tif, dir, v)) {
- uint16 i;
- int check_count = dir->tdir_count;
- if( samples < check_count )
- check_count = samples;
-
- for (i = 1; i < check_count; i++)
- if (v[i] != v[0]) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
- goto bad;
- }
- *pl = v[0];
- status = 1;
- }
- bad:
- if (v && v != buf)
- _TIFFfree(v);
- }
- return (status);
-}
-#undef NITEMS
-
-/*
- * Fetch a set of offsets or lengths.
- * While this routine says "strips", in fact it's also used for tiles.
- */
-static int
-TIFFFetchStripThing(TIFF* tif, TIFFDirEntry* dir, long nstrips, uint32** lpp)
-{
- register uint32* lp;
- int status;
-
- CheckDirCount(tif, dir, (uint32) nstrips);
-
- /*
- * Allocate space for strip information.
- */
- if (*lpp == NULL &&
- (*lpp = (uint32 *)_TIFFCheckMalloc(tif,
- nstrips, sizeof (uint32), "for strip array")) == NULL)
- return (0);
- lp = *lpp;
- _TIFFmemset( lp, 0, sizeof(uint32) * nstrips );
-
- if (dir->tdir_type == (int)TIFF_SHORT) {
- /*
- * Handle uint16->uint32 expansion.
- */
- uint16* dp = (uint16*) _TIFFCheckMalloc(tif,
- dir->tdir_count, sizeof (uint16), "to fetch strip tag");
- if (dp == NULL)
- return (0);
- if( (status = TIFFFetchShortArray(tif, dir, dp)) != 0 ) {
- int i;
-
- for( i = 0; i < nstrips && i < (int) dir->tdir_count; i++ )
- {
- lp[i] = dp[i];
- }
- }
- _TIFFfree((char*) dp);
-
- } else if( nstrips != (int) dir->tdir_count ) {
- /* Special case to correct length */
-
- uint32* dp = (uint32*) _TIFFCheckMalloc(tif,
- dir->tdir_count, sizeof (uint32), "to fetch strip tag");
- if (dp == NULL)
- return (0);
-
- status = TIFFFetchLongArray(tif, dir, dp);
- if( status != 0 ) {
- int i;
-
- for( i = 0; i < nstrips && i < (int) dir->tdir_count; i++ )
- {
- lp[i] = dp[i];
- }
- }
-
- _TIFFfree( (char *) dp );
- } else
- status = TIFFFetchLongArray(tif, dir, lp);
-
- return (status);
-}
-
-/*
- * Fetch and set the RefBlackWhite tag.
- */
-static int
-TIFFFetchRefBlackWhite(TIFF* tif, TIFFDirEntry* dir)
-{
- static const char mesg[] = "for \"ReferenceBlackWhite\" array";
- char* cp;
- int ok;
-
- if (dir->tdir_type == TIFF_RATIONAL)
- return (TIFFFetchNormalTag(tif, dir));
- /*
- * Handle LONG's for backward compatibility.
- */
- cp = (char *)_TIFFCheckMalloc(tif, dir->tdir_count,
- sizeof (uint32), mesg);
- if( (ok = (cp && TIFFFetchLongArray(tif, dir, (uint32*) cp))) != 0) {
- float* fp = (float*)
- _TIFFCheckMalloc(tif, dir->tdir_count, sizeof (float), mesg);
- if( (ok = (fp != NULL)) != 0 ) {
- uint32 i;
- for (i = 0; i < dir->tdir_count; i++)
- fp[i] = (float)((uint32*) cp)[i];
- ok = TIFFSetField(tif, dir->tdir_tag, fp);
- _TIFFfree((char*) fp);
- }
- }
- if (cp)
- _TIFFfree(cp);
- return (ok);
-}
-
-/*
- * Fetch and set the SubjectDistance EXIF tag.
- */
-static int
-TIFFFetchSubjectDistance(TIFF* tif, TIFFDirEntry* dir)
-{
- uint32 l[2];
- float v;
- int ok = 0;
-
- if (TIFFFetchData(tif, dir, (char *)l)
- && cvtRational(tif, dir, l[0], l[1], &v)) {
- /*
- * XXX: Numerator 0xFFFFFFFF means that we have infinite
- * distance. Indicate that with a negative floating point
- * SubjectDistance value.
- */
- ok = TIFFSetField(tif, dir->tdir_tag,
- (l[0] != 0xFFFFFFFF) ? v : -v);
- }
-
- return ok;
-}
-
-/*
- * Replace a single strip (tile) of uncompressed data by multiple strips
- * (tiles), each approximately STRIP_SIZE_DEFAULT bytes. This is useful for
- * dealing with large images or for dealing with machines with a limited
- * amount memory.
- */
-static void
-ChopUpSingleUncompressedStrip(TIFF* tif)
-{
- register TIFFDirectory *td = &tif->tif_dir;
- uint32 bytecount = td->td_stripbytecount[0];
- uint32 offset = td->td_stripoffset[0];
- tsize_t rowbytes = TIFFVTileSize(tif, 1), stripbytes;
- tstrip_t strip, nstrips, rowsperstrip;
- uint32* newcounts;
- uint32* newoffsets;
-
- /*
- * Make the rows hold at least one scanline, but fill specified amount
- * of data if possible.
- */
- if (rowbytes > STRIP_SIZE_DEFAULT) {
- stripbytes = rowbytes;
- rowsperstrip = 1;
- } else if (rowbytes > 0 ) {
- rowsperstrip = STRIP_SIZE_DEFAULT / rowbytes;
- stripbytes = rowbytes * rowsperstrip;
- }
- else
- return;
-
- /*
- * never increase the number of strips in an image
- */
- if (rowsperstrip >= td->td_rowsperstrip)
- return;
- nstrips = (tstrip_t) TIFFhowmany(bytecount, stripbytes);
- if( nstrips == 0 ) /* something is wonky, do nothing. */
- return;
-
- newcounts = (uint32*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint32),
- "for chopped \"StripByteCounts\" array");
- newoffsets = (uint32*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint32),
- "for chopped \"StripOffsets\" array");
- if (newcounts == NULL || newoffsets == NULL) {
- /*
- * Unable to allocate new strip information, give up and use
- * the original one strip information.
- */
- if (newcounts != NULL)
- _TIFFfree(newcounts);
- if (newoffsets != NULL)
- _TIFFfree(newoffsets);
- return;
- }
- /*
- * Fill the strip information arrays with new bytecounts and offsets
- * that reflect the broken-up format.
- */
- for (strip = 0; strip < nstrips; strip++) {
- if ((uint32)stripbytes > bytecount)
- stripbytes = bytecount;
- newcounts[strip] = stripbytes;
- newoffsets[strip] = offset;
- offset += stripbytes;
- bytecount -= stripbytes;
- }
- /*
- * Replace old single strip info with multi-strip info.
- */
- td->td_stripsperimage = td->td_nstrips = nstrips;
- TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip);
-
- _TIFFfree(td->td_stripbytecount);
- _TIFFfree(td->td_stripoffset);
- td->td_stripbytecount = newcounts;
- td->td_stripoffset = newoffsets;
- td->td_stripbytecountsorted = 1;
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_dirwrite.c b/src/3rdparty/libtiff/libtiff/tif_dirwrite.c
deleted file mode 100644
index 5148097dc3..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_dirwrite.c
+++ /dev/null
@@ -1,1407 +0,0 @@
-/* $Id: tif_dirwrite.c,v 1.37.2.6 2009-10-31 21:51:08 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Directory Write Support Routines.
- */
-#include "tiffiop.h"
-
-#ifdef HAVE_IEEEFP
-# define TIFFCvtNativeToIEEEFloat(tif, n, fp)
-# define TIFFCvtNativeToIEEEDouble(tif, n, dp)
-#else
-extern void TIFFCvtNativeToIEEEFloat(TIFF*, uint32, float*);
-extern void TIFFCvtNativeToIEEEDouble(TIFF*, uint32, double*);
-#endif
-
-static int TIFFWriteNormalTag(TIFF*, TIFFDirEntry*, const TIFFFieldInfo*);
-static void TIFFSetupShortLong(TIFF*, ttag_t, TIFFDirEntry*, uint32);
-static void TIFFSetupShort(TIFF*, ttag_t, TIFFDirEntry*, uint16);
-static int TIFFSetupShortPair(TIFF*, ttag_t, TIFFDirEntry*);
-static int TIFFWritePerSampleShorts(TIFF*, ttag_t, TIFFDirEntry*);
-static int TIFFWritePerSampleAnys(TIFF*, TIFFDataType, ttag_t, TIFFDirEntry*);
-static int TIFFWriteShortTable(TIFF*, ttag_t, TIFFDirEntry*, uint32, uint16**);
-static int TIFFWriteShortArray(TIFF*, TIFFDirEntry*, uint16*);
-static int TIFFWriteLongArray(TIFF *, TIFFDirEntry*, uint32*);
-static int TIFFWriteRationalArray(TIFF *, TIFFDirEntry*, float*);
-static int TIFFWriteFloatArray(TIFF *, TIFFDirEntry*, float*);
-static int TIFFWriteDoubleArray(TIFF *, TIFFDirEntry*, double*);
-static int TIFFWriteByteArray(TIFF*, TIFFDirEntry*, char*);
-static int TIFFWriteAnyArray(TIFF*,
- TIFFDataType, ttag_t, TIFFDirEntry*, uint32, double*);
-static int TIFFWriteTransferFunction(TIFF*, TIFFDirEntry*);
-static int TIFFWriteInkNames(TIFF*, TIFFDirEntry*);
-static int TIFFWriteData(TIFF*, TIFFDirEntry*, char*);
-static int TIFFLinkDirectory(TIFF*);
-
-#define WriteRationalPair(type, tag1, v1, tag2, v2) { \
- TIFFWriteRational((tif), (type), (tag1), (dir), (v1)) \
- TIFFWriteRational((tif), (type), (tag2), (dir)+1, (v2)) \
- (dir)++; \
-}
-#define TIFFWriteRational(tif, type, tag, dir, v) \
- (dir)->tdir_tag = (tag); \
- (dir)->tdir_type = (type); \
- (dir)->tdir_count = 1; \
- if (!TIFFWriteRationalArray((tif), (dir), &(v))) \
- goto bad;
-
-/*
- * Write the contents of the current directory
- * to the specified file. This routine doesn't
- * handle overwriting a directory with auxiliary
- * storage that's been changed.
- */
-static int
-_TIFFWriteDirectory(TIFF* tif, int done)
-{
- uint16 dircount;
- toff_t diroff;
- ttag_t tag;
- uint32 nfields;
- tsize_t dirsize;
- char* data;
- TIFFDirEntry* dir;
- TIFFDirectory* td;
- unsigned long b, fields[FIELD_SETLONGS];
- int fi, nfi;
-
- if (tif->tif_mode == O_RDONLY)
- return (1);
- /*
- * Clear write state so that subsequent images with
- * different characteristics get the right buffers
- * setup for them.
- */
- if (done)
- {
- if (tif->tif_flags & TIFF_POSTENCODE) {
- tif->tif_flags &= ~TIFF_POSTENCODE;
- if (!(*tif->tif_postencode)(tif)) {
- TIFFErrorExt(tif->tif_clientdata,
- tif->tif_name,
- "Error post-encoding before directory write");
- return (0);
- }
- }
- (*tif->tif_close)(tif); /* shutdown encoder */
- /*
- * Flush any data that might have been written
- * by the compression close+cleanup routines.
- */
- if (tif->tif_rawcc > 0
- && (tif->tif_flags & TIFF_BEENWRITING) != 0
- && !TIFFFlushData1(tif)) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error flushing data before directory write");
- return (0);
- }
- if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata) {
- _TIFFfree(tif->tif_rawdata);
- tif->tif_rawdata = NULL;
- tif->tif_rawcc = 0;
- tif->tif_rawdatasize = 0;
- }
- tif->tif_flags &= ~(TIFF_BEENWRITING|TIFF_BUFFERSETUP);
- }
-
- td = &tif->tif_dir;
- /*
- * Size the directory so that we can calculate
- * offsets for the data items that aren't kept
- * in-place in each field.
- */
- nfields = 0;
- for (b = 0; b <= FIELD_LAST; b++)
- if (TIFFFieldSet(tif, b) && b != FIELD_CUSTOM)
- nfields += (b < FIELD_SUBFILETYPE ? 2 : 1);
- nfields += td->td_customValueCount;
- dirsize = nfields * sizeof (TIFFDirEntry);
- data = (char*) _TIFFmalloc(dirsize);
- if (data == NULL) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Cannot write directory, out of space");
- return (0);
- }
- /*
- * Directory hasn't been placed yet, put
- * it at the end of the file and link it
- * into the existing directory structure.
- */
- if (tif->tif_diroff == 0 && !TIFFLinkDirectory(tif))
- goto bad;
- tif->tif_dataoff = (toff_t)(
- tif->tif_diroff + sizeof (uint16) + dirsize + sizeof (toff_t));
- if (tif->tif_dataoff & 1)
- tif->tif_dataoff++;
- (void) TIFFSeekFile(tif, tif->tif_dataoff, SEEK_SET);
- tif->tif_curdir++;
- dir = (TIFFDirEntry*) data;
- /*
- * Setup external form of directory
- * entries and write data items.
- */
- _TIFFmemcpy(fields, td->td_fieldsset, sizeof (fields));
- /*
- * Write out ExtraSamples tag only if
- * extra samples are present in the data.
- */
- if (FieldSet(fields, FIELD_EXTRASAMPLES) && !td->td_extrasamples) {
- ResetFieldBit(fields, FIELD_EXTRASAMPLES);
- nfields--;
- dirsize -= sizeof (TIFFDirEntry);
- } /*XXX*/
- for (fi = 0, nfi = tif->tif_nfields; nfi > 0; nfi--, fi++) {
- const TIFFFieldInfo* fip = tif->tif_fieldinfo[fi];
-
- /*
- * For custom fields, we test to see if the custom field
- * is set or not. For normal fields, we just use the
- * FieldSet test.
- */
- if( fip->field_bit == FIELD_CUSTOM )
- {
- int ci, is_set = FALSE;
-
- for( ci = 0; ci < td->td_customValueCount; ci++ )
- is_set |= (td->td_customValues[ci].info == fip);
-
- if( !is_set )
- continue;
- }
- else if (!FieldSet(fields, fip->field_bit))
- continue;
-
- /*
- * Handle other fields.
- */
- switch (fip->field_bit)
- {
- case FIELD_STRIPOFFSETS:
- /*
- * We use one field bit for both strip and tile
-
- * offsets, and so must be careful in selecting
- * the appropriate field descriptor (so that tags
- * are written in sorted order).
- */
- tag = isTiled(tif) ?
- TIFFTAG_TILEOFFSETS : TIFFTAG_STRIPOFFSETS;
- if (tag != fip->field_tag)
- continue;
-
- dir->tdir_tag = (uint16) tag;
- dir->tdir_type = (uint16) TIFF_LONG;
- dir->tdir_count = (uint32) td->td_nstrips;
- if (!TIFFWriteLongArray(tif, dir, td->td_stripoffset))
- goto bad;
- break;
- case FIELD_STRIPBYTECOUNTS:
- /*
- * We use one field bit for both strip and tile
- * byte counts, and so must be careful in selecting
- * the appropriate field descriptor (so that tags
- * are written in sorted order).
- */
- tag = isTiled(tif) ?
- TIFFTAG_TILEBYTECOUNTS : TIFFTAG_STRIPBYTECOUNTS;
- if (tag != fip->field_tag)
- continue;
-
- dir->tdir_tag = (uint16) tag;
- dir->tdir_type = (uint16) TIFF_LONG;
- dir->tdir_count = (uint32) td->td_nstrips;
- if (!TIFFWriteLongArray(tif, dir, td->td_stripbytecount))
- goto bad;
- break;
- case FIELD_ROWSPERSTRIP:
- TIFFSetupShortLong(tif, TIFFTAG_ROWSPERSTRIP,
- dir, td->td_rowsperstrip);
- break;
- case FIELD_COLORMAP:
- if (!TIFFWriteShortTable(tif, TIFFTAG_COLORMAP, dir,
- 3, td->td_colormap))
- goto bad;
- break;
- case FIELD_IMAGEDIMENSIONS:
- TIFFSetupShortLong(tif, TIFFTAG_IMAGEWIDTH,
- dir++, td->td_imagewidth);
- TIFFSetupShortLong(tif, TIFFTAG_IMAGELENGTH,
- dir, td->td_imagelength);
- break;
- case FIELD_TILEDIMENSIONS:
- TIFFSetupShortLong(tif, TIFFTAG_TILEWIDTH,
- dir++, td->td_tilewidth);
- TIFFSetupShortLong(tif, TIFFTAG_TILELENGTH,
- dir, td->td_tilelength);
- break;
- case FIELD_COMPRESSION:
- TIFFSetupShort(tif, TIFFTAG_COMPRESSION,
- dir, td->td_compression);
- break;
- case FIELD_PHOTOMETRIC:
- TIFFSetupShort(tif, TIFFTAG_PHOTOMETRIC,
- dir, td->td_photometric);
- break;
- case FIELD_POSITION:
- WriteRationalPair(TIFF_RATIONAL,
- TIFFTAG_XPOSITION, td->td_xposition,
- TIFFTAG_YPOSITION, td->td_yposition);
- break;
- case FIELD_RESOLUTION:
- WriteRationalPair(TIFF_RATIONAL,
- TIFFTAG_XRESOLUTION, td->td_xresolution,
- TIFFTAG_YRESOLUTION, td->td_yresolution);
- break;
- case FIELD_BITSPERSAMPLE:
- case FIELD_MINSAMPLEVALUE:
- case FIELD_MAXSAMPLEVALUE:
- case FIELD_SAMPLEFORMAT:
- if (!TIFFWritePerSampleShorts(tif, fip->field_tag, dir))
- goto bad;
- break;
- case FIELD_SMINSAMPLEVALUE:
- case FIELD_SMAXSAMPLEVALUE:
- if (!TIFFWritePerSampleAnys(tif,
- _TIFFSampleToTagType(tif), fip->field_tag, dir))
- goto bad;
- break;
- case FIELD_PAGENUMBER:
- case FIELD_HALFTONEHINTS:
- case FIELD_YCBCRSUBSAMPLING:
- if (!TIFFSetupShortPair(tif, fip->field_tag, dir))
- goto bad;
- break;
- case FIELD_INKNAMES:
- if (!TIFFWriteInkNames(tif, dir))
- goto bad;
- break;
- case FIELD_TRANSFERFUNCTION:
- if (!TIFFWriteTransferFunction(tif, dir))
- goto bad;
- break;
- case FIELD_SUBIFD:
- /*
- * XXX: Always write this field using LONG type
- * for backward compatibility.
- */
- dir->tdir_tag = (uint16) fip->field_tag;
- dir->tdir_type = (uint16) TIFF_LONG;
- dir->tdir_count = (uint32) td->td_nsubifd;
- if (!TIFFWriteLongArray(tif, dir, td->td_subifd))
- goto bad;
- /*
- * Total hack: if this directory includes a SubIFD
- * tag then force the next <n> directories to be
- * written as ``sub directories'' of this one. This
- * is used to write things like thumbnails and
- * image masks that one wants to keep out of the
- * normal directory linkage access mechanism.
- */
- if (dir->tdir_count > 0) {
- tif->tif_flags |= TIFF_INSUBIFD;
- tif->tif_nsubifd = (uint16) dir->tdir_count;
- if (dir->tdir_count > 1)
- tif->tif_subifdoff = dir->tdir_offset;
- else
- tif->tif_subifdoff = (uint32)(
- tif->tif_diroff
- + sizeof (uint16)
- + ((char*)&dir->tdir_offset-data));
- }
- break;
- default:
- /* XXX: Should be fixed and removed. */
- if (fip->field_tag == TIFFTAG_DOTRANGE) {
- if (!TIFFSetupShortPair(tif, fip->field_tag, dir))
- goto bad;
- }
- else if (!TIFFWriteNormalTag(tif, dir, fip))
- goto bad;
- break;
- }
- dir++;
-
- if( fip->field_bit != FIELD_CUSTOM )
- ResetFieldBit(fields, fip->field_bit);
- }
-
- /*
- * Write directory.
- */
- dircount = (uint16) nfields;
- diroff = (uint32) tif->tif_nextdiroff;
- if (tif->tif_flags & TIFF_SWAB) {
- /*
- * The file's byte order is opposite to the
- * native machine architecture. We overwrite
- * the directory information with impunity
- * because it'll be released below after we
- * write it to the file. Note that all the
- * other tag construction routines assume that
- * we do this byte-swapping; i.e. they only
- * byte-swap indirect data.
- */
- for (dir = (TIFFDirEntry*) data; dircount; dir++, dircount--) {
- TIFFSwabArrayOfShort(&dir->tdir_tag, 2);
- TIFFSwabArrayOfLong(&dir->tdir_count, 2);
- }
- dircount = (uint16) nfields;
- TIFFSwabShort(&dircount);
- TIFFSwabLong(&diroff);
- }
- (void) TIFFSeekFile(tif, tif->tif_diroff, SEEK_SET);
- if (!WriteOK(tif, &dircount, sizeof (dircount))) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error writing directory count");
- goto bad;
- }
- if (!WriteOK(tif, data, dirsize)) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error writing directory contents");
- goto bad;
- }
- if (!WriteOK(tif, &diroff, sizeof (uint32))) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error writing directory link");
- goto bad;
- }
- if (done) {
- TIFFFreeDirectory(tif);
- tif->tif_flags &= ~TIFF_DIRTYDIRECT;
- (*tif->tif_cleanup)(tif);
-
- /*
- * Reset directory-related state for subsequent
- * directories.
- */
- TIFFCreateDirectory(tif);
- }
- _TIFFfree(data);
- return (1);
-bad:
- _TIFFfree(data);
- return (0);
-}
-#undef WriteRationalPair
-
-int
-TIFFWriteDirectory(TIFF* tif)
-{
- return _TIFFWriteDirectory(tif, TRUE);
-}
-
-/*
- * Similar to TIFFWriteDirectory(), writes the directory out
- * but leaves all data structures in memory so that it can be
- * written again. This will make a partially written TIFF file
- * readable before it is successfully completed/closed.
- */
-int
-TIFFCheckpointDirectory(TIFF* tif)
-{
- int rc;
- /* Setup the strips arrays, if they haven't already been. */
- if (tif->tif_dir.td_stripoffset == NULL)
- (void) TIFFSetupStrips(tif);
- rc = _TIFFWriteDirectory(tif, FALSE);
- (void) TIFFSetWriteOffset(tif, TIFFSeekFile(tif, 0, SEEK_END));
- return rc;
-}
-
-static int
-_TIFFWriteCustomDirectory(TIFF* tif, toff_t *pdiroff)
-{
- uint16 dircount;
- uint32 nfields;
- tsize_t dirsize;
- char* data;
- TIFFDirEntry* dir;
- TIFFDirectory* td;
- unsigned long b, fields[FIELD_SETLONGS];
- int fi, nfi;
-
- if (tif->tif_mode == O_RDONLY)
- return (1);
-
- td = &tif->tif_dir;
- /*
- * Size the directory so that we can calculate
- * offsets for the data items that aren't kept
- * in-place in each field.
- */
- nfields = 0;
- for (b = 0; b <= FIELD_LAST; b++)
- if (TIFFFieldSet(tif, b) && b != FIELD_CUSTOM)
- nfields += (b < FIELD_SUBFILETYPE ? 2 : 1);
- nfields += td->td_customValueCount;
- dirsize = nfields * sizeof (TIFFDirEntry);
- data = (char*) _TIFFmalloc(dirsize);
- if (data == NULL) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Cannot write directory, out of space");
- return (0);
- }
- /*
- * Put the directory at the end of the file.
- */
- tif->tif_diroff = (TIFFSeekFile(tif, (toff_t) 0, SEEK_END)+1) &~ 1;
- tif->tif_dataoff = (toff_t)(
- tif->tif_diroff + sizeof (uint16) + dirsize + sizeof (toff_t));
- if (tif->tif_dataoff & 1)
- tif->tif_dataoff++;
- (void) TIFFSeekFile(tif, tif->tif_dataoff, SEEK_SET);
- dir = (TIFFDirEntry*) data;
- /*
- * Setup external form of directory
- * entries and write data items.
- */
- _TIFFmemcpy(fields, td->td_fieldsset, sizeof (fields));
-
- for (fi = 0, nfi = tif->tif_nfields; nfi > 0; nfi--, fi++) {
- const TIFFFieldInfo* fip = tif->tif_fieldinfo[fi];
-
- /*
- * For custom fields, we test to see if the custom field
- * is set or not. For normal fields, we just use the
- * FieldSet test.
- */
- if( fip->field_bit == FIELD_CUSTOM )
- {
- int ci, is_set = FALSE;
-
- for( ci = 0; ci < td->td_customValueCount; ci++ )
- is_set |= (td->td_customValues[ci].info == fip);
-
- if( !is_set )
- continue;
- }
- else if (!FieldSet(fields, fip->field_bit))
- continue;
-
- if( fip->field_bit != FIELD_CUSTOM )
- ResetFieldBit(fields, fip->field_bit);
- }
-
- /*
- * Write directory.
- */
- dircount = (uint16) nfields;
- *pdiroff = (uint32) tif->tif_nextdiroff;
- if (tif->tif_flags & TIFF_SWAB) {
- /*
- * The file's byte order is opposite to the
- * native machine architecture. We overwrite
- * the directory information with impunity
- * because it'll be released below after we
- * write it to the file. Note that all the
- * other tag construction routines assume that
- * we do this byte-swapping; i.e. they only
- * byte-swap indirect data.
- */
- for (dir = (TIFFDirEntry*) data; dircount; dir++, dircount--) {
- TIFFSwabArrayOfShort(&dir->tdir_tag, 2);
- TIFFSwabArrayOfLong(&dir->tdir_count, 2);
- }
- dircount = (uint16) nfields;
- TIFFSwabShort(&dircount);
- TIFFSwabLong(pdiroff);
- }
- (void) TIFFSeekFile(tif, tif->tif_diroff, SEEK_SET);
- if (!WriteOK(tif, &dircount, sizeof (dircount))) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error writing directory count");
- goto bad;
- }
- if (!WriteOK(tif, data, dirsize)) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error writing directory contents");
- goto bad;
- }
- if (!WriteOK(tif, pdiroff, sizeof (uint32))) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error writing directory link");
- goto bad;
- }
- _TIFFfree(data);
- return (1);
-bad:
- _TIFFfree(data);
- return (0);
-}
-
-int
-TIFFWriteCustomDirectory(TIFF* tif, toff_t *pdiroff)
-{
- return _TIFFWriteCustomDirectory(tif, pdiroff);
-}
-
-/*
- * Process tags that are not special cased.
- */
-static int
-TIFFWriteNormalTag(TIFF* tif, TIFFDirEntry* dir, const TIFFFieldInfo* fip)
-{
- uint16 wc = (uint16) fip->field_writecount;
- uint32 wc2;
-
- dir->tdir_tag = (uint16) fip->field_tag;
- dir->tdir_type = (uint16) fip->field_type;
- dir->tdir_count = wc;
-
- switch (fip->field_type) {
- case TIFF_SHORT:
- case TIFF_SSHORT:
- if (fip->field_passcount) {
- uint16* wp;
- if (wc == (uint16) TIFF_VARIABLE2) {
- TIFFGetField(tif, fip->field_tag, &wc2, &wp);
- dir->tdir_count = wc2;
- } else { /* Assume TIFF_VARIABLE */
- TIFFGetField(tif, fip->field_tag, &wc, &wp);
- dir->tdir_count = wc;
- }
- if (!TIFFWriteShortArray(tif, dir, wp))
- return 0;
- } else {
- if (wc == 1) {
- uint16 sv;
- TIFFGetField(tif, fip->field_tag, &sv);
- dir->tdir_offset =
- TIFFInsertData(tif, dir->tdir_type, sv);
- } else {
- uint16* wp;
- TIFFGetField(tif, fip->field_tag, &wp);
- if (!TIFFWriteShortArray(tif, dir, wp))
- return 0;
- }
- }
- break;
- case TIFF_LONG:
- case TIFF_SLONG:
- case TIFF_IFD:
- if (fip->field_passcount) {
- uint32* lp;
- if (wc == (uint16) TIFF_VARIABLE2) {
- TIFFGetField(tif, fip->field_tag, &wc2, &lp);
- dir->tdir_count = wc2;
- } else { /* Assume TIFF_VARIABLE */
- TIFFGetField(tif, fip->field_tag, &wc, &lp);
- dir->tdir_count = wc;
- }
- if (!TIFFWriteLongArray(tif, dir, lp))
- return 0;
- } else {
- if (wc == 1) {
- /* XXX handle LONG->SHORT conversion */
- TIFFGetField(tif, fip->field_tag,
- &dir->tdir_offset);
- } else {
- uint32* lp;
- TIFFGetField(tif, fip->field_tag, &lp);
- if (!TIFFWriteLongArray(tif, dir, lp))
- return 0;
- }
- }
- break;
- case TIFF_RATIONAL:
- case TIFF_SRATIONAL:
- if (fip->field_passcount) {
- float* fp;
- if (wc == (uint16) TIFF_VARIABLE2) {
- TIFFGetField(tif, fip->field_tag, &wc2, &fp);
- dir->tdir_count = wc2;
- } else { /* Assume TIFF_VARIABLE */
- TIFFGetField(tif, fip->field_tag, &wc, &fp);
- dir->tdir_count = wc;
- }
- if (!TIFFWriteRationalArray(tif, dir, fp))
- return 0;
- } else {
- if (wc == 1) {
- float fv;
- TIFFGetField(tif, fip->field_tag, &fv);
- if (!TIFFWriteRationalArray(tif, dir, &fv))
- return 0;
- } else {
- float* fp;
- TIFFGetField(tif, fip->field_tag, &fp);
- if (!TIFFWriteRationalArray(tif, dir, fp))
- return 0;
- }
- }
- break;
- case TIFF_FLOAT:
- if (fip->field_passcount) {
- float* fp;
- if (wc == (uint16) TIFF_VARIABLE2) {
- TIFFGetField(tif, fip->field_tag, &wc2, &fp);
- dir->tdir_count = wc2;
- } else { /* Assume TIFF_VARIABLE */
- TIFFGetField(tif, fip->field_tag, &wc, &fp);
- dir->tdir_count = wc;
- }
- if (!TIFFWriteFloatArray(tif, dir, fp))
- return 0;
- } else {
- if (wc == 1) {
- float fv;
- TIFFGetField(tif, fip->field_tag, &fv);
- if (!TIFFWriteFloatArray(tif, dir, &fv))
- return 0;
- } else {
- float* fp;
- TIFFGetField(tif, fip->field_tag, &fp);
- if (!TIFFWriteFloatArray(tif, dir, fp))
- return 0;
- }
- }
- break;
- case TIFF_DOUBLE:
- if (fip->field_passcount) {
- double* dp;
- if (wc == (uint16) TIFF_VARIABLE2) {
- TIFFGetField(tif, fip->field_tag, &wc2, &dp);
- dir->tdir_count = wc2;
- } else { /* Assume TIFF_VARIABLE */
- TIFFGetField(tif, fip->field_tag, &wc, &dp);
- dir->tdir_count = wc;
- }
- if (!TIFFWriteDoubleArray(tif, dir, dp))
- return 0;
- } else {
- if (wc == 1) {
- double dv;
- TIFFGetField(tif, fip->field_tag, &dv);
- if (!TIFFWriteDoubleArray(tif, dir, &dv))
- return 0;
- } else {
- double* dp;
- TIFFGetField(tif, fip->field_tag, &dp);
- if (!TIFFWriteDoubleArray(tif, dir, dp))
- return 0;
- }
- }
- break;
- case TIFF_ASCII:
- {
- char* cp;
- if (fip->field_passcount)
- {
- if( wc == (uint16) TIFF_VARIABLE2 )
- TIFFGetField(tif, fip->field_tag, &wc2, &cp);
- else
- TIFFGetField(tif, fip->field_tag, &wc, &cp);
- }
- else
- TIFFGetField(tif, fip->field_tag, &cp);
-
- dir->tdir_count = (uint32) (strlen(cp) + 1);
- if (!TIFFWriteByteArray(tif, dir, cp))
- return (0);
- }
- break;
-
- case TIFF_BYTE:
- case TIFF_SBYTE:
- if (fip->field_passcount) {
- char* cp;
- if (wc == (uint16) TIFF_VARIABLE2) {
- TIFFGetField(tif, fip->field_tag, &wc2, &cp);
- dir->tdir_count = wc2;
- } else { /* Assume TIFF_VARIABLE */
- TIFFGetField(tif, fip->field_tag, &wc, &cp);
- dir->tdir_count = wc;
- }
- if (!TIFFWriteByteArray(tif, dir, cp))
- return 0;
- } else {
- if (wc == 1) {
- char cv;
- TIFFGetField(tif, fip->field_tag, &cv);
- if (!TIFFWriteByteArray(tif, dir, &cv))
- return 0;
- } else {
- char* cp;
- TIFFGetField(tif, fip->field_tag, &cp);
- if (!TIFFWriteByteArray(tif, dir, cp))
- return 0;
- }
- }
- break;
-
- case TIFF_UNDEFINED:
- { char* cp;
- if (wc == (unsigned short) TIFF_VARIABLE) {
- TIFFGetField(tif, fip->field_tag, &wc, &cp);
- dir->tdir_count = wc;
- } else if (wc == (unsigned short) TIFF_VARIABLE2) {
- TIFFGetField(tif, fip->field_tag, &wc2, &cp);
- dir->tdir_count = wc2;
- } else
- TIFFGetField(tif, fip->field_tag, &cp);
- if (!TIFFWriteByteArray(tif, dir, cp))
- return (0);
- }
- break;
-
- case TIFF_NOTYPE:
- break;
- }
- return (1);
-}
-
-/*
- * Setup a directory entry with either a SHORT
- * or LONG type according to the value.
- */
-static void
-TIFFSetupShortLong(TIFF* tif, ttag_t tag, TIFFDirEntry* dir, uint32 v)
-{
- dir->tdir_tag = (uint16) tag;
- dir->tdir_count = 1;
- if (v > 0xffffL) {
- dir->tdir_type = (short) TIFF_LONG;
- dir->tdir_offset = v;
- } else {
- dir->tdir_type = (short) TIFF_SHORT;
- dir->tdir_offset = TIFFInsertData(tif, (int) TIFF_SHORT, v);
- }
-}
-
-/*
- * Setup a SHORT directory entry
- */
-static void
-TIFFSetupShort(TIFF* tif, ttag_t tag, TIFFDirEntry* dir, uint16 v)
-{
- dir->tdir_tag = (uint16) tag;
- dir->tdir_count = 1;
- dir->tdir_type = (short) TIFF_SHORT;
- dir->tdir_offset = TIFFInsertData(tif, (int) TIFF_SHORT, v);
-}
-#undef MakeShortDirent
-
-#define NITEMS(x) (sizeof (x) / sizeof (x[0]))
-/*
- * Setup a directory entry that references a
- * samples/pixel array of SHORT values and
- * (potentially) write the associated indirect
- * values.
- */
-static int
-TIFFWritePerSampleShorts(TIFF* tif, ttag_t tag, TIFFDirEntry* dir)
-{
- uint16 buf[10], v;
- uint16* w = buf;
- uint16 i, samples = tif->tif_dir.td_samplesperpixel;
- int status;
-
- if (samples > NITEMS(buf)) {
- w = (uint16*) _TIFFmalloc(samples * sizeof (uint16));
- if (w == NULL) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "No space to write per-sample shorts");
- return (0);
- }
- }
- TIFFGetField(tif, tag, &v);
- for (i = 0; i < samples; i++)
- w[i] = v;
-
- dir->tdir_tag = (uint16) tag;
- dir->tdir_type = (uint16) TIFF_SHORT;
- dir->tdir_count = samples;
- status = TIFFWriteShortArray(tif, dir, w);
- if (w != buf)
- _TIFFfree((char*) w);
- return (status);
-}
-
-/*
- * Setup a directory entry that references a samples/pixel array of ``type''
- * values and (potentially) write the associated indirect values. The source
- * data from TIFFGetField() for the specified tag must be returned as double.
- */
-static int
-TIFFWritePerSampleAnys(TIFF* tif,
- TIFFDataType type, ttag_t tag, TIFFDirEntry* dir)
-{
- double buf[10], v;
- double* w = buf;
- uint16 i, samples = tif->tif_dir.td_samplesperpixel;
- int status;
-
- if (samples > NITEMS(buf)) {
- w = (double*) _TIFFmalloc(samples * sizeof (double));
- if (w == NULL) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "No space to write per-sample values");
- return (0);
- }
- }
- TIFFGetField(tif, tag, &v);
- for (i = 0; i < samples; i++)
- w[i] = v;
- status = TIFFWriteAnyArray(tif, type, tag, dir, samples, w);
- if (w != buf)
- _TIFFfree(w);
- return (status);
-}
-#undef NITEMS
-
-/*
- * Setup a pair of shorts that are returned by
- * value, rather than as a reference to an array.
- */
-static int
-TIFFSetupShortPair(TIFF* tif, ttag_t tag, TIFFDirEntry* dir)
-{
- uint16 v[2];
-
- TIFFGetField(tif, tag, &v[0], &v[1]);
-
- dir->tdir_tag = (uint16) tag;
- dir->tdir_type = (uint16) TIFF_SHORT;
- dir->tdir_count = 2;
- return (TIFFWriteShortArray(tif, dir, v));
-}
-
-/*
- * Setup a directory entry for an NxM table of shorts,
- * where M is known to be 2**bitspersample, and write
- * the associated indirect data.
- */
-static int
-TIFFWriteShortTable(TIFF* tif,
- ttag_t tag, TIFFDirEntry* dir, uint32 n, uint16** table)
-{
- uint32 i, off;
-
- dir->tdir_tag = (uint16) tag;
- dir->tdir_type = (short) TIFF_SHORT;
- /* XXX -- yech, fool TIFFWriteData */
- dir->tdir_count = (uint32) (1L<<tif->tif_dir.td_bitspersample);
- off = tif->tif_dataoff;
- for (i = 0; i < n; i++)
- if (!TIFFWriteData(tif, dir, (char *)table[i]))
- return (0);
- dir->tdir_count *= n;
- dir->tdir_offset = off;
- return (1);
-}
-
-/*
- * Write/copy data associated with an ASCII or opaque tag value.
- */
-static int
-TIFFWriteByteArray(TIFF* tif, TIFFDirEntry* dir, char* cp)
-{
- if (dir->tdir_count <= 4) {
- if (tif->tif_header.tiff_magic == TIFF_BIGENDIAN) {
- dir->tdir_offset = (uint32)cp[0] << 24;
- if (dir->tdir_count >= 2)
- dir->tdir_offset |= (uint32)cp[1] << 16;
- if (dir->tdir_count >= 3)
- dir->tdir_offset |= (uint32)cp[2] << 8;
- if (dir->tdir_count == 4)
- dir->tdir_offset |= cp[3];
- } else {
- dir->tdir_offset = cp[0];
- if (dir->tdir_count >= 2)
- dir->tdir_offset |= (uint32) cp[1] << 8;
- if (dir->tdir_count >= 3)
- dir->tdir_offset |= (uint32) cp[2] << 16;
- if (dir->tdir_count == 4)
- dir->tdir_offset |= (uint32) cp[3] << 24;
- }
- return 1;
- } else
- return TIFFWriteData(tif, dir, cp);
-}
-
-/*
- * Setup a directory entry of an array of SHORT
- * or SSHORT and write the associated indirect values.
- */
-static int
-TIFFWriteShortArray(TIFF* tif, TIFFDirEntry* dir, uint16* v)
-{
- if (dir->tdir_count <= 2) {
- if (tif->tif_header.tiff_magic == TIFF_BIGENDIAN) {
- dir->tdir_offset = (uint32) v[0] << 16;
- if (dir->tdir_count == 2)
- dir->tdir_offset |= v[1] & 0xffff;
- } else {
- dir->tdir_offset = v[0] & 0xffff;
- if (dir->tdir_count == 2)
- dir->tdir_offset |= (uint32) v[1] << 16;
- }
- return (1);
- } else
- return (TIFFWriteData(tif, dir, (char*) v));
-}
-
-/*
- * Setup a directory entry of an array of LONG
- * or SLONG and write the associated indirect values.
- */
-static int
-TIFFWriteLongArray(TIFF* tif, TIFFDirEntry* dir, uint32* v)
-{
- if (dir->tdir_count == 1) {
- dir->tdir_offset = v[0];
- return (1);
- } else
- return (TIFFWriteData(tif, dir, (char*) v));
-}
-
-/*
- * Setup a directory entry of an array of RATIONAL
- * or SRATIONAL and write the associated indirect values.
- */
-static int
-TIFFWriteRationalArray(TIFF* tif, TIFFDirEntry* dir, float* v)
-{
- uint32 i;
- uint32* t;
- int status;
-
- t = (uint32*) _TIFFmalloc(2 * dir->tdir_count * sizeof (uint32));
- if (t == NULL) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "No space to write RATIONAL array");
- return (0);
- }
- for (i = 0; i < dir->tdir_count; i++) {
- float fv = v[i];
- int sign = 1;
- uint32 den;
-
- if (fv < 0) {
- if (dir->tdir_type == TIFF_RATIONAL) {
- TIFFWarningExt(tif->tif_clientdata,
- tif->tif_name,
- "\"%s\": Information lost writing value (%g) as (unsigned) RATIONAL",
- _TIFFFieldWithTag(tif,dir->tdir_tag)->field_name,
- fv);
- fv = 0;
- } else
- fv = -fv, sign = -1;
- }
- den = 1L;
- if (fv > 0) {
- while (fv < 1L<<(31-3) && den < 1L<<(31-3))
- fv *= 1<<3, den *= 1L<<3;
- }
- t[2*i+0] = (uint32) (sign * (fv + 0.5));
- t[2*i+1] = den;
- }
- status = TIFFWriteData(tif, dir, (char *)t);
- _TIFFfree((char*) t);
- return (status);
-}
-
-static int
-TIFFWriteFloatArray(TIFF* tif, TIFFDirEntry* dir, float* v)
-{
- TIFFCvtNativeToIEEEFloat(tif, dir->tdir_count, v);
- if (dir->tdir_count == 1) {
- dir->tdir_offset = *(uint32*) &v[0];
- return (1);
- } else
- return (TIFFWriteData(tif, dir, (char*) v));
-}
-
-static int
-TIFFWriteDoubleArray(TIFF* tif, TIFFDirEntry* dir, double* v)
-{
- TIFFCvtNativeToIEEEDouble(tif, dir->tdir_count, v);
- return (TIFFWriteData(tif, dir, (char*) v));
-}
-
-/*
- * Write an array of ``type'' values for a specified tag (i.e. this is a tag
- * which is allowed to have different types, e.g. SMaxSampleType).
- * Internally the data values are represented as double since a double can
- * hold any of the TIFF tag types (yes, this should really be an abstract
- * type tany_t for portability). The data is converted into the specified
- * type in a temporary buffer and then handed off to the appropriate array
- * writer.
- */
-static int
-TIFFWriteAnyArray(TIFF* tif,
- TIFFDataType type, ttag_t tag, TIFFDirEntry* dir, uint32 n, double* v)
-{
- char buf[10 * sizeof(double)];
- char* w = buf;
- int i, status = 0;
-
- if (n * TIFFDataWidth(type) > sizeof buf) {
- w = (char*) _TIFFmalloc(n * TIFFDataWidth(type));
- if (w == NULL) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "No space to write array");
- return (0);
- }
- }
-
- dir->tdir_tag = (uint16) tag;
- dir->tdir_type = (uint16) type;
- dir->tdir_count = n;
-
- switch (type) {
- case TIFF_BYTE:
- {
- uint8* bp = (uint8*) w;
- for (i = 0; i < (int) n; i++)
- bp[i] = (uint8) v[i];
- if (!TIFFWriteByteArray(tif, dir, (char*) bp))
- goto out;
- }
- break;
- case TIFF_SBYTE:
- {
- int8* bp = (int8*) w;
- for (i = 0; i < (int) n; i++)
- bp[i] = (int8) v[i];
- if (!TIFFWriteByteArray(tif, dir, (char*) bp))
- goto out;
- }
- break;
- case TIFF_SHORT:
- {
- uint16* bp = (uint16*) w;
- for (i = 0; i < (int) n; i++)
- bp[i] = (uint16) v[i];
- if (!TIFFWriteShortArray(tif, dir, (uint16*)bp))
- goto out;
- }
- break;
- case TIFF_SSHORT:
- {
- int16* bp = (int16*) w;
- for (i = 0; i < (int) n; i++)
- bp[i] = (int16) v[i];
- if (!TIFFWriteShortArray(tif, dir, (uint16*)bp))
- goto out;
- }
- break;
- case TIFF_LONG:
- {
- uint32* bp = (uint32*) w;
- for (i = 0; i < (int) n; i++)
- bp[i] = (uint32) v[i];
- if (!TIFFWriteLongArray(tif, dir, bp))
- goto out;
- }
- break;
- case TIFF_SLONG:
- {
- int32* bp = (int32*) w;
- for (i = 0; i < (int) n; i++)
- bp[i] = (int32) v[i];
- if (!TIFFWriteLongArray(tif, dir, (uint32*) bp))
- goto out;
- }
- break;
- case TIFF_FLOAT:
- {
- float* bp = (float*) w;
- for (i = 0; i < (int) n; i++)
- bp[i] = (float) v[i];
- if (!TIFFWriteFloatArray(tif, dir, bp))
- goto out;
- }
- break;
- case TIFF_DOUBLE:
- {
- if( !TIFFWriteDoubleArray(tif, dir, v))
- goto out;
- }
- break;
- default:
- /* TIFF_NOTYPE */
- /* TIFF_ASCII */
- /* TIFF_UNDEFINED */
- /* TIFF_RATIONAL */
- /* TIFF_SRATIONAL */
- goto out;
- }
- status = 1;
- out:
- if (w != buf)
- _TIFFfree(w);
- return (status);
-}
-
-static int
-TIFFWriteTransferFunction(TIFF* tif, TIFFDirEntry* dir)
-{
- TIFFDirectory* td = &tif->tif_dir;
- tsize_t n = (1L<<td->td_bitspersample) * sizeof (uint16);
- uint16** tf = td->td_transferfunction;
- int ncols;
-
- /*
- * Check if the table can be written as a single column,
- * or if it must be written as 3 columns. Note that we
- * write a 3-column tag if there are 2 samples/pixel and
- * a single column of data won't suffice--hmm.
- */
- switch (td->td_samplesperpixel - td->td_extrasamples) {
- default: if (_TIFFmemcmp(tf[0], tf[2], n)) { ncols = 3; break; }
- case 2: if (_TIFFmemcmp(tf[0], tf[1], n)) { ncols = 3; break; }
- case 1: case 0: ncols = 1;
- }
- return (TIFFWriteShortTable(tif,
- TIFFTAG_TRANSFERFUNCTION, dir, ncols, tf));
-}
-
-static int
-TIFFWriteInkNames(TIFF* tif, TIFFDirEntry* dir)
-{
- TIFFDirectory* td = &tif->tif_dir;
-
- dir->tdir_tag = TIFFTAG_INKNAMES;
- dir->tdir_type = (short) TIFF_ASCII;
- dir->tdir_count = td->td_inknameslen;
- return (TIFFWriteByteArray(tif, dir, td->td_inknames));
-}
-
-/*
- * Write a contiguous directory item.
- */
-static int
-TIFFWriteData(TIFF* tif, TIFFDirEntry* dir, char* cp)
-{
- tsize_t cc;
-
- if (tif->tif_flags & TIFF_SWAB) {
- switch (dir->tdir_type) {
- case TIFF_SHORT:
- case TIFF_SSHORT:
- TIFFSwabArrayOfShort((uint16*) cp, dir->tdir_count);
- break;
- case TIFF_LONG:
- case TIFF_SLONG:
- case TIFF_FLOAT:
- TIFFSwabArrayOfLong((uint32*) cp, dir->tdir_count);
- break;
- case TIFF_RATIONAL:
- case TIFF_SRATIONAL:
- TIFFSwabArrayOfLong((uint32*) cp, 2*dir->tdir_count);
- break;
- case TIFF_DOUBLE:
- TIFFSwabArrayOfDouble((double*) cp, dir->tdir_count);
- break;
- }
- }
- dir->tdir_offset = tif->tif_dataoff;
- cc = dir->tdir_count * TIFFDataWidth((TIFFDataType) dir->tdir_type);
- if (SeekOK(tif, dir->tdir_offset) &&
- WriteOK(tif, cp, cc)) {
- tif->tif_dataoff += (cc + 1) & ~1;
- return (1);
- }
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error writing data for field \"%s\"",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
- return (0);
-}
-
-/*
- * Similar to TIFFWriteDirectory(), but if the directory has already
- * been written once, it is relocated to the end of the file, in case it
- * has changed in size. Note that this will result in the loss of the
- * previously used directory space.
- */
-
-int
-TIFFRewriteDirectory( TIFF *tif )
-{
- static const char module[] = "TIFFRewriteDirectory";
-
- /* We don't need to do anything special if it hasn't been written. */
- if( tif->tif_diroff == 0 )
- return TIFFWriteDirectory( tif );
-
- /*
- ** Find and zero the pointer to this directory, so that TIFFLinkDirectory
- ** will cause it to be added after this directories current pre-link.
- */
-
- /* Is it the first directory in the file? */
- if (tif->tif_header.tiff_diroff == tif->tif_diroff)
- {
- tif->tif_header.tiff_diroff = 0;
- tif->tif_diroff = 0;
-
- TIFFSeekFile(tif, (toff_t)(TIFF_MAGIC_SIZE+TIFF_VERSION_SIZE),
- SEEK_SET);
- if (!WriteOK(tif, &(tif->tif_header.tiff_diroff),
- sizeof (tif->tif_diroff)))
- {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error updating TIFF header");
- return (0);
- }
- }
- else
- {
- toff_t nextdir, off;
-
- nextdir = tif->tif_header.tiff_diroff;
- do {
- uint16 dircount;
-
- if (!SeekOK(tif, nextdir) ||
- !ReadOK(tif, &dircount, sizeof (dircount))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Error fetching directory count");
- return (0);
- }
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabShort(&dircount);
- (void) TIFFSeekFile(tif,
- dircount * sizeof (TIFFDirEntry), SEEK_CUR);
- if (!ReadOK(tif, &nextdir, sizeof (nextdir))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Error fetching directory link");
- return (0);
- }
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabLong(&nextdir);
- } while (nextdir != tif->tif_diroff && nextdir != 0);
- off = TIFFSeekFile(tif, 0, SEEK_CUR); /* get current offset */
- (void) TIFFSeekFile(tif, off - (toff_t)sizeof(nextdir), SEEK_SET);
- tif->tif_diroff = 0;
- if (!WriteOK(tif, &(tif->tif_diroff), sizeof (nextdir))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Error writing directory link");
- return (0);
- }
- }
-
- /*
- ** Now use TIFFWriteDirectory() normally.
- */
-
- return TIFFWriteDirectory( tif );
-}
-
-
-/*
- * Link the current directory into the directory chain for the file.
- */
-static int
-TIFFLinkDirectory(TIFF* tif)
-{
- static const char module[] = "TIFFLinkDirectory";
- toff_t nextdir;
- toff_t diroff, off;
-
- tif->tif_diroff = (TIFFSeekFile(tif, (toff_t) 0, SEEK_END)+1) &~ 1;
- diroff = tif->tif_diroff;
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabLong(&diroff);
-
- /*
- * Handle SubIFDs
- */
- if (tif->tif_flags & TIFF_INSUBIFD) {
- (void) TIFFSeekFile(tif, tif->tif_subifdoff, SEEK_SET);
- if (!WriteOK(tif, &diroff, sizeof (diroff))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Error writing SubIFD directory link",
- tif->tif_name);
- return (0);
- }
- /*
- * Advance to the next SubIFD or, if this is
- * the last one configured, revert back to the
- * normal directory linkage.
- */
- if (--tif->tif_nsubifd)
- tif->tif_subifdoff += sizeof (diroff);
- else
- tif->tif_flags &= ~TIFF_INSUBIFD;
- return (1);
- }
-
- if (tif->tif_header.tiff_diroff == 0) {
- /*
- * First directory, overwrite offset in header.
- */
- tif->tif_header.tiff_diroff = tif->tif_diroff;
- (void) TIFFSeekFile(tif,
- (toff_t)(TIFF_MAGIC_SIZE+TIFF_VERSION_SIZE),
- SEEK_SET);
- if (!WriteOK(tif, &diroff, sizeof (diroff))) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error writing TIFF header");
- return (0);
- }
- return (1);
- }
- /*
- * Not the first directory, search to the last and append.
- */
- nextdir = tif->tif_header.tiff_diroff;
- do {
- uint16 dircount;
-
- if (!SeekOK(tif, nextdir) ||
- !ReadOK(tif, &dircount, sizeof (dircount))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Error fetching directory count");
- return (0);
- }
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabShort(&dircount);
- (void) TIFFSeekFile(tif,
- dircount * sizeof (TIFFDirEntry), SEEK_CUR);
- if (!ReadOK(tif, &nextdir, sizeof (nextdir))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Error fetching directory link");
- return (0);
- }
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabLong(&nextdir);
- } while (nextdir != 0);
- off = TIFFSeekFile(tif, 0, SEEK_CUR); /* get current offset */
- (void) TIFFSeekFile(tif, off - (toff_t)sizeof(nextdir), SEEK_SET);
- if (!WriteOK(tif, &diroff, sizeof (diroff))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Error writing directory link");
- return (0);
- }
- return (1);
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_dumpmode.c b/src/3rdparty/libtiff/libtiff/tif_dumpmode.c
deleted file mode 100644
index 767d6d9263..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_dumpmode.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dumpmode.c,v 1.5.2.1 2009-01-01 00:10:43 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * "Null" Compression Algorithm Support.
- */
-#include "tiffiop.h"
-
-/*
- * Encode a hunk of pixels.
- */
-static int
-DumpModeEncode(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
-{
- (void) s;
- while (cc > 0) {
- tsize_t n;
-
- n = cc;
- if (tif->tif_rawcc + n > tif->tif_rawdatasize)
- n = tif->tif_rawdatasize - tif->tif_rawcc;
-
- assert( n > 0 );
-
- /*
- * Avoid copy if client has setup raw
- * data buffer to avoid extra copy.
- */
- if (tif->tif_rawcp != pp)
- _TIFFmemcpy(tif->tif_rawcp, pp, n);
- tif->tif_rawcp += n;
- tif->tif_rawcc += n;
- pp += n;
- cc -= n;
- if (tif->tif_rawcc >= tif->tif_rawdatasize &&
- !TIFFFlushData1(tif))
- return (-1);
- }
- return (1);
-}
-
-/*
- * Decode a hunk of pixels.
- */
-static int
-DumpModeDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
-{
- (void) s;
-/* fprintf(stderr,"DumpModeDecode: scanline %ld, expected %ld bytes, got %ld bytes\n", */
-/* (long) tif->tif_row, (long) tif->tif_rawcc, (long) cc); */
- if (tif->tif_rawcc < cc) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "DumpModeDecode: Not enough data for scanline %d",
- tif->tif_row);
- return (0);
- }
- /*
- * Avoid copy if client has setup raw
- * data buffer to avoid extra copy.
- */
- if (tif->tif_rawcp != buf)
- _TIFFmemcpy(buf, tif->tif_rawcp, cc);
- tif->tif_rawcp += cc;
- tif->tif_rawcc -= cc;
- return (1);
-}
-
-/*
- * Seek forwards nrows in the current strip.
- */
-static int
-DumpModeSeek(TIFF* tif, uint32 nrows)
-{
- tif->tif_rawcp += nrows * tif->tif_scanlinesize;
- tif->tif_rawcc -= nrows * tif->tif_scanlinesize;
- return (1);
-}
-
-/*
- * Initialize dump mode.
- */
-int
-TIFFInitDumpMode(TIFF* tif, int scheme)
-{
- (void) scheme;
- tif->tif_decoderow = DumpModeDecode;
- tif->tif_decodestrip = DumpModeDecode;
- tif->tif_decodetile = DumpModeDecode;
- tif->tif_encoderow = DumpModeEncode;
- tif->tif_encodestrip = DumpModeEncode;
- tif->tif_encodetile = DumpModeEncode;
- tif->tif_seek = DumpModeSeek;
- return (1);
-}
diff --git a/src/3rdparty/libtiff/libtiff/tif_error.c b/src/3rdparty/libtiff/libtiff/tif_error.c
deleted file mode 100644
index 7025080ed3..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_error.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_error.c,v 1.4 2005/12/23 01:18:59 joris Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- */
-#include "tiffiop.h"
-
-TIFFErrorHandlerExt _TIFFerrorHandlerExt = NULL;
-
-TIFFErrorHandler
-TIFFSetErrorHandler(TIFFErrorHandler handler)
-{
- TIFFErrorHandler prev = _TIFFerrorHandler;
- _TIFFerrorHandler = handler;
- return (prev);
-}
-
-TIFFErrorHandlerExt
-TIFFSetErrorHandlerExt(TIFFErrorHandlerExt handler)
-{
- TIFFErrorHandlerExt prev = _TIFFerrorHandlerExt;
- _TIFFerrorHandlerExt = handler;
- return (prev);
-}
-
-void
-TIFFError(const char* module, const char* fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- if (_TIFFerrorHandler)
- (*_TIFFerrorHandler)(module, fmt, ap);
- if (_TIFFerrorHandlerExt)
- (*_TIFFerrorHandlerExt)(0, module, fmt, ap);
- va_end(ap);
-}
-
-void
-TIFFErrorExt(thandle_t fd, const char* module, const char* fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- if (_TIFFerrorHandler)
- (*_TIFFerrorHandler)(module, fmt, ap);
- if (_TIFFerrorHandlerExt)
- (*_TIFFerrorHandlerExt)(fd, module, fmt, ap);
- va_end(ap);
-}
-
diff --git a/src/3rdparty/libtiff/libtiff/tif_extension.c b/src/3rdparty/libtiff/libtiff/tif_extension.c
deleted file mode 100644
index 6861522285..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_extension.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_extension.c,v 1.4 2004/10/02 13:29:41 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Various routines support external extension of the tag set, and other
- * application extension capabilities.
- */
-
-#include "tiffiop.h"
-
-int TIFFGetTagListCount( TIFF *tif )
-
-{
- TIFFDirectory* td = &tif->tif_dir;
-
- return td->td_customValueCount;
-}
-
-ttag_t TIFFGetTagListEntry( TIFF *tif, int tag_index )
-
-{
- TIFFDirectory* td = &tif->tif_dir;
-
- if( tag_index < 0 || tag_index >= td->td_customValueCount )
- return (ttag_t) -1;
- else
- return td->td_customValues[tag_index].info->field_tag;
-}
-
-/*
-** This provides read/write access to the TIFFTagMethods within the TIFF
-** structure to application code without giving access to the private
-** TIFF structure.
-*/
-TIFFTagMethods *TIFFAccessTagMethods( TIFF *tif )
-
-{
- return &(tif->tif_tagmethods);
-}
-
-void *TIFFGetClientInfo( TIFF *tif, const char *name )
-
-{
- TIFFClientInfoLink *link = tif->tif_clientinfo;
-
- while( link != NULL && strcmp(link->name,name) != 0 )
- link = link->next;
-
- if( link != NULL )
- return link->data;
- else
- return NULL;
-}
-
-void TIFFSetClientInfo( TIFF *tif, void *data, const char *name )
-
-{
- TIFFClientInfoLink *link = tif->tif_clientinfo;
-
- /*
- ** Do we have an existing link with this name? If so, just
- ** set it.
- */
- while( link != NULL && strcmp(link->name,name) != 0 )
- link = link->next;
-
- if( link != NULL )
- {
- link->data = data;
- return;
- }
-
- /*
- ** Create a new link.
- */
-
- link = (TIFFClientInfoLink *) _TIFFmalloc(sizeof(TIFFClientInfoLink));
- assert (link != NULL);
- link->next = tif->tif_clientinfo;
- link->name = (char *) _TIFFmalloc(strlen(name)+1);
- assert (link->name != NULL);
- strcpy(link->name, name);
- link->data = data;
-
- tif->tif_clientinfo = link;
-}
diff --git a/src/3rdparty/libtiff/libtiff/tif_fax3.c b/src/3rdparty/libtiff/libtiff/tif_fax3.c
deleted file mode 100644
index b560d56415..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_fax3.c
+++ /dev/null
@@ -1,1603 +0,0 @@
-/* $Id: tif_fax3.c,v 1.43.2.5 2009-01-01 00:10:43 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1990-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#include "tiffiop.h"
-#ifdef CCITT_SUPPORT
-/*
- * TIFF Library.
- *
- * CCITT Group 3 (T.4) and Group 4 (T.6) Compression Support.
- *
- * This file contains support for decoding and encoding TIFF
- * compression algorithms 2, 3, 4, and 32771.
- *
- * Decoder support is derived, with permission, from the code
- * in Frank Cringle's viewfax program;
- * Copyright (C) 1990, 1995 Frank D. Cringle.
- */
-#include "tif_fax3.h"
-#define G3CODES
-#include "t4.h"
-#include <stdio.h>
-
-/*
- * Compression+decompression state blocks are
- * derived from this ``base state'' block.
- */
-typedef struct {
- int rw_mode; /* O_RDONLY for decode, else encode */
- int mode; /* operating mode */
- uint32 rowbytes; /* bytes in a decoded scanline */
- uint32 rowpixels; /* pixels in a scanline */
-
- uint16 cleanfaxdata; /* CleanFaxData tag */
- uint32 badfaxrun; /* BadFaxRun tag */
- uint32 badfaxlines; /* BadFaxLines tag */
- uint32 groupoptions; /* Group 3/4 options tag */
- uint32 recvparams; /* encoded Class 2 session params */
- char* subaddress; /* subaddress string */
- uint32 recvtime; /* time spent receiving (secs) */
- char* faxdcs; /* Table 2/T.30 encoded session params */
- TIFFVGetMethod vgetparent; /* super-class method */
- TIFFVSetMethod vsetparent; /* super-class method */
- TIFFPrintMethod printdir; /* super-class method */
-} Fax3BaseState;
-#define Fax3State(tif) ((Fax3BaseState*) (tif)->tif_data)
-
-typedef enum { G3_1D, G3_2D } Ttag;
-typedef struct {
- Fax3BaseState b;
-
- /* Decoder state info */
- const unsigned char* bitmap; /* bit reversal table */
- uint32 data; /* current i/o byte/word */
- int bit; /* current i/o bit in byte */
- int EOLcnt; /* count of EOL codes recognized */
- TIFFFaxFillFunc fill; /* fill routine */
- uint32* runs; /* b&w runs for current/previous row */
- uint32* refruns; /* runs for reference line */
- uint32* curruns; /* runs for current line */
-
- /* Encoder state info */
- Ttag tag; /* encoding state */
- unsigned char* refline; /* reference line for 2d decoding */
- int k; /* #rows left that can be 2d encoded */
- int maxk; /* max #rows that can be 2d encoded */
-
- int line;
-} Fax3CodecState;
-#define DecoderState(tif) ((Fax3CodecState*) Fax3State(tif))
-#define EncoderState(tif) ((Fax3CodecState*) Fax3State(tif))
-
-#define is2DEncoding(sp) \
- (sp->b.groupoptions & GROUP3OPT_2DENCODING)
-#define isAligned(p,t) ((((unsigned long)(p)) & (sizeof (t)-1)) == 0)
-
-/*
- * Group 3 and Group 4 Decoding.
- */
-
-/*
- * These macros glue the TIFF library state to
- * the state expected by Frank's decoder.
- */
-#define DECLARE_STATE(tif, sp, mod) \
- static const char module[] = mod; \
- Fax3CodecState* sp = DecoderState(tif); \
- int a0; /* reference element */ \
- int lastx = sp->b.rowpixels; /* last element in row */ \
- uint32 BitAcc; /* bit accumulator */ \
- int BitsAvail; /* # valid bits in BitAcc */ \
- int RunLength; /* length of current run */ \
- unsigned char* cp; /* next byte of input data */ \
- unsigned char* ep; /* end of input data */ \
- uint32* pa; /* place to stuff next run */ \
- uint32* thisrun; /* current row's run array */ \
- int EOLcnt; /* # EOL codes recognized */ \
- const unsigned char* bitmap = sp->bitmap; /* input data bit reverser */ \
- const TIFFFaxTabEnt* TabEnt
-#define DECLARE_STATE_2D(tif, sp, mod) \
- DECLARE_STATE(tif, sp, mod); \
- int b1; /* next change on prev line */ \
- uint32* pb /* next run in reference line */\
-/*
- * Load any state that may be changed during decoding.
- */
-#define CACHE_STATE(tif, sp) do { \
- BitAcc = sp->data; \
- BitsAvail = sp->bit; \
- EOLcnt = sp->EOLcnt; \
- cp = (unsigned char*) tif->tif_rawcp; \
- ep = cp + tif->tif_rawcc; \
-} while (0)
-/*
- * Save state possibly changed during decoding.
- */
-#define UNCACHE_STATE(tif, sp) do { \
- sp->bit = BitsAvail; \
- sp->data = BitAcc; \
- sp->EOLcnt = EOLcnt; \
- tif->tif_rawcc -= (tidata_t) cp - tif->tif_rawcp; \
- tif->tif_rawcp = (tidata_t) cp; \
-} while (0)
-
-/*
- * Setup state for decoding a strip.
- */
-static int
-Fax3PreDecode(TIFF* tif, tsample_t s)
-{
- Fax3CodecState* sp = DecoderState(tif);
-
- (void) s;
- assert(sp != NULL);
- sp->bit = 0; /* force initial read */
- sp->data = 0;
- sp->EOLcnt = 0; /* force initial scan for EOL */
- /*
- * Decoder assumes lsb-to-msb bit order. Note that we select
- * this here rather than in Fax3SetupState so that viewers can
- * hold the image open, fiddle with the FillOrder tag value,
- * and then re-decode the image. Otherwise they'd need to close
- * and open the image to get the state reset.
- */
- sp->bitmap =
- TIFFGetBitRevTable(tif->tif_dir.td_fillorder != FILLORDER_LSB2MSB);
- if (sp->refruns) { /* init reference line to white */
- sp->refruns[0] = (uint32) sp->b.rowpixels;
- sp->refruns[1] = 0;
- }
- sp->line = 0;
- return (1);
-}
-
-/*
- * Routine for handling various errors/conditions.
- * Note how they are "glued into the decoder" by
- * overriding the definitions used by the decoder.
- */
-
-static void
-Fax3Unexpected(const char* module, TIFF* tif, uint32 line, uint32 a0)
-{
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad code word at line %u of %s %u (x %u)",
- tif->tif_name, line, isTiled(tif) ? "tile" : "strip",
- (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
- a0);
-}
-#define unexpected(table, a0) Fax3Unexpected(module, tif, sp->line, a0)
-
-static void
-Fax3Extension(const char* module, TIFF* tif, uint32 line, uint32 a0)
-{
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Uncompressed data (not supported) at line %u of %s %u (x %u)",
- tif->tif_name, line, isTiled(tif) ? "tile" : "strip",
- (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
- a0);
-}
-#define extension(a0) Fax3Extension(module, tif, sp->line, a0)
-
-static void
-Fax3BadLength(const char* module, TIFF* tif, uint32 line, uint32 a0, uint32 lastx)
-{
- TIFFWarningExt(tif->tif_clientdata, module, "%s: %s at line %u of %s %u (got %u, expected %u)",
- tif->tif_name,
- a0 < lastx ? "Premature EOL" : "Line length mismatch",
- line, isTiled(tif) ? "tile" : "strip",
- (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
- a0, lastx);
-}
-#define badlength(a0,lastx) Fax3BadLength(module, tif, sp->line, a0, lastx)
-
-static void
-Fax3PrematureEOF(const char* module, TIFF* tif, uint32 line, uint32 a0)
-{
- TIFFWarningExt(tif->tif_clientdata, module, "%s: Premature EOF at line %u of %s %u (x %u)",
- tif->tif_name,
- line, isTiled(tif) ? "tile" : "strip",
- (isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip),
- a0);
-}
-#define prematureEOF(a0) Fax3PrematureEOF(module, tif, sp->line, a0)
-
-#define Nop
-
-/*
- * Decode the requested amount of G3 1D-encoded data.
- */
-static int
-Fax3Decode1D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
-{
- DECLARE_STATE(tif, sp, "Fax3Decode1D");
-
- (void) s;
- CACHE_STATE(tif, sp);
- thisrun = sp->curruns;
- while ((long)occ > 0) {
- a0 = 0;
- RunLength = 0;
- pa = thisrun;
-#ifdef FAX3_DEBUG
- printf("\nBitAcc=%08X, BitsAvail = %d\n", BitAcc, BitsAvail);
- printf("-------------------- %d\n", tif->tif_row);
- fflush(stdout);
-#endif
- SYNC_EOL(EOF1D);
- EXPAND1D(EOF1Da);
- (*sp->fill)(buf, thisrun, pa, lastx);
- buf += sp->b.rowbytes;
- occ -= sp->b.rowbytes;
- sp->line++;
- continue;
- EOF1D: /* premature EOF */
- CLEANUP_RUNS();
- EOF1Da: /* premature EOF */
- (*sp->fill)(buf, thisrun, pa, lastx);
- UNCACHE_STATE(tif, sp);
- return (-1);
- }
- UNCACHE_STATE(tif, sp);
- return (1);
-}
-
-#define SWAP(t,a,b) { t x; x = (a); (a) = (b); (b) = x; }
-/*
- * Decode the requested amount of G3 2D-encoded data.
- */
-static int
-Fax3Decode2D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
-{
- DECLARE_STATE_2D(tif, sp, "Fax3Decode2D");
- int is1D; /* current line is 1d/2d-encoded */
-
- (void) s;
- CACHE_STATE(tif, sp);
- while ((long)occ > 0) {
- a0 = 0;
- RunLength = 0;
- pa = thisrun = sp->curruns;
-#ifdef FAX3_DEBUG
- printf("\nBitAcc=%08X, BitsAvail = %d EOLcnt = %d",
- BitAcc, BitsAvail, EOLcnt);
-#endif
- SYNC_EOL(EOF2D);
- NeedBits8(1, EOF2D);
- is1D = GetBits(1); /* 1D/2D-encoding tag bit */
- ClrBits(1);
-#ifdef FAX3_DEBUG
- printf(" %s\n-------------------- %d\n",
- is1D ? "1D" : "2D", tif->tif_row);
- fflush(stdout);
-#endif
- pb = sp->refruns;
- b1 = *pb++;
- if (is1D)
- EXPAND1D(EOF2Da);
- else
- EXPAND2D(EOF2Da);
- (*sp->fill)(buf, thisrun, pa, lastx);
- SETVALUE(0); /* imaginary change for reference */
- SWAP(uint32*, sp->curruns, sp->refruns);
- buf += sp->b.rowbytes;
- occ -= sp->b.rowbytes;
- sp->line++;
- continue;
- EOF2D: /* premature EOF */
- CLEANUP_RUNS();
- EOF2Da: /* premature EOF */
- (*sp->fill)(buf, thisrun, pa, lastx);
- UNCACHE_STATE(tif, sp);
- return (-1);
- }
- UNCACHE_STATE(tif, sp);
- return (1);
-}
-#undef SWAP
-
-/*
- * The ZERO & FILL macros must handle spans < 2*sizeof(long) bytes.
- * For machines with 64-bit longs this is <16 bytes; otherwise
- * this is <8 bytes. We optimize the code here to reflect the
- * machine characteristics.
- */
-#if SIZEOF_LONG == 8
-# define FILL(n, cp) \
- switch (n) { \
- case 15:(cp)[14] = 0xff; case 14:(cp)[13] = 0xff; case 13: (cp)[12] = 0xff;\
- case 12:(cp)[11] = 0xff; case 11:(cp)[10] = 0xff; case 10: (cp)[9] = 0xff;\
- case 9: (cp)[8] = 0xff; case 8: (cp)[7] = 0xff; case 7: (cp)[6] = 0xff;\
- case 6: (cp)[5] = 0xff; case 5: (cp)[4] = 0xff; case 4: (cp)[3] = 0xff;\
- case 3: (cp)[2] = 0xff; case 2: (cp)[1] = 0xff; \
- case 1: (cp)[0] = 0xff; (cp) += (n); case 0: ; \
- }
-# define ZERO(n, cp) \
- switch (n) { \
- case 15:(cp)[14] = 0; case 14:(cp)[13] = 0; case 13: (cp)[12] = 0; \
- case 12:(cp)[11] = 0; case 11:(cp)[10] = 0; case 10: (cp)[9] = 0; \
- case 9: (cp)[8] = 0; case 8: (cp)[7] = 0; case 7: (cp)[6] = 0; \
- case 6: (cp)[5] = 0; case 5: (cp)[4] = 0; case 4: (cp)[3] = 0; \
- case 3: (cp)[2] = 0; case 2: (cp)[1] = 0; \
- case 1: (cp)[0] = 0; (cp) += (n); case 0: ; \
- }
-#else
-# define FILL(n, cp) \
- switch (n) { \
- case 7: (cp)[6] = 0xff; case 6: (cp)[5] = 0xff; case 5: (cp)[4] = 0xff; \
- case 4: (cp)[3] = 0xff; case 3: (cp)[2] = 0xff; case 2: (cp)[1] = 0xff; \
- case 1: (cp)[0] = 0xff; (cp) += (n); case 0: ; \
- }
-# define ZERO(n, cp) \
- switch (n) { \
- case 7: (cp)[6] = 0; case 6: (cp)[5] = 0; case 5: (cp)[4] = 0; \
- case 4: (cp)[3] = 0; case 3: (cp)[2] = 0; case 2: (cp)[1] = 0; \
- case 1: (cp)[0] = 0; (cp) += (n); case 0: ; \
- }
-#endif
-
-/*
- * Bit-fill a row according to the white/black
- * runs generated during G3/G4 decoding.
- */
-void
-_TIFFFax3fillruns(unsigned char* buf, uint32* runs, uint32* erun, uint32 lastx)
-{
- static const unsigned char _fillmasks[] =
- { 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff };
- unsigned char* cp;
- uint32 x, bx, run;
- int32 n, nw;
- long* lp;
-
- if ((erun-runs)&1)
- *erun++ = 0;
- x = 0;
- for (; runs < erun; runs += 2) {
- run = runs[0];
- if (x+run > lastx || run > lastx )
- run = runs[0] = (uint32) (lastx - x);
- if (run) {
- cp = buf + (x>>3);
- bx = x&7;
- if (run > 8-bx) {
- if (bx) { /* align to byte boundary */
- *cp++ &= 0xff << (8-bx);
- run -= 8-bx;
- }
- if( (n = run >> 3) != 0 ) { /* multiple bytes to fill */
- if ((n/sizeof (long)) > 1) {
- /*
- * Align to longword boundary and fill.
- */
- for (; n && !isAligned(cp, long); n--)
- *cp++ = 0x00;
- lp = (long*) cp;
- nw = (int32)(n / sizeof (long));
- n -= nw * sizeof (long);
- do {
- *lp++ = 0L;
- } while (--nw);
- cp = (unsigned char*) lp;
- }
- ZERO(n, cp);
- run &= 7;
- }
- if (run)
- cp[0] &= 0xff >> run;
- } else
- cp[0] &= ~(_fillmasks[run]>>bx);
- x += runs[0];
- }
- run = runs[1];
- if (x+run > lastx || run > lastx )
- run = runs[1] = lastx - x;
- if (run) {
- cp = buf + (x>>3);
- bx = x&7;
- if (run > 8-bx) {
- if (bx) { /* align to byte boundary */
- *cp++ |= 0xff >> bx;
- run -= 8-bx;
- }
- if( (n = run>>3) != 0 ) { /* multiple bytes to fill */
- if ((n/sizeof (long)) > 1) {
- /*
- * Align to longword boundary and fill.
- */
- for (; n && !isAligned(cp, long); n--)
- *cp++ = 0xff;
- lp = (long*) cp;
- nw = (int32)(n / sizeof (long));
- n -= nw * sizeof (long);
- do {
- *lp++ = -1L;
- } while (--nw);
- cp = (unsigned char*) lp;
- }
- FILL(n, cp);
- run &= 7;
- }
- if (run)
- cp[0] |= 0xff00 >> run;
- } else
- cp[0] |= _fillmasks[run]>>bx;
- x += runs[1];
- }
- }
- assert(x == lastx);
-}
-#undef ZERO
-#undef FILL
-
-/*
- * Setup G3/G4-related compression/decompression state
- * before data is processed. This routine is called once
- * per image -- it sets up different state based on whether
- * or not decoding or encoding is being done and whether
- * 1D- or 2D-encoded data is involved.
- */
-static int
-Fax3SetupState(TIFF* tif)
-{
- TIFFDirectory* td = &tif->tif_dir;
- Fax3BaseState* sp = Fax3State(tif);
- int needsRefLine;
- Fax3CodecState* dsp = (Fax3CodecState*) Fax3State(tif);
- uint32 rowbytes, rowpixels, nruns;
-
- if (td->td_bitspersample != 1) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Bits/sample must be 1 for Group 3/4 encoding/decoding");
- return (0);
- }
- /*
- * Calculate the scanline/tile widths.
- */
- if (isTiled(tif)) {
- rowbytes = TIFFTileRowSize(tif);
- rowpixels = td->td_tilewidth;
- } else {
- rowbytes = TIFFScanlineSize(tif);
- rowpixels = td->td_imagewidth;
- }
- sp->rowbytes = (uint32) rowbytes;
- sp->rowpixels = (uint32) rowpixels;
- /*
- * Allocate any additional space required for decoding/encoding.
- */
- needsRefLine = (
- (sp->groupoptions & GROUP3OPT_2DENCODING) ||
- td->td_compression == COMPRESSION_CCITTFAX4
- );
-
- nruns = needsRefLine ? 2*TIFFroundup(rowpixels,32) : rowpixels;
- nruns += 3;
- dsp->runs = (uint32*) _TIFFCheckMalloc(tif, 2*nruns, sizeof (uint32),
- "for Group 3/4 run arrays");
- if (dsp->runs == NULL)
- return (0);
- dsp->curruns = dsp->runs;
- if (needsRefLine)
- dsp->refruns = dsp->runs + nruns;
- else
- dsp->refruns = NULL;
- if (td->td_compression == COMPRESSION_CCITTFAX3
- && is2DEncoding(dsp)) { /* NB: default is 1D routine */
- tif->tif_decoderow = Fax3Decode2D;
- tif->tif_decodestrip = Fax3Decode2D;
- tif->tif_decodetile = Fax3Decode2D;
- }
-
- if (needsRefLine) { /* 2d encoding */
- Fax3CodecState* esp = EncoderState(tif);
- /*
- * 2d encoding requires a scanline
- * buffer for the ``reference line''; the
- * scanline against which delta encoding
- * is referenced. The reference line must
- * be initialized to be ``white'' (done elsewhere).
- */
- esp->refline = (unsigned char*) _TIFFmalloc(rowbytes);
- if (esp->refline == NULL) {
- TIFFErrorExt(tif->tif_clientdata, "Fax3SetupState",
- "%s: No space for Group 3/4 reference line",
- tif->tif_name);
- return (0);
- }
- } else /* 1d encoding */
- EncoderState(tif)->refline = NULL;
-
- return (1);
-}
-
-/*
- * CCITT Group 3 FAX Encoding.
- */
-
-#define Fax3FlushBits(tif, sp) { \
- if ((tif)->tif_rawcc >= (tif)->tif_rawdatasize) \
- (void) TIFFFlushData1(tif); \
- *(tif)->tif_rawcp++ = (tidataval_t) (sp)->data; \
- (tif)->tif_rawcc++; \
- (sp)->data = 0, (sp)->bit = 8; \
-}
-#define _FlushBits(tif) { \
- if ((tif)->tif_rawcc >= (tif)->tif_rawdatasize) \
- (void) TIFFFlushData1(tif); \
- *(tif)->tif_rawcp++ = (tidataval_t) data; \
- (tif)->tif_rawcc++; \
- data = 0, bit = 8; \
-}
-static const int _msbmask[9] =
- { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
-#define _PutBits(tif, bits, length) { \
- while (length > bit) { \
- data |= bits >> (length - bit); \
- length -= bit; \
- _FlushBits(tif); \
- } \
- data |= (bits & _msbmask[length]) << (bit - length); \
- bit -= length; \
- if (bit == 0) \
- _FlushBits(tif); \
-}
-
-/*
- * Write a variable-length bit-value to
- * the output stream. Values are
- * assumed to be at most 16 bits.
- */
-static void
-Fax3PutBits(TIFF* tif, unsigned int bits, unsigned int length)
-{
- Fax3CodecState* sp = EncoderState(tif);
- unsigned int bit = sp->bit;
- int data = sp->data;
-
- _PutBits(tif, bits, length);
-
- sp->data = data;
- sp->bit = bit;
-}
-
-/*
- * Write a code to the output stream.
- */
-#define putcode(tif, te) Fax3PutBits(tif, (te)->code, (te)->length)
-
-#ifdef FAX3_DEBUG
-#define DEBUG_COLOR(w) (tab == TIFFFaxWhiteCodes ? w "W" : w "B")
-#define DEBUG_PRINT(what,len) { \
- int t; \
- printf("%08X/%-2d: %s%5d\t", data, bit, DEBUG_COLOR(what), len); \
- for (t = length-1; t >= 0; t--) \
- putchar(code & (1<<t) ? '1' : '0'); \
- putchar('\n'); \
-}
-#endif
-
-/*
- * Write the sequence of codes that describes
- * the specified span of zero's or one's. The
- * appropriate table that holds the make-up and
- * terminating codes is supplied.
- */
-static void
-putspan(TIFF* tif, int32 span, const tableentry* tab)
-{
- Fax3CodecState* sp = EncoderState(tif);
- unsigned int bit = sp->bit;
- int data = sp->data;
- unsigned int code, length;
-
- while (span >= 2624) {
- const tableentry* te = &tab[63 + (2560>>6)];
- code = te->code, length = te->length;
-#ifdef FAX3_DEBUG
- DEBUG_PRINT("MakeUp", te->runlen);
-#endif
- _PutBits(tif, code, length);
- span -= te->runlen;
- }
- if (span >= 64) {
- const tableentry* te = &tab[63 + (span>>6)];
- assert(te->runlen == 64*(span>>6));
- code = te->code, length = te->length;
-#ifdef FAX3_DEBUG
- DEBUG_PRINT("MakeUp", te->runlen);
-#endif
- _PutBits(tif, code, length);
- span -= te->runlen;
- }
- code = tab[span].code, length = tab[span].length;
-#ifdef FAX3_DEBUG
- DEBUG_PRINT(" Term", tab[span].runlen);
-#endif
- _PutBits(tif, code, length);
-
- sp->data = data;
- sp->bit = bit;
-}
-
-/*
- * Write an EOL code to the output stream. The zero-fill
- * logic for byte-aligning encoded scanlines is handled
- * here. We also handle writing the tag bit for the next
- * scanline when doing 2d encoding.
- */
-static void
-Fax3PutEOL(TIFF* tif)
-{
- Fax3CodecState* sp = EncoderState(tif);
- unsigned int bit = sp->bit;
- int data = sp->data;
- unsigned int code, length, tparm;
-
- if (sp->b.groupoptions & GROUP3OPT_FILLBITS) {
- /*
- * Force bit alignment so EOL will terminate on
- * a byte boundary. That is, force the bit alignment
- * to 16-12 = 4 before putting out the EOL code.
- */
- int align = 8 - 4;
- if (align != sp->bit) {
- if (align > sp->bit)
- align = sp->bit + (8 - align);
- else
- align = sp->bit - align;
- code = 0;
- tparm=align;
- _PutBits(tif, 0, tparm);
- }
- }
- code = EOL, length = 12;
- if (is2DEncoding(sp))
- code = (code<<1) | (sp->tag == G3_1D), length++;
- _PutBits(tif, code, length);
-
- sp->data = data;
- sp->bit = bit;
-}
-
-/*
- * Reset encoding state at the start of a strip.
- */
-static int
-Fax3PreEncode(TIFF* tif, tsample_t s)
-{
- Fax3CodecState* sp = EncoderState(tif);
-
- (void) s;
- assert(sp != NULL);
- sp->bit = 8;
- sp->data = 0;
- sp->tag = G3_1D;
- /*
- * This is necessary for Group 4; otherwise it isn't
- * needed because the first scanline of each strip ends
- * up being copied into the refline.
- */
- if (sp->refline)
- _TIFFmemset(sp->refline, 0x00, sp->b.rowbytes);
- if (is2DEncoding(sp)) {
- float res = tif->tif_dir.td_yresolution;
- /*
- * The CCITT spec says that when doing 2d encoding, you
- * should only do it on K consecutive scanlines, where K
- * depends on the resolution of the image being encoded
- * (2 for <= 200 lpi, 4 for > 200 lpi). Since the directory
- * code initializes td_yresolution to 0, this code will
- * select a K of 2 unless the YResolution tag is set
- * appropriately. (Note also that we fudge a little here
- * and use 150 lpi to avoid problems with units conversion.)
- */
- if (tif->tif_dir.td_resolutionunit == RESUNIT_CENTIMETER)
- res *= 2.54f; /* convert to inches */
- sp->maxk = (res > 150 ? 4 : 2);
- sp->k = sp->maxk-1;
- } else
- sp->k = sp->maxk = 0;
- sp->line = 0;
- return (1);
-}
-
-static const unsigned char zeroruns[256] = {
- 8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, /* 0x00 - 0x0f */
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 0x10 - 0x1f */
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 0x20 - 0x2f */
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 0x30 - 0x3f */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x40 - 0x4f */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x50 - 0x5f */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x60 - 0x6f */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x70 - 0x7f */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x80 - 0x8f */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x90 - 0x9f */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xa0 - 0xaf */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xb0 - 0xbf */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xc0 - 0xcf */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xd0 - 0xdf */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xe0 - 0xef */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xf0 - 0xff */
-};
-static const unsigned char oneruns[256] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 - 0x0f */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 - 0x1f */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 - 0x2f */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x30 - 0x3f */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 - 0x4f */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 - 0x5f */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x60 - 0x6f */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x70 - 0x7f */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x80 - 0x8f */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x90 - 0x9f */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xa0 - 0xaf */
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0xb0 - 0xbf */
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 0xc0 - 0xcf */
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 0xd0 - 0xdf */
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 0xe0 - 0xef */
- 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 8, /* 0xf0 - 0xff */
-};
-
-/*
- * On certain systems it pays to inline
- * the routines that find pixel spans.
- */
-#ifdef VAXC
-static int32 find0span(unsigned char*, int32, int32);
-static int32 find1span(unsigned char*, int32, int32);
-#pragma inline(find0span,find1span)
-#endif
-
-/*
- * Find a span of ones or zeros using the supplied
- * table. The ``base'' of the bit string is supplied
- * along with the start+end bit indices.
- */
-static int32
-find0span(unsigned char* bp, int32 bs, int32 be)
-{
- int32 bits = be - bs;
- int32 n, span;
-
- bp += bs>>3;
- /*
- * Check partial byte on lhs.
- */
- if (bits > 0 && (n = (bs & 7))) {
- span = zeroruns[(*bp << n) & 0xff];
- if (span > 8-n) /* table value too generous */
- span = 8-n;
- if (span > bits) /* constrain span to bit range */
- span = bits;
- if (n+span < 8) /* doesn't extend to edge of byte */
- return (span);
- bits -= span;
- bp++;
- } else
- span = 0;
- if (bits >= (int32)(2 * 8 * sizeof(long))) {
- long* lp;
- /*
- * Align to longword boundary and check longwords.
- */
- while (!isAligned(bp, long)) {
- if (*bp != 0x00)
- return (span + zeroruns[*bp]);
- span += 8, bits -= 8;
- bp++;
- }
- lp = (long*) bp;
- while ((bits >= (int32)(8 * sizeof(long))) && (0 == *lp)) {
- span += 8*sizeof (long), bits -= 8*sizeof (long);
- lp++;
- }
- bp = (unsigned char*) lp;
- }
- /*
- * Scan full bytes for all 0's.
- */
- while (bits >= 8) {
- if (*bp != 0x00) /* end of run */
- return (span + zeroruns[*bp]);
- span += 8, bits -= 8;
- bp++;
- }
- /*
- * Check partial byte on rhs.
- */
- if (bits > 0) {
- n = zeroruns[*bp];
- span += (n > bits ? bits : n);
- }
- return (span);
-}
-
-static int32
-find1span(unsigned char* bp, int32 bs, int32 be)
-{
- int32 bits = be - bs;
- int32 n, span;
-
- bp += bs>>3;
- /*
- * Check partial byte on lhs.
- */
- if (bits > 0 && (n = (bs & 7))) {
- span = oneruns[(*bp << n) & 0xff];
- if (span > 8-n) /* table value too generous */
- span = 8-n;
- if (span > bits) /* constrain span to bit range */
- span = bits;
- if (n+span < 8) /* doesn't extend to edge of byte */
- return (span);
- bits -= span;
- bp++;
- } else
- span = 0;
- if (bits >= (int32)(2 * 8 * sizeof(long))) {
- long* lp;
- /*
- * Align to longword boundary and check longwords.
- */
- while (!isAligned(bp, long)) {
- if (*bp != 0xff)
- return (span + oneruns[*bp]);
- span += 8, bits -= 8;
- bp++;
- }
- lp = (long*) bp;
- while ((bits >= (int32)(8 * sizeof(long))) && (~0 == *lp)) {
- span += 8*sizeof (long), bits -= 8*sizeof (long);
- lp++;
- }
- bp = (unsigned char*) lp;
- }
- /*
- * Scan full bytes for all 1's.
- */
- while (bits >= 8) {
- if (*bp != 0xff) /* end of run */
- return (span + oneruns[*bp]);
- span += 8, bits -= 8;
- bp++;
- }
- /*
- * Check partial byte on rhs.
- */
- if (bits > 0) {
- n = oneruns[*bp];
- span += (n > bits ? bits : n);
- }
- return (span);
-}
-
-/*
- * Return the offset of the next bit in the range
- * [bs..be] that is different from the specified
- * color. The end, be, is returned if no such bit
- * exists.
- */
-#define finddiff(_cp, _bs, _be, _color) \
- (_bs + (_color ? find1span(_cp,_bs,_be) : find0span(_cp,_bs,_be)))
-/*
- * Like finddiff, but also check the starting bit
- * against the end in case start > end.
- */
-#define finddiff2(_cp, _bs, _be, _color) \
- (_bs < _be ? finddiff(_cp,_bs,_be,_color) : _be)
-
-/*
- * 1d-encode a row of pixels. The encoding is
- * a sequence of all-white or all-black spans
- * of pixels encoded with Huffman codes.
- */
-static int
-Fax3Encode1DRow(TIFF* tif, unsigned char* bp, uint32 bits)
-{
- Fax3CodecState* sp = EncoderState(tif);
- int32 span;
- uint32 bs = 0;
-
- for (;;) {
- span = find0span(bp, bs, bits); /* white span */
- putspan(tif, span, TIFFFaxWhiteCodes);
- bs += span;
- if (bs >= bits)
- break;
- span = find1span(bp, bs, bits); /* black span */
- putspan(tif, span, TIFFFaxBlackCodes);
- bs += span;
- if (bs >= bits)
- break;
- }
- if (sp->b.mode & (FAXMODE_BYTEALIGN|FAXMODE_WORDALIGN)) {
- if (sp->bit != 8) /* byte-align */
- Fax3FlushBits(tif, sp);
- if ((sp->b.mode&FAXMODE_WORDALIGN) &&
- !isAligned(tif->tif_rawcp, uint16))
- Fax3FlushBits(tif, sp);
- }
- return (1);
-}
-
-static const tableentry horizcode =
- { 3, 0x1, 0 }; /* 001 */
-static const tableentry passcode =
- { 4, 0x1, 0 }; /* 0001 */
-static const tableentry vcodes[7] = {
- { 7, 0x03, 0 }, /* 0000 011 */
- { 6, 0x03, 0 }, /* 0000 11 */
- { 3, 0x03, 0 }, /* 011 */
- { 1, 0x1, 0 }, /* 1 */
- { 3, 0x2, 0 }, /* 010 */
- { 6, 0x02, 0 }, /* 0000 10 */
- { 7, 0x02, 0 } /* 0000 010 */
-};
-
-/*
- * 2d-encode a row of pixels. Consult the CCITT
- * documentation for the algorithm.
- */
-static int
-Fax3Encode2DRow(TIFF* tif, unsigned char* bp, unsigned char* rp, uint32 bits)
-{
-#define PIXEL(buf,ix) ((((buf)[(ix)>>3]) >> (7-((ix)&7))) & 1)
- uint32 a0 = 0;
- uint32 a1 = (PIXEL(bp, 0) != 0 ? 0 : finddiff(bp, 0, bits, 0));
- uint32 b1 = (PIXEL(rp, 0) != 0 ? 0 : finddiff(rp, 0, bits, 0));
- uint32 a2, b2;
-
- for (;;) {
- b2 = finddiff2(rp, b1, bits, PIXEL(rp,b1));
- if (b2 >= a1) {
- int32 d = b1 - a1;
- if (!(-3 <= d && d <= 3)) { /* horizontal mode */
- a2 = finddiff2(bp, a1, bits, PIXEL(bp,a1));
- putcode(tif, &horizcode);
- if (a0+a1 == 0 || PIXEL(bp, a0) == 0) {
- putspan(tif, a1-a0, TIFFFaxWhiteCodes);
- putspan(tif, a2-a1, TIFFFaxBlackCodes);
- } else {
- putspan(tif, a1-a0, TIFFFaxBlackCodes);
- putspan(tif, a2-a1, TIFFFaxWhiteCodes);
- }
- a0 = a2;
- } else { /* vertical mode */
- putcode(tif, &vcodes[d+3]);
- a0 = a1;
- }
- } else { /* pass mode */
- putcode(tif, &passcode);
- a0 = b2;
- }
- if (a0 >= bits)
- break;
- a1 = finddiff(bp, a0, bits, PIXEL(bp,a0));
- b1 = finddiff(rp, a0, bits, !PIXEL(bp,a0));
- b1 = finddiff(rp, b1, bits, PIXEL(bp,a0));
- }
- return (1);
-#undef PIXEL
-}
-
-/*
- * Encode a buffer of pixels.
- */
-static int
-Fax3Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- Fax3CodecState* sp = EncoderState(tif);
-
- (void) s;
- while ((long)cc > 0) {
- if ((sp->b.mode & FAXMODE_NOEOL) == 0)
- Fax3PutEOL(tif);
- if (is2DEncoding(sp)) {
- if (sp->tag == G3_1D) {
- if (!Fax3Encode1DRow(tif, bp, sp->b.rowpixels))
- return (0);
- sp->tag = G3_2D;
- } else {
- if (!Fax3Encode2DRow(tif, bp, sp->refline,
- sp->b.rowpixels))
- return (0);
- sp->k--;
- }
- if (sp->k == 0) {
- sp->tag = G3_1D;
- sp->k = sp->maxk-1;
- } else
- _TIFFmemcpy(sp->refline, bp, sp->b.rowbytes);
- } else {
- if (!Fax3Encode1DRow(tif, bp, sp->b.rowpixels))
- return (0);
- }
- bp += sp->b.rowbytes;
- cc -= sp->b.rowbytes;
- }
- return (1);
-}
-
-static int
-Fax3PostEncode(TIFF* tif)
-{
- Fax3CodecState* sp = EncoderState(tif);
-
- if (sp->bit != 8)
- Fax3FlushBits(tif, sp);
- return (1);
-}
-
-static void
-Fax3Close(TIFF* tif)
-{
- if ((Fax3State(tif)->mode & FAXMODE_NORTC) == 0) {
- Fax3CodecState* sp = EncoderState(tif);
- unsigned int code = EOL;
- unsigned int length = 12;
- int i;
-
- if (is2DEncoding(sp))
- code = (code<<1) | (sp->tag == G3_1D), length++;
- for (i = 0; i < 6; i++)
- Fax3PutBits(tif, code, length);
- Fax3FlushBits(tif, sp);
- }
-}
-
-static void
-Fax3Cleanup(TIFF* tif)
-{
- Fax3CodecState* sp = DecoderState(tif);
-
- assert(sp != 0);
-
- tif->tif_tagmethods.vgetfield = sp->b.vgetparent;
- tif->tif_tagmethods.vsetfield = sp->b.vsetparent;
- tif->tif_tagmethods.printdir = sp->b.printdir;
-
- if (sp->runs)
- _TIFFfree(sp->runs);
- if (sp->refline)
- _TIFFfree(sp->refline);
-
- if (Fax3State(tif)->subaddress)
- _TIFFfree(Fax3State(tif)->subaddress);
- if (Fax3State(tif)->faxdcs)
- _TIFFfree(Fax3State(tif)->faxdcs);
-
- _TIFFfree(tif->tif_data);
- tif->tif_data = NULL;
-
- _TIFFSetDefaultCompressionState(tif);
-}
-
-#define FIELD_BADFAXLINES (FIELD_CODEC+0)
-#define FIELD_CLEANFAXDATA (FIELD_CODEC+1)
-#define FIELD_BADFAXRUN (FIELD_CODEC+2)
-#define FIELD_RECVPARAMS (FIELD_CODEC+3)
-#define FIELD_SUBADDRESS (FIELD_CODEC+4)
-#define FIELD_RECVTIME (FIELD_CODEC+5)
-#define FIELD_FAXDCS (FIELD_CODEC+6)
-
-#define FIELD_OPTIONS (FIELD_CODEC+7)
-
-static const TIFFFieldInfo faxFieldInfo[] = {
- { TIFFTAG_FAXMODE, 0, 0, TIFF_ANY, FIELD_PSEUDO,
- FALSE, FALSE, "FaxMode" },
- { TIFFTAG_FAXFILLFUNC, 0, 0, TIFF_ANY, FIELD_PSEUDO,
- FALSE, FALSE, "FaxFillFunc" },
- { TIFFTAG_BADFAXLINES, 1, 1, TIFF_LONG, FIELD_BADFAXLINES,
- TRUE, FALSE, "BadFaxLines" },
- { TIFFTAG_BADFAXLINES, 1, 1, TIFF_SHORT, FIELD_BADFAXLINES,
- TRUE, FALSE, "BadFaxLines" },
- { TIFFTAG_CLEANFAXDATA, 1, 1, TIFF_SHORT, FIELD_CLEANFAXDATA,
- TRUE, FALSE, "CleanFaxData" },
- { TIFFTAG_CONSECUTIVEBADFAXLINES,1,1, TIFF_LONG, FIELD_BADFAXRUN,
- TRUE, FALSE, "ConsecutiveBadFaxLines" },
- { TIFFTAG_CONSECUTIVEBADFAXLINES,1,1, TIFF_SHORT, FIELD_BADFAXRUN,
- TRUE, FALSE, "ConsecutiveBadFaxLines" },
- { TIFFTAG_FAXRECVPARAMS, 1, 1, TIFF_LONG, FIELD_RECVPARAMS,
- TRUE, FALSE, "FaxRecvParams" },
- { TIFFTAG_FAXSUBADDRESS, -1,-1, TIFF_ASCII, FIELD_SUBADDRESS,
- TRUE, FALSE, "FaxSubAddress" },
- { TIFFTAG_FAXRECVTIME, 1, 1, TIFF_LONG, FIELD_RECVTIME,
- TRUE, FALSE, "FaxRecvTime" },
- { TIFFTAG_FAXDCS, -1,-1, TIFF_ASCII, FIELD_FAXDCS,
- TRUE, FALSE, "FaxDcs" },
-};
-static const TIFFFieldInfo fax3FieldInfo[] = {
- { TIFFTAG_GROUP3OPTIONS, 1, 1, TIFF_LONG, FIELD_OPTIONS,
- FALSE, FALSE, "Group3Options" },
-};
-static const TIFFFieldInfo fax4FieldInfo[] = {
- { TIFFTAG_GROUP4OPTIONS, 1, 1, TIFF_LONG, FIELD_OPTIONS,
- FALSE, FALSE, "Group4Options" },
-};
-#define N(a) (sizeof (a) / sizeof (a[0]))
-
-static int
-Fax3VSetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- Fax3BaseState* sp = Fax3State(tif);
- const TIFFFieldInfo* fip;
-
- assert(sp != 0);
- assert(sp->vsetparent != 0);
-
- switch (tag) {
- case TIFFTAG_FAXMODE:
- sp->mode = va_arg(ap, int);
- return 1; /* NB: pseudo tag */
- case TIFFTAG_FAXFILLFUNC:
- DecoderState(tif)->fill = va_arg(ap, TIFFFaxFillFunc);
- return 1; /* NB: pseudo tag */
- case TIFFTAG_GROUP3OPTIONS:
- /* XXX: avoid reading options if compression mismatches. */
- if (tif->tif_dir.td_compression == COMPRESSION_CCITTFAX3)
- sp->groupoptions = va_arg(ap, uint32);
- break;
- case TIFFTAG_GROUP4OPTIONS:
- /* XXX: avoid reading options if compression mismatches. */
- if (tif->tif_dir.td_compression == COMPRESSION_CCITTFAX4)
- sp->groupoptions = va_arg(ap, uint32);
- break;
- case TIFFTAG_BADFAXLINES:
- sp->badfaxlines = va_arg(ap, uint32);
- break;
- case TIFFTAG_CLEANFAXDATA:
- sp->cleanfaxdata = (uint16) va_arg(ap, int);
- break;
- case TIFFTAG_CONSECUTIVEBADFAXLINES:
- sp->badfaxrun = va_arg(ap, uint32);
- break;
- case TIFFTAG_FAXRECVPARAMS:
- sp->recvparams = va_arg(ap, uint32);
- break;
- case TIFFTAG_FAXSUBADDRESS:
- _TIFFsetString(&sp->subaddress, va_arg(ap, char*));
- break;
- case TIFFTAG_FAXRECVTIME:
- sp->recvtime = va_arg(ap, uint32);
- break;
- case TIFFTAG_FAXDCS:
- _TIFFsetString(&sp->faxdcs, va_arg(ap, char*));
- break;
- default:
- return (*sp->vsetparent)(tif, tag, ap);
- }
-
- if ((fip = _TIFFFieldWithTag(tif, tag)))
- TIFFSetFieldBit(tif, fip->field_bit);
- else
- return 0;
-
- tif->tif_flags |= TIFF_DIRTYDIRECT;
- return 1;
-}
-
-static int
-Fax3VGetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- Fax3BaseState* sp = Fax3State(tif);
-
- assert(sp != 0);
-
- switch (tag) {
- case TIFFTAG_FAXMODE:
- *va_arg(ap, int*) = sp->mode;
- break;
- case TIFFTAG_FAXFILLFUNC:
- *va_arg(ap, TIFFFaxFillFunc*) = DecoderState(tif)->fill;
- break;
- case TIFFTAG_GROUP3OPTIONS:
- case TIFFTAG_GROUP4OPTIONS:
- *va_arg(ap, uint32*) = sp->groupoptions;
- break;
- case TIFFTAG_BADFAXLINES:
- *va_arg(ap, uint32*) = sp->badfaxlines;
- break;
- case TIFFTAG_CLEANFAXDATA:
- *va_arg(ap, uint16*) = sp->cleanfaxdata;
- break;
- case TIFFTAG_CONSECUTIVEBADFAXLINES:
- *va_arg(ap, uint32*) = sp->badfaxrun;
- break;
- case TIFFTAG_FAXRECVPARAMS:
- *va_arg(ap, uint32*) = sp->recvparams;
- break;
- case TIFFTAG_FAXSUBADDRESS:
- *va_arg(ap, char**) = sp->subaddress;
- break;
- case TIFFTAG_FAXRECVTIME:
- *va_arg(ap, uint32*) = sp->recvtime;
- break;
- case TIFFTAG_FAXDCS:
- *va_arg(ap, char**) = sp->faxdcs;
- break;
- default:
- return (*sp->vgetparent)(tif, tag, ap);
- }
- return (1);
-}
-
-static void
-Fax3PrintDir(TIFF* tif, FILE* fd, long flags)
-{
- Fax3BaseState* sp = Fax3State(tif);
-
- assert(sp != 0);
-
- (void) flags;
- if (TIFFFieldSet(tif,FIELD_OPTIONS)) {
- const char* sep = " ";
- if (tif->tif_dir.td_compression == COMPRESSION_CCITTFAX4) {
- fprintf(fd, " Group 4 Options:");
- if (sp->groupoptions & GROUP4OPT_UNCOMPRESSED)
- fprintf(fd, "%suncompressed data", sep);
- } else {
-
- fprintf(fd, " Group 3 Options:");
- if (sp->groupoptions & GROUP3OPT_2DENCODING)
- fprintf(fd, "%s2-d encoding", sep), sep = "+";
- if (sp->groupoptions & GROUP3OPT_FILLBITS)
- fprintf(fd, "%sEOL padding", sep), sep = "+";
- if (sp->groupoptions & GROUP3OPT_UNCOMPRESSED)
- fprintf(fd, "%suncompressed data", sep);
- }
- fprintf(fd, " (%lu = 0x%lx)\n",
- (unsigned long) sp->groupoptions,
- (unsigned long) sp->groupoptions);
- }
- if (TIFFFieldSet(tif,FIELD_CLEANFAXDATA)) {
- fprintf(fd, " Fax Data:");
- switch (sp->cleanfaxdata) {
- case CLEANFAXDATA_CLEAN:
- fprintf(fd, " clean");
- break;
- case CLEANFAXDATA_REGENERATED:
- fprintf(fd, " receiver regenerated");
- break;
- case CLEANFAXDATA_UNCLEAN:
- fprintf(fd, " uncorrected errors");
- break;
- }
- fprintf(fd, " (%u = 0x%x)\n",
- sp->cleanfaxdata, sp->cleanfaxdata);
- }
- if (TIFFFieldSet(tif,FIELD_BADFAXLINES))
- fprintf(fd, " Bad Fax Lines: %lu\n",
- (unsigned long) sp->badfaxlines);
- if (TIFFFieldSet(tif,FIELD_BADFAXRUN))
- fprintf(fd, " Consecutive Bad Fax Lines: %lu\n",
- (unsigned long) sp->badfaxrun);
- if (TIFFFieldSet(tif,FIELD_RECVPARAMS))
- fprintf(fd, " Fax Receive Parameters: %08lx\n",
- (unsigned long) sp->recvparams);
- if (TIFFFieldSet(tif,FIELD_SUBADDRESS))
- fprintf(fd, " Fax SubAddress: %s\n", sp->subaddress);
- if (TIFFFieldSet(tif,FIELD_RECVTIME))
- fprintf(fd, " Fax Receive Time: %lu secs\n",
- (unsigned long) sp->recvtime);
- if (TIFFFieldSet(tif,FIELD_FAXDCS))
- fprintf(fd, " Fax DCS: %s\n", sp->faxdcs);
-}
-
-static int
-InitCCITTFax3(TIFF* tif)
-{
- Fax3BaseState* sp;
-
- /*
- * Merge codec-specific tag information.
- */
- if (!_TIFFMergeFieldInfo(tif, faxFieldInfo, N(faxFieldInfo))) {
- TIFFErrorExt(tif->tif_clientdata, "InitCCITTFax3",
- "Merging common CCITT Fax codec-specific tags failed");
- return 0;
- }
-
- /*
- * Allocate state block so tag methods have storage to record values.
- */
- tif->tif_data = (tidata_t)
- _TIFFmalloc(sizeof (Fax3CodecState));
-
- if (tif->tif_data == NULL) {
- TIFFErrorExt(tif->tif_clientdata, "TIFFInitCCITTFax3",
- "%s: No space for state block", tif->tif_name);
- return (0);
- }
-
- sp = Fax3State(tif);
- sp->rw_mode = tif->tif_mode;
-
- /*
- * Override parent get/set field methods.
- */
- sp->vgetparent = tif->tif_tagmethods.vgetfield;
- tif->tif_tagmethods.vgetfield = Fax3VGetField; /* hook for codec tags */
- sp->vsetparent = tif->tif_tagmethods.vsetfield;
- tif->tif_tagmethods.vsetfield = Fax3VSetField; /* hook for codec tags */
- sp->printdir = tif->tif_tagmethods.printdir;
- tif->tif_tagmethods.printdir = Fax3PrintDir; /* hook for codec tags */
- sp->groupoptions = 0;
- sp->recvparams = 0;
- sp->subaddress = NULL;
- sp->faxdcs = NULL;
-
- if (sp->rw_mode == O_RDONLY) /* FIXME: improve for in place update */
- tif->tif_flags |= TIFF_NOBITREV; /* decoder does bit reversal */
- DecoderState(tif)->runs = NULL;
- TIFFSetField(tif, TIFFTAG_FAXFILLFUNC, _TIFFFax3fillruns);
- EncoderState(tif)->refline = NULL;
-
- /*
- * Install codec methods.
- */
- tif->tif_setupdecode = Fax3SetupState;
- tif->tif_predecode = Fax3PreDecode;
- tif->tif_decoderow = Fax3Decode1D;
- tif->tif_decodestrip = Fax3Decode1D;
- tif->tif_decodetile = Fax3Decode1D;
- tif->tif_setupencode = Fax3SetupState;
- tif->tif_preencode = Fax3PreEncode;
- tif->tif_postencode = Fax3PostEncode;
- tif->tif_encoderow = Fax3Encode;
- tif->tif_encodestrip = Fax3Encode;
- tif->tif_encodetile = Fax3Encode;
- tif->tif_close = Fax3Close;
- tif->tif_cleanup = Fax3Cleanup;
-
- return (1);
-}
-
-int
-TIFFInitCCITTFax3(TIFF* tif, int scheme)
-{
- (void) scheme;
- if (InitCCITTFax3(tif)) {
- /*
- * Merge codec-specific tag information.
- */
- if (!_TIFFMergeFieldInfo(tif, fax3FieldInfo, N(fax3FieldInfo))) {
- TIFFErrorExt(tif->tif_clientdata, "TIFFInitCCITTFax3",
- "Merging CCITT Fax 3 codec-specific tags failed");
- return 0;
- }
-
- /*
- * The default format is Class/F-style w/o RTC.
- */
- return TIFFSetField(tif, TIFFTAG_FAXMODE, FAXMODE_CLASSF);
- } else
- return 01;
-}
-
-/*
- * CCITT Group 4 (T.6) Facsimile-compatible
- * Compression Scheme Support.
- */
-
-#define SWAP(t,a,b) { t x; x = (a); (a) = (b); (b) = x; }
-/*
- * Decode the requested amount of G4-encoded data.
- */
-static int
-Fax4Decode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
-{
- DECLARE_STATE_2D(tif, sp, "Fax4Decode");
-
- (void) s;
- CACHE_STATE(tif, sp);
- while ((long)occ > 0) {
- a0 = 0;
- RunLength = 0;
- pa = thisrun = sp->curruns;
- pb = sp->refruns;
- b1 = *pb++;
-#ifdef FAX3_DEBUG
- printf("\nBitAcc=%08X, BitsAvail = %d\n", BitAcc, BitsAvail);
- printf("-------------------- %d\n", tif->tif_row);
- fflush(stdout);
-#endif
- EXPAND2D(EOFG4);
- if (EOLcnt)
- goto EOFG4;
- (*sp->fill)(buf, thisrun, pa, lastx);
- SETVALUE(0); /* imaginary change for reference */
- SWAP(uint32*, sp->curruns, sp->refruns);
- buf += sp->b.rowbytes;
- occ -= sp->b.rowbytes;
- sp->line++;
- continue;
- EOFG4:
- NeedBits16( 13, BADG4 );
- BADG4:
-#ifdef FAX3_DEBUG
- if( GetBits(13) != 0x1001 )
- fputs( "Bad RTC\n", stderr );
-#endif
- ClrBits( 13 );
- (*sp->fill)(buf, thisrun, pa, lastx);
- UNCACHE_STATE(tif, sp);
- return (-1);
- }
- UNCACHE_STATE(tif, sp);
- return (1);
-}
-#undef SWAP
-
-/*
- * Encode the requested amount of data.
- */
-static int
-Fax4Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- Fax3CodecState *sp = EncoderState(tif);
-
- (void) s;
- while ((long)cc > 0) {
- if (!Fax3Encode2DRow(tif, bp, sp->refline, sp->b.rowpixels))
- return (0);
- _TIFFmemcpy(sp->refline, bp, sp->b.rowbytes);
- bp += sp->b.rowbytes;
- cc -= sp->b.rowbytes;
- }
- return (1);
-}
-
-static int
-Fax4PostEncode(TIFF* tif)
-{
- Fax3CodecState *sp = EncoderState(tif);
-
- /* terminate strip w/ EOFB */
- Fax3PutBits(tif, EOL, 12);
- Fax3PutBits(tif, EOL, 12);
- if (sp->bit != 8)
- Fax3FlushBits(tif, sp);
- return (1);
-}
-
-int
-TIFFInitCCITTFax4(TIFF* tif, int scheme)
-{
- (void) scheme;
- if (InitCCITTFax3(tif)) { /* reuse G3 support */
- /*
- * Merge codec-specific tag information.
- */
- if (!_TIFFMergeFieldInfo(tif, fax4FieldInfo, N(fax4FieldInfo))) {
- TIFFErrorExt(tif->tif_clientdata, "TIFFInitCCITTFax4",
- "Merging CCITT Fax 4 codec-specific tags failed");
- return 0;
- }
-
- tif->tif_decoderow = Fax4Decode;
- tif->tif_decodestrip = Fax4Decode;
- tif->tif_decodetile = Fax4Decode;
- tif->tif_encoderow = Fax4Encode;
- tif->tif_encodestrip = Fax4Encode;
- tif->tif_encodetile = Fax4Encode;
- tif->tif_postencode = Fax4PostEncode;
- /*
- * Suppress RTC at the end of each strip.
- */
- return TIFFSetField(tif, TIFFTAG_FAXMODE, FAXMODE_NORTC);
- } else
- return (0);
-}
-
-/*
- * CCITT Group 3 1-D Modified Huffman RLE Compression Support.
- * (Compression algorithms 2 and 32771)
- */
-
-/*
- * Decode the requested amount of RLE-encoded data.
- */
-static int
-Fax3DecodeRLE(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
-{
- DECLARE_STATE(tif, sp, "Fax3DecodeRLE");
- int mode = sp->b.mode;
-
- (void) s;
- CACHE_STATE(tif, sp);
- thisrun = sp->curruns;
- while ((long)occ > 0) {
- a0 = 0;
- RunLength = 0;
- pa = thisrun;
-#ifdef FAX3_DEBUG
- printf("\nBitAcc=%08X, BitsAvail = %d\n", BitAcc, BitsAvail);
- printf("-------------------- %d\n", tif->tif_row);
- fflush(stdout);
-#endif
- EXPAND1D(EOFRLE);
- (*sp->fill)(buf, thisrun, pa, lastx);
- /*
- * Cleanup at the end of the row.
- */
- if (mode & FAXMODE_BYTEALIGN) {
- int n = BitsAvail - (BitsAvail &~ 7);
- ClrBits(n);
- } else if (mode & FAXMODE_WORDALIGN) {
- int n = BitsAvail - (BitsAvail &~ 15);
- ClrBits(n);
- if (BitsAvail == 0 && !isAligned(cp, uint16))
- cp++;
- }
- buf += sp->b.rowbytes;
- occ -= sp->b.rowbytes;
- sp->line++;
- continue;
- EOFRLE: /* premature EOF */
- (*sp->fill)(buf, thisrun, pa, lastx);
- UNCACHE_STATE(tif, sp);
- return (-1);
- }
- UNCACHE_STATE(tif, sp);
- return (1);
-}
-
-int
-TIFFInitCCITTRLE(TIFF* tif, int scheme)
-{
- (void) scheme;
- if (InitCCITTFax3(tif)) { /* reuse G3 support */
- tif->tif_decoderow = Fax3DecodeRLE;
- tif->tif_decodestrip = Fax3DecodeRLE;
- tif->tif_decodetile = Fax3DecodeRLE;
- /*
- * Suppress RTC+EOLs when encoding and byte-align data.
- */
- return TIFFSetField(tif, TIFFTAG_FAXMODE,
- FAXMODE_NORTC|FAXMODE_NOEOL|FAXMODE_BYTEALIGN);
- } else
- return (0);
-}
-
-int
-TIFFInitCCITTRLEW(TIFF* tif, int scheme)
-{
- (void) scheme;
- if (InitCCITTFax3(tif)) { /* reuse G3 support */
- tif->tif_decoderow = Fax3DecodeRLE;
- tif->tif_decodestrip = Fax3DecodeRLE;
- tif->tif_decodetile = Fax3DecodeRLE;
- /*
- * Suppress RTC+EOLs when encoding and word-align data.
- */
- return TIFFSetField(tif, TIFFTAG_FAXMODE,
- FAXMODE_NORTC|FAXMODE_NOEOL|FAXMODE_WORDALIGN);
- } else
- return (0);
-}
-#endif /* CCITT_SUPPORT */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_fax3.h b/src/3rdparty/libtiff/libtiff/tif_fax3.h
deleted file mode 100644
index 030632f80a..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_fax3.h
+++ /dev/null
@@ -1,525 +0,0 @@
-/* $Id: tif_fax3.h,v 1.5 2005/12/12 09:23:11 dron Exp $ */
-
-/*
- * Copyright (c) 1990-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _FAX3_
-#define _FAX3_
-/*
- * TIFF Library.
- *
- * CCITT Group 3 (T.4) and Group 4 (T.6) Decompression Support.
- *
- * Decoder support is derived, with permission, from the code
- * in Frank Cringle's viewfax program;
- * Copyright (C) 1990, 1995 Frank D. Cringle.
- */
-#include "tiff.h"
-
-/*
- * To override the default routine used to image decoded
- * spans one can use the pseduo tag TIFFTAG_FAXFILLFUNC.
- * The routine must have the type signature given below;
- * for example:
- *
- * fillruns(unsigned char* buf, uint32* runs, uint32* erun, uint32 lastx)
- *
- * where buf is place to set the bits, runs is the array of b&w run
- * lengths (white then black), erun is the last run in the array, and
- * lastx is the width of the row in pixels. Fill routines can assume
- * the run array has room for at least lastx runs and can overwrite
- * data in the run array as needed (e.g. to append zero runs to bring
- * the count up to a nice multiple).
- */
-typedef void (*TIFFFaxFillFunc)(unsigned char*, uint32*, uint32*, uint32);
-
-/*
- * The default run filler; made external for other decoders.
- */
-#if defined(__cplusplus)
-extern "C" {
-#endif
-extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);
-#if defined(__cplusplus)
-}
-#endif
-
-
-/* finite state machine codes */
-#define S_Null 0
-#define S_Pass 1
-#define S_Horiz 2
-#define S_V0 3
-#define S_VR 4
-#define S_VL 5
-#define S_Ext 6
-#define S_TermW 7
-#define S_TermB 8
-#define S_MakeUpW 9
-#define S_MakeUpB 10
-#define S_MakeUp 11
-#define S_EOL 12
-
-typedef struct { /* state table entry */
- unsigned char State; /* see above */
- unsigned char Width; /* width of code in bits */
- uint32 Param; /* unsigned 32-bit run length in bits */
-} TIFFFaxTabEnt;
-
-extern const TIFFFaxTabEnt TIFFFaxMainTable[];
-extern const TIFFFaxTabEnt TIFFFaxWhiteTable[];
-extern const TIFFFaxTabEnt TIFFFaxBlackTable[];
-
-/*
- * The following macros define the majority of the G3/G4 decoder
- * algorithm using the state tables defined elsewhere. To build
- * a decoder you need some setup code and some glue code. Note
- * that you may also need/want to change the way the NeedBits*
- * macros get input data if, for example, you know the data to be
- * decoded is properly aligned and oriented (doing so before running
- * the decoder can be a big performance win).
- *
- * Consult the decoder in the TIFF library for an idea of what you
- * need to define and setup to make use of these definitions.
- *
- * NB: to enable a debugging version of these macros define FAX3_DEBUG
- * before including this file. Trace output goes to stdout.
- */
-
-#ifndef EndOfData
-#define EndOfData() (cp >= ep)
-#endif
-/*
- * Need <=8 or <=16 bits of input data. Unlike viewfax we
- * cannot use/assume a word-aligned, properly bit swizzled
- * input data set because data may come from an arbitrarily
- * aligned, read-only source such as a memory-mapped file.
- * Note also that the viewfax decoder does not check for
- * running off the end of the input data buffer. This is
- * possible for G3-encoded data because it prescans the input
- * data to count EOL markers, but can cause problems for G4
- * data. In any event, we don't prescan and must watch for
- * running out of data since we can't permit the library to
- * scan past the end of the input data buffer.
- *
- * Finally, note that we must handle remaindered data at the end
- * of a strip specially. The coder asks for a fixed number of
- * bits when scanning for the next code. This may be more bits
- * than are actually present in the data stream. If we appear
- * to run out of data but still have some number of valid bits
- * remaining then we makeup the requested amount with zeros and
- * return successfully. If the returned data is incorrect then
- * we should be called again and get a premature EOF error;
- * otherwise we should get the right answer.
- */
-#ifndef NeedBits8
-#define NeedBits8(n,eoflab) do { \
- if (BitsAvail < (n)) { \
- if (EndOfData()) { \
- if (BitsAvail == 0) /* no valid bits */ \
- goto eoflab; \
- BitsAvail = (n); /* pad with zeros */ \
- } else { \
- BitAcc |= ((uint32) bitmap[*cp++])<<BitsAvail; \
- BitsAvail += 8; \
- } \
- } \
-} while (0)
-#endif
-#ifndef NeedBits16
-#define NeedBits16(n,eoflab) do { \
- if (BitsAvail < (n)) { \
- if (EndOfData()) { \
- if (BitsAvail == 0) /* no valid bits */ \
- goto eoflab; \
- BitsAvail = (n); /* pad with zeros */ \
- } else { \
- BitAcc |= ((uint32) bitmap[*cp++])<<BitsAvail; \
- if ((BitsAvail += 8) < (n)) { \
- if (EndOfData()) { \
- /* NB: we know BitsAvail is non-zero here */ \
- BitsAvail = (n); /* pad with zeros */ \
- } else { \
- BitAcc |= ((uint32) bitmap[*cp++])<<BitsAvail; \
- BitsAvail += 8; \
- } \
- } \
- } \
- } \
-} while (0)
-#endif
-#define GetBits(n) (BitAcc & ((1<<(n))-1))
-#define ClrBits(n) do { \
- BitsAvail -= (n); \
- BitAcc >>= (n); \
-} while (0)
-
-#ifdef FAX3_DEBUG
-static const char* StateNames[] = {
- "Null ",
- "Pass ",
- "Horiz ",
- "V0 ",
- "VR ",
- "VL ",
- "Ext ",
- "TermW ",
- "TermB ",
- "MakeUpW",
- "MakeUpB",
- "MakeUp ",
- "EOL ",
-};
-#define DEBUG_SHOW putchar(BitAcc & (1 << t) ? '1' : '0')
-#define LOOKUP8(wid,tab,eoflab) do { \
- int t; \
- NeedBits8(wid,eoflab); \
- TabEnt = tab + GetBits(wid); \
- printf("%08lX/%d: %s%5d\t", (long) BitAcc, BitsAvail, \
- StateNames[TabEnt->State], TabEnt->Param); \
- for (t = 0; t < TabEnt->Width; t++) \
- DEBUG_SHOW; \
- putchar('\n'); \
- fflush(stdout); \
- ClrBits(TabEnt->Width); \
-} while (0)
-#define LOOKUP16(wid,tab,eoflab) do { \
- int t; \
- NeedBits16(wid,eoflab); \
- TabEnt = tab + GetBits(wid); \
- printf("%08lX/%d: %s%5d\t", (long) BitAcc, BitsAvail, \
- StateNames[TabEnt->State], TabEnt->Param); \
- for (t = 0; t < TabEnt->Width; t++) \
- DEBUG_SHOW; \
- putchar('\n'); \
- fflush(stdout); \
- ClrBits(TabEnt->Width); \
-} while (0)
-
-#define SETVALUE(x) do { \
- *pa++ = RunLength + (x); \
- printf("SETVALUE: %d\t%d\n", RunLength + (x), a0); \
- a0 += x; \
- RunLength = 0; \
-} while (0)
-#else
-#define LOOKUP8(wid,tab,eoflab) do { \
- NeedBits8(wid,eoflab); \
- TabEnt = tab + GetBits(wid); \
- ClrBits(TabEnt->Width); \
-} while (0)
-#define LOOKUP16(wid,tab,eoflab) do { \
- NeedBits16(wid,eoflab); \
- TabEnt = tab + GetBits(wid); \
- ClrBits(TabEnt->Width); \
-} while (0)
-
-/*
- * Append a run to the run length array for the
- * current row and reset decoding state.
- */
-#define SETVALUE(x) do { \
- *pa++ = RunLength + (x); \
- a0 += (x); \
- RunLength = 0; \
-} while (0)
-#endif
-
-/*
- * Synchronize input decoding at the start of each
- * row by scanning for an EOL (if appropriate) and
- * skipping any trash data that might be present
- * after a decoding error. Note that the decoding
- * done elsewhere that recognizes an EOL only consumes
- * 11 consecutive zero bits. This means that if EOLcnt
- * is non-zero then we still need to scan for the final flag
- * bit that is part of the EOL code.
- */
-#define SYNC_EOL(eoflab) do { \
- if (EOLcnt == 0) { \
- for (;;) { \
- NeedBits16(11,eoflab); \
- if (GetBits(11) == 0) \
- break; \
- ClrBits(1); \
- } \
- } \
- for (;;) { \
- NeedBits8(8,eoflab); \
- if (GetBits(8)) \
- break; \
- ClrBits(8); \
- } \
- while (GetBits(1) == 0) \
- ClrBits(1); \
- ClrBits(1); /* EOL bit */ \
- EOLcnt = 0; /* reset EOL counter/flag */ \
-} while (0)
-
-/*
- * Cleanup the array of runs after decoding a row.
- * We adjust final runs to insure the user buffer is not
- * overwritten and/or undecoded area is white filled.
- */
-#define CLEANUP_RUNS() do { \
- if (RunLength) \
- SETVALUE(0); \
- if (a0 != lastx) { \
- badlength(a0, lastx); \
- while (a0 > lastx && pa > thisrun) \
- a0 -= *--pa; \
- if (a0 < lastx) { \
- if (a0 < 0) \
- a0 = 0; \
- if ((pa-thisrun)&1) \
- SETVALUE(0); \
- SETVALUE(lastx - a0); \
- } else if (a0 > lastx) { \
- SETVALUE(lastx); \
- SETVALUE(0); \
- } \
- } \
-} while (0)
-
-/*
- * Decode a line of 1D-encoded data.
- *
- * The line expanders are written as macros so that they can be reused
- * but still have direct access to the local variables of the "calling"
- * function.
- *
- * Note that unlike the original version we have to explicitly test for
- * a0 >= lastx after each black/white run is decoded. This is because
- * the original code depended on the input data being zero-padded to
- * insure the decoder recognized an EOL before running out of data.
- */
-#define EXPAND1D(eoflab) do { \
- for (;;) { \
- for (;;) { \
- LOOKUP16(12, TIFFFaxWhiteTable, eof1d); \
- switch (TabEnt->State) { \
- case S_EOL: \
- EOLcnt = 1; \
- goto done1d; \
- case S_TermW: \
- SETVALUE(TabEnt->Param); \
- goto doneWhite1d; \
- case S_MakeUpW: \
- case S_MakeUp: \
- a0 += TabEnt->Param; \
- RunLength += TabEnt->Param; \
- break; \
- default: \
- unexpected("WhiteTable", a0); \
- goto done1d; \
- } \
- } \
- doneWhite1d: \
- if (a0 >= lastx) \
- goto done1d; \
- for (;;) { \
- LOOKUP16(13, TIFFFaxBlackTable, eof1d); \
- switch (TabEnt->State) { \
- case S_EOL: \
- EOLcnt = 1; \
- goto done1d; \
- case S_TermB: \
- SETVALUE(TabEnt->Param); \
- goto doneBlack1d; \
- case S_MakeUpB: \
- case S_MakeUp: \
- a0 += TabEnt->Param; \
- RunLength += TabEnt->Param; \
- break; \
- default: \
- unexpected("BlackTable", a0); \
- goto done1d; \
- } \
- } \
- doneBlack1d: \
- if (a0 >= lastx) \
- goto done1d; \
- if( *(pa-1) == 0 && *(pa-2) == 0 ) \
- pa -= 2; \
- } \
-eof1d: \
- prematureEOF(a0); \
- CLEANUP_RUNS(); \
- goto eoflab; \
-done1d: \
- CLEANUP_RUNS(); \
-} while (0)
-
-/*
- * Update the value of b1 using the array
- * of runs for the reference line.
- */
-#define CHECK_b1 do { \
- if (pa != thisrun) while (b1 <= a0 && b1 < lastx) { \
- b1 += pb[0] + pb[1]; \
- pb += 2; \
- } \
-} while (0)
-
-/*
- * Expand a row of 2D-encoded data.
- */
-#define EXPAND2D(eoflab) do { \
- while (a0 < lastx) { \
- LOOKUP8(7, TIFFFaxMainTable, eof2d); \
- switch (TabEnt->State) { \
- case S_Pass: \
- CHECK_b1; \
- b1 += *pb++; \
- RunLength += b1 - a0; \
- a0 = b1; \
- b1 += *pb++; \
- break; \
- case S_Horiz: \
- if ((pa-thisrun)&1) { \
- for (;;) { /* black first */ \
- LOOKUP16(13, TIFFFaxBlackTable, eof2d); \
- switch (TabEnt->State) { \
- case S_TermB: \
- SETVALUE(TabEnt->Param); \
- goto doneWhite2da; \
- case S_MakeUpB: \
- case S_MakeUp: \
- a0 += TabEnt->Param; \
- RunLength += TabEnt->Param; \
- break; \
- default: \
- goto badBlack2d; \
- } \
- } \
- doneWhite2da:; \
- for (;;) { /* then white */ \
- LOOKUP16(12, TIFFFaxWhiteTable, eof2d); \
- switch (TabEnt->State) { \
- case S_TermW: \
- SETVALUE(TabEnt->Param); \
- goto doneBlack2da; \
- case S_MakeUpW: \
- case S_MakeUp: \
- a0 += TabEnt->Param; \
- RunLength += TabEnt->Param; \
- break; \
- default: \
- goto badWhite2d; \
- } \
- } \
- doneBlack2da:; \
- } else { \
- for (;;) { /* white first */ \
- LOOKUP16(12, TIFFFaxWhiteTable, eof2d); \
- switch (TabEnt->State) { \
- case S_TermW: \
- SETVALUE(TabEnt->Param); \
- goto doneWhite2db; \
- case S_MakeUpW: \
- case S_MakeUp: \
- a0 += TabEnt->Param; \
- RunLength += TabEnt->Param; \
- break; \
- default: \
- goto badWhite2d; \
- } \
- } \
- doneWhite2db:; \
- for (;;) { /* then black */ \
- LOOKUP16(13, TIFFFaxBlackTable, eof2d); \
- switch (TabEnt->State) { \
- case S_TermB: \
- SETVALUE(TabEnt->Param); \
- goto doneBlack2db; \
- case S_MakeUpB: \
- case S_MakeUp: \
- a0 += TabEnt->Param; \
- RunLength += TabEnt->Param; \
- break; \
- default: \
- goto badBlack2d; \
- } \
- } \
- doneBlack2db:; \
- } \
- CHECK_b1; \
- break; \
- case S_V0: \
- CHECK_b1; \
- SETVALUE(b1 - a0); \
- b1 += *pb++; \
- break; \
- case S_VR: \
- CHECK_b1; \
- SETVALUE(b1 - a0 + TabEnt->Param); \
- b1 += *pb++; \
- break; \
- case S_VL: \
- CHECK_b1; \
- SETVALUE(b1 - a0 - TabEnt->Param); \
- b1 -= *--pb; \
- break; \
- case S_Ext: \
- *pa++ = lastx - a0; \
- extension(a0); \
- goto eol2d; \
- case S_EOL: \
- *pa++ = lastx - a0; \
- NeedBits8(4,eof2d); \
- if (GetBits(4)) \
- unexpected("EOL", a0); \
- ClrBits(4); \
- EOLcnt = 1; \
- goto eol2d; \
- default: \
- badMain2d: \
- unexpected("MainTable", a0); \
- goto eol2d; \
- badBlack2d: \
- unexpected("BlackTable", a0); \
- goto eol2d; \
- badWhite2d: \
- unexpected("WhiteTable", a0); \
- goto eol2d; \
- eof2d: \
- prematureEOF(a0); \
- CLEANUP_RUNS(); \
- goto eoflab; \
- } \
- } \
- if (RunLength) { \
- if (RunLength + a0 < lastx) { \
- /* expect a final V0 */ \
- NeedBits8(1,eof2d); \
- if (!GetBits(1)) \
- goto badMain2d; \
- ClrBits(1); \
- } \
- SETVALUE(0); \
- } \
-eol2d: \
- CLEANUP_RUNS(); \
-} while (0)
-#endif /* _FAX3_ */
diff --git a/src/3rdparty/libtiff/libtiff/tif_fax3sm.c b/src/3rdparty/libtiff/libtiff/tif_fax3sm.c
deleted file mode 100644
index 08ce1ad608..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_fax3sm.c
+++ /dev/null
@@ -1,1253 +0,0 @@
-/* WARNING, this file was automatically generated by the
- mkg3states program */
-#include "tiff.h"
-#include "tif_fax3.h"
- const TIFFFaxTabEnt TIFFFaxMainTable[128] = {
-{12,7,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},
-{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{5,6,2},{3,1,0},{5,3,1},{3,1,0},
-{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},
-{4,3,1},{3,1,0},{5,7,3},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},
-{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{4,6,2},{3,1,0},
-{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},
-{2,3,0},{3,1,0},{4,3,1},{3,1,0},{6,7,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},
-{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},
-{5,6,2},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},
-{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{4,7,3},{3,1,0},{5,3,1},{3,1,0},
-{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},
-{4,3,1},{3,1,0},{4,6,2},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},
-{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0}
-};
- const TIFFFaxTabEnt TIFFFaxWhiteTable[4096] = {
-{12,11,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
-{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
-{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
-{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
-{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},
-{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
-{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1792},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
-{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
-{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
-{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},
-{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
-{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
-{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
-{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},
-{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},
-{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},
-{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},
-{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},
-{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},
-{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},
-{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1856},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
-{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},
-{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},
-{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},
-{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},
-{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},
-{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
-{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
-{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},
-{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},
-{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},
-{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
-{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},
-{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
-{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{11,12,2112},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
-{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
-{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},
-{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},
-{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},
-{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
-{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
-{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},
-{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},
-{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},
-{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},
-{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
-{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2368},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
-{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},
-{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},
-{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},
-{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},
-{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},
-{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},
-{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},
-{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
-{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},
-{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},
-{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},
-{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},
-{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},
-{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
-{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{11,12,1984},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
-{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},
-{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},
-{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},
-{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
-{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},
-{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
-{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
-{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
-{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
-{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
-{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},
-{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
-{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1920},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
-{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
-{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
-{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},
-{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
-{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
-{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
-{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},
-{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},
-{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},
-{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},
-{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},
-{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},
-{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},
-{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2240},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
-{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},
-{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},
-{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},
-{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},
-{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},
-{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
-{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
-{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},
-{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},
-{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},
-{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
-{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},
-{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
-{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{11,12,2496},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
-{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
-{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},
-{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},
-{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},
-{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
-{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{12,11,0},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
-{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},
-{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},
-{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},
-{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},
-{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
-{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1792},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
-{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},
-{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},
-{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},
-{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},
-{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},
-{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},
-{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},
-{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
-{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},
-{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},
-{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},
-{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},
-{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},
-{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
-{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{11,11,1856},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
-{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},
-{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},
-{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},
-{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
-{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},
-{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
-{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
-{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
-{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
-{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
-{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},
-{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
-{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2176},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
-{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
-{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
-{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},
-{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
-{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
-{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
-{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},
-{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},
-{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},
-{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},
-{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},
-{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},
-{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},
-{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2432},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
-{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},
-{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},
-{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},
-{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},
-{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},
-{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
-{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
-{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},
-{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},
-{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},
-{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
-{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},
-{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
-{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{11,12,2048},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
-{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
-{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},
-{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},
-{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},
-{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
-{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
-{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},
-{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},
-{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},
-{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},
-{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
-{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1920},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
-{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},
-{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},
-{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},
-{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},
-{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},
-{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},
-{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},
-{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
-{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},
-{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},
-{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},
-{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},
-{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},
-{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
-{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{11,12,2304},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
-{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},
-{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},
-{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},
-{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},
-{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
-{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},
-{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
-{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
-{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
-{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
-{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
-{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
-{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
-{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},
-{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
-{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
-{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
-{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2560},{7,4,3},
-{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
-{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
-{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
-{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
-{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},
-{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
-{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
-{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
-{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
-{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
-{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
-{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
-{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7}
-};
- const TIFFFaxTabEnt TIFFFaxBlackTable[8192] = {
-{12,11,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1792},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,11,23},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,20},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,11,25},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,128},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,56},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,30},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1856},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,57},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,11,21},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,54},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,52},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,48},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{11,12,2112},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,44},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,36},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,384},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,28},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,60},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,40},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2368},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{11,12,1984},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,50},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,34},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1664},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,26},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1408},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,32},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1920},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,61},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,42},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{10,13,1024},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{10,13,768},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,62},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2240},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,46},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,38},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,512},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,11,19},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,24},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,22},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{11,12,2496},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{12,11,0},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1792},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,23},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,20},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,11,25},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{10,12,192},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1280},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,31},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{11,11,1856},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,58},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,11,21},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,896},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,640},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,49},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2176},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,45},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,37},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{10,12,448},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,29},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{10,13,1536},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,41},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2432},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{11,12,2048},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,51},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,35},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,320},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,27},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,59},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,33},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1920},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,256},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,43},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{10,13,1152},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,55},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,63},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{11,12,2304},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,47},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,39},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,53},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,19},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,24},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,22},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2560},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{12,11,0},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1792},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,23},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,11,20},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,25},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{10,12,128},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,56},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,30},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{11,11,1856},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,57},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,21},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,54},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,52},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,48},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2112},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,44},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,36},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{10,12,384},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,28},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,60},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,40},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{11,12,2368},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,1984},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,50},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,34},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{10,13,1728},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,26},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{10,13,1472},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,32},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1920},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,61},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,42},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1088},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,832},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,62},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{11,12,2240},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,46},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,38},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,576},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,19},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,11,24},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,22},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2496},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{12,11,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{11,11,1792},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,23},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,11,20},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,25},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,192},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1344},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,31},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1856},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,58},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,21},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{10,13,960},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{10,13,704},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,49},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2176},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,45},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,37},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,448},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,29},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1600},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,41},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{11,12,2432},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2048},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,51},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,35},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{10,12,320},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,27},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,59},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,33},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{11,11,1920},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,256},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,43},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1216},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,55},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,63},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2304},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,12,47},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,39},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,12,53},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,19},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,11,24},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,11,22},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2560},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
-{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},
-{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
-{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
-{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
-{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
-{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
-{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
-{8,3,4},{8,2,2}
-};
diff --git a/src/3rdparty/libtiff/libtiff/tif_flush.c b/src/3rdparty/libtiff/libtiff/tif_flush.c
deleted file mode 100644
index 5ff56e9a81..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_flush.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_flush.c,v 1.3 2000/09/15 20:52:42 warmerda Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- */
-#include "tiffiop.h"
-
-int
-TIFFFlush(TIFF* tif)
-{
-
- if (tif->tif_mode != O_RDONLY) {
- if (!TIFFFlushData(tif))
- return (0);
- if ((tif->tif_flags & TIFF_DIRTYDIRECT) &&
- !TIFFWriteDirectory(tif))
- return (0);
- }
- return (1);
-}
-
-/*
- * Flush buffered data to the file.
- *
- * Frank Warmerdam'2000: I modified this to return 1 if TIFF_BEENWRITING
- * is not set, so that TIFFFlush() will proceed to write out the directory.
- * The documentation says returning 1 is an error indicator, but not having
- * been writing isn't exactly a an error. Hopefully this doesn't cause
- * problems for other people.
- */
-int
-TIFFFlushData(TIFF* tif)
-{
- if ((tif->tif_flags & TIFF_BEENWRITING) == 0)
- return (0);
- if (tif->tif_flags & TIFF_POSTENCODE) {
- tif->tif_flags &= ~TIFF_POSTENCODE;
- if (!(*tif->tif_postencode)(tif))
- return (0);
- }
- return (TIFFFlushData1(tif));
-}
-
diff --git a/src/3rdparty/libtiff/libtiff/tif_getimage.c b/src/3rdparty/libtiff/libtiff/tif_getimage.c
deleted file mode 100644
index 667f32380a..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_getimage.c
+++ /dev/null
@@ -1,2669 +0,0 @@
-/* $Id: tif_getimage.c,v 1.63.2.3 2009-08-30 16:21:46 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1991-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library
- *
- * Read and return a packed RGBA image.
- */
-#include "tiffiop.h"
-#include <stdio.h>
-
-static int gtTileContig(TIFFRGBAImage*, uint32*, uint32, uint32);
-static int gtTileSeparate(TIFFRGBAImage*, uint32*, uint32, uint32);
-static int gtStripContig(TIFFRGBAImage*, uint32*, uint32, uint32);
-static int gtStripSeparate(TIFFRGBAImage*, uint32*, uint32, uint32);
-static int PickContigCase(TIFFRGBAImage*);
-static int PickSeparateCase(TIFFRGBAImage*);
-static const char photoTag[] = "PhotometricInterpretation";
-
-/*
- * Helper constants used in Orientation tag handling
- */
-#define FLIP_VERTICALLY 0x01
-#define FLIP_HORIZONTALLY 0x02
-
-/*
- * Color conversion constants. We will define display types here.
- */
-
-TIFFDisplay display_sRGB = {
- { /* XYZ -> luminance matrix */
- { 3.2410F, -1.5374F, -0.4986F },
- { -0.9692F, 1.8760F, 0.0416F },
- { 0.0556F, -0.2040F, 1.0570F }
- },
- 100.0F, 100.0F, 100.0F, /* Light o/p for reference white */
- 255, 255, 255, /* Pixel values for ref. white */
- 1.0F, 1.0F, 1.0F, /* Residual light o/p for black pixel */
- 2.4F, 2.4F, 2.4F, /* Gamma values for the three guns */
-};
-
-/*
- * Check the image to see if TIFFReadRGBAImage can deal with it.
- * 1/0 is returned according to whether or not the image can
- * be handled. If 0 is returned, emsg contains the reason
- * why it is being rejected.
- */
-int
-TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
-{
- TIFFDirectory* td = &tif->tif_dir;
- uint16 photometric;
- int colorchannels;
-
- if (!tif->tif_decodestatus) {
- sprintf(emsg, "Sorry, requested compression method is not configured");
- return (0);
- }
- switch (td->td_bitspersample) {
- case 1:
- case 2:
- case 4:
- case 8:
- case 16:
- break;
- default:
- sprintf(emsg, "Sorry, can not handle images with %d-bit samples",
- td->td_bitspersample);
- return (0);
- }
- colorchannels = td->td_samplesperpixel - td->td_extrasamples;
- if (!TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric)) {
- switch (colorchannels) {
- case 1:
- photometric = PHOTOMETRIC_MINISBLACK;
- break;
- case 3:
- photometric = PHOTOMETRIC_RGB;
- break;
- default:
- sprintf(emsg, "Missing needed %s tag", photoTag);
- return (0);
- }
- }
- switch (photometric) {
- case PHOTOMETRIC_MINISWHITE:
- case PHOTOMETRIC_MINISBLACK:
- case PHOTOMETRIC_PALETTE:
- if (td->td_planarconfig == PLANARCONFIG_CONTIG
- && td->td_samplesperpixel != 1
- && td->td_bitspersample < 8 ) {
- sprintf(emsg,
- "Sorry, can not handle contiguous data with %s=%d, "
- "and %s=%d and Bits/Sample=%d",
- photoTag, photometric,
- "Samples/pixel", td->td_samplesperpixel,
- td->td_bitspersample);
- return (0);
- }
- /*
- * We should likely validate that any extra samples are either
- * to be ignored, or are alpha, and if alpha we should try to use
- * them. But for now we won't bother with this.
- */
- break;
- case PHOTOMETRIC_YCBCR:
- /*
- * TODO: if at all meaningful and useful, make more complete
- * support check here, or better still, refactor to let supporting
- * code decide whether there is support and what meaningfull
- * error to return
- */
- break;
- case PHOTOMETRIC_RGB:
- if (colorchannels < 3) {
- sprintf(emsg, "Sorry, can not handle RGB image with %s=%d",
- "Color channels", colorchannels);
- return (0);
- }
- break;
- case PHOTOMETRIC_SEPARATED:
- {
- uint16 inkset;
- TIFFGetFieldDefaulted(tif, TIFFTAG_INKSET, &inkset);
- if (inkset != INKSET_CMYK) {
- sprintf(emsg,
- "Sorry, can not handle separated image with %s=%d",
- "InkSet", inkset);
- return 0;
- }
- if (td->td_samplesperpixel < 4) {
- sprintf(emsg,
- "Sorry, can not handle separated image with %s=%d",
- "Samples/pixel", td->td_samplesperpixel);
- return 0;
- }
- break;
- }
- case PHOTOMETRIC_LOGL:
- if (td->td_compression != COMPRESSION_SGILOG) {
- sprintf(emsg, "Sorry, LogL data must have %s=%d",
- "Compression", COMPRESSION_SGILOG);
- return (0);
- }
- break;
- case PHOTOMETRIC_LOGLUV:
- if (td->td_compression != COMPRESSION_SGILOG &&
- td->td_compression != COMPRESSION_SGILOG24) {
- sprintf(emsg, "Sorry, LogLuv data must have %s=%d or %d",
- "Compression", COMPRESSION_SGILOG, COMPRESSION_SGILOG24);
- return (0);
- }
- if (td->td_planarconfig != PLANARCONFIG_CONTIG) {
- sprintf(emsg, "Sorry, can not handle LogLuv images with %s=%d",
- "Planarconfiguration", td->td_planarconfig);
- return (0);
- }
- break;
- case PHOTOMETRIC_CIELAB:
- break;
- default:
- sprintf(emsg, "Sorry, can not handle image with %s=%d",
- photoTag, photometric);
- return (0);
- }
- return (1);
-}
-
-void
-TIFFRGBAImageEnd(TIFFRGBAImage* img)
-{
- if (img->Map)
- _TIFFfree(img->Map), img->Map = NULL;
- if (img->BWmap)
- _TIFFfree(img->BWmap), img->BWmap = NULL;
- if (img->PALmap)
- _TIFFfree(img->PALmap), img->PALmap = NULL;
- if (img->ycbcr)
- _TIFFfree(img->ycbcr), img->ycbcr = NULL;
- if (img->cielab)
- _TIFFfree(img->cielab), img->cielab = NULL;
- if( img->redcmap ) {
- _TIFFfree( img->redcmap );
- _TIFFfree( img->greencmap );
- _TIFFfree( img->bluecmap );
- }
-}
-
-static int
-isCCITTCompression(TIFF* tif)
-{
- uint16 compress;
- TIFFGetField(tif, TIFFTAG_COMPRESSION, &compress);
- return (compress == COMPRESSION_CCITTFAX3 ||
- compress == COMPRESSION_CCITTFAX4 ||
- compress == COMPRESSION_CCITTRLE ||
- compress == COMPRESSION_CCITTRLEW);
-}
-
-int
-TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024])
-{
- uint16* sampleinfo;
- uint16 extrasamples;
- uint16 planarconfig;
- uint16 compress;
- int colorchannels;
- uint16 *red_orig, *green_orig, *blue_orig;
- int n_color;
-
- /* Initialize to normal values */
- img->row_offset = 0;
- img->col_offset = 0;
- img->redcmap = NULL;
- img->greencmap = NULL;
- img->bluecmap = NULL;
- img->req_orientation = ORIENTATION_BOTLEFT; /* It is the default */
-
- img->tif = tif;
- img->stoponerr = stop;
- TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &img->bitspersample);
- switch (img->bitspersample) {
- case 1:
- case 2:
- case 4:
- case 8:
- case 16:
- break;
- default:
- sprintf(emsg, "Sorry, can not handle images with %d-bit samples",
- img->bitspersample);
- return (0);
- }
- img->alpha = 0;
- TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &img->samplesperpixel);
- TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
- &extrasamples, &sampleinfo);
- if (extrasamples >= 1)
- {
- switch (sampleinfo[0]) {
- case EXTRASAMPLE_UNSPECIFIED: /* Workaround for some images without */
- if (img->samplesperpixel > 3) /* correct info about alpha channel */
- img->alpha = EXTRASAMPLE_ASSOCALPHA;
- break;
- case EXTRASAMPLE_ASSOCALPHA: /* data is pre-multiplied */
- case EXTRASAMPLE_UNASSALPHA: /* data is not pre-multiplied */
- img->alpha = sampleinfo[0];
- break;
- }
- }
-
-#ifdef DEFAULT_EXTRASAMPLE_AS_ALPHA
- if( !TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &img->photometric))
- img->photometric = PHOTOMETRIC_MINISWHITE;
-
- if( extrasamples == 0
- && img->samplesperpixel == 4
- && img->photometric == PHOTOMETRIC_RGB )
- {
- img->alpha = EXTRASAMPLE_ASSOCALPHA;
- extrasamples = 1;
- }
-#endif
-
- colorchannels = img->samplesperpixel - extrasamples;
- TIFFGetFieldDefaulted(tif, TIFFTAG_COMPRESSION, &compress);
- TIFFGetFieldDefaulted(tif, TIFFTAG_PLANARCONFIG, &planarconfig);
- if (!TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &img->photometric)) {
- switch (colorchannels) {
- case 1:
- if (isCCITTCompression(tif))
- img->photometric = PHOTOMETRIC_MINISWHITE;
- else
- img->photometric = PHOTOMETRIC_MINISBLACK;
- break;
- case 3:
- img->photometric = PHOTOMETRIC_RGB;
- break;
- default:
- sprintf(emsg, "Missing needed %s tag", photoTag);
- return (0);
- }
- }
- switch (img->photometric) {
- case PHOTOMETRIC_PALETTE:
- if (!TIFFGetField(tif, TIFFTAG_COLORMAP,
- &red_orig, &green_orig, &blue_orig)) {
- sprintf(emsg, "Missing required \"Colormap\" tag");
- return (0);
- }
-
- /* copy the colormaps so we can modify them */
- n_color = (1L << img->bitspersample);
- img->redcmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color);
- img->greencmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color);
- img->bluecmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color);
- if( !img->redcmap || !img->greencmap || !img->bluecmap ) {
- sprintf(emsg, "Out of memory for colormap copy");
- return (0);
- }
-
- _TIFFmemcpy( img->redcmap, red_orig, n_color * 2 );
- _TIFFmemcpy( img->greencmap, green_orig, n_color * 2 );
- _TIFFmemcpy( img->bluecmap, blue_orig, n_color * 2 );
-
- /* fall thru... */
- case PHOTOMETRIC_MINISWHITE:
- case PHOTOMETRIC_MINISBLACK:
- if (planarconfig == PLANARCONFIG_CONTIG
- && img->samplesperpixel != 1
- && img->bitspersample < 8 ) {
- sprintf(emsg,
- "Sorry, can not handle contiguous data with %s=%d, "
- "and %s=%d and Bits/Sample=%d",
- photoTag, img->photometric,
- "Samples/pixel", img->samplesperpixel,
- img->bitspersample);
- return (0);
- }
- break;
- case PHOTOMETRIC_YCBCR:
- /* It would probably be nice to have a reality check here. */
- if (planarconfig == PLANARCONFIG_CONTIG)
- /* can rely on libjpeg to convert to RGB */
- /* XXX should restore current state on exit */
- switch (compress) {
- case COMPRESSION_JPEG:
- /*
- * TODO: when complete tests verify complete desubsampling
- * and YCbCr handling, remove use of TIFFTAG_JPEGCOLORMODE in
- * favor of tif_getimage.c native handling
- */
- TIFFSetField(tif, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
- img->photometric = PHOTOMETRIC_RGB;
- break;
- default:
- /* do nothing */;
- break;
- }
- /*
- * TODO: if at all meaningful and useful, make more complete
- * support check here, or better still, refactor to let supporting
- * code decide whether there is support and what meaningfull
- * error to return
- */
- break;
- case PHOTOMETRIC_RGB:
- if (colorchannels < 3) {
- sprintf(emsg, "Sorry, can not handle RGB image with %s=%d",
- "Color channels", colorchannels);
- return (0);
- }
- break;
- case PHOTOMETRIC_SEPARATED:
- {
- uint16 inkset;
- TIFFGetFieldDefaulted(tif, TIFFTAG_INKSET, &inkset);
- if (inkset != INKSET_CMYK) {
- sprintf(emsg, "Sorry, can not handle separated image with %s=%d",
- "InkSet", inkset);
- return (0);
- }
- if (img->samplesperpixel < 4) {
- sprintf(emsg, "Sorry, can not handle separated image with %s=%d",
- "Samples/pixel", img->samplesperpixel);
- return (0);
- }
- }
- break;
- case PHOTOMETRIC_LOGL:
- if (compress != COMPRESSION_SGILOG) {
- sprintf(emsg, "Sorry, LogL data must have %s=%d",
- "Compression", COMPRESSION_SGILOG);
- return (0);
- }
- TIFFSetField(tif, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_8BIT);
- img->photometric = PHOTOMETRIC_MINISBLACK; /* little white lie */
- img->bitspersample = 8;
- break;
- case PHOTOMETRIC_LOGLUV:
- if (compress != COMPRESSION_SGILOG && compress != COMPRESSION_SGILOG24) {
- sprintf(emsg, "Sorry, LogLuv data must have %s=%d or %d",
- "Compression", COMPRESSION_SGILOG, COMPRESSION_SGILOG24);
- return (0);
- }
- if (planarconfig != PLANARCONFIG_CONTIG) {
- sprintf(emsg, "Sorry, can not handle LogLuv images with %s=%d",
- "Planarconfiguration", planarconfig);
- return (0);
- }
- TIFFSetField(tif, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_8BIT);
- img->photometric = PHOTOMETRIC_RGB; /* little white lie */
- img->bitspersample = 8;
- break;
- case PHOTOMETRIC_CIELAB:
- break;
- default:
- sprintf(emsg, "Sorry, can not handle image with %s=%d",
- photoTag, img->photometric);
- return (0);
- }
- img->Map = NULL;
- img->BWmap = NULL;
- img->PALmap = NULL;
- img->ycbcr = NULL;
- img->cielab = NULL;
- TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &img->width);
- TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &img->height);
- TIFFGetFieldDefaulted(tif, TIFFTAG_ORIENTATION, &img->orientation);
- img->isContig =
- !(planarconfig == PLANARCONFIG_SEPARATE && colorchannels > 1);
- if (img->isContig) {
- if (!PickContigCase(img)) {
- sprintf(emsg, "Sorry, can not handle image");
- return 0;
- }
- } else {
- if (!PickSeparateCase(img)) {
- sprintf(emsg, "Sorry, can not handle image");
- return 0;
- }
- }
- return 1;
-}
-
-int
-TIFFRGBAImageGet(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
-{
- if (img->get == NULL) {
- TIFFErrorExt(img->tif->tif_clientdata, TIFFFileName(img->tif), "No \"get\" routine setup");
- return (0);
- }
- if (img->put.any == NULL) {
- TIFFErrorExt(img->tif->tif_clientdata, TIFFFileName(img->tif),
- "No \"put\" routine setupl; probably can not handle image format");
- return (0);
- }
- return (*img->get)(img, raster, w, h);
-}
-
-/*
- * Read the specified image into an ABGR-format rastertaking in account
- * specified orientation.
- */
-int
-TIFFReadRGBAImageOriented(TIFF* tif,
- uint32 rwidth, uint32 rheight, uint32* raster,
- int orientation, int stop)
-{
- char emsg[1024] = "";
- TIFFRGBAImage img;
- int ok;
-
- if (TIFFRGBAImageOK(tif, emsg) && TIFFRGBAImageBegin(&img, tif, stop, emsg)) {
- img.req_orientation = orientation;
- /* XXX verify rwidth and rheight against width and height */
- ok = TIFFRGBAImageGet(&img, raster+(rheight-img.height)*rwidth,
- rwidth, img.height);
- TIFFRGBAImageEnd(&img);
- } else {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "%s", emsg);
- ok = 0;
- }
- return (ok);
-}
-
-/*
- * Read the specified image into an ABGR-format raster. Use bottom left
- * origin for raster by default.
- */
-int
-TIFFReadRGBAImage(TIFF* tif,
- uint32 rwidth, uint32 rheight, uint32* raster, int stop)
-{
- return TIFFReadRGBAImageOriented(tif, rwidth, rheight, raster,
- ORIENTATION_BOTLEFT, stop);
-}
-
-static int
-setorientation(TIFFRGBAImage* img)
-{
- switch (img->orientation) {
- case ORIENTATION_TOPLEFT:
- case ORIENTATION_LEFTTOP:
- if (img->req_orientation == ORIENTATION_TOPRIGHT ||
- img->req_orientation == ORIENTATION_RIGHTTOP)
- return FLIP_HORIZONTALLY;
- else if (img->req_orientation == ORIENTATION_BOTRIGHT ||
- img->req_orientation == ORIENTATION_RIGHTBOT)
- return FLIP_HORIZONTALLY | FLIP_VERTICALLY;
- else if (img->req_orientation == ORIENTATION_BOTLEFT ||
- img->req_orientation == ORIENTATION_LEFTBOT)
- return FLIP_VERTICALLY;
- else
- return 0;
- case ORIENTATION_TOPRIGHT:
- case ORIENTATION_RIGHTTOP:
- if (img->req_orientation == ORIENTATION_TOPLEFT ||
- img->req_orientation == ORIENTATION_LEFTTOP)
- return FLIP_HORIZONTALLY;
- else if (img->req_orientation == ORIENTATION_BOTRIGHT ||
- img->req_orientation == ORIENTATION_RIGHTBOT)
- return FLIP_VERTICALLY;
- else if (img->req_orientation == ORIENTATION_BOTLEFT ||
- img->req_orientation == ORIENTATION_LEFTBOT)
- return FLIP_HORIZONTALLY | FLIP_VERTICALLY;
- else
- return 0;
- case ORIENTATION_BOTRIGHT:
- case ORIENTATION_RIGHTBOT:
- if (img->req_orientation == ORIENTATION_TOPLEFT ||
- img->req_orientation == ORIENTATION_LEFTTOP)
- return FLIP_HORIZONTALLY | FLIP_VERTICALLY;
- else if (img->req_orientation == ORIENTATION_TOPRIGHT ||
- img->req_orientation == ORIENTATION_RIGHTTOP)
- return FLIP_VERTICALLY;
- else if (img->req_orientation == ORIENTATION_BOTLEFT ||
- img->req_orientation == ORIENTATION_LEFTBOT)
- return FLIP_HORIZONTALLY;
- else
- return 0;
- case ORIENTATION_BOTLEFT:
- case ORIENTATION_LEFTBOT:
- if (img->req_orientation == ORIENTATION_TOPLEFT ||
- img->req_orientation == ORIENTATION_LEFTTOP)
- return FLIP_VERTICALLY;
- else if (img->req_orientation == ORIENTATION_TOPRIGHT ||
- img->req_orientation == ORIENTATION_RIGHTTOP)
- return FLIP_HORIZONTALLY | FLIP_VERTICALLY;
- else if (img->req_orientation == ORIENTATION_BOTRIGHT ||
- img->req_orientation == ORIENTATION_RIGHTBOT)
- return FLIP_HORIZONTALLY;
- else
- return 0;
- default: /* NOTREACHED */
- return 0;
- }
-}
-
-/*
- * Get an tile-organized image that has
- * PlanarConfiguration contiguous if SamplesPerPixel > 1
- * or
- * SamplesPerPixel == 1
- */
-static int
-gtTileContig(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
-{
- TIFF* tif = img->tif;
- tileContigRoutine put = img->put.contig;
- uint32 col, row, y, rowstoread;
- uint32 pos;
- uint32 tw, th;
- unsigned char* buf;
- int32 fromskew, toskew;
- uint32 nrow;
- int ret = 1, flip;
-
- buf = (unsigned char*) _TIFFmalloc(TIFFTileSize(tif));
- if (buf == 0) {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "No space for tile buffer");
- return (0);
- }
- _TIFFmemset(buf, 0, TIFFTileSize(tif));
- TIFFGetField(tif, TIFFTAG_TILEWIDTH, &tw);
- TIFFGetField(tif, TIFFTAG_TILELENGTH, &th);
-
- flip = setorientation(img);
- if (flip & FLIP_VERTICALLY) {
- y = h - 1;
- toskew = -(int32)(tw + w);
- }
- else {
- y = 0;
- toskew = -(int32)(tw - w);
- }
-
- for (row = 0; row < h; row += nrow)
- {
- rowstoread = th - (row + img->row_offset) % th;
- nrow = (row + rowstoread > h ? h - row : rowstoread);
- for (col = 0; col < w; col += tw)
- {
- if (TIFFReadTile(tif, buf, col+img->col_offset,
- row+img->row_offset, 0, 0) < 0 && img->stoponerr)
- {
- ret = 0;
- break;
- }
-
- pos = ((row+img->row_offset) % th) * TIFFTileRowSize(tif);
-
- if (col + tw > w)
- {
- /*
- * Tile is clipped horizontally. Calculate
- * visible portion and skewing factors.
- */
- uint32 npix = w - col;
- fromskew = tw - npix;
- (*put)(img, raster+y*w+col, col, y,
- npix, nrow, fromskew, toskew + fromskew, buf + pos);
- }
- else
- {
- (*put)(img, raster+y*w+col, col, y, tw, nrow, 0, toskew, buf + pos);
- }
- }
-
- y += (flip & FLIP_VERTICALLY ? -(int32) nrow : (int32) nrow);
- }
- _TIFFfree(buf);
-
- if (flip & FLIP_HORIZONTALLY) {
- uint32 line;
-
- for (line = 0; line < h; line++) {
- uint32 *left = raster + (line * w);
- uint32 *right = left + w - 1;
-
- while ( left < right ) {
- uint32 temp = *left;
- *left = *right;
- *right = temp;
- left++, right--;
- }
- }
- }
-
- return (ret);
-}
-
-/*
- * Get an tile-organized image that has
- * SamplesPerPixel > 1
- * PlanarConfiguration separated
- * We assume that all such images are RGB.
- */
-static int
-gtTileSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
-{
- TIFF* tif = img->tif;
- tileSeparateRoutine put = img->put.separate;
- uint32 col, row, y, rowstoread;
- uint32 pos;
- uint32 tw, th;
- unsigned char* buf;
- unsigned char* p0;
- unsigned char* p1;
- unsigned char* p2;
- unsigned char* pa;
- tsize_t tilesize;
- int32 fromskew, toskew;
- int alpha = img->alpha;
- uint32 nrow;
- int ret = 1, flip;
-
- tilesize = TIFFTileSize(tif);
- buf = (unsigned char*) _TIFFmalloc((alpha?4:3)*tilesize);
- if (buf == 0) {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "No space for tile buffer");
- return (0);
- }
- _TIFFmemset(buf, 0, (alpha?4:3)*tilesize);
- p0 = buf;
- p1 = p0 + tilesize;
- p2 = p1 + tilesize;
- pa = (alpha?(p2+tilesize):NULL);
- TIFFGetField(tif, TIFFTAG_TILEWIDTH, &tw);
- TIFFGetField(tif, TIFFTAG_TILELENGTH, &th);
-
- flip = setorientation(img);
- if (flip & FLIP_VERTICALLY) {
- y = h - 1;
- toskew = -(int32)(tw + w);
- }
- else {
- y = 0;
- toskew = -(int32)(tw - w);
- }
-
- for (row = 0; row < h; row += nrow)
- {
- rowstoread = th - (row + img->row_offset) % th;
- nrow = (row + rowstoread > h ? h - row : rowstoread);
- for (col = 0; col < w; col += tw)
- {
- if (TIFFReadTile(tif, p0, col+img->col_offset,
- row+img->row_offset,0,0) < 0 && img->stoponerr)
- {
- ret = 0;
- break;
- }
- if (TIFFReadTile(tif, p1, col+img->col_offset,
- row+img->row_offset,0,1) < 0 && img->stoponerr)
- {
- ret = 0;
- break;
- }
- if (TIFFReadTile(tif, p2, col+img->col_offset,
- row+img->row_offset,0,2) < 0 && img->stoponerr)
- {
- ret = 0;
- break;
- }
- if (alpha)
- {
- if (TIFFReadTile(tif,pa,col+img->col_offset,
- row+img->row_offset,0,3) < 0 && img->stoponerr)
- {
- ret = 0;
- break;
- }
- }
-
- pos = ((row+img->row_offset) % th) * TIFFTileRowSize(tif);
-
- if (col + tw > w)
- {
- /*
- * Tile is clipped horizontally. Calculate
- * visible portion and skewing factors.
- */
- uint32 npix = w - col;
- fromskew = tw - npix;
- (*put)(img, raster+y*w+col, col, y,
- npix, nrow, fromskew, toskew + fromskew,
- p0 + pos, p1 + pos, p2 + pos, (alpha?(pa+pos):NULL));
- } else {
- (*put)(img, raster+y*w+col, col, y,
- tw, nrow, 0, toskew, p0 + pos, p1 + pos, p2 + pos, (alpha?(pa+pos):NULL));
- }
- }
-
- y += (flip & FLIP_VERTICALLY ?-(int32) nrow : (int32) nrow);
- }
-
- if (flip & FLIP_HORIZONTALLY) {
- uint32 line;
-
- for (line = 0; line < h; line++) {
- uint32 *left = raster + (line * w);
- uint32 *right = left + w - 1;
-
- while ( left < right ) {
- uint32 temp = *left;
- *left = *right;
- *right = temp;
- left++, right--;
- }
- }
- }
-
- _TIFFfree(buf);
- return (ret);
-}
-
-/*
- * Get a strip-organized image that has
- * PlanarConfiguration contiguous if SamplesPerPixel > 1
- * or
- * SamplesPerPixel == 1
- */
-static int
-gtStripContig(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
-{
- TIFF* tif = img->tif;
- tileContigRoutine put = img->put.contig;
- uint32 row, y, nrow, nrowsub, rowstoread;
- uint32 pos;
- unsigned char* buf;
- uint32 rowsperstrip;
- uint16 subsamplinghor,subsamplingver;
- uint32 imagewidth = img->width;
- tsize_t scanline;
- int32 fromskew, toskew;
- int ret = 1, flip;
-
- buf = (unsigned char*) _TIFFmalloc(TIFFStripSize(tif));
- if (buf == 0) {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "No space for strip buffer");
- return (0);
- }
- _TIFFmemset(buf, 0, TIFFStripSize(tif));
-
- flip = setorientation(img);
- if (flip & FLIP_VERTICALLY) {
- y = h - 1;
- toskew = -(int32)(w + w);
- } else {
- y = 0;
- toskew = -(int32)(w - w);
- }
-
- TIFFGetFieldDefaulted(tif, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
- TIFFGetFieldDefaulted(tif, TIFFTAG_YCBCRSUBSAMPLING, &subsamplinghor, &subsamplingver);
- scanline = TIFFNewScanlineSize(tif);
- fromskew = (w < imagewidth ? imagewidth - w : 0);
- for (row = 0; row < h; row += nrow)
- {
- rowstoread = rowsperstrip - (row + img->row_offset) % rowsperstrip;
- nrow = (row + rowstoread > h ? h - row : rowstoread);
- nrowsub = nrow;
- if ((nrowsub%subsamplingver)!=0)
- nrowsub+=subsamplingver-nrowsub%subsamplingver;
- if (TIFFReadEncodedStrip(tif,
- TIFFComputeStrip(tif,row+img->row_offset, 0),
- buf,
- ((row + img->row_offset)%rowsperstrip + nrowsub) * scanline) < 0
- && img->stoponerr)
- {
- ret = 0;
- break;
- }
-
- pos = ((row + img->row_offset) % rowsperstrip) * scanline;
- (*put)(img, raster+y*w, 0, y, w, nrow, fromskew, toskew, buf + pos);
- y += (flip & FLIP_VERTICALLY ? -(int32) nrow : (int32) nrow);
- }
-
- if (flip & FLIP_HORIZONTALLY) {
- uint32 line;
-
- for (line = 0; line < h; line++) {
- uint32 *left = raster + (line * w);
- uint32 *right = left + w - 1;
-
- while ( left < right ) {
- uint32 temp = *left;
- *left = *right;
- *right = temp;
- left++, right--;
- }
- }
- }
-
- _TIFFfree(buf);
- return (ret);
-}
-
-/*
- * Get a strip-organized image with
- * SamplesPerPixel > 1
- * PlanarConfiguration separated
- * We assume that all such images are RGB.
- */
-static int
-gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
-{
- TIFF* tif = img->tif;
- tileSeparateRoutine put = img->put.separate;
- unsigned char *buf;
- unsigned char *p0, *p1, *p2, *pa;
- uint32 row, y, nrow, rowstoread;
- uint32 pos;
- tsize_t scanline;
- uint32 rowsperstrip, offset_row;
- uint32 imagewidth = img->width;
- tsize_t stripsize;
- int32 fromskew, toskew;
- int alpha = img->alpha;
- int ret = 1, flip;
-
- stripsize = TIFFStripSize(tif);
- p0 = buf = (unsigned char *)_TIFFmalloc((alpha?4:3)*stripsize);
- if (buf == 0) {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "No space for tile buffer");
- return (0);
- }
- _TIFFmemset(buf, 0, (alpha?4:3)*stripsize);
- p1 = p0 + stripsize;
- p2 = p1 + stripsize;
- pa = (alpha?(p2+stripsize):NULL);
-
- flip = setorientation(img);
- if (flip & FLIP_VERTICALLY) {
- y = h - 1;
- toskew = -(int32)(w + w);
- }
- else {
- y = 0;
- toskew = -(int32)(w - w);
- }
-
- TIFFGetFieldDefaulted(tif, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
- scanline = TIFFScanlineSize(tif);
- fromskew = (w < imagewidth ? imagewidth - w : 0);
- for (row = 0; row < h; row += nrow)
- {
- rowstoread = rowsperstrip - (row + img->row_offset) % rowsperstrip;
- nrow = (row + rowstoread > h ? h - row : rowstoread);
- offset_row = row + img->row_offset;
- if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 0),
- p0, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) < 0
- && img->stoponerr)
- {
- ret = 0;
- break;
- }
- if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 1),
- p1, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) < 0
- && img->stoponerr)
- {
- ret = 0;
- break;
- }
- if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 2),
- p2, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) < 0
- && img->stoponerr)
- {
- ret = 0;
- break;
- }
- if (alpha)
- {
- if (TIFFReadEncodedStrip(tif, TIFFComputeStrip(tif, offset_row, 3),
- pa, ((row + img->row_offset)%rowsperstrip + nrow) * scanline) < 0
- && img->stoponerr)
- {
- ret = 0;
- break;
- }
- }
-
- pos = ((row + img->row_offset) % rowsperstrip) * scanline;
- (*put)(img, raster+y*w, 0, y, w, nrow, fromskew, toskew, p0 + pos, p1 + pos,
- p2 + pos, (alpha?(pa+pos):NULL));
- y += (flip & FLIP_VERTICALLY ? -(int32) nrow : (int32) nrow);
- }
-
- if (flip & FLIP_HORIZONTALLY) {
- uint32 line;
-
- for (line = 0; line < h; line++) {
- uint32 *left = raster + (line * w);
- uint32 *right = left + w - 1;
-
- while ( left < right ) {
- uint32 temp = *left;
- *left = *right;
- *right = temp;
- left++, right--;
- }
- }
- }
-
- _TIFFfree(buf);
- return (ret);
-}
-
-/*
- * The following routines move decoded data returned
- * from the TIFF library into rasters filled with packed
- * ABGR pixels (i.e. suitable for passing to lrecwrite.)
- *
- * The routines have been created according to the most
- * important cases and optimized. PickContigCase and
- * PickSeparateCase analyze the parameters and select
- * the appropriate "get" and "put" routine to use.
- */
-#define REPEAT8(op) REPEAT4(op); REPEAT4(op)
-#define REPEAT4(op) REPEAT2(op); REPEAT2(op)
-#define REPEAT2(op) op; op
-#define CASE8(x,op) \
- switch (x) { \
- case 7: op; case 6: op; case 5: op; \
- case 4: op; case 3: op; case 2: op; \
- case 1: op; \
- }
-#define CASE4(x,op) switch (x) { case 3: op; case 2: op; case 1: op; }
-#define NOP
-
-#define UNROLL8(w, op1, op2) { \
- uint32 _x; \
- for (_x = w; _x >= 8; _x -= 8) { \
- op1; \
- REPEAT8(op2); \
- } \
- if (_x > 0) { \
- op1; \
- CASE8(_x,op2); \
- } \
-}
-#define UNROLL4(w, op1, op2) { \
- uint32 _x; \
- for (_x = w; _x >= 4; _x -= 4) { \
- op1; \
- REPEAT4(op2); \
- } \
- if (_x > 0) { \
- op1; \
- CASE4(_x,op2); \
- } \
-}
-#define UNROLL2(w, op1, op2) { \
- uint32 _x; \
- for (_x = w; _x >= 2; _x -= 2) { \
- op1; \
- REPEAT2(op2); \
- } \
- if (_x) { \
- op1; \
- op2; \
- } \
-}
-
-#define SKEW(r,g,b,skew) { r += skew; g += skew; b += skew; }
-#define SKEW4(r,g,b,a,skew) { r += skew; g += skew; b += skew; a+= skew; }
-
-#define A1 (((uint32)0xffL)<<24)
-#define PACK(r,g,b) \
- ((uint32)(r)|((uint32)(g)<<8)|((uint32)(b)<<16)|A1)
-#define PACK4(r,g,b,a) \
- ((uint32)(r)|((uint32)(g)<<8)|((uint32)(b)<<16)|((uint32)(a)<<24))
-#define W2B(v) (((v)>>8)&0xff)
-#define PACKW(r,g,b) \
- ((uint32)W2B(r)|((uint32)W2B(g)<<8)|((uint32)W2B(b)<<16)|A1)
-#define PACKW4(r,g,b,a) \
- ((uint32)W2B(r)|((uint32)W2B(g)<<8)|((uint32)W2B(b)<<16)|((uint32)W2B(a)<<24))
-
-#define DECLAREContigPutFunc(name) \
-static void name(\
- TIFFRGBAImage* img, \
- uint32* cp, \
- uint32 x, uint32 y, \
- uint32 w, uint32 h, \
- int32 fromskew, int32 toskew, \
- unsigned char* pp \
-)
-
-/*
- * 8-bit palette => colormap/RGB
- */
-DECLAREContigPutFunc(put8bitcmaptile)
-{
- uint32** PALmap = img->PALmap;
- int samplesperpixel = img->samplesperpixel;
-
- (void) y;
- while (h-- > 0) {
- for (x = w; x-- > 0;)
- {
- *cp++ = PALmap[*pp][0];
- pp += samplesperpixel;
- }
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 4-bit palette => colormap/RGB
- */
-DECLAREContigPutFunc(put4bitcmaptile)
-{
- uint32** PALmap = img->PALmap;
-
- (void) x; (void) y;
- fromskew /= 2;
- while (h-- > 0) {
- uint32* bw;
- UNROLL2(w, bw = PALmap[*pp++], *cp++ = *bw++);
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 2-bit palette => colormap/RGB
- */
-DECLAREContigPutFunc(put2bitcmaptile)
-{
- uint32** PALmap = img->PALmap;
-
- (void) x; (void) y;
- fromskew /= 4;
- while (h-- > 0) {
- uint32* bw;
- UNROLL4(w, bw = PALmap[*pp++], *cp++ = *bw++);
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 1-bit palette => colormap/RGB
- */
-DECLAREContigPutFunc(put1bitcmaptile)
-{
- uint32** PALmap = img->PALmap;
-
- (void) x; (void) y;
- fromskew /= 8;
- while (h-- > 0) {
- uint32* bw;
- UNROLL8(w, bw = PALmap[*pp++], *cp++ = *bw++);
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 8-bit greyscale => colormap/RGB
- */
-DECLAREContigPutFunc(putgreytile)
-{
- int samplesperpixel = img->samplesperpixel;
- uint32** BWmap = img->BWmap;
-
- (void) y;
- while (h-- > 0) {
- for (x = w; x-- > 0;)
- {
- *cp++ = BWmap[*pp][0];
- pp += samplesperpixel;
- }
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 16-bit greyscale => colormap/RGB
- */
-DECLAREContigPutFunc(put16bitbwtile)
-{
- int samplesperpixel = img->samplesperpixel;
- uint32** BWmap = img->BWmap;
-
- (void) y;
- while (h-- > 0) {
- uint16 *wp = (uint16 *) pp;
-
- for (x = w; x-- > 0;)
- {
- /* use high order byte of 16bit value */
-
- *cp++ = BWmap[*wp >> 8][0];
- pp += 2 * samplesperpixel;
- wp += samplesperpixel;
- }
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 1-bit bilevel => colormap/RGB
- */
-DECLAREContigPutFunc(put1bitbwtile)
-{
- uint32** BWmap = img->BWmap;
-
- (void) x; (void) y;
- fromskew /= 8;
- while (h-- > 0) {
- uint32* bw;
- UNROLL8(w, bw = BWmap[*pp++], *cp++ = *bw++);
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 2-bit greyscale => colormap/RGB
- */
-DECLAREContigPutFunc(put2bitbwtile)
-{
- uint32** BWmap = img->BWmap;
-
- (void) x; (void) y;
- fromskew /= 4;
- while (h-- > 0) {
- uint32* bw;
- UNROLL4(w, bw = BWmap[*pp++], *cp++ = *bw++);
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 4-bit greyscale => colormap/RGB
- */
-DECLAREContigPutFunc(put4bitbwtile)
-{
- uint32** BWmap = img->BWmap;
-
- (void) x; (void) y;
- fromskew /= 2;
- while (h-- > 0) {
- uint32* bw;
- UNROLL2(w, bw = BWmap[*pp++], *cp++ = *bw++);
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 8-bit packed samples, no Map => RGB
- */
-DECLAREContigPutFunc(putRGBcontig8bittile)
-{
- int samplesperpixel = img->samplesperpixel;
-
- (void) x; (void) y;
- fromskew *= samplesperpixel;
- while (h-- > 0) {
- UNROLL8(w, NOP,
- *cp++ = PACK(pp[0], pp[1], pp[2]);
- pp += samplesperpixel);
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 8-bit packed samples => RGBA w/ associated alpha
- * (known to have Map == NULL)
- */
-DECLAREContigPutFunc(putRGBAAcontig8bittile)
-{
- int samplesperpixel = img->samplesperpixel;
-
- (void) x; (void) y;
- fromskew *= samplesperpixel;
- while (h-- > 0) {
- UNROLL8(w, NOP,
- *cp++ = PACK4(pp[0], pp[1], pp[2], pp[3]);
- pp += samplesperpixel);
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 8-bit packed samples => RGBA w/ unassociated alpha
- * (known to have Map == NULL)
- */
-DECLAREContigPutFunc(putRGBUAcontig8bittile)
-{
- int samplesperpixel = img->samplesperpixel;
- (void) y;
- fromskew *= samplesperpixel;
- while (h-- > 0) {
- uint32 r, g, b, a;
- for (x = w; x-- > 0;) {
- a = pp[3];
- r = (a*pp[0] + 127) / 255;
- g = (a*pp[1] + 127) / 255;
- b = (a*pp[2] + 127) / 255;
- *cp++ = PACK4(r,g,b,a);
- pp += samplesperpixel;
- }
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 16-bit packed samples => RGB
- */
-DECLAREContigPutFunc(putRGBcontig16bittile)
-{
- int samplesperpixel = img->samplesperpixel;
- uint16 *wp = (uint16 *)pp;
- (void) y;
- fromskew *= samplesperpixel;
- while (h-- > 0) {
- for (x = w; x-- > 0;) {
- *cp++ = PACKW(wp[0],wp[1],wp[2]);
- wp += samplesperpixel;
- }
- cp += toskew;
- wp += fromskew;
- }
-}
-
-/*
- * 16-bit packed samples => RGBA w/ associated alpha
- * (known to have Map == NULL)
- */
-DECLAREContigPutFunc(putRGBAAcontig16bittile)
-{
- int samplesperpixel = img->samplesperpixel;
- uint16 *wp = (uint16 *)pp;
- (void) y;
- fromskew *= samplesperpixel;
- while (h-- > 0) {
- for (x = w; x-- > 0;) {
- *cp++ = PACKW4(wp[0],wp[1],wp[2],wp[3]);
- wp += samplesperpixel;
- }
- cp += toskew;
- wp += fromskew;
- }
-}
-
-/*
- * 16-bit packed samples => RGBA w/ unassociated alpha
- * (known to have Map == NULL)
- */
-DECLAREContigPutFunc(putRGBUAcontig16bittile)
-{
- int samplesperpixel = img->samplesperpixel;
- uint16 *wp = (uint16 *)pp;
- (void) y;
- fromskew *= samplesperpixel;
- while (h-- > 0) {
- uint32 r,g,b,a;
- for (x = w; x-- > 0;) {
- a = W2B(wp[3]);
- r = (a*W2B(wp[0]) + 127) / 255;
- g = (a*W2B(wp[1]) + 127) / 255;
- b = (a*W2B(wp[2]) + 127) / 255;
- *cp++ = PACK4(r,g,b,a);
- wp += samplesperpixel;
- }
- cp += toskew;
- wp += fromskew;
- }
-}
-
-/*
- * 8-bit packed CMYK samples w/o Map => RGB
- *
- * NB: The conversion of CMYK->RGB is *very* crude.
- */
-DECLAREContigPutFunc(putRGBcontig8bitCMYKtile)
-{
- int samplesperpixel = img->samplesperpixel;
- uint16 r, g, b, k;
-
- (void) x; (void) y;
- fromskew *= samplesperpixel;
- while (h-- > 0) {
- UNROLL8(w, NOP,
- k = 255 - pp[3];
- r = (k*(255-pp[0]))/255;
- g = (k*(255-pp[1]))/255;
- b = (k*(255-pp[2]))/255;
- *cp++ = PACK(r, g, b);
- pp += samplesperpixel);
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * 8-bit packed CMYK samples w/Map => RGB
- *
- * NB: The conversion of CMYK->RGB is *very* crude.
- */
-DECLAREContigPutFunc(putRGBcontig8bitCMYKMaptile)
-{
- int samplesperpixel = img->samplesperpixel;
- TIFFRGBValue* Map = img->Map;
- uint16 r, g, b, k;
-
- (void) y;
- fromskew *= samplesperpixel;
- while (h-- > 0) {
- for (x = w; x-- > 0;) {
- k = 255 - pp[3];
- r = (k*(255-pp[0]))/255;
- g = (k*(255-pp[1]))/255;
- b = (k*(255-pp[2]))/255;
- *cp++ = PACK(Map[r], Map[g], Map[b]);
- pp += samplesperpixel;
- }
- pp += fromskew;
- cp += toskew;
- }
-}
-
-#define DECLARESepPutFunc(name) \
-static void name(\
- TIFFRGBAImage* img,\
- uint32* cp,\
- uint32 x, uint32 y, \
- uint32 w, uint32 h,\
- int32 fromskew, int32 toskew,\
- unsigned char* r, unsigned char* g, unsigned char* b, unsigned char* a\
-)
-
-/*
- * 8-bit unpacked samples => RGB
- */
-DECLARESepPutFunc(putRGBseparate8bittile)
-{
- (void) img; (void) x; (void) y; (void) a;
- while (h-- > 0) {
- UNROLL8(w, NOP, *cp++ = PACK(*r++, *g++, *b++));
- SKEW(r, g, b, fromskew);
- cp += toskew;
- }
-}
-
-/*
- * 8-bit unpacked samples => RGBA w/ associated alpha
- */
-DECLARESepPutFunc(putRGBAAseparate8bittile)
-{
- (void) img; (void) x; (void) y;
- while (h-- > 0) {
- UNROLL8(w, NOP, *cp++ = PACK4(*r++, *g++, *b++, *a++));
- SKEW4(r, g, b, a, fromskew);
- cp += toskew;
- }
-}
-
-/*
- * 8-bit unpacked samples => RGBA w/ unassociated alpha
- */
-DECLARESepPutFunc(putRGBUAseparate8bittile)
-{
- (void) img; (void) y;
- while (h-- > 0) {
- uint32 rv, gv, bv, av;
- for (x = w; x-- > 0;) {
- av = *a++;
- rv = (av* *r++ + 127) / 255;
- gv = (av* *g++ + 127) / 255;
- bv = (av* *b++ + 127) / 255;
- *cp++ = PACK4(rv,gv,bv,av);
- }
- SKEW4(r, g, b, a, fromskew);
- cp += toskew;
- }
-}
-
-/*
- * 16-bit unpacked samples => RGB
- */
-DECLARESepPutFunc(putRGBseparate16bittile)
-{
- uint16 *wr = (uint16*) r;
- uint16 *wg = (uint16*) g;
- uint16 *wb = (uint16*) b;
- (void) img; (void) y; (void) a;
- while (h-- > 0) {
- for (x = 0; x < w; x++)
- *cp++ = PACKW(*wr++,*wg++,*wb++);
- SKEW(wr, wg, wb, fromskew);
- cp += toskew;
- }
-}
-
-/*
- * 16-bit unpacked samples => RGBA w/ associated alpha
- */
-DECLARESepPutFunc(putRGBAAseparate16bittile)
-{
- uint16 *wr = (uint16*) r;
- uint16 *wg = (uint16*) g;
- uint16 *wb = (uint16*) b;
- uint16 *wa = (uint16*) a;
- (void) img; (void) y;
- while (h-- > 0) {
- for (x = 0; x < w; x++)
- *cp++ = PACKW4(*wr++,*wg++,*wb++,*wa++);
- SKEW4(wr, wg, wb, wa, fromskew);
- cp += toskew;
- }
-}
-
-/*
- * 16-bit unpacked samples => RGBA w/ unassociated alpha
- */
-DECLARESepPutFunc(putRGBUAseparate16bittile)
-{
- uint16 *wr = (uint16*) r;
- uint16 *wg = (uint16*) g;
- uint16 *wb = (uint16*) b;
- uint16 *wa = (uint16*) a;
- (void) img; (void) y;
- while (h-- > 0) {
- uint32 r,g,b,a;
- for (x = w; x-- > 0;) {
- a = W2B(*wa++);
- r = (a*W2B(*wr++) + 127) / 255;
- g = (a*W2B(*wg++) + 127) / 255;
- b = (a*W2B(*wb++) + 127) / 255;
- *cp++ = PACK4(r,g,b,a);
- }
- SKEW4(wr, wg, wb, wa, fromskew);
- cp += toskew;
- }
-}
-
-/*
- * 8-bit packed CIE L*a*b 1976 samples => RGB
- */
-DECLAREContigPutFunc(putcontig8bitCIELab)
-{
- float X, Y, Z;
- uint32 r, g, b;
- (void) y;
- fromskew *= 3;
- while (h-- > 0) {
- for (x = w; x-- > 0;) {
- TIFFCIELabToXYZ(img->cielab,
- (unsigned char)pp[0],
- (signed char)pp[1],
- (signed char)pp[2],
- &X, &Y, &Z);
- TIFFXYZToRGB(img->cielab, X, Y, Z, &r, &g, &b);
- *cp++ = PACK(r, g, b);
- pp += 3;
- }
- cp += toskew;
- pp += fromskew;
- }
-}
-
-/*
- * YCbCr -> RGB conversion and packing routines.
- */
-
-#define YCbCrtoRGB(dst, Y) { \
- uint32 r, g, b; \
- TIFFYCbCrtoRGB(img->ycbcr, (Y), Cb, Cr, &r, &g, &b); \
- dst = PACK(r, g, b); \
-}
-
-/*
- * 8-bit packed YCbCr samples => RGB
- * This function is generic for different sampling sizes,
- * and can handle blocks sizes that aren't multiples of the
- * sampling size. However, it is substantially less optimized
- * than the specific sampling cases. It is used as a fallback
- * for difficult blocks.
- */
-#ifdef notdef
-static void putcontig8bitYCbCrGenericTile(
- TIFFRGBAImage* img,
- uint32* cp,
- uint32 x, uint32 y,
- uint32 w, uint32 h,
- int32 fromskew, int32 toskew,
- unsigned char* pp,
- int h_group,
- int v_group )
-
-{
- uint32* cp1 = cp+w+toskew;
- uint32* cp2 = cp1+w+toskew;
- uint32* cp3 = cp2+w+toskew;
- int32 incr = 3*w+4*toskew;
- int32 Cb, Cr;
- int group_size = v_group * h_group + 2;
-
- (void) y;
- fromskew = (fromskew * group_size) / h_group;
-
- for( yy = 0; yy < h; yy++ )
- {
- unsigned char *pp_line;
- int y_line_group = yy / v_group;
- int y_remainder = yy - y_line_group * v_group;
-
- pp_line = pp + v_line_group *
-
-
- for( xx = 0; xx < w; xx++ )
- {
- Cb = pp
- }
- }
- for (; h >= 4; h -= 4) {
- x = w>>2;
- do {
- Cb = pp[16];
- Cr = pp[17];
-
- YCbCrtoRGB(cp [0], pp[ 0]);
- YCbCrtoRGB(cp [1], pp[ 1]);
- YCbCrtoRGB(cp [2], pp[ 2]);
- YCbCrtoRGB(cp [3], pp[ 3]);
- YCbCrtoRGB(cp1[0], pp[ 4]);
- YCbCrtoRGB(cp1[1], pp[ 5]);
- YCbCrtoRGB(cp1[2], pp[ 6]);
- YCbCrtoRGB(cp1[3], pp[ 7]);
- YCbCrtoRGB(cp2[0], pp[ 8]);
- YCbCrtoRGB(cp2[1], pp[ 9]);
- YCbCrtoRGB(cp2[2], pp[10]);
- YCbCrtoRGB(cp2[3], pp[11]);
- YCbCrtoRGB(cp3[0], pp[12]);
- YCbCrtoRGB(cp3[1], pp[13]);
- YCbCrtoRGB(cp3[2], pp[14]);
- YCbCrtoRGB(cp3[3], pp[15]);
-
- cp += 4, cp1 += 4, cp2 += 4, cp3 += 4;
- pp += 18;
- } while (--x);
- cp += incr, cp1 += incr, cp2 += incr, cp3 += incr;
- pp += fromskew;
- }
-}
-#endif
-
-/*
- * 8-bit packed YCbCr samples w/ 4,4 subsampling => RGB
- */
-DECLAREContigPutFunc(putcontig8bitYCbCr44tile)
-{
- uint32* cp1 = cp+w+toskew;
- uint32* cp2 = cp1+w+toskew;
- uint32* cp3 = cp2+w+toskew;
- int32 incr = 3*w+4*toskew;
-
- (void) y;
- /* adjust fromskew */
- fromskew = (fromskew * 18) / 4;
- if ((h & 3) == 0 && (w & 3) == 0) {
- for (; h >= 4; h -= 4) {
- x = w>>2;
- do {
- int32 Cb = pp[16];
- int32 Cr = pp[17];
-
- YCbCrtoRGB(cp [0], pp[ 0]);
- YCbCrtoRGB(cp [1], pp[ 1]);
- YCbCrtoRGB(cp [2], pp[ 2]);
- YCbCrtoRGB(cp [3], pp[ 3]);
- YCbCrtoRGB(cp1[0], pp[ 4]);
- YCbCrtoRGB(cp1[1], pp[ 5]);
- YCbCrtoRGB(cp1[2], pp[ 6]);
- YCbCrtoRGB(cp1[3], pp[ 7]);
- YCbCrtoRGB(cp2[0], pp[ 8]);
- YCbCrtoRGB(cp2[1], pp[ 9]);
- YCbCrtoRGB(cp2[2], pp[10]);
- YCbCrtoRGB(cp2[3], pp[11]);
- YCbCrtoRGB(cp3[0], pp[12]);
- YCbCrtoRGB(cp3[1], pp[13]);
- YCbCrtoRGB(cp3[2], pp[14]);
- YCbCrtoRGB(cp3[3], pp[15]);
-
- cp += 4, cp1 += 4, cp2 += 4, cp3 += 4;
- pp += 18;
- } while (--x);
- cp += incr, cp1 += incr, cp2 += incr, cp3 += incr;
- pp += fromskew;
- }
- } else {
- while (h > 0) {
- for (x = w; x > 0;) {
- int32 Cb = pp[16];
- int32 Cr = pp[17];
- switch (x) {
- default:
- switch (h) {
- default: YCbCrtoRGB(cp3[3], pp[15]); /* FALLTHROUGH */
- case 3: YCbCrtoRGB(cp2[3], pp[11]); /* FALLTHROUGH */
- case 2: YCbCrtoRGB(cp1[3], pp[ 7]); /* FALLTHROUGH */
- case 1: YCbCrtoRGB(cp [3], pp[ 3]); /* FALLTHROUGH */
- } /* FALLTHROUGH */
- case 3:
- switch (h) {
- default: YCbCrtoRGB(cp3[2], pp[14]); /* FALLTHROUGH */
- case 3: YCbCrtoRGB(cp2[2], pp[10]); /* FALLTHROUGH */
- case 2: YCbCrtoRGB(cp1[2], pp[ 6]); /* FALLTHROUGH */
- case 1: YCbCrtoRGB(cp [2], pp[ 2]); /* FALLTHROUGH */
- } /* FALLTHROUGH */
- case 2:
- switch (h) {
- default: YCbCrtoRGB(cp3[1], pp[13]); /* FALLTHROUGH */
- case 3: YCbCrtoRGB(cp2[1], pp[ 9]); /* FALLTHROUGH */
- case 2: YCbCrtoRGB(cp1[1], pp[ 5]); /* FALLTHROUGH */
- case 1: YCbCrtoRGB(cp [1], pp[ 1]); /* FALLTHROUGH */
- } /* FALLTHROUGH */
- case 1:
- switch (h) {
- default: YCbCrtoRGB(cp3[0], pp[12]); /* FALLTHROUGH */
- case 3: YCbCrtoRGB(cp2[0], pp[ 8]); /* FALLTHROUGH */
- case 2: YCbCrtoRGB(cp1[0], pp[ 4]); /* FALLTHROUGH */
- case 1: YCbCrtoRGB(cp [0], pp[ 0]); /* FALLTHROUGH */
- } /* FALLTHROUGH */
- }
- if (x < 4) {
- cp += x; cp1 += x; cp2 += x; cp3 += x;
- x = 0;
- }
- else {
- cp += 4; cp1 += 4; cp2 += 4; cp3 += 4;
- x -= 4;
- }
- pp += 18;
- }
- if (h <= 4)
- break;
- h -= 4;
- cp += incr, cp1 += incr, cp2 += incr, cp3 += incr;
- pp += fromskew;
- }
- }
-}
-
-/*
- * 8-bit packed YCbCr samples w/ 4,2 subsampling => RGB
- */
-DECLAREContigPutFunc(putcontig8bitYCbCr42tile)
-{
- uint32* cp1 = cp+w+toskew;
- int32 incr = 2*toskew+w;
-
- (void) y;
- fromskew = (fromskew * 10) / 4;
- if ((h & 3) == 0 && (w & 1) == 0) {
- for (; h >= 2; h -= 2) {
- x = w>>2;
- do {
- int32 Cb = pp[8];
- int32 Cr = pp[9];
-
- YCbCrtoRGB(cp [0], pp[0]);
- YCbCrtoRGB(cp [1], pp[1]);
- YCbCrtoRGB(cp [2], pp[2]);
- YCbCrtoRGB(cp [3], pp[3]);
- YCbCrtoRGB(cp1[0], pp[4]);
- YCbCrtoRGB(cp1[1], pp[5]);
- YCbCrtoRGB(cp1[2], pp[6]);
- YCbCrtoRGB(cp1[3], pp[7]);
-
- cp += 4, cp1 += 4;
- pp += 10;
- } while (--x);
- cp += incr, cp1 += incr;
- pp += fromskew;
- }
- } else {
- while (h > 0) {
- for (x = w; x > 0;) {
- int32 Cb = pp[8];
- int32 Cr = pp[9];
- switch (x) {
- default:
- switch (h) {
- default: YCbCrtoRGB(cp1[3], pp[ 7]); /* FALLTHROUGH */
- case 1: YCbCrtoRGB(cp [3], pp[ 3]); /* FALLTHROUGH */
- } /* FALLTHROUGH */
- case 3:
- switch (h) {
- default: YCbCrtoRGB(cp1[2], pp[ 6]); /* FALLTHROUGH */
- case 1: YCbCrtoRGB(cp [2], pp[ 2]); /* FALLTHROUGH */
- } /* FALLTHROUGH */
- case 2:
- switch (h) {
- default: YCbCrtoRGB(cp1[1], pp[ 5]); /* FALLTHROUGH */
- case 1: YCbCrtoRGB(cp [1], pp[ 1]); /* FALLTHROUGH */
- } /* FALLTHROUGH */
- case 1:
- switch (h) {
- default: YCbCrtoRGB(cp1[0], pp[ 4]); /* FALLTHROUGH */
- case 1: YCbCrtoRGB(cp [0], pp[ 0]); /* FALLTHROUGH */
- } /* FALLTHROUGH */
- }
- if (x < 4) {
- cp += x; cp1 += x;
- x = 0;
- }
- else {
- cp += 4; cp1 += 4;
- x -= 4;
- }
- pp += 10;
- }
- if (h <= 2)
- break;
- h -= 2;
- cp += incr, cp1 += incr;
- pp += fromskew;
- }
- }
-}
-
-/*
- * 8-bit packed YCbCr samples w/ 4,1 subsampling => RGB
- */
-DECLAREContigPutFunc(putcontig8bitYCbCr41tile)
-{
- (void) y;
- /* XXX adjust fromskew */
- do {
- x = w>>2;
- do {
- int32 Cb = pp[4];
- int32 Cr = pp[5];
-
- YCbCrtoRGB(cp [0], pp[0]);
- YCbCrtoRGB(cp [1], pp[1]);
- YCbCrtoRGB(cp [2], pp[2]);
- YCbCrtoRGB(cp [3], pp[3]);
-
- cp += 4;
- pp += 6;
- } while (--x);
-
- if( (w&3) != 0 )
- {
- int32 Cb = pp[4];
- int32 Cr = pp[5];
-
- switch( (w&3) ) {
- case 3: YCbCrtoRGB(cp [2], pp[2]);
- case 2: YCbCrtoRGB(cp [1], pp[1]);
- case 1: YCbCrtoRGB(cp [0], pp[0]);
- case 0: break;
- }
-
- cp += (w&3);
- pp += 6;
- }
-
- cp += toskew;
- pp += fromskew;
- } while (--h);
-
-}
-
-/*
- * 8-bit packed YCbCr samples w/ 2,2 subsampling => RGB
- */
-DECLAREContigPutFunc(putcontig8bitYCbCr22tile)
-{
- uint32* cp2;
- (void) y;
- fromskew = (fromskew / 2) * 6;
- cp2 = cp+w+toskew;
- while (h>=2) {
- x = w;
- while (x>=2) {
- uint32 Cb = pp[4];
- uint32 Cr = pp[5];
- YCbCrtoRGB(cp[0], pp[0]);
- YCbCrtoRGB(cp[1], pp[1]);
- YCbCrtoRGB(cp2[0], pp[2]);
- YCbCrtoRGB(cp2[1], pp[3]);
- cp += 2;
- cp2 += 2;
- pp += 6;
- x -= 2;
- }
- if (x==1) {
- uint32 Cb = pp[4];
- uint32 Cr = pp[5];
- YCbCrtoRGB(cp[0], pp[0]);
- YCbCrtoRGB(cp2[0], pp[2]);
- cp ++ ;
- cp2 ++ ;
- pp += 6;
- }
- cp += toskew*2+w;
- cp2 += toskew*2+w;
- pp += fromskew;
- h-=2;
- }
- if (h==1) {
- x = w;
- while (x>=2) {
- uint32 Cb = pp[4];
- uint32 Cr = pp[5];
- YCbCrtoRGB(cp[0], pp[0]);
- YCbCrtoRGB(cp[1], pp[1]);
- cp += 2;
- cp2 += 2;
- pp += 6;
- x -= 2;
- }
- if (x==1) {
- uint32 Cb = pp[4];
- uint32 Cr = pp[5];
- YCbCrtoRGB(cp[0], pp[0]);
- }
- }
-}
-
-/*
- * 8-bit packed YCbCr samples w/ 2,1 subsampling => RGB
- */
-DECLAREContigPutFunc(putcontig8bitYCbCr21tile)
-{
- (void) y;
- fromskew = (fromskew * 4) / 2;
- do {
- x = w>>1;
- do {
- int32 Cb = pp[2];
- int32 Cr = pp[3];
-
- YCbCrtoRGB(cp[0], pp[0]);
- YCbCrtoRGB(cp[1], pp[1]);
-
- cp += 2;
- pp += 4;
- } while (--x);
-
- if( (w&1) != 0 )
- {
- int32 Cb = pp[2];
- int32 Cr = pp[3];
-
- YCbCrtoRGB(cp[0], pp[0]);
-
- cp += 1;
- pp += 4;
- }
-
- cp += toskew;
- pp += fromskew;
- } while (--h);
-}
-
-/*
- * 8-bit packed YCbCr samples w/ 1,2 subsampling => RGB
- */
-DECLAREContigPutFunc(putcontig8bitYCbCr12tile)
-{
- uint32* cp2;
- (void) y;
- fromskew = (fromskew / 2) * 4;
- cp2 = cp+w+toskew;
- while (h>=2) {
- x = w;
- do {
- uint32 Cb = pp[2];
- uint32 Cr = pp[3];
- YCbCrtoRGB(cp[0], pp[0]);
- YCbCrtoRGB(cp2[0], pp[1]);
- cp ++;
- cp2 ++;
- pp += 4;
- } while (--x);
- cp += toskew*2+w;
- cp2 += toskew*2+w;
- pp += fromskew;
- h-=2;
- }
- if (h==1) {
- x = w;
- do {
- uint32 Cb = pp[2];
- uint32 Cr = pp[3];
- YCbCrtoRGB(cp[0], pp[0]);
- cp ++;
- pp += 4;
- } while (--x);
- }
-}
-
-/*
- * 8-bit packed YCbCr samples w/ no subsampling => RGB
- */
-DECLAREContigPutFunc(putcontig8bitYCbCr11tile)
-{
- (void) y;
- fromskew *= 3;
- do {
- x = w; /* was x = w>>1; patched 2000/09/25 warmerda@home.com */
- do {
- int32 Cb = pp[1];
- int32 Cr = pp[2];
-
- YCbCrtoRGB(*cp++, pp[0]);
-
- pp += 3;
- } while (--x);
- cp += toskew;
- pp += fromskew;
- } while (--h);
-}
-
-/*
- * 8-bit packed YCbCr samples w/ no subsampling => RGB
- */
-DECLARESepPutFunc(putseparate8bitYCbCr11tile)
-{
- (void) y;
- (void) a;
- /* TODO: naming of input vars is still off, change obfuscating declaration inside define, or resolve obfuscation */
- while (h-- > 0) {
- x = w;
- do {
- uint32 dr, dg, db;
- TIFFYCbCrtoRGB(img->ycbcr,*r++,*g++,*b++,&dr,&dg,&db);
- *cp++ = PACK(dr,dg,db);
- } while (--x);
- SKEW(r, g, b, fromskew);
- cp += toskew;
- }
-}
-#undef YCbCrtoRGB
-
-static int
-initYCbCrConversion(TIFFRGBAImage* img)
-{
- static char module[] = "initYCbCrConversion";
-
- float *luma, *refBlackWhite;
-
- if (img->ycbcr == NULL) {
- img->ycbcr = (TIFFYCbCrToRGB*) _TIFFmalloc(
- TIFFroundup(sizeof (TIFFYCbCrToRGB), sizeof (long))
- + 4*256*sizeof (TIFFRGBValue)
- + 2*256*sizeof (int)
- + 3*256*sizeof (int32)
- );
- if (img->ycbcr == NULL) {
- TIFFErrorExt(img->tif->tif_clientdata, module,
- "No space for YCbCr->RGB conversion state");
- return (0);
- }
- }
-
- TIFFGetFieldDefaulted(img->tif, TIFFTAG_YCBCRCOEFFICIENTS, &luma);
- TIFFGetFieldDefaulted(img->tif, TIFFTAG_REFERENCEBLACKWHITE,
- &refBlackWhite);
- if (TIFFYCbCrToRGBInit(img->ycbcr, luma, refBlackWhite) < 0)
- return(0);
- return (1);
-}
-
-static tileContigRoutine
-initCIELabConversion(TIFFRGBAImage* img)
-{
- static char module[] = "initCIELabConversion";
-
- float *whitePoint;
- float refWhite[3];
-
- if (!img->cielab) {
- img->cielab = (TIFFCIELabToRGB *)
- _TIFFmalloc(sizeof(TIFFCIELabToRGB));
- if (!img->cielab) {
- TIFFErrorExt(img->tif->tif_clientdata, module,
- "No space for CIE L*a*b*->RGB conversion state.");
- return NULL;
- }
- }
-
- TIFFGetFieldDefaulted(img->tif, TIFFTAG_WHITEPOINT, &whitePoint);
- refWhite[1] = 100.0F;
- refWhite[0] = whitePoint[0] / whitePoint[1] * refWhite[1];
- refWhite[2] = (1.0F - whitePoint[0] - whitePoint[1])
- / whitePoint[1] * refWhite[1];
- if (TIFFCIELabToRGBInit(img->cielab, &display_sRGB, refWhite) < 0) {
- TIFFErrorExt(img->tif->tif_clientdata, module,
- "Failed to initialize CIE L*a*b*->RGB conversion state.");
- _TIFFfree(img->cielab);
- return NULL;
- }
-
- return putcontig8bitCIELab;
-}
-
-/*
- * Greyscale images with less than 8 bits/sample are handled
- * with a table to avoid lots of shifts and masks. The table
- * is setup so that put*bwtile (below) can retrieve 8/bitspersample
- * pixel values simply by indexing into the table with one
- * number.
- */
-static int
-makebwmap(TIFFRGBAImage* img)
-{
- TIFFRGBValue* Map = img->Map;
- int bitspersample = img->bitspersample;
- int nsamples = 8 / bitspersample;
- int i;
- uint32* p;
-
- if( nsamples == 0 )
- nsamples = 1;
-
- img->BWmap = (uint32**) _TIFFmalloc(
- 256*sizeof (uint32 *)+(256*nsamples*sizeof(uint32)));
- if (img->BWmap == NULL) {
- TIFFErrorExt(img->tif->tif_clientdata, TIFFFileName(img->tif), "No space for B&W mapping table");
- return (0);
- }
- p = (uint32*)(img->BWmap + 256);
- for (i = 0; i < 256; i++) {
- TIFFRGBValue c;
- img->BWmap[i] = p;
- switch (bitspersample) {
-#define GREY(x) c = Map[x]; *p++ = PACK(c,c,c);
- case 1:
- GREY(i>>7);
- GREY((i>>6)&1);
- GREY((i>>5)&1);
- GREY((i>>4)&1);
- GREY((i>>3)&1);
- GREY((i>>2)&1);
- GREY((i>>1)&1);
- GREY(i&1);
- break;
- case 2:
- GREY(i>>6);
- GREY((i>>4)&3);
- GREY((i>>2)&3);
- GREY(i&3);
- break;
- case 4:
- GREY(i>>4);
- GREY(i&0xf);
- break;
- case 8:
- case 16:
- GREY(i);
- break;
- }
-#undef GREY
- }
- return (1);
-}
-
-/*
- * Construct a mapping table to convert from the range
- * of the data samples to [0,255] --for display. This
- * process also handles inverting B&W images when needed.
- */
-static int
-setupMap(TIFFRGBAImage* img)
-{
- int32 x, range;
-
- range = (int32)((1L<<img->bitspersample)-1);
-
- /* treat 16 bit the same as eight bit */
- if( img->bitspersample == 16 )
- range = (int32) 255;
-
- img->Map = (TIFFRGBValue*) _TIFFmalloc((range+1) * sizeof (TIFFRGBValue));
- if (img->Map == NULL) {
- TIFFErrorExt(img->tif->tif_clientdata, TIFFFileName(img->tif),
- "No space for photometric conversion table");
- return (0);
- }
- if (img->photometric == PHOTOMETRIC_MINISWHITE) {
- for (x = 0; x <= range; x++)
- img->Map[x] = (TIFFRGBValue) (((range - x) * 255) / range);
- } else {
- for (x = 0; x <= range; x++)
- img->Map[x] = (TIFFRGBValue) ((x * 255) / range);
- }
- if (img->bitspersample <= 16 &&
- (img->photometric == PHOTOMETRIC_MINISBLACK ||
- img->photometric == PHOTOMETRIC_MINISWHITE)) {
- /*
- * Use photometric mapping table to construct
- * unpacking tables for samples <= 8 bits.
- */
- if (!makebwmap(img))
- return (0);
- /* no longer need Map, free it */
- _TIFFfree(img->Map), img->Map = NULL;
- }
- return (1);
-}
-
-static int
-checkcmap(TIFFRGBAImage* img)
-{
- uint16* r = img->redcmap;
- uint16* g = img->greencmap;
- uint16* b = img->bluecmap;
- long n = 1L<<img->bitspersample;
-
- while (n-- > 0)
- if (*r++ >= 256 || *g++ >= 256 || *b++ >= 256)
- return (16);
- return (8);
-}
-
-static void
-cvtcmap(TIFFRGBAImage* img)
-{
- uint16* r = img->redcmap;
- uint16* g = img->greencmap;
- uint16* b = img->bluecmap;
- long i;
-
- for (i = (1L<<img->bitspersample)-1; i >= 0; i--) {
-#define CVT(x) ((uint16)((x)>>8))
- r[i] = CVT(r[i]);
- g[i] = CVT(g[i]);
- b[i] = CVT(b[i]);
-#undef CVT
- }
-}
-
-/*
- * Palette images with <= 8 bits/sample are handled
- * with a table to avoid lots of shifts and masks. The table
- * is setup so that put*cmaptile (below) can retrieve 8/bitspersample
- * pixel values simply by indexing into the table with one
- * number.
- */
-static int
-makecmap(TIFFRGBAImage* img)
-{
- int bitspersample = img->bitspersample;
- int nsamples = 8 / bitspersample;
- uint16* r = img->redcmap;
- uint16* g = img->greencmap;
- uint16* b = img->bluecmap;
- uint32 *p;
- int i;
-
- img->PALmap = (uint32**) _TIFFmalloc(
- 256*sizeof (uint32 *)+(256*nsamples*sizeof(uint32)));
- if (img->PALmap == NULL) {
- TIFFErrorExt(img->tif->tif_clientdata, TIFFFileName(img->tif), "No space for Palette mapping table");
- return (0);
- }
- p = (uint32*)(img->PALmap + 256);
- for (i = 0; i < 256; i++) {
- TIFFRGBValue c;
- img->PALmap[i] = p;
-#define CMAP(x) c = (TIFFRGBValue) x; *p++ = PACK(r[c]&0xff, g[c]&0xff, b[c]&0xff);
- switch (bitspersample) {
- case 1:
- CMAP(i>>7);
- CMAP((i>>6)&1);
- CMAP((i>>5)&1);
- CMAP((i>>4)&1);
- CMAP((i>>3)&1);
- CMAP((i>>2)&1);
- CMAP((i>>1)&1);
- CMAP(i&1);
- break;
- case 2:
- CMAP(i>>6);
- CMAP((i>>4)&3);
- CMAP((i>>2)&3);
- CMAP(i&3);
- break;
- case 4:
- CMAP(i>>4);
- CMAP(i&0xf);
- break;
- case 8:
- CMAP(i);
- break;
- }
-#undef CMAP
- }
- return (1);
-}
-
-/*
- * Construct any mapping table used
- * by the associated put routine.
- */
-static int
-buildMap(TIFFRGBAImage* img)
-{
- switch (img->photometric) {
- case PHOTOMETRIC_RGB:
- case PHOTOMETRIC_YCBCR:
- case PHOTOMETRIC_SEPARATED:
- if (img->bitspersample == 8)
- break;
- /* fall thru... */
- case PHOTOMETRIC_MINISBLACK:
- case PHOTOMETRIC_MINISWHITE:
- if (!setupMap(img))
- return (0);
- break;
- case PHOTOMETRIC_PALETTE:
- /*
- * Convert 16-bit colormap to 8-bit (unless it looks
- * like an old-style 8-bit colormap).
- */
- if (checkcmap(img) == 16)
- cvtcmap(img);
- else
- TIFFWarningExt(img->tif->tif_clientdata, TIFFFileName(img->tif), "Assuming 8-bit colormap");
- /*
- * Use mapping table and colormap to construct
- * unpacking tables for samples < 8 bits.
- */
- if (img->bitspersample <= 8 && !makecmap(img))
- return (0);
- break;
- }
- return (1);
-}
-
-/*
- * Select the appropriate conversion routine for packed data.
- */
-static int
-PickContigCase(TIFFRGBAImage* img)
-{
- img->get = TIFFIsTiled(img->tif) ? gtTileContig : gtStripContig;
- img->put.contig = NULL;
- switch (img->photometric) {
- case PHOTOMETRIC_RGB:
- switch (img->bitspersample) {
- case 8:
- if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
- img->put.contig = putRGBAAcontig8bittile;
- else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
- {
- img->put.contig = putRGBUAcontig8bittile;
- }
- else
- img->put.contig = putRGBcontig8bittile;
- break;
- case 16:
- if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
- {
- img->put.contig = putRGBAAcontig16bittile;
- }
- else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
- {
- img->put.contig = putRGBUAcontig16bittile;
- }
- else
- {
- img->put.contig = putRGBcontig16bittile;
- }
- break;
- }
- break;
- case PHOTOMETRIC_SEPARATED:
- if (buildMap(img)) {
- if (img->bitspersample == 8) {
- if (!img->Map)
- img->put.contig = putRGBcontig8bitCMYKtile;
- else
- img->put.contig = putRGBcontig8bitCMYKMaptile;
- }
- }
- break;
- case PHOTOMETRIC_PALETTE:
- if (buildMap(img)) {
- switch (img->bitspersample) {
- case 8:
- img->put.contig = put8bitcmaptile;
- break;
- case 4:
- img->put.contig = put4bitcmaptile;
- break;
- case 2:
- img->put.contig = put2bitcmaptile;
- break;
- case 1:
- img->put.contig = put1bitcmaptile;
- break;
- }
- }
- break;
- case PHOTOMETRIC_MINISWHITE:
- case PHOTOMETRIC_MINISBLACK:
- if (buildMap(img)) {
- switch (img->bitspersample) {
- case 16:
- img->put.contig = put16bitbwtile;
- break;
- case 8:
- img->put.contig = putgreytile;
- break;
- case 4:
- img->put.contig = put4bitbwtile;
- break;
- case 2:
- img->put.contig = put2bitbwtile;
- break;
- case 1:
- img->put.contig = put1bitbwtile;
- break;
- }
- }
- break;
- case PHOTOMETRIC_YCBCR:
- if (img->bitspersample == 8)
- {
- if (initYCbCrConversion(img)!=0)
- {
- /*
- * The 6.0 spec says that subsampling must be
- * one of 1, 2, or 4, and that vertical subsampling
- * must always be <= horizontal subsampling; so
- * there are only a few possibilities and we just
- * enumerate the cases.
- * Joris: added support for the [1,2] case, nonetheless, to accomodate
- * some OJPEG files
- */
- uint16 SubsamplingHor;
- uint16 SubsamplingVer;
- TIFFGetFieldDefaulted(img->tif, TIFFTAG_YCBCRSUBSAMPLING, &SubsamplingHor, &SubsamplingVer);
- switch ((SubsamplingHor<<4)|SubsamplingVer) {
- case 0x44:
- img->put.contig = putcontig8bitYCbCr44tile;
- break;
- case 0x42:
- img->put.contig = putcontig8bitYCbCr42tile;
- break;
- case 0x41:
- img->put.contig = putcontig8bitYCbCr41tile;
- break;
- case 0x22:
- img->put.contig = putcontig8bitYCbCr22tile;
- break;
- case 0x21:
- img->put.contig = putcontig8bitYCbCr21tile;
- break;
- case 0x12:
- img->put.contig = putcontig8bitYCbCr12tile;
- break;
- case 0x11:
- img->put.contig = putcontig8bitYCbCr11tile;
- break;
- }
- }
- }
- break;
- case PHOTOMETRIC_CIELAB:
- if (buildMap(img)) {
- if (img->bitspersample == 8)
- img->put.contig = initCIELabConversion(img);
- break;
- }
- }
- return ((img->get!=NULL) && (img->put.contig!=NULL));
-}
-
-/*
- * Select the appropriate conversion routine for unpacked data.
- *
- * NB: we assume that unpacked single channel data is directed
- * to the "packed routines.
- */
-static int
-PickSeparateCase(TIFFRGBAImage* img)
-{
- img->get = TIFFIsTiled(img->tif) ? gtTileSeparate : gtStripSeparate;
- img->put.separate = NULL;
- switch (img->photometric) {
- case PHOTOMETRIC_RGB:
- switch (img->bitspersample) {
- case 8:
- if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
- img->put.separate = putRGBAAseparate8bittile;
- else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
- {
- img->put.separate = putRGBUAseparate8bittile;
- }
- else
- img->put.separate = putRGBseparate8bittile;
- break;
- case 16:
- if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
- {
- img->put.separate = putRGBAAseparate16bittile;
- }
- else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
- {
- img->put.separate = putRGBUAseparate16bittile;
- }
- else
- {
- img->put.separate = putRGBseparate16bittile;
- }
- break;
- }
- break;
- case PHOTOMETRIC_YCBCR:
- if ((img->bitspersample==8) && (img->samplesperpixel==3))
- {
- if (initYCbCrConversion(img)!=0)
- {
- uint16 hs, vs;
- TIFFGetFieldDefaulted(img->tif, TIFFTAG_YCBCRSUBSAMPLING, &hs, &vs);
- switch ((hs<<4)|vs) {
- case 0x11:
- img->put.separate = putseparate8bitYCbCr11tile;
- break;
- /* TODO: add other cases here */
- }
- }
- }
- break;
- }
- return ((img->get!=NULL) && (img->put.separate!=NULL));
-}
-
-/*
- * Read a whole strip off data from the file, and convert to RGBA form.
- * If this is the last strip, then it will only contain the portion of
- * the strip that is actually within the image space. The result is
- * organized in bottom to top form.
- */
-
-
-int
-TIFFReadRGBAStrip(TIFF* tif, uint32 row, uint32 * raster )
-
-{
- char emsg[1024] = "";
- TIFFRGBAImage img;
- int ok;
- uint32 rowsperstrip, rows_to_read;
-
- if( TIFFIsTiled( tif ) )
- {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif),
- "Can't use TIFFReadRGBAStrip() with tiled file.");
- return (0);
- }
-
- TIFFGetFieldDefaulted(tif, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
- if( (row % rowsperstrip) != 0 )
- {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif),
- "Row passed to TIFFReadRGBAStrip() must be first in a strip.");
- return (0);
- }
-
- if (TIFFRGBAImageOK(tif, emsg) && TIFFRGBAImageBegin(&img, tif, 0, emsg)) {
-
- img.row_offset = row;
- img.col_offset = 0;
-
- if( row + rowsperstrip > img.height )
- rows_to_read = img.height - row;
- else
- rows_to_read = rowsperstrip;
-
- ok = TIFFRGBAImageGet(&img, raster, img.width, rows_to_read );
-
- TIFFRGBAImageEnd(&img);
- } else {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "%s", emsg);
- ok = 0;
- }
-
- return (ok);
-}
-
-/*
- * Read a whole tile off data from the file, and convert to RGBA form.
- * The returned RGBA data is organized from bottom to top of tile,
- * and may include zeroed areas if the tile extends off the image.
- */
-
-int
-TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster)
-
-{
- char emsg[1024] = "";
- TIFFRGBAImage img;
- int ok;
- uint32 tile_xsize, tile_ysize;
- uint32 read_xsize, read_ysize;
- uint32 i_row;
-
- /*
- * Verify that our request is legal - on a tile file, and on a
- * tile boundary.
- */
-
- if( !TIFFIsTiled( tif ) )
- {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif),
- "Can't use TIFFReadRGBATile() with stripped file.");
- return (0);
- }
-
- TIFFGetFieldDefaulted(tif, TIFFTAG_TILEWIDTH, &tile_xsize);
- TIFFGetFieldDefaulted(tif, TIFFTAG_TILELENGTH, &tile_ysize);
- if( (col % tile_xsize) != 0 || (row % tile_ysize) != 0 )
- {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif),
- "Row/col passed to TIFFReadRGBATile() must be top"
- "left corner of a tile.");
- return (0);
- }
-
- /*
- * Setup the RGBA reader.
- */
-
- if (!TIFFRGBAImageOK(tif, emsg)
- || !TIFFRGBAImageBegin(&img, tif, 0, emsg)) {
- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "%s", emsg);
- return( 0 );
- }
-
- /*
- * The TIFFRGBAImageGet() function doesn't allow us to get off the
- * edge of the image, even to fill an otherwise valid tile. So we
- * figure out how much we can read, and fix up the tile buffer to
- * a full tile configuration afterwards.
- */
-
- if( row + tile_ysize > img.height )
- read_ysize = img.height - row;
- else
- read_ysize = tile_ysize;
-
- if( col + tile_xsize > img.width )
- read_xsize = img.width - col;
- else
- read_xsize = tile_xsize;
-
- /*
- * Read the chunk of imagery.
- */
-
- img.row_offset = row;
- img.col_offset = col;
-
- ok = TIFFRGBAImageGet(&img, raster, read_xsize, read_ysize );
-
- TIFFRGBAImageEnd(&img);
-
- /*
- * If our read was incomplete we will need to fix up the tile by
- * shifting the data around as if a full tile of data is being returned.
- *
- * This is all the more complicated because the image is organized in
- * bottom to top format.
- */
-
- if( read_xsize == tile_xsize && read_ysize == tile_ysize )
- return( ok );
-
- for( i_row = 0; i_row < read_ysize; i_row++ ) {
- memmove( raster + (tile_ysize - i_row - 1) * tile_xsize,
- raster + (read_ysize - i_row - 1) * read_xsize,
- read_xsize * sizeof(uint32) );
- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize+read_xsize,
- 0, sizeof(uint32) * (tile_xsize - read_xsize) );
- }
-
- for( i_row = read_ysize; i_row < tile_ysize; i_row++ ) {
- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize,
- 0, sizeof(uint32) * tile_xsize );
- }
-
- return (ok);
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_jbig.c b/src/3rdparty/libtiff/libtiff/tif_jbig.c
deleted file mode 100644
index 99183ba74e..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_jbig.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* $Id: tif_jbig.c,v 1.2.2.2 2008-10-21 13:13:07 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * JBIG Compression Algorithm Support.
- * Contributed by Lee Howard <faxguy@deanox.com>
- *
- */
-
-#include "tiffiop.h"
-
-#ifdef JBIG_SUPPORT
-#include "jbig.h"
-
-typedef struct
-{
- uint32 recvparams; /* encoded Class 2 session params */
- char* subaddress; /* subaddress string */
- uint32 recvtime; /* time spend receiving in seconds */
- char* faxdcs; /* encoded fax parameters (DCS, Table 2/T.30) */
-
- TIFFVGetMethod vgetparent;
- TIFFVSetMethod vsetparent;
-} JBIGState;
-
-#define GetJBIGState(tif) ((JBIGState*)(tif)->tif_data)
-
-#define FIELD_RECVPARAMS (FIELD_CODEC+0)
-#define FIELD_SUBADDRESS (FIELD_CODEC+1)
-#define FIELD_RECVTIME (FIELD_CODEC+2)
-#define FIELD_FAXDCS (FIELD_CODEC+3)
-
-static const TIFFFieldInfo jbigFieldInfo[] =
-{
- {TIFFTAG_FAXRECVPARAMS, 1, 1, TIFF_LONG, FIELD_RECVPARAMS, TRUE, FALSE, "FaxRecvParams"},
- {TIFFTAG_FAXSUBADDRESS, -1, -1, TIFF_ASCII, FIELD_SUBADDRESS, TRUE, FALSE, "FaxSubAddress"},
- {TIFFTAG_FAXRECVTIME, 1, 1, TIFF_LONG, FIELD_RECVTIME, TRUE, FALSE, "FaxRecvTime"},
- {TIFFTAG_FAXDCS, -1, -1, TIFF_ASCII, FIELD_FAXDCS, TRUE, FALSE, "FaxDcs"},
-};
-
-static int JBIGSetupDecode(TIFF* tif)
-{
- if (TIFFNumberOfStrips(tif) != 1)
- {
- TIFFError("JBIG", "Multistrip images not supported in decoder");
- return 0;
- }
-
- return 1;
-}
-
-static int JBIGDecode(TIFF* tif, tidata_t buffer, tsize_t size, tsample_t s)
-{
- struct jbg_dec_state decoder;
- int decodeStatus = 0;
- unsigned char* pImage = NULL;
- (void) size, (void) s;
-
- if (isFillOrder(tif, tif->tif_dir.td_fillorder))
- {
- TIFFReverseBits(tif->tif_rawdata, tif->tif_rawdatasize);
- }
-
- jbg_dec_init(&decoder);
-
-#if defined(HAVE_JBG_NEWLEN)
- jbg_newlen(tif->tif_rawdata, tif->tif_rawdatasize);
- /*
- * I do not check the return status of jbg_newlen because even if this
- * function fails it does not necessarily mean that decoding the image
- * will fail. It is generally only needed for received fax images
- * that do not contain the actual length of the image in the BIE
- * header. I do not log when an error occurs because that will cause
- * problems when converting JBIG encoded TIFF's to
- * PostScript. As long as the actual image length is contained in the
- * BIE header jbg_dec_in should succeed.
- */
-#endif /* HAVE_JBG_NEWLEN */
-
- decodeStatus = jbg_dec_in(&decoder, tif->tif_rawdata,
- tif->tif_rawdatasize, NULL);
- if (JBG_EOK != decodeStatus)
- {
- /*
- * XXX: JBG_EN constant was defined in pre-2.0 releases of the
- * JBIG-KIT. Since the 2.0 the error reporting functions were
- * changed. We will handle both cases here.
- */
- TIFFError("JBIG", "Error (%d) decoding: %s", decodeStatus,
-#if defined(JBG_EN)
- jbg_strerror(decodeStatus, JBG_EN)
-#else
- jbg_strerror(decodeStatus)
-#endif
- );
- return 0;
- }
-
- pImage = jbg_dec_getimage(&decoder, 0);
- _TIFFmemcpy(buffer, pImage, jbg_dec_getsize(&decoder));
- jbg_dec_free(&decoder);
- return 1;
-}
-
-static int JBIGSetupEncode(TIFF* tif)
-{
- if (TIFFNumberOfStrips(tif) != 1)
- {
- TIFFError("JBIG", "Multistrip images not supported in encoder");
- return 0;
- }
-
- return 1;
-}
-
-static int JBIGCopyEncodedData(TIFF* tif, tidata_t pp, tsize_t cc, tsample_t s)
-{
- (void) s;
- while (cc > 0)
- {
- tsize_t n = cc;
-
- if (tif->tif_rawcc + n > tif->tif_rawdatasize)
- {
- n = tif->tif_rawdatasize - tif->tif_rawcc;
- }
-
- assert(n > 0);
- _TIFFmemcpy(tif->tif_rawcp, pp, n);
- tif->tif_rawcp += n;
- tif->tif_rawcc += n;
- pp += n;
- cc -= n;
- if (tif->tif_rawcc >= tif->tif_rawdatasize &&
- !TIFFFlushData1(tif))
- {
- return (-1);
- }
- }
-
- return (1);
-}
-
-static void JBIGOutputBie(unsigned char* buffer, size_t len, void *userData)
-{
- TIFF* tif = (TIFF*)userData;
-
- if (isFillOrder(tif, tif->tif_dir.td_fillorder))
- {
- TIFFReverseBits(buffer, len);
- }
-
- JBIGCopyEncodedData(tif, buffer, len, 0);
-}
-
-static int JBIGEncode(TIFF* tif, tidata_t buffer, tsize_t size, tsample_t s)
-{
- TIFFDirectory* dir = &tif->tif_dir;
- struct jbg_enc_state encoder;
-
- (void) size, (void) s;
-
- jbg_enc_init(&encoder,
- dir->td_imagewidth,
- dir->td_imagelength,
- 1,
- &buffer,
- JBIGOutputBie,
- tif);
- /*
- * jbg_enc_out does the "real" encoding. As data is encoded,
- * JBIGOutputBie is called, which writes the data to the directory.
- */
- jbg_enc_out(&encoder);
- jbg_enc_free(&encoder);
-
- return 1;
-}
-
-static void JBIGCleanup(TIFF* tif)
-{
- JBIGState *sp = GetJBIGState(tif);
-
- assert(sp != 0);
-
- tif->tif_tagmethods.vgetfield = sp->vgetparent;
- tif->tif_tagmethods.vsetfield = sp->vsetparent;
-
- _TIFFfree(tif->tif_data);
- tif->tif_data = NULL;
-
- _TIFFSetDefaultCompressionState(tif);
-}
-
-static void JBIGPrintDir(TIFF* tif, FILE* fd, long flags)
-{
- JBIGState* codec = GetJBIGState(tif);
- (void)flags;
-
- if (TIFFFieldSet(tif, FIELD_RECVPARAMS))
- {
- fprintf(fd,
- " Fax Receive Parameters: %08lx\n",
- (unsigned long)codec->recvparams);
- }
-
- if (TIFFFieldSet(tif, FIELD_SUBADDRESS))
- {
- fprintf(fd,
- " Fax SubAddress: %s\n",
- codec->subaddress);
- }
-
- if (TIFFFieldSet(tif, FIELD_RECVTIME))
- {
- fprintf(fd,
- " Fax Receive Time: %lu secs\n",
- (unsigned long)codec->recvtime);
- }
-
- if (TIFFFieldSet(tif, FIELD_FAXDCS))
- {
- fprintf(fd,
- " Fax DCS: %s\n",
- codec->faxdcs);
- }
-}
-
-static int JBIGVGetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- JBIGState* codec = GetJBIGState(tif);
-
- switch (tag)
- {
- case TIFFTAG_FAXRECVPARAMS:
- *va_arg(ap, uint32*) = codec->recvparams;
- break;
-
- case TIFFTAG_FAXSUBADDRESS:
- *va_arg(ap, char**) = codec->subaddress;
- break;
-
- case TIFFTAG_FAXRECVTIME:
- *va_arg(ap, uint32*) = codec->recvtime;
- break;
-
- case TIFFTAG_FAXDCS:
- *va_arg(ap, char**) = codec->faxdcs;
- break;
-
- default:
- return (*codec->vgetparent)(tif, tag, ap);
- }
-
- return 1;
-}
-
-static int JBIGVSetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- JBIGState* codec = GetJBIGState(tif);
-
- switch (tag)
- {
- case TIFFTAG_FAXRECVPARAMS:
- codec->recvparams = va_arg(ap, uint32);
- break;
-
- case TIFFTAG_FAXSUBADDRESS:
- _TIFFsetString(&codec->subaddress, va_arg(ap, char*));
- break;
-
- case TIFFTAG_FAXRECVTIME:
- codec->recvtime = va_arg(ap, uint32);
- break;
-
- case TIFFTAG_FAXDCS:
- _TIFFsetString(&codec->faxdcs, va_arg(ap, char*));
- break;
-
- default:
- return (*codec->vsetparent)(tif, tag, ap);
- }
-
- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
- tif->tif_flags |= TIFF_DIRTYDIRECT;
- return 1;
-}
-
-int TIFFInitJBIG(TIFF* tif, int scheme)
-{
- JBIGState* codec = NULL;
-
- assert(scheme == COMPRESSION_JBIG);
-
- /*
- * Merge codec-specific tag information.
- */
- if (!_TIFFMergeFieldInfo(tif, jbigFieldInfo,
- TIFFArrayCount(jbigFieldInfo))) {
- TIFFErrorExt(tif->tif_clientdata, "TIFFInitJBIG",
- "Merging JBIG codec-specific tags failed");
- return 0;
- }
-
- /* Allocate memory for the JBIGState structure.*/
- tif->tif_data = (tdata_t)_TIFFmalloc(sizeof(JBIGState));
- if (tif->tif_data == NULL)
- {
- TIFFError("TIFFInitJBIG", "Not enough memory for JBIGState");
- return 0;
- }
- _TIFFmemset(tif->tif_data, 0, sizeof(JBIGState));
- codec = GetJBIGState(tif);
-
- /* Initialize codec private fields */
- codec->recvparams = 0;
- codec->subaddress = NULL;
- codec->faxdcs = NULL;
- codec->recvtime = 0;
-
- /*
- * Override parent get/set field methods.
- */
- codec->vgetparent = tif->tif_tagmethods.vgetfield;
- codec->vsetparent = tif->tif_tagmethods.vsetfield;
- tif->tif_tagmethods.vgetfield = JBIGVGetField;
- tif->tif_tagmethods.vsetfield = JBIGVSetField;
- tif->tif_tagmethods.printdir = JBIGPrintDir;
-
- /*
- * These flags are set so the JBIG Codec can control when to reverse
- * bits and when not to and to allow the jbig decoder and bit reverser
- * to write to memory when necessary.
- */
- tif->tif_flags |= TIFF_NOBITREV;
- tif->tif_flags &= ~TIFF_MAPPED;
-
- /* Setup the function pointers for encode, decode, and cleanup. */
- tif->tif_setupdecode = JBIGSetupDecode;
- tif->tif_decodestrip = JBIGDecode;
-
- tif->tif_setupencode = JBIGSetupEncode;
- tif->tif_encodestrip = JBIGEncode;
-
- tif->tif_cleanup = JBIGCleanup;
-
- return 1;
-}
-
-#endif /* JBIG_SUPPORT */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
-
diff --git a/src/3rdparty/libtiff/libtiff/tif_jpeg.c b/src/3rdparty/libtiff/libtiff/tif_jpeg.c
deleted file mode 100644
index 74b0d3f860..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_jpeg.c
+++ /dev/null
@@ -1,2035 +0,0 @@
-/* $Id: tif_jpeg.c,v 1.50.2.4 2009-08-30 16:21:46 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1994-1997 Sam Leffler
- * Copyright (c) 1994-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#define WIN32_LEAN_AND_MEAN
-#define VC_EXTRALEAN
-
-#include "tiffiop.h"
-#ifdef JPEG_SUPPORT
-
-/*
- * TIFF Library
- *
- * JPEG Compression support per TIFF Technical Note #2
- * (*not* per the original TIFF 6.0 spec).
- *
- * This file is simply an interface to the libjpeg library written by
- * the Independent JPEG Group. You need release 5 or later of the IJG
- * code, which you can find on the Internet at ftp.uu.net:/graphics/jpeg/.
- *
- * Contributed by Tom Lane <tgl@sss.pgh.pa.us>.
- */
-#include <setjmp.h>
-
-int TIFFFillStrip(TIFF*, tstrip_t);
-int TIFFFillTile(TIFF*, ttile_t);
-
-/* We undefine FAR to avoid conflict with JPEG definition */
-
-#ifdef FAR
-#undef FAR
-#endif
-
-/*
- Libjpeg's jmorecfg.h defines INT16 and INT32, but only if XMD_H is
- not defined. Unfortunately, the MinGW and Borland compilers include
- a typedef for INT32, which causes a conflict. MSVC does not include
- a conficting typedef given the headers which are included.
-*/
-#if defined(__BORLANDC__) || defined(__MINGW32__)
-# define XMD_H 1
-#endif
-
-/*
- The windows RPCNDR.H file defines boolean, but defines it with the
- unsigned char size. You should compile JPEG library using appropriate
- definitions in jconfig.h header, but many users compile library in wrong
- way. That causes errors of the following type:
-
- "JPEGLib: JPEG parameter struct mismatch: library thinks size is 432,
- caller expects 464"
-
- For such users we wil fix the problem here. See install.doc file from
- the JPEG library distribution for details.
-*/
-
-/* Define "boolean" as unsigned char, not int, per Windows custom. */
-#if defined(WIN32) && !defined(__MINGW32__)
-# ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
- typedef unsigned char boolean;
-# endif
-# define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
-#endif
-
-#include "jpeglib.h"
-#include "jerror.h"
-
-/*
- * We are using width_in_blocks which is supposed to be private to
- * libjpeg. Unfortunately, the libjpeg delivered with Cygwin has
- * renamed this member to width_in_data_units. Since the header has
- * also renamed a define, use that unique define name in order to
- * detect the problem header and adjust to suit.
- */
-#if defined(D_MAX_DATA_UNITS_IN_MCU)
-#define width_in_blocks width_in_data_units
-#endif
-
-/*
- * On some machines it may be worthwhile to use _setjmp or sigsetjmp
- * in place of plain setjmp. These macros will make it easier.
- */
-#define SETJMP(jbuf) setjmp(jbuf)
-#define LONGJMP(jbuf,code) longjmp(jbuf,code)
-#define JMP_BUF jmp_buf
-
-typedef struct jpeg_destination_mgr jpeg_destination_mgr;
-typedef struct jpeg_source_mgr jpeg_source_mgr;
-typedef struct jpeg_error_mgr jpeg_error_mgr;
-
-/*
- * State block for each open TIFF file using
- * libjpeg to do JPEG compression/decompression.
- *
- * libjpeg's visible state is either a jpeg_compress_struct
- * or jpeg_decompress_struct depending on which way we
- * are going. comm can be used to refer to the fields
- * which are common to both.
- *
- * NB: cinfo is required to be the first member of JPEGState,
- * so we can safely cast JPEGState* -> jpeg_xxx_struct*
- * and vice versa!
- */
-typedef struct {
- union {
- struct jpeg_compress_struct c;
- struct jpeg_decompress_struct d;
- struct jpeg_common_struct comm;
- } cinfo; /* NB: must be first */
- int cinfo_initialized;
-
- jpeg_error_mgr err; /* libjpeg error manager */
- JMP_BUF exit_jmpbuf; /* for catching libjpeg failures */
- /*
- * The following two members could be a union, but
- * they're small enough that it's not worth the effort.
- */
- jpeg_destination_mgr dest; /* data dest for compression */
- jpeg_source_mgr src; /* data source for decompression */
- /* private state */
- TIFF* tif; /* back link needed by some code */
- uint16 photometric; /* copy of PhotometricInterpretation */
- uint16 h_sampling; /* luminance sampling factors */
- uint16 v_sampling;
- tsize_t bytesperline; /* decompressed bytes per scanline */
- /* pointers to intermediate buffers when processing downsampled data */
- JSAMPARRAY ds_buffer[MAX_COMPONENTS];
- int scancount; /* number of "scanlines" accumulated */
- int samplesperclump;
-
- TIFFVGetMethod vgetparent; /* super-class method */
- TIFFVSetMethod vsetparent; /* super-class method */
- TIFFPrintMethod printdir; /* super-class method */
- TIFFStripMethod defsparent; /* super-class method */
- TIFFTileMethod deftparent; /* super-class method */
- /* pseudo-tag fields */
- void* jpegtables; /* JPEGTables tag value, or NULL */
- uint32 jpegtables_length; /* number of bytes in same */
- int jpegquality; /* Compression quality level */
- int jpegcolormode; /* Auto RGB<=>YCbCr convert? */
- int jpegtablesmode; /* What to put in JPEGTables */
-
- int ycbcrsampling_fetched;
- uint32 recvparams; /* encoded Class 2 session params */
- char* subaddress; /* subaddress string */
- uint32 recvtime; /* time spent receiving (secs) */
- char* faxdcs; /* encoded fax parameters (DCS, Table 2/T.30) */
-} JPEGState;
-
-#define JState(tif) ((JPEGState*)(tif)->tif_data)
-
-static int JPEGDecode(TIFF*, tidata_t, tsize_t, tsample_t);
-static int JPEGDecodeRaw(TIFF*, tidata_t, tsize_t, tsample_t);
-static int JPEGEncode(TIFF*, tidata_t, tsize_t, tsample_t);
-static int JPEGEncodeRaw(TIFF*, tidata_t, tsize_t, tsample_t);
-static int JPEGInitializeLibJPEG( TIFF * tif,
- int force_encode, int force_decode );
-
-#define FIELD_JPEGTABLES (FIELD_CODEC+0)
-#define FIELD_RECVPARAMS (FIELD_CODEC+1)
-#define FIELD_SUBADDRESS (FIELD_CODEC+2)
-#define FIELD_RECVTIME (FIELD_CODEC+3)
-#define FIELD_FAXDCS (FIELD_CODEC+4)
-
-static const TIFFFieldInfo jpegFieldInfo[] = {
- { TIFFTAG_JPEGTABLES, -3,-3, TIFF_UNDEFINED, FIELD_JPEGTABLES,
- FALSE, TRUE, "JPEGTables" },
- { TIFFTAG_JPEGQUALITY, 0, 0, TIFF_ANY, FIELD_PSEUDO,
- TRUE, FALSE, "" },
- { TIFFTAG_JPEGCOLORMODE, 0, 0, TIFF_ANY, FIELD_PSEUDO,
- FALSE, FALSE, "" },
- { TIFFTAG_JPEGTABLESMODE, 0, 0, TIFF_ANY, FIELD_PSEUDO,
- FALSE, FALSE, "" },
- /* Specific for JPEG in faxes */
- { TIFFTAG_FAXRECVPARAMS, 1, 1, TIFF_LONG, FIELD_RECVPARAMS,
- TRUE, FALSE, "FaxRecvParams" },
- { TIFFTAG_FAXSUBADDRESS, -1,-1, TIFF_ASCII, FIELD_SUBADDRESS,
- TRUE, FALSE, "FaxSubAddress" },
- { TIFFTAG_FAXRECVTIME, 1, 1, TIFF_LONG, FIELD_RECVTIME,
- TRUE, FALSE, "FaxRecvTime" },
- { TIFFTAG_FAXDCS, -1, -1, TIFF_ASCII, FIELD_FAXDCS,
- TRUE, FALSE, "FaxDcs" },
-};
-#define N(a) (sizeof (a) / sizeof (a[0]))
-
-/*
- * libjpeg interface layer.
- *
- * We use setjmp/longjmp to return control to libtiff
- * when a fatal error is encountered within the JPEG
- * library. We also direct libjpeg error and warning
- * messages through the appropriate libtiff handlers.
- */
-
-/*
- * Error handling routines (these replace corresponding
- * IJG routines from jerror.c). These are used for both
- * compression and decompression.
- */
-static void
-TIFFjpeg_error_exit(j_common_ptr cinfo)
-{
- JPEGState *sp = (JPEGState *) cinfo; /* NB: cinfo assumed first */
- char buffer[JMSG_LENGTH_MAX];
-
- (*cinfo->err->format_message) (cinfo, buffer);
- TIFFErrorExt(sp->tif->tif_clientdata, "JPEGLib", "%s", buffer); /* display the error message */
- jpeg_abort(cinfo); /* clean up libjpeg state */
- LONGJMP(sp->exit_jmpbuf, 1); /* return to libtiff caller */
-}
-
-/*
- * This routine is invoked only for warning messages,
- * since error_exit does its own thing and trace_level
- * is never set > 0.
- */
-static void
-TIFFjpeg_output_message(j_common_ptr cinfo)
-{
- char buffer[JMSG_LENGTH_MAX];
-
- (*cinfo->err->format_message) (cinfo, buffer);
- TIFFWarningExt(((JPEGState *) cinfo)->tif->tif_clientdata, "JPEGLib", "%s", buffer);
-}
-
-/*
- * Interface routines. This layer of routines exists
- * primarily to limit side-effects from using setjmp.
- * Also, normal/error returns are converted into return
- * values per libtiff practice.
- */
-#define CALLJPEG(sp, fail, op) (SETJMP((sp)->exit_jmpbuf) ? (fail) : (op))
-#define CALLVJPEG(sp, op) CALLJPEG(sp, 0, ((op),1))
-
-static int
-TIFFjpeg_create_compress(JPEGState* sp)
-{
- /* initialize JPEG error handling */
- sp->cinfo.c.err = jpeg_std_error(&sp->err);
- sp->err.error_exit = TIFFjpeg_error_exit;
- sp->err.output_message = TIFFjpeg_output_message;
-
- return CALLVJPEG(sp, jpeg_create_compress(&sp->cinfo.c));
-}
-
-static int
-TIFFjpeg_create_decompress(JPEGState* sp)
-{
- /* initialize JPEG error handling */
- sp->cinfo.d.err = jpeg_std_error(&sp->err);
- sp->err.error_exit = TIFFjpeg_error_exit;
- sp->err.output_message = TIFFjpeg_output_message;
-
- return CALLVJPEG(sp, jpeg_create_decompress(&sp->cinfo.d));
-}
-
-static int
-TIFFjpeg_set_defaults(JPEGState* sp)
-{
- return CALLVJPEG(sp, jpeg_set_defaults(&sp->cinfo.c));
-}
-
-static int
-TIFFjpeg_set_colorspace(JPEGState* sp, J_COLOR_SPACE colorspace)
-{
- return CALLVJPEG(sp, jpeg_set_colorspace(&sp->cinfo.c, colorspace));
-}
-
-static int
-TIFFjpeg_set_quality(JPEGState* sp, int quality, boolean force_baseline)
-{
- return CALLVJPEG(sp,
- jpeg_set_quality(&sp->cinfo.c, quality, force_baseline));
-}
-
-static int
-TIFFjpeg_suppress_tables(JPEGState* sp, boolean suppress)
-{
- return CALLVJPEG(sp, jpeg_suppress_tables(&sp->cinfo.c, suppress));
-}
-
-static int
-TIFFjpeg_start_compress(JPEGState* sp, boolean write_all_tables)
-{
- return CALLVJPEG(sp,
- jpeg_start_compress(&sp->cinfo.c, write_all_tables));
-}
-
-static int
-TIFFjpeg_write_scanlines(JPEGState* sp, JSAMPARRAY scanlines, int num_lines)
-{
- return CALLJPEG(sp, -1, (int) jpeg_write_scanlines(&sp->cinfo.c,
- scanlines, (JDIMENSION) num_lines));
-}
-
-static int
-TIFFjpeg_write_raw_data(JPEGState* sp, JSAMPIMAGE data, int num_lines)
-{
- return CALLJPEG(sp, -1, (int) jpeg_write_raw_data(&sp->cinfo.c,
- data, (JDIMENSION) num_lines));
-}
-
-static int
-TIFFjpeg_finish_compress(JPEGState* sp)
-{
- return CALLVJPEG(sp, jpeg_finish_compress(&sp->cinfo.c));
-}
-
-static int
-TIFFjpeg_write_tables(JPEGState* sp)
-{
- return CALLVJPEG(sp, jpeg_write_tables(&sp->cinfo.c));
-}
-
-static int
-TIFFjpeg_read_header(JPEGState* sp, boolean require_image)
-{
- return CALLJPEG(sp, -1, jpeg_read_header(&sp->cinfo.d, require_image));
-}
-
-static int
-TIFFjpeg_start_decompress(JPEGState* sp)
-{
- return CALLVJPEG(sp, jpeg_start_decompress(&sp->cinfo.d));
-}
-
-static int
-TIFFjpeg_read_scanlines(JPEGState* sp, JSAMPARRAY scanlines, int max_lines)
-{
- return CALLJPEG(sp, -1, (int) jpeg_read_scanlines(&sp->cinfo.d,
- scanlines, (JDIMENSION) max_lines));
-}
-
-static int
-TIFFjpeg_read_raw_data(JPEGState* sp, JSAMPIMAGE data, int max_lines)
-{
- return CALLJPEG(sp, -1, (int) jpeg_read_raw_data(&sp->cinfo.d,
- data, (JDIMENSION) max_lines));
-}
-
-static int
-TIFFjpeg_finish_decompress(JPEGState* sp)
-{
- return CALLJPEG(sp, -1, (int) jpeg_finish_decompress(&sp->cinfo.d));
-}
-
-static int
-TIFFjpeg_abort(JPEGState* sp)
-{
- return CALLVJPEG(sp, jpeg_abort(&sp->cinfo.comm));
-}
-
-static int
-TIFFjpeg_destroy(JPEGState* sp)
-{
- return CALLVJPEG(sp, jpeg_destroy(&sp->cinfo.comm));
-}
-
-static JSAMPARRAY
-TIFFjpeg_alloc_sarray(JPEGState* sp, int pool_id,
- JDIMENSION samplesperrow, JDIMENSION numrows)
-{
- return CALLJPEG(sp, (JSAMPARRAY) NULL,
- (*sp->cinfo.comm.mem->alloc_sarray)
- (&sp->cinfo.comm, pool_id, samplesperrow, numrows));
-}
-
-/*
- * JPEG library destination data manager.
- * These routines direct compressed data from libjpeg into the
- * libtiff output buffer.
- */
-
-static void
-std_init_destination(j_compress_ptr cinfo)
-{
- JPEGState* sp = (JPEGState*) cinfo;
- TIFF* tif = sp->tif;
-
- sp->dest.next_output_byte = (JOCTET*) tif->tif_rawdata;
- sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize;
-}
-
-static boolean
-std_empty_output_buffer(j_compress_ptr cinfo)
-{
- JPEGState* sp = (JPEGState*) cinfo;
- TIFF* tif = sp->tif;
-
- /* the entire buffer has been filled */
- tif->tif_rawcc = tif->tif_rawdatasize;
- TIFFFlushData1(tif);
- sp->dest.next_output_byte = (JOCTET*) tif->tif_rawdata;
- sp->dest.free_in_buffer = (size_t) tif->tif_rawdatasize;
-
- return (TRUE);
-}
-
-static void
-std_term_destination(j_compress_ptr cinfo)
-{
- JPEGState* sp = (JPEGState*) cinfo;
- TIFF* tif = sp->tif;
-
- tif->tif_rawcp = (tidata_t) sp->dest.next_output_byte;
- tif->tif_rawcc =
- tif->tif_rawdatasize - (tsize_t) sp->dest.free_in_buffer;
- /* NB: libtiff does the final buffer flush */
-}
-
-static void
-TIFFjpeg_data_dest(JPEGState* sp, TIFF* tif)
-{
- (void) tif;
- sp->cinfo.c.dest = &sp->dest;
- sp->dest.init_destination = std_init_destination;
- sp->dest.empty_output_buffer = std_empty_output_buffer;
- sp->dest.term_destination = std_term_destination;
-}
-
-/*
- * Alternate destination manager for outputting to JPEGTables field.
- */
-
-static void
-tables_init_destination(j_compress_ptr cinfo)
-{
- JPEGState* sp = (JPEGState*) cinfo;
-
- /* while building, jpegtables_length is allocated buffer size */
- sp->dest.next_output_byte = (JOCTET*) sp->jpegtables;
- sp->dest.free_in_buffer = (size_t) sp->jpegtables_length;
-}
-
-static boolean
-tables_empty_output_buffer(j_compress_ptr cinfo)
-{
- JPEGState* sp = (JPEGState*) cinfo;
- void* newbuf;
-
- /* the entire buffer has been filled; enlarge it by 1000 bytes */
- newbuf = _TIFFrealloc((tdata_t) sp->jpegtables,
- (tsize_t) (sp->jpegtables_length + 1000));
- if (newbuf == NULL)
- ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 100);
- sp->dest.next_output_byte = (JOCTET*) newbuf + sp->jpegtables_length;
- sp->dest.free_in_buffer = (size_t) 1000;
- sp->jpegtables = newbuf;
- sp->jpegtables_length += 1000;
- return (TRUE);
-}
-
-static void
-tables_term_destination(j_compress_ptr cinfo)
-{
- JPEGState* sp = (JPEGState*) cinfo;
-
- /* set tables length to number of bytes actually emitted */
- sp->jpegtables_length -= sp->dest.free_in_buffer;
-}
-
-static int
-TIFFjpeg_tables_dest(JPEGState* sp, TIFF* tif)
-{
- (void) tif;
- /*
- * Allocate a working buffer for building tables.
- * Initial size is 1000 bytes, which is usually adequate.
- */
- if (sp->jpegtables)
- _TIFFfree(sp->jpegtables);
- sp->jpegtables_length = 1000;
- sp->jpegtables = (void*) _TIFFmalloc((tsize_t) sp->jpegtables_length);
- if (sp->jpegtables == NULL) {
- sp->jpegtables_length = 0;
- TIFFErrorExt(sp->tif->tif_clientdata, "TIFFjpeg_tables_dest", "No space for JPEGTables");
- return (0);
- }
- sp->cinfo.c.dest = &sp->dest;
- sp->dest.init_destination = tables_init_destination;
- sp->dest.empty_output_buffer = tables_empty_output_buffer;
- sp->dest.term_destination = tables_term_destination;
- return (1);
-}
-
-/*
- * JPEG library source data manager.
- * These routines supply compressed data to libjpeg.
- */
-
-static void
-std_init_source(j_decompress_ptr cinfo)
-{
- JPEGState* sp = (JPEGState*) cinfo;
- TIFF* tif = sp->tif;
-
- sp->src.next_input_byte = (const JOCTET*) tif->tif_rawdata;
- sp->src.bytes_in_buffer = (size_t) tif->tif_rawcc;
-}
-
-static boolean
-std_fill_input_buffer(j_decompress_ptr cinfo)
-{
- JPEGState* sp = (JPEGState* ) cinfo;
- static const JOCTET dummy_EOI[2] = { 0xFF, JPEG_EOI };
-
- /*
- * Should never get here since entire strip/tile is
- * read into memory before the decompressor is called,
- * and thus was supplied by init_source.
- */
- WARNMS(cinfo, JWRN_JPEG_EOF);
- /* insert a fake EOI marker */
- sp->src.next_input_byte = dummy_EOI;
- sp->src.bytes_in_buffer = 2;
- return (TRUE);
-}
-
-static void
-std_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
-{
- JPEGState* sp = (JPEGState*) cinfo;
-
- if (num_bytes > 0) {
- if (num_bytes > (long) sp->src.bytes_in_buffer) {
- /* oops, buffer overrun */
- (void) std_fill_input_buffer(cinfo);
- } else {
- sp->src.next_input_byte += (size_t) num_bytes;
- sp->src.bytes_in_buffer -= (size_t) num_bytes;
- }
- }
-}
-
-static void
-std_term_source(j_decompress_ptr cinfo)
-{
- /* No work necessary here */
- /* Or must we update tif->tif_rawcp, tif->tif_rawcc ??? */
- /* (if so, need empty tables_term_source!) */
- (void) cinfo;
-}
-
-static void
-TIFFjpeg_data_src(JPEGState* sp, TIFF* tif)
-{
- (void) tif;
- sp->cinfo.d.src = &sp->src;
- sp->src.init_source = std_init_source;
- sp->src.fill_input_buffer = std_fill_input_buffer;
- sp->src.skip_input_data = std_skip_input_data;
- sp->src.resync_to_restart = jpeg_resync_to_restart;
- sp->src.term_source = std_term_source;
- sp->src.bytes_in_buffer = 0; /* for safety */
- sp->src.next_input_byte = NULL;
-}
-
-/*
- * Alternate source manager for reading from JPEGTables.
- * We can share all the code except for the init routine.
- */
-
-static void
-tables_init_source(j_decompress_ptr cinfo)
-{
- JPEGState* sp = (JPEGState*) cinfo;
-
- sp->src.next_input_byte = (const JOCTET*) sp->jpegtables;
- sp->src.bytes_in_buffer = (size_t) sp->jpegtables_length;
-}
-
-static void
-TIFFjpeg_tables_src(JPEGState* sp, TIFF* tif)
-{
- TIFFjpeg_data_src(sp, tif);
- sp->src.init_source = tables_init_source;
-}
-
-/*
- * Allocate downsampled-data buffers needed for downsampled I/O.
- * We use values computed in jpeg_start_compress or jpeg_start_decompress.
- * We use libjpeg's allocator so that buffers will be released automatically
- * when done with strip/tile.
- * This is also a handy place to compute samplesperclump, bytesperline.
- */
-static int
-alloc_downsampled_buffers(TIFF* tif, jpeg_component_info* comp_info,
- int num_components)
-{
- JPEGState* sp = JState(tif);
- int ci;
- jpeg_component_info* compptr;
- JSAMPARRAY buf;
- int samples_per_clump = 0;
-
- for (ci = 0, compptr = comp_info; ci < num_components;
- ci++, compptr++) {
- samples_per_clump += compptr->h_samp_factor *
- compptr->v_samp_factor;
- buf = TIFFjpeg_alloc_sarray(sp, JPOOL_IMAGE,
- compptr->width_in_blocks * DCTSIZE,
- (JDIMENSION) (compptr->v_samp_factor*DCTSIZE));
- if (buf == NULL)
- return (0);
- sp->ds_buffer[ci] = buf;
- }
- sp->samplesperclump = samples_per_clump;
- return (1);
-}
-
-
-/*
- * JPEG Decoding.
- */
-
-static int
-JPEGSetupDecode(TIFF* tif)
-{
- JPEGState* sp = JState(tif);
- TIFFDirectory *td = &tif->tif_dir;
-
- JPEGInitializeLibJPEG( tif, 0, 1 );
-
- assert(sp != NULL);
- assert(sp->cinfo.comm.is_decompressor);
-
- /* Read JPEGTables if it is present */
- if (TIFFFieldSet(tif,FIELD_JPEGTABLES)) {
- TIFFjpeg_tables_src(sp, tif);
- if(TIFFjpeg_read_header(sp,FALSE) != JPEG_HEADER_TABLES_ONLY) {
- TIFFErrorExt(tif->tif_clientdata, "JPEGSetupDecode", "Bogus JPEGTables field");
- return (0);
- }
- }
-
- /* Grab parameters that are same for all strips/tiles */
- sp->photometric = td->td_photometric;
- switch (sp->photometric) {
- case PHOTOMETRIC_YCBCR:
- sp->h_sampling = td->td_ycbcrsubsampling[0];
- sp->v_sampling = td->td_ycbcrsubsampling[1];
- break;
- default:
- /* TIFF 6.0 forbids subsampling of all other color spaces */
- sp->h_sampling = 1;
- sp->v_sampling = 1;
- break;
- }
-
- /* Set up for reading normal data */
- TIFFjpeg_data_src(sp, tif);
- tif->tif_postdecode = _TIFFNoPostDecode; /* override byte swapping */
- return (1);
-}
-
-/*
- * Set up for decoding a strip or tile.
- */
-static int
-JPEGPreDecode(TIFF* tif, tsample_t s)
-{
- JPEGState *sp = JState(tif);
- TIFFDirectory *td = &tif->tif_dir;
- static const char module[] = "JPEGPreDecode";
- uint32 segment_width, segment_height;
- int downsampled_output;
- int ci;
-
- assert(sp != NULL);
- assert(sp->cinfo.comm.is_decompressor);
- /*
- * Reset decoder state from any previous strip/tile,
- * in case application didn't read the whole strip.
- */
- if (!TIFFjpeg_abort(sp))
- return (0);
- /*
- * Read the header for this strip/tile.
- */
- if (TIFFjpeg_read_header(sp, TRUE) != JPEG_HEADER_OK)
- return (0);
- /*
- * Check image parameters and set decompression parameters.
- */
- segment_width = td->td_imagewidth;
- segment_height = td->td_imagelength - tif->tif_row;
- if (isTiled(tif)) {
- segment_width = td->td_tilewidth;
- segment_height = td->td_tilelength;
- sp->bytesperline = TIFFTileRowSize(tif);
- } else {
- if (segment_height > td->td_rowsperstrip)
- segment_height = td->td_rowsperstrip;
- sp->bytesperline = TIFFOldScanlineSize(tif);
- }
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE && s > 0) {
- /*
- * For PC 2, scale down the expected strip/tile size
- * to match a downsampled component
- */
- segment_width = TIFFhowmany(segment_width, sp->h_sampling);
- segment_height = TIFFhowmany(segment_height, sp->v_sampling);
- }
- if (sp->cinfo.d.image_width < segment_width ||
- sp->cinfo.d.image_height < segment_height) {
- TIFFWarningExt(tif->tif_clientdata, module,
- "Improper JPEG strip/tile size, "
- "expected %dx%d, got %dx%d",
- segment_width, segment_height,
- sp->cinfo.d.image_width,
- sp->cinfo.d.image_height);
- }
- if (sp->cinfo.d.image_width > segment_width ||
- sp->cinfo.d.image_height > segment_height) {
- /*
- * This case could be dangerous, if the strip or tile size has
- * been reported as less than the amount of data jpeg will
- * return, some potential security issues arise. Catch this
- * case and error out.
- */
- TIFFErrorExt(tif->tif_clientdata, module,
- "JPEG strip/tile size exceeds expected dimensions,"
- " expected %dx%d, got %dx%d",
- segment_width, segment_height,
- sp->cinfo.d.image_width, sp->cinfo.d.image_height);
- return (0);
- }
- if (sp->cinfo.d.num_components !=
- (td->td_planarconfig == PLANARCONFIG_CONTIG ?
- td->td_samplesperpixel : 1)) {
- TIFFErrorExt(tif->tif_clientdata, module, "Improper JPEG component count");
- return (0);
- }
-#ifdef JPEG_LIB_MK1
- if (12 != td->td_bitspersample && 8 != td->td_bitspersample) {
- TIFFErrorExt(tif->tif_clientdata, module, "Improper JPEG data precision");
- return (0);
- }
- sp->cinfo.d.data_precision = td->td_bitspersample;
- sp->cinfo.d.bits_in_jsample = td->td_bitspersample;
-#else
- if (sp->cinfo.d.data_precision != td->td_bitspersample) {
- TIFFErrorExt(tif->tif_clientdata, module, "Improper JPEG data precision");
- return (0);
- }
-#endif
- if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
- /* Component 0 should have expected sampling factors */
- if (sp->cinfo.d.comp_info[0].h_samp_factor != sp->h_sampling ||
- sp->cinfo.d.comp_info[0].v_samp_factor != sp->v_sampling) {
- TIFFWarningExt(tif->tif_clientdata, module,
- "Improper JPEG sampling factors %d,%d\n"
- "Apparently should be %d,%d.",
- sp->cinfo.d.comp_info[0].h_samp_factor,
- sp->cinfo.d.comp_info[0].v_samp_factor,
- sp->h_sampling, sp->v_sampling);
-
- /*
- * There are potential security issues here
- * for decoders that have already allocated
- * buffers based on the expected sampling
- * factors. Lets check the sampling factors
- * dont exceed what we were expecting.
- */
- if (sp->cinfo.d.comp_info[0].h_samp_factor
- > sp->h_sampling
- || sp->cinfo.d.comp_info[0].v_samp_factor
- > sp->v_sampling) {
- TIFFErrorExt(tif->tif_clientdata,
- module,
- "Cannot honour JPEG sampling factors"
- " that exceed those specified.");
- return (0);
- }
-
- /*
- * XXX: Files written by the Intergraph software
- * has different sampling factors stored in the
- * TIFF tags and in the JPEG structures. We will
- * try to deduce Intergraph files by the presense
- * of the tag 33918.
- */
- if (!_TIFFFindFieldInfo(tif, 33918, TIFF_ANY)) {
- TIFFWarningExt(tif->tif_clientdata, module,
- "Decompressor will try reading with "
- "sampling %d,%d.",
- sp->cinfo.d.comp_info[0].h_samp_factor,
- sp->cinfo.d.comp_info[0].v_samp_factor);
-
- sp->h_sampling = (uint16)
- sp->cinfo.d.comp_info[0].h_samp_factor;
- sp->v_sampling = (uint16)
- sp->cinfo.d.comp_info[0].v_samp_factor;
- }
- }
- /* Rest should have sampling factors 1,1 */
- for (ci = 1; ci < sp->cinfo.d.num_components; ci++) {
- if (sp->cinfo.d.comp_info[ci].h_samp_factor != 1 ||
- sp->cinfo.d.comp_info[ci].v_samp_factor != 1) {
- TIFFErrorExt(tif->tif_clientdata, module, "Improper JPEG sampling factors");
- return (0);
- }
- }
- } else {
- /* PC 2's single component should have sampling factors 1,1 */
- if (sp->cinfo.d.comp_info[0].h_samp_factor != 1 ||
- sp->cinfo.d.comp_info[0].v_samp_factor != 1) {
- TIFFErrorExt(tif->tif_clientdata, module, "Improper JPEG sampling factors");
- return (0);
- }
- }
- downsampled_output = FALSE;
- if (td->td_planarconfig == PLANARCONFIG_CONTIG &&
- sp->photometric == PHOTOMETRIC_YCBCR &&
- sp->jpegcolormode == JPEGCOLORMODE_RGB) {
- /* Convert YCbCr to RGB */
- sp->cinfo.d.jpeg_color_space = JCS_YCbCr;
- sp->cinfo.d.out_color_space = JCS_RGB;
- } else {
- /* Suppress colorspace handling */
- sp->cinfo.d.jpeg_color_space = JCS_UNKNOWN;
- sp->cinfo.d.out_color_space = JCS_UNKNOWN;
- if (td->td_planarconfig == PLANARCONFIG_CONTIG &&
- (sp->h_sampling != 1 || sp->v_sampling != 1))
- downsampled_output = TRUE;
- /* XXX what about up-sampling? */
- }
- if (downsampled_output) {
- /* Need to use raw-data interface to libjpeg */
- sp->cinfo.d.raw_data_out = TRUE;
- tif->tif_decoderow = JPEGDecodeRaw;
- tif->tif_decodestrip = JPEGDecodeRaw;
- tif->tif_decodetile = JPEGDecodeRaw;
- } else {
- /* Use normal interface to libjpeg */
- sp->cinfo.d.raw_data_out = FALSE;
- tif->tif_decoderow = JPEGDecode;
- tif->tif_decodestrip = JPEGDecode;
- tif->tif_decodetile = JPEGDecode;
- }
- /* Start JPEG decompressor */
- if (!TIFFjpeg_start_decompress(sp))
- return (0);
- /* Allocate downsampled-data buffers if needed */
- if (downsampled_output) {
- if (!alloc_downsampled_buffers(tif, sp->cinfo.d.comp_info,
- sp->cinfo.d.num_components))
- return (0);
- sp->scancount = DCTSIZE; /* mark buffer empty */
- }
- return (1);
-}
-
-/*
- * Decode a chunk of pixels.
- * "Standard" case: returned data is not downsampled.
- */
-/*ARGSUSED*/ static int
-JPEGDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
-{
- JPEGState *sp = JState(tif);
- tsize_t nrows;
- (void) s;
-
- nrows = cc / sp->bytesperline;
- if (cc % sp->bytesperline)
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline not read");
-
- if( nrows > (int) sp->cinfo.d.image_height )
- nrows = sp->cinfo.d.image_height;
-
- /* data is expected to be read in multiples of a scanline */
- if (nrows)
- {
- JSAMPROW line_work_buf = NULL;
-
- /*
- ** For 6B, only use temporary buffer for 12 bit imagery.
- ** For Mk1 always use it.
- */
-#if !defined(JPEG_LIB_MK1)
- if( sp->cinfo.d.data_precision == 12 )
-#endif
- {
- line_work_buf = (JSAMPROW)
- _TIFFmalloc(sizeof(short) * sp->cinfo.d.output_width
- * sp->cinfo.d.num_components );
- }
-
- do {
- if( line_work_buf != NULL )
- {
- /*
- ** In the MK1 case, we aways read into a 16bit buffer, and then
- ** pack down to 12bit or 8bit. In 6B case we only read into 16
- ** bit buffer for 12bit data, which we need to repack.
- */
- if (TIFFjpeg_read_scanlines(sp, &line_work_buf, 1) != 1)
- return (0);
-
- if( sp->cinfo.d.data_precision == 12 )
- {
- int value_pairs = (sp->cinfo.d.output_width
- * sp->cinfo.d.num_components) / 2;
- int iPair;
-
- for( iPair = 0; iPair < value_pairs; iPair++ )
- {
- unsigned char *out_ptr =
- ((unsigned char *) buf) + iPair * 3;
- JSAMPLE *in_ptr = line_work_buf + iPair * 2;
-
- out_ptr[0] = (in_ptr[0] & 0xff0) >> 4;
- out_ptr[1] = ((in_ptr[0] & 0xf) << 4)
- | ((in_ptr[1] & 0xf00) >> 8);
- out_ptr[2] = ((in_ptr[1] & 0xff) >> 0);
- }
- }
- else if( sp->cinfo.d.data_precision == 8 )
- {
- int value_count = (sp->cinfo.d.output_width
- * sp->cinfo.d.num_components);
- int iValue;
-
- for( iValue = 0; iValue < value_count; iValue++ )
- {
- ((unsigned char *) buf)[iValue] =
- line_work_buf[iValue] & 0xff;
- }
- }
- }
- else
- {
- /*
- ** In the libjpeg6b 8bit case. We read directly into the
- ** TIFF buffer.
- */
- JSAMPROW bufptr = (JSAMPROW)buf;
-
- if (TIFFjpeg_read_scanlines(sp, &bufptr, 1) != 1)
- return (0);
- }
-
- ++tif->tif_row;
- buf += sp->bytesperline;
- cc -= sp->bytesperline;
- } while (--nrows > 0);
-
- if( line_work_buf != NULL )
- _TIFFfree( line_work_buf );
- }
-
- /* Close down the decompressor if we've finished the strip or tile. */
- return sp->cinfo.d.output_scanline < sp->cinfo.d.output_height
- || TIFFjpeg_finish_decompress(sp);
-}
-
-/*
- * Decode a chunk of pixels.
- * Returned data is downsampled per sampling factors.
- */
-/*ARGSUSED*/ static int
-JPEGDecodeRaw(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
-{
- JPEGState *sp = JState(tif);
- tsize_t nrows;
- (void) s;
-
- /* data is expected to be read in multiples of a scanline */
- if ( (nrows = sp->cinfo.d.image_height) ) {
- /* Cb,Cr both have sampling factors 1, so this is correct */
- JDIMENSION clumps_per_line = sp->cinfo.d.comp_info[1].downsampled_width;
- int samples_per_clump = sp->samplesperclump;
-
-#ifdef JPEG_LIB_MK1
- unsigned short* tmpbuf = _TIFFmalloc(sizeof(unsigned short) *
- sp->cinfo.d.output_width *
- sp->cinfo.d.num_components);
-#endif
-
- do {
- jpeg_component_info *compptr;
- int ci, clumpoffset;
-
- /* Reload downsampled-data buffer if needed */
- if (sp->scancount >= DCTSIZE) {
- int n = sp->cinfo.d.max_v_samp_factor * DCTSIZE;
- if (TIFFjpeg_read_raw_data(sp, sp->ds_buffer, n) != n)
- return (0);
- sp->scancount = 0;
- }
- /*
- * Fastest way to unseparate data is to make one pass
- * over the scanline for each row of each component.
- */
- clumpoffset = 0; /* first sample in clump */
- for (ci = 0, compptr = sp->cinfo.d.comp_info;
- ci < sp->cinfo.d.num_components;
- ci++, compptr++) {
- int hsamp = compptr->h_samp_factor;
- int vsamp = compptr->v_samp_factor;
- int ypos;
-
- for (ypos = 0; ypos < vsamp; ypos++) {
- JSAMPLE *inptr = sp->ds_buffer[ci][sp->scancount*vsamp + ypos];
-#ifdef JPEG_LIB_MK1
- JSAMPLE *outptr = (JSAMPLE*)tmpbuf + clumpoffset;
-#else
- JSAMPLE *outptr = (JSAMPLE*)buf + clumpoffset;
-#endif
- JDIMENSION nclump;
-
- if (hsamp == 1) {
- /* fast path for at least Cb and Cr */
- for (nclump = clumps_per_line; nclump-- > 0; ) {
- outptr[0] = *inptr++;
- outptr += samples_per_clump;
- }
- } else {
- int xpos;
-
- /* general case */
- for (nclump = clumps_per_line; nclump-- > 0; ) {
- for (xpos = 0; xpos < hsamp; xpos++)
- outptr[xpos] = *inptr++;
- outptr += samples_per_clump;
- }
- }
- clumpoffset += hsamp;
- }
- }
-
-#ifdef JPEG_LIB_MK1
- {
- if (sp->cinfo.d.data_precision == 8)
- {
- int i=0;
- int len = sp->cinfo.d.output_width * sp->cinfo.d.num_components;
- for (i=0; i<len; i++)
- {
- ((unsigned char*)buf)[i] = tmpbuf[i] & 0xff;
- }
- }
- else
- { // 12-bit
- int value_pairs = (sp->cinfo.d.output_width
- * sp->cinfo.d.num_components) / 2;
- int iPair;
- for( iPair = 0; iPair < value_pairs; iPair++ )
- {
- unsigned char *out_ptr = ((unsigned char *) buf) + iPair * 3;
- JSAMPLE *in_ptr = tmpbuf + iPair * 2;
- out_ptr[0] = (in_ptr[0] & 0xff0) >> 4;
- out_ptr[1] = ((in_ptr[0] & 0xf) << 4)
- | ((in_ptr[1] & 0xf00) >> 8);
- out_ptr[2] = ((in_ptr[1] & 0xff) >> 0);
- }
- }
- }
-#endif
-
- sp->scancount ++;
- tif->tif_row += sp->v_sampling;
- /* increment/decrement of buf and cc is still incorrect, but should not matter
- * TODO: resolve this */
- buf += sp->bytesperline;
- cc -= sp->bytesperline;
- nrows -= sp->v_sampling;
- } while (nrows > 0);
-
-#ifdef JPEG_LIB_MK1
- _TIFFfree(tmpbuf);
-#endif
-
- }
-
- /* Close down the decompressor if done. */
- return sp->cinfo.d.output_scanline < sp->cinfo.d.output_height
- || TIFFjpeg_finish_decompress(sp);
-}
-
-
-/*
- * JPEG Encoding.
- */
-
-static void
-unsuppress_quant_table (JPEGState* sp, int tblno)
-{
- JQUANT_TBL* qtbl;
-
- if ((qtbl = sp->cinfo.c.quant_tbl_ptrs[tblno]) != NULL)
- qtbl->sent_table = FALSE;
-}
-
-static void
-unsuppress_huff_table (JPEGState* sp, int tblno)
-{
- JHUFF_TBL* htbl;
-
- if ((htbl = sp->cinfo.c.dc_huff_tbl_ptrs[tblno]) != NULL)
- htbl->sent_table = FALSE;
- if ((htbl = sp->cinfo.c.ac_huff_tbl_ptrs[tblno]) != NULL)
- htbl->sent_table = FALSE;
-}
-
-static int
-prepare_JPEGTables(TIFF* tif)
-{
- JPEGState* sp = JState(tif);
-
- JPEGInitializeLibJPEG( tif, 0, 0 );
-
- /* Initialize quant tables for current quality setting */
- if (!TIFFjpeg_set_quality(sp, sp->jpegquality, FALSE))
- return (0);
- /* Mark only the tables we want for output */
- /* NB: chrominance tables are currently used only with YCbCr */
- if (!TIFFjpeg_suppress_tables(sp, TRUE))
- return (0);
- if (sp->jpegtablesmode & JPEGTABLESMODE_QUANT) {
- unsuppress_quant_table(sp, 0);
- if (sp->photometric == PHOTOMETRIC_YCBCR)
- unsuppress_quant_table(sp, 1);
- }
- if (sp->jpegtablesmode & JPEGTABLESMODE_HUFF) {
- unsuppress_huff_table(sp, 0);
- if (sp->photometric == PHOTOMETRIC_YCBCR)
- unsuppress_huff_table(sp, 1);
- }
- /* Direct libjpeg output into jpegtables */
- if (!TIFFjpeg_tables_dest(sp, tif))
- return (0);
- /* Emit tables-only datastream */
- if (!TIFFjpeg_write_tables(sp))
- return (0);
-
- return (1);
-}
-
-static int
-JPEGSetupEncode(TIFF* tif)
-{
- JPEGState* sp = JState(tif);
- TIFFDirectory *td = &tif->tif_dir;
- static const char module[] = "JPEGSetupEncode";
-
- JPEGInitializeLibJPEG( tif, 1, 0 );
-
- assert(sp != NULL);
- assert(!sp->cinfo.comm.is_decompressor);
-
- /*
- * Initialize all JPEG parameters to default values.
- * Note that jpeg_set_defaults needs legal values for
- * in_color_space and input_components.
- */
- sp->cinfo.c.in_color_space = JCS_UNKNOWN;
- sp->cinfo.c.input_components = 1;
- if (!TIFFjpeg_set_defaults(sp))
- return (0);
- /* Set per-file parameters */
- sp->photometric = td->td_photometric;
- switch (sp->photometric) {
- case PHOTOMETRIC_YCBCR:
- sp->h_sampling = td->td_ycbcrsubsampling[0];
- sp->v_sampling = td->td_ycbcrsubsampling[1];
- /*
- * A ReferenceBlackWhite field *must* be present since the
- * default value is inappropriate for YCbCr. Fill in the
- * proper value if application didn't set it.
- */
- {
- float *ref;
- if (!TIFFGetField(tif, TIFFTAG_REFERENCEBLACKWHITE,
- &ref)) {
- float refbw[6];
- long top = 1L << td->td_bitspersample;
- refbw[0] = 0;
- refbw[1] = (float)(top-1L);
- refbw[2] = (float)(top>>1);
- refbw[3] = refbw[1];
- refbw[4] = refbw[2];
- refbw[5] = refbw[1];
- TIFFSetField(tif, TIFFTAG_REFERENCEBLACKWHITE,
- refbw);
- }
- }
- break;
- case PHOTOMETRIC_PALETTE: /* disallowed by Tech Note */
- case PHOTOMETRIC_MASK:
- TIFFErrorExt(tif->tif_clientdata, module,
- "PhotometricInterpretation %d not allowed for JPEG",
- (int) sp->photometric);
- return (0);
- default:
- /* TIFF 6.0 forbids subsampling of all other color spaces */
- sp->h_sampling = 1;
- sp->v_sampling = 1;
- break;
- }
-
- /* Verify miscellaneous parameters */
-
- /*
- * This would need work if libtiff ever supports different
- * depths for different components, or if libjpeg ever supports
- * run-time selection of depth. Neither is imminent.
- */
-#ifdef JPEG_LIB_MK1
- /* BITS_IN_JSAMPLE now permits 8 and 12 --- dgilbert */
- if (td->td_bitspersample != 8 && td->td_bitspersample != 12)
-#else
- if (td->td_bitspersample != BITS_IN_JSAMPLE )
-#endif
- {
- TIFFErrorExt(tif->tif_clientdata, module, "BitsPerSample %d not allowed for JPEG",
- (int) td->td_bitspersample);
- return (0);
- }
- sp->cinfo.c.data_precision = td->td_bitspersample;
-#ifdef JPEG_LIB_MK1
- sp->cinfo.c.bits_in_jsample = td->td_bitspersample;
-#endif
- if (isTiled(tif)) {
- if ((td->td_tilelength % (sp->v_sampling * DCTSIZE)) != 0) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "JPEG tile height must be multiple of %d",
- sp->v_sampling * DCTSIZE);
- return (0);
- }
- if ((td->td_tilewidth % (sp->h_sampling * DCTSIZE)) != 0) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "JPEG tile width must be multiple of %d",
- sp->h_sampling * DCTSIZE);
- return (0);
- }
- } else {
- if (td->td_rowsperstrip < td->td_imagelength &&
- (td->td_rowsperstrip % (sp->v_sampling * DCTSIZE)) != 0) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "RowsPerStrip must be multiple of %d for JPEG",
- sp->v_sampling * DCTSIZE);
- return (0);
- }
- }
-
- /* Create a JPEGTables field if appropriate */
- if (sp->jpegtablesmode & (JPEGTABLESMODE_QUANT|JPEGTABLESMODE_HUFF)) {
- if (!prepare_JPEGTables(tif))
- return (0);
- /* Mark the field present */
- /* Can't use TIFFSetField since BEENWRITING is already set! */
- TIFFSetFieldBit(tif, FIELD_JPEGTABLES);
- tif->tif_flags |= TIFF_DIRTYDIRECT;
- } else {
- /* We do not support application-supplied JPEGTables, */
- /* so mark the field not present */
- TIFFClrFieldBit(tif, FIELD_JPEGTABLES);
- }
-
- /* Direct libjpeg output to libtiff's output buffer */
- TIFFjpeg_data_dest(sp, tif);
-
- return (1);
-}
-
-/*
- * Set encoding state at the start of a strip or tile.
- */
-static int
-JPEGPreEncode(TIFF* tif, tsample_t s)
-{
- JPEGState *sp = JState(tif);
- TIFFDirectory *td = &tif->tif_dir;
- static const char module[] = "JPEGPreEncode";
- uint32 segment_width, segment_height;
- int downsampled_input;
-
- assert(sp != NULL);
- assert(!sp->cinfo.comm.is_decompressor);
- /*
- * Set encoding parameters for this strip/tile.
- */
- if (isTiled(tif)) {
- segment_width = td->td_tilewidth;
- segment_height = td->td_tilelength;
- sp->bytesperline = TIFFTileRowSize(tif);
- } else {
- segment_width = td->td_imagewidth;
- segment_height = td->td_imagelength - tif->tif_row;
- if (segment_height > td->td_rowsperstrip)
- segment_height = td->td_rowsperstrip;
- sp->bytesperline = TIFFOldScanlineSize(tif);
- }
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE && s > 0) {
- /* for PC 2, scale down the strip/tile size
- * to match a downsampled component
- */
- segment_width = TIFFhowmany(segment_width, sp->h_sampling);
- segment_height = TIFFhowmany(segment_height, sp->v_sampling);
- }
- if (segment_width > 65535 || segment_height > 65535) {
- TIFFErrorExt(tif->tif_clientdata, module, "Strip/tile too large for JPEG");
- return (0);
- }
- sp->cinfo.c.image_width = segment_width;
- sp->cinfo.c.image_height = segment_height;
- downsampled_input = FALSE;
- if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
- sp->cinfo.c.input_components = td->td_samplesperpixel;
- if (sp->photometric == PHOTOMETRIC_YCBCR) {
- if (sp->jpegcolormode == JPEGCOLORMODE_RGB) {
- sp->cinfo.c.in_color_space = JCS_RGB;
- } else {
- sp->cinfo.c.in_color_space = JCS_YCbCr;
- if (sp->h_sampling != 1 || sp->v_sampling != 1)
- downsampled_input = TRUE;
- }
- if (!TIFFjpeg_set_colorspace(sp, JCS_YCbCr))
- return (0);
- /*
- * Set Y sampling factors;
- * we assume jpeg_set_colorspace() set the rest to 1
- */
- sp->cinfo.c.comp_info[0].h_samp_factor = sp->h_sampling;
- sp->cinfo.c.comp_info[0].v_samp_factor = sp->v_sampling;
- } else {
- sp->cinfo.c.in_color_space = JCS_UNKNOWN;
- if (!TIFFjpeg_set_colorspace(sp, JCS_UNKNOWN))
- return (0);
- /* jpeg_set_colorspace set all sampling factors to 1 */
- }
- } else {
- sp->cinfo.c.input_components = 1;
- sp->cinfo.c.in_color_space = JCS_UNKNOWN;
- if (!TIFFjpeg_set_colorspace(sp, JCS_UNKNOWN))
- return (0);
- sp->cinfo.c.comp_info[0].component_id = s;
- /* jpeg_set_colorspace() set sampling factors to 1 */
- if (sp->photometric == PHOTOMETRIC_YCBCR && s > 0) {
- sp->cinfo.c.comp_info[0].quant_tbl_no = 1;
- sp->cinfo.c.comp_info[0].dc_tbl_no = 1;
- sp->cinfo.c.comp_info[0].ac_tbl_no = 1;
- }
- }
- /* ensure libjpeg won't write any extraneous markers */
- sp->cinfo.c.write_JFIF_header = FALSE;
- sp->cinfo.c.write_Adobe_marker = FALSE;
- /* set up table handling correctly */
- if (! (sp->jpegtablesmode & JPEGTABLESMODE_QUANT)) {
- if (!TIFFjpeg_set_quality(sp, sp->jpegquality, FALSE))
- return (0);
- unsuppress_quant_table(sp, 0);
- unsuppress_quant_table(sp, 1);
- }
- if (sp->jpegtablesmode & JPEGTABLESMODE_HUFF)
- sp->cinfo.c.optimize_coding = FALSE;
- else
- sp->cinfo.c.optimize_coding = TRUE;
- if (downsampled_input) {
- /* Need to use raw-data interface to libjpeg */
- sp->cinfo.c.raw_data_in = TRUE;
- tif->tif_encoderow = JPEGEncodeRaw;
- tif->tif_encodestrip = JPEGEncodeRaw;
- tif->tif_encodetile = JPEGEncodeRaw;
- } else {
- /* Use normal interface to libjpeg */
- sp->cinfo.c.raw_data_in = FALSE;
- tif->tif_encoderow = JPEGEncode;
- tif->tif_encodestrip = JPEGEncode;
- tif->tif_encodetile = JPEGEncode;
- }
- /* Start JPEG compressor */
- if (!TIFFjpeg_start_compress(sp, FALSE))
- return (0);
- /* Allocate downsampled-data buffers if needed */
- if (downsampled_input) {
- if (!alloc_downsampled_buffers(tif, sp->cinfo.c.comp_info,
- sp->cinfo.c.num_components))
- return (0);
- }
- sp->scancount = 0;
-
- return (1);
-}
-
-/*
- * Encode a chunk of pixels.
- * "Standard" case: incoming data is not downsampled.
- */
-static int
-JPEGEncode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
-{
- JPEGState *sp = JState(tif);
- tsize_t nrows;
- JSAMPROW bufptr[1];
-
- (void) s;
- assert(sp != NULL);
- /* data is expected to be supplied in multiples of a scanline */
- nrows = cc / sp->bytesperline;
- if (cc % sp->bytesperline)
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline discarded");
-
- /* The last strip will be limited to image size */
- if( !isTiled(tif) && tif->tif_row+nrows > tif->tif_dir.td_imagelength )
- nrows = tif->tif_dir.td_imagelength - tif->tif_row;
-
- while (nrows-- > 0) {
- bufptr[0] = (JSAMPROW) buf;
- if (TIFFjpeg_write_scanlines(sp, bufptr, 1) != 1)
- return (0);
- if (nrows > 0)
- tif->tif_row++;
- buf += sp->bytesperline;
- }
- return (1);
-}
-
-/*
- * Encode a chunk of pixels.
- * Incoming data is expected to be downsampled per sampling factors.
- */
-static int
-JPEGEncodeRaw(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
-{
- JPEGState *sp = JState(tif);
- JSAMPLE* inptr;
- JSAMPLE* outptr;
- tsize_t nrows;
- JDIMENSION clumps_per_line, nclump;
- int clumpoffset, ci, xpos, ypos;
- jpeg_component_info* compptr;
- int samples_per_clump = sp->samplesperclump;
- tsize_t bytesperclumpline;
-
- (void) s;
- assert(sp != NULL);
- /* data is expected to be supplied in multiples of a clumpline */
- /* a clumpline is equivalent to v_sampling desubsampled scanlines */
- /* TODO: the following calculation of bytesperclumpline, should substitute calculation of sp->bytesperline, except that it is per v_sampling lines */
- bytesperclumpline = (((sp->cinfo.c.image_width+sp->h_sampling-1)/sp->h_sampling)
- *(sp->h_sampling*sp->v_sampling+2)*sp->cinfo.c.data_precision+7)
- /8;
-
- nrows = ( cc / bytesperclumpline ) * sp->v_sampling;
- if (cc % bytesperclumpline)
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline discarded");
-
- /* Cb,Cr both have sampling factors 1, so this is correct */
- clumps_per_line = sp->cinfo.c.comp_info[1].downsampled_width;
-
- while (nrows > 0) {
- /*
- * Fastest way to separate the data is to make one pass
- * over the scanline for each row of each component.
- */
- clumpoffset = 0; /* first sample in clump */
- for (ci = 0, compptr = sp->cinfo.c.comp_info;
- ci < sp->cinfo.c.num_components;
- ci++, compptr++) {
- int hsamp = compptr->h_samp_factor;
- int vsamp = compptr->v_samp_factor;
- int padding = (int) (compptr->width_in_blocks * DCTSIZE -
- clumps_per_line * hsamp);
- for (ypos = 0; ypos < vsamp; ypos++) {
- inptr = ((JSAMPLE*) buf) + clumpoffset;
- outptr = sp->ds_buffer[ci][sp->scancount*vsamp + ypos];
- if (hsamp == 1) {
- /* fast path for at least Cb and Cr */
- for (nclump = clumps_per_line; nclump-- > 0; ) {
- *outptr++ = inptr[0];
- inptr += samples_per_clump;
- }
- } else {
- /* general case */
- for (nclump = clumps_per_line; nclump-- > 0; ) {
- for (xpos = 0; xpos < hsamp; xpos++)
- *outptr++ = inptr[xpos];
- inptr += samples_per_clump;
- }
- }
- /* pad each scanline as needed */
- for (xpos = 0; xpos < padding; xpos++) {
- *outptr = outptr[-1];
- outptr++;
- }
- clumpoffset += hsamp;
- }
- }
- sp->scancount++;
- if (sp->scancount >= DCTSIZE) {
- int n = sp->cinfo.c.max_v_samp_factor * DCTSIZE;
- if (TIFFjpeg_write_raw_data(sp, sp->ds_buffer, n) != n)
- return (0);
- sp->scancount = 0;
- }
- tif->tif_row += sp->v_sampling;
- buf += sp->bytesperline;
- nrows -= sp->v_sampling;
- }
- return (1);
-}
-
-/*
- * Finish up at the end of a strip or tile.
- */
-static int
-JPEGPostEncode(TIFF* tif)
-{
- JPEGState *sp = JState(tif);
-
- if (sp->scancount > 0) {
- /*
- * Need to emit a partial bufferload of downsampled data.
- * Pad the data vertically.
- */
- int ci, ypos, n;
- jpeg_component_info* compptr;
-
- for (ci = 0, compptr = sp->cinfo.c.comp_info;
- ci < sp->cinfo.c.num_components;
- ci++, compptr++) {
- int vsamp = compptr->v_samp_factor;
- tsize_t row_width = compptr->width_in_blocks * DCTSIZE
- * sizeof(JSAMPLE);
- for (ypos = sp->scancount * vsamp;
- ypos < DCTSIZE * vsamp; ypos++) {
- _TIFFmemcpy((tdata_t)sp->ds_buffer[ci][ypos],
- (tdata_t)sp->ds_buffer[ci][ypos-1],
- row_width);
-
- }
- }
- n = sp->cinfo.c.max_v_samp_factor * DCTSIZE;
- if (TIFFjpeg_write_raw_data(sp, sp->ds_buffer, n) != n)
- return (0);
- }
-
- return (TIFFjpeg_finish_compress(JState(tif)));
-}
-
-static void
-JPEGCleanup(TIFF* tif)
-{
- JPEGState *sp = JState(tif);
-
- assert(sp != 0);
-
- tif->tif_tagmethods.vgetfield = sp->vgetparent;
- tif->tif_tagmethods.vsetfield = sp->vsetparent;
- tif->tif_tagmethods.printdir = sp->printdir;
-
- if( sp->cinfo_initialized )
- TIFFjpeg_destroy(sp); /* release libjpeg resources */
- if (sp->jpegtables) /* tag value */
- _TIFFfree(sp->jpegtables);
- _TIFFfree(tif->tif_data); /* release local state */
- tif->tif_data = NULL;
-
- _TIFFSetDefaultCompressionState(tif);
-}
-
-static void
-JPEGResetUpsampled( TIFF* tif )
-{
- JPEGState* sp = JState(tif);
- TIFFDirectory* td = &tif->tif_dir;
-
- /*
- * Mark whether returned data is up-sampled or not so TIFFStripSize
- * and TIFFTileSize return values that reflect the true amount of
- * data.
- */
- tif->tif_flags &= ~TIFF_UPSAMPLED;
- if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
- if (td->td_photometric == PHOTOMETRIC_YCBCR &&
- sp->jpegcolormode == JPEGCOLORMODE_RGB) {
- tif->tif_flags |= TIFF_UPSAMPLED;
- } else {
-#ifdef notdef
- if (td->td_ycbcrsubsampling[0] != 1 ||
- td->td_ycbcrsubsampling[1] != 1)
- ; /* XXX what about up-sampling? */
-#endif
- }
- }
-
- /*
- * Must recalculate cached tile size in case sampling state changed.
- * Should we really be doing this now if image size isn't set?
- */
- tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
-}
-
-static int
-JPEGVSetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- JPEGState* sp = JState(tif);
- const TIFFFieldInfo* fip;
- uint32 v32;
-
- assert(sp != NULL);
-
- switch (tag) {
- case TIFFTAG_JPEGTABLES:
- v32 = va_arg(ap, uint32);
- if (v32 == 0) {
- /* XXX */
- return (0);
- }
- _TIFFsetByteArray(&sp->jpegtables, va_arg(ap, void*),
- (long) v32);
- sp->jpegtables_length = v32;
- TIFFSetFieldBit(tif, FIELD_JPEGTABLES);
- break;
- case TIFFTAG_JPEGQUALITY:
- sp->jpegquality = va_arg(ap, int);
- return (1); /* pseudo tag */
- case TIFFTAG_JPEGCOLORMODE:
- sp->jpegcolormode = va_arg(ap, int);
- JPEGResetUpsampled( tif );
- return (1); /* pseudo tag */
- case TIFFTAG_PHOTOMETRIC:
- {
- int ret_value = (*sp->vsetparent)(tif, tag, ap);
- JPEGResetUpsampled( tif );
- return ret_value;
- }
- case TIFFTAG_JPEGTABLESMODE:
- sp->jpegtablesmode = va_arg(ap, int);
- return (1); /* pseudo tag */
- case TIFFTAG_YCBCRSUBSAMPLING:
- /* mark the fact that we have a real ycbcrsubsampling! */
- sp->ycbcrsampling_fetched = 1;
- /* should we be recomputing upsampling info here? */
- return (*sp->vsetparent)(tif, tag, ap);
- case TIFFTAG_FAXRECVPARAMS:
- sp->recvparams = va_arg(ap, uint32);
- break;
- case TIFFTAG_FAXSUBADDRESS:
- _TIFFsetString(&sp->subaddress, va_arg(ap, char*));
- break;
- case TIFFTAG_FAXRECVTIME:
- sp->recvtime = va_arg(ap, uint32);
- break;
- case TIFFTAG_FAXDCS:
- _TIFFsetString(&sp->faxdcs, va_arg(ap, char*));
- break;
- default:
- return (*sp->vsetparent)(tif, tag, ap);
- }
-
- if ((fip = _TIFFFieldWithTag(tif, tag))) {
- TIFFSetFieldBit(tif, fip->field_bit);
- } else {
- return (0);
- }
-
- tif->tif_flags |= TIFF_DIRTYDIRECT;
- return (1);
-}
-
-/*
- * Some JPEG-in-TIFF produces do not emit the YCBCRSUBSAMPLING values in
- * the TIFF tags, but still use non-default (2,2) values within the jpeg
- * data stream itself. In order for TIFF applications to work properly
- * - for instance to get the strip buffer size right - it is imperative
- * that the subsampling be available before we start reading the image
- * data normally. This function will attempt to load the first strip in
- * order to get the sampling values from the jpeg data stream. Various
- * hacks are various places are done to ensure this function gets called
- * before the td_ycbcrsubsampling values are used from the directory structure,
- * including calling TIFFGetField() for the YCBCRSUBSAMPLING field from
- * TIFFStripSize(), and the printing code in tif_print.c.
- *
- * Note that JPEGPreDeocode() will produce a fairly loud warning when the
- * discovered sampling does not match the default sampling (2,2) or whatever
- * was actually in the tiff tags.
- *
- * Problems:
- * o This code will cause one whole strip/tile of compressed data to be
- * loaded just to get the tags right, even if the imagery is never read.
- * It would be more efficient to just load a bit of the header, and
- * initialize things from that.
- *
- * See the bug in bugzilla for details:
- *
- * http://bugzilla.remotesensing.org/show_bug.cgi?id=168
- *
- * Frank Warmerdam, July 2002
- */
-
-static void
-JPEGFixupTestSubsampling( TIFF * tif )
-{
-#ifdef CHECK_JPEG_YCBCR_SUBSAMPLING
- JPEGState *sp = JState(tif);
- TIFFDirectory *td = &tif->tif_dir;
-
- JPEGInitializeLibJPEG( tif, 0, 0 );
-
- /*
- * Some JPEG-in-TIFF files don't provide the ycbcrsampling tags,
- * and use a sampling schema other than the default 2,2. To handle
- * this we actually have to scan the header of a strip or tile of
- * jpeg data to get the sampling.
- */
- if( !sp->cinfo.comm.is_decompressor
- || sp->ycbcrsampling_fetched
- || td->td_photometric != PHOTOMETRIC_YCBCR )
- return;
-
- sp->ycbcrsampling_fetched = 1;
- if( TIFFIsTiled( tif ) )
- {
- if( !TIFFFillTile( tif, 0 ) )
- return;
- }
- else
- {
- if( !TIFFFillStrip( tif, 0 ) )
- return;
- }
-
- TIFFSetField( tif, TIFFTAG_YCBCRSUBSAMPLING,
- (uint16) sp->h_sampling, (uint16) sp->v_sampling );
-#endif /* CHECK_JPEG_YCBCR_SUBSAMPLING */
-}
-
-static int
-JPEGVGetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- JPEGState* sp = JState(tif);
-
- assert(sp != NULL);
-
- switch (tag) {
- case TIFFTAG_JPEGTABLES:
- *va_arg(ap, uint32*) = sp->jpegtables_length;
- *va_arg(ap, void**) = sp->jpegtables;
- break;
- case TIFFTAG_JPEGQUALITY:
- *va_arg(ap, int*) = sp->jpegquality;
- break;
- case TIFFTAG_JPEGCOLORMODE:
- *va_arg(ap, int*) = sp->jpegcolormode;
- break;
- case TIFFTAG_JPEGTABLESMODE:
- *va_arg(ap, int*) = sp->jpegtablesmode;
- break;
- case TIFFTAG_YCBCRSUBSAMPLING:
- JPEGFixupTestSubsampling( tif );
- return (*sp->vgetparent)(tif, tag, ap);
- case TIFFTAG_FAXRECVPARAMS:
- *va_arg(ap, uint32*) = sp->recvparams;
- break;
- case TIFFTAG_FAXSUBADDRESS:
- *va_arg(ap, char**) = sp->subaddress;
- break;
- case TIFFTAG_FAXRECVTIME:
- *va_arg(ap, uint32*) = sp->recvtime;
- break;
- case TIFFTAG_FAXDCS:
- *va_arg(ap, char**) = sp->faxdcs;
- break;
- default:
- return (*sp->vgetparent)(tif, tag, ap);
- }
- return (1);
-}
-
-static void
-JPEGPrintDir(TIFF* tif, FILE* fd, long flags)
-{
- JPEGState* sp = JState(tif);
-
- assert(sp != NULL);
-
- (void) flags;
- if (TIFFFieldSet(tif,FIELD_JPEGTABLES))
- fprintf(fd, " JPEG Tables: (%lu bytes)\n",
- (unsigned long) sp->jpegtables_length);
- if (TIFFFieldSet(tif,FIELD_RECVPARAMS))
- fprintf(fd, " Fax Receive Parameters: %08lx\n",
- (unsigned long) sp->recvparams);
- if (TIFFFieldSet(tif,FIELD_SUBADDRESS))
- fprintf(fd, " Fax SubAddress: %s\n", sp->subaddress);
- if (TIFFFieldSet(tif,FIELD_RECVTIME))
- fprintf(fd, " Fax Receive Time: %lu secs\n",
- (unsigned long) sp->recvtime);
- if (TIFFFieldSet(tif,FIELD_FAXDCS))
- fprintf(fd, " Fax DCS: %s\n", sp->faxdcs);
-}
-
-static uint32
-JPEGDefaultStripSize(TIFF* tif, uint32 s)
-{
- JPEGState* sp = JState(tif);
- TIFFDirectory *td = &tif->tif_dir;
-
- s = (*sp->defsparent)(tif, s);
- if (s < td->td_imagelength)
- s = TIFFroundup(s, td->td_ycbcrsubsampling[1] * DCTSIZE);
- return (s);
-}
-
-static void
-JPEGDefaultTileSize(TIFF* tif, uint32* tw, uint32* th)
-{
- JPEGState* sp = JState(tif);
- TIFFDirectory *td = &tif->tif_dir;
-
- (*sp->deftparent)(tif, tw, th);
- *tw = TIFFroundup(*tw, td->td_ycbcrsubsampling[0] * DCTSIZE);
- *th = TIFFroundup(*th, td->td_ycbcrsubsampling[1] * DCTSIZE);
-}
-
-/*
- * The JPEG library initialized used to be done in TIFFInitJPEG(), but
- * now that we allow a TIFF file to be opened in update mode it is necessary
- * to have some way of deciding whether compression or decompression is
- * desired other than looking at tif->tif_mode. We accomplish this by
- * examining {TILE/STRIP}BYTECOUNTS to see if there is a non-zero entry.
- * If so, we assume decompression is desired.
- *
- * This is tricky, because TIFFInitJPEG() is called while the directory is
- * being read, and generally speaking the BYTECOUNTS tag won't have been read
- * at that point. So we try to defer jpeg library initialization till we
- * do have that tag ... basically any access that might require the compressor
- * or decompressor that occurs after the reading of the directory.
- *
- * In an ideal world compressors or decompressors would be setup
- * at the point where a single tile or strip was accessed (for read or write)
- * so that stuff like update of missing tiles, or replacement of tiles could
- * be done. However, we aren't trying to crack that nut just yet ...
- *
- * NFW, Feb 3rd, 2003.
- */
-
-static int JPEGInitializeLibJPEG( TIFF * tif, int force_encode, int force_decode )
-{
- JPEGState* sp = JState(tif);
- uint32 *byte_counts = NULL;
- int data_is_empty = TRUE;
- int decompress;
-
-
- if(sp->cinfo_initialized)
- {
- if( force_encode && sp->cinfo.comm.is_decompressor )
- TIFFjpeg_destroy( sp );
- else if( force_decode && !sp->cinfo.comm.is_decompressor )
- TIFFjpeg_destroy( sp );
- else
- return 1;
-
- sp->cinfo_initialized = 0;
- }
-
- /*
- * Do we have tile data already? Make sure we initialize the
- * the state in decompressor mode if we have tile data, even if we
- * are not in read-only file access mode.
- */
- if( TIFFIsTiled( tif )
- && TIFFGetField( tif, TIFFTAG_TILEBYTECOUNTS, &byte_counts )
- && byte_counts != NULL )
- {
- data_is_empty = byte_counts[0] == 0;
- }
- if( !TIFFIsTiled( tif )
- && TIFFGetField( tif, TIFFTAG_STRIPBYTECOUNTS, &byte_counts)
- && byte_counts != NULL )
- {
- data_is_empty = byte_counts[0] == 0;
- }
-
- if( force_decode )
- decompress = 1;
- else if( force_encode )
- decompress = 0;
- else if( tif->tif_mode == O_RDONLY )
- decompress = 1;
- else if( data_is_empty )
- decompress = 0;
- else
- decompress = 1;
-
- /*
- * Initialize libjpeg.
- */
- if ( decompress ) {
- if (!TIFFjpeg_create_decompress(sp))
- return (0);
-
- } else {
- if (!TIFFjpeg_create_compress(sp))
- return (0);
- }
-
- sp->cinfo_initialized = TRUE;
-
- return 1;
-}
-
-int
-TIFFInitJPEG(TIFF* tif, int scheme)
-{
- JPEGState* sp;
-
- assert(scheme == COMPRESSION_JPEG);
-
- /*
- * Merge codec-specific tag information.
- */
- if (!_TIFFMergeFieldInfo(tif, jpegFieldInfo, N(jpegFieldInfo))) {
- TIFFErrorExt(tif->tif_clientdata,
- "TIFFInitJPEG",
- "Merging JPEG codec-specific tags failed");
- return 0;
- }
-
- /*
- * Allocate state block so tag methods have storage to record values.
- */
- tif->tif_data = (tidata_t) _TIFFmalloc(sizeof (JPEGState));
-
- if (tif->tif_data == NULL) {
- TIFFErrorExt(tif->tif_clientdata,
- "TIFFInitJPEG", "No space for JPEG state block");
- return 0;
- }
- _TIFFmemset(tif->tif_data, 0, sizeof(JPEGState));
-
- sp = JState(tif);
- sp->tif = tif; /* back link */
-
- /*
- * Override parent get/set field methods.
- */
- sp->vgetparent = tif->tif_tagmethods.vgetfield;
- tif->tif_tagmethods.vgetfield = JPEGVGetField; /* hook for codec tags */
- sp->vsetparent = tif->tif_tagmethods.vsetfield;
- tif->tif_tagmethods.vsetfield = JPEGVSetField; /* hook for codec tags */
- sp->printdir = tif->tif_tagmethods.printdir;
- tif->tif_tagmethods.printdir = JPEGPrintDir; /* hook for codec tags */
-
- /* Default values for codec-specific fields */
- sp->jpegtables = NULL;
- sp->jpegtables_length = 0;
- sp->jpegquality = 75; /* Default IJG quality */
- sp->jpegcolormode = JPEGCOLORMODE_RAW;
- sp->jpegtablesmode = JPEGTABLESMODE_QUANT | JPEGTABLESMODE_HUFF;
-
- sp->recvparams = 0;
- sp->subaddress = NULL;
- sp->faxdcs = NULL;
-
- sp->ycbcrsampling_fetched = 0;
-
- /*
- * Install codec methods.
- */
- tif->tif_setupdecode = JPEGSetupDecode;
- tif->tif_predecode = JPEGPreDecode;
- tif->tif_decoderow = JPEGDecode;
- tif->tif_decodestrip = JPEGDecode;
- tif->tif_decodetile = JPEGDecode;
- tif->tif_setupencode = JPEGSetupEncode;
- tif->tif_preencode = JPEGPreEncode;
- tif->tif_postencode = JPEGPostEncode;
- tif->tif_encoderow = JPEGEncode;
- tif->tif_encodestrip = JPEGEncode;
- tif->tif_encodetile = JPEGEncode;
- tif->tif_cleanup = JPEGCleanup;
- sp->defsparent = tif->tif_defstripsize;
- tif->tif_defstripsize = JPEGDefaultStripSize;
- sp->deftparent = tif->tif_deftilesize;
- tif->tif_deftilesize = JPEGDefaultTileSize;
- tif->tif_flags |= TIFF_NOBITREV; /* no bit reversal, please */
-
- sp->cinfo_initialized = FALSE;
-
- /*
- ** Create a JPEGTables field if no directory has yet been created.
- ** We do this just to ensure that sufficient space is reserved for
- ** the JPEGTables field. It will be properly created the right
- ** size later.
- */
- if( tif->tif_diroff == 0 )
- {
-#define SIZE_OF_JPEGTABLES 2000
- TIFFSetFieldBit(tif, FIELD_JPEGTABLES);
- sp->jpegtables_length = SIZE_OF_JPEGTABLES;
- sp->jpegtables = (void *) _TIFFmalloc(sp->jpegtables_length);
- _TIFFmemset(sp->jpegtables, 0, SIZE_OF_JPEGTABLES);
-#undef SIZE_OF_JPEGTABLES
- }
-
- /*
- * Mark the TIFFTAG_YCBCRSAMPLES as present even if it is not
- * see: JPEGFixupTestSubsampling().
- */
- TIFFSetFieldBit( tif, FIELD_YCBCRSUBSAMPLING );
-
- return 1;
-}
-#endif /* JPEG_SUPPORT */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
-
diff --git a/src/3rdparty/libtiff/libtiff/tif_luv.c b/src/3rdparty/libtiff/libtiff/tif_luv.c
deleted file mode 100644
index be8fceaf86..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_luv.c
+++ /dev/null
@@ -1,1622 +0,0 @@
-/* $Id: tif_luv.c,v 1.17.2.3 2009-06-30 17:06:25 fwarmerdam Exp $ */
-
-/*
- * Copyright (c) 1997 Greg Ward Larson
- * Copyright (c) 1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler, Greg Larson and Silicon Graphics may not be used in any
- * advertising or publicity relating to the software without the specific,
- * prior written permission of Sam Leffler, Greg Larson and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER, GREG LARSON OR SILICON GRAPHICS BE LIABLE
- * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#include "tiffiop.h"
-#ifdef LOGLUV_SUPPORT
-
-/*
- * TIFF Library.
- * LogLuv compression support for high dynamic range images.
- *
- * Contributed by Greg Larson.
- *
- * LogLuv image support uses the TIFF library to store 16 or 10-bit
- * log luminance values with 8 bits each of u and v or a 14-bit index.
- *
- * The codec can take as input and produce as output 32-bit IEEE float values
- * as well as 16-bit integer values. A 16-bit luminance is interpreted
- * as a sign bit followed by a 15-bit integer that is converted
- * to and from a linear magnitude using the transformation:
- *
- * L = 2^( (Le+.5)/256 - 64 ) # real from 15-bit
- *
- * Le = floor( 256*(log2(L) + 64) ) # 15-bit from real
- *
- * The actual conversion to world luminance units in candelas per sq. meter
- * requires an additional multiplier, which is stored in the TIFFTAG_STONITS.
- * This value is usually set such that a reasonable exposure comes from
- * clamping decoded luminances above 1 to 1 in the displayed image.
- *
- * The 16-bit values for u and v may be converted to real values by dividing
- * each by 32768. (This allows for negative values, which aren't useful as
- * far as we know, but are left in case of future improvements in human
- * color vision.)
- *
- * Conversion from (u,v), which is actually the CIE (u',v') system for
- * you color scientists, is accomplished by the following transformation:
- *
- * u = 4*x / (-2*x + 12*y + 3)
- * v = 9*y / (-2*x + 12*y + 3)
- *
- * x = 9*u / (6*u - 16*v + 12)
- * y = 4*v / (6*u - 16*v + 12)
- *
- * This process is greatly simplified by passing 32-bit IEEE floats
- * for each of three CIE XYZ coordinates. The codec then takes care
- * of conversion to and from LogLuv, though the application is still
- * responsible for interpreting the TIFFTAG_STONITS calibration factor.
- *
- * By definition, a CIE XYZ vector of [1 1 1] corresponds to a neutral white
- * point of (x,y)=(1/3,1/3). However, most color systems assume some other
- * white point, such as D65, and an absolute color conversion to XYZ then
- * to another color space with a different white point may introduce an
- * unwanted color cast to the image. It is often desirable, therefore, to
- * perform a white point conversion that maps the input white to [1 1 1]
- * in XYZ, then record the original white point using the TIFFTAG_WHITEPOINT
- * tag value. A decoder that demands absolute color calibration may use
- * this white point tag to get back the original colors, but usually it
- * will be ignored and the new white point will be used instead that
- * matches the output color space.
- *
- * Pixel information is compressed into one of two basic encodings, depending
- * on the setting of the compression tag, which is one of COMPRESSION_SGILOG
- * or COMPRESSION_SGILOG24. For COMPRESSION_SGILOG, greyscale data is
- * stored as:
- *
- * 1 15
- * |-+---------------|
- *
- * COMPRESSION_SGILOG color data is stored as:
- *
- * 1 15 8 8
- * |-+---------------|--------+--------|
- * S Le ue ve
- *
- * For the 24-bit COMPRESSION_SGILOG24 color format, the data is stored as:
- *
- * 10 14
- * |----------|--------------|
- * Le' Ce
- *
- * There is no sign bit in the 24-bit case, and the (u,v) chromaticity is
- * encoded as an index for optimal color resolution. The 10 log bits are
- * defined by the following conversions:
- *
- * L = 2^((Le'+.5)/64 - 12) # real from 10-bit
- *
- * Le' = floor( 64*(log2(L) + 12) ) # 10-bit from real
- *
- * The 10 bits of the smaller format may be converted into the 15 bits of
- * the larger format by multiplying by 4 and adding 13314. Obviously,
- * a smaller range of magnitudes is covered (about 5 orders of magnitude
- * instead of 38), and the lack of a sign bit means that negative luminances
- * are not allowed. (Well, they aren't allowed in the real world, either,
- * but they are useful for certain types of image processing.)
- *
- * The desired user format is controlled by the setting the internal
- * pseudo tag TIFFTAG_SGILOGDATAFMT to one of:
- * SGILOGDATAFMT_FLOAT = IEEE 32-bit float XYZ values
- * SGILOGDATAFMT_16BIT = 16-bit integer encodings of logL, u and v
- * Raw data i/o is also possible using:
- * SGILOGDATAFMT_RAW = 32-bit unsigned integer with encoded pixel
- * In addition, the following decoding is provided for ease of display:
- * SGILOGDATAFMT_8BIT = 8-bit default RGB gamma-corrected values
- *
- * For grayscale images, we provide the following data formats:
- * SGILOGDATAFMT_FLOAT = IEEE 32-bit float Y values
- * SGILOGDATAFMT_16BIT = 16-bit integer w/ encoded luminance
- * SGILOGDATAFMT_8BIT = 8-bit gray monitor values
- *
- * Note that the COMPRESSION_SGILOG applies a simple run-length encoding
- * scheme by separating the logL, u and v bytes for each row and applying
- * a PackBits type of compression. Since the 24-bit encoding is not
- * adaptive, the 32-bit color format takes less space in many cases.
- *
- * Further control is provided over the conversion from higher-resolution
- * formats to final encoded values through the pseudo tag
- * TIFFTAG_SGILOGENCODE:
- * SGILOGENCODE_NODITHER = do not dither encoded values
- * SGILOGENCODE_RANDITHER = apply random dithering during encoding
- *
- * The default value of this tag is SGILOGENCODE_NODITHER for
- * COMPRESSION_SGILOG to maximize run-length encoding and
- * SGILOGENCODE_RANDITHER for COMPRESSION_SGILOG24 to turn
- * quantization errors into noise.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-/*
- * State block for each open TIFF
- * file using LogLuv compression/decompression.
- */
-typedef struct logLuvState LogLuvState;
-
-struct logLuvState {
- int user_datafmt; /* user data format */
- int encode_meth; /* encoding method */
- int pixel_size; /* bytes per pixel */
-
- tidata_t* tbuf; /* translation buffer */
- int tbuflen; /* buffer length */
- void (*tfunc)(LogLuvState*, tidata_t, int);
-
- TIFFVSetMethod vgetparent; /* super-class method */
- TIFFVSetMethod vsetparent; /* super-class method */
-};
-
-#define DecoderState(tif) ((LogLuvState*) (tif)->tif_data)
-#define EncoderState(tif) ((LogLuvState*) (tif)->tif_data)
-
-#define SGILOGDATAFMT_UNKNOWN -1
-
-#define MINRUN 4 /* minimum run length */
-
-/*
- * Decode a string of 16-bit gray pixels.
- */
-static int
-LogL16Decode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
-{
- LogLuvState* sp = DecoderState(tif);
- int shft, i, npixels;
- unsigned char* bp;
- int16* tp;
- int16 b;
- int cc, rc;
-
- assert(s == 0);
- assert(sp != NULL);
-
- npixels = occ / sp->pixel_size;
-
- if (sp->user_datafmt == SGILOGDATAFMT_16BIT)
- tp = (int16*) op;
- else {
- assert(sp->tbuflen >= npixels);
- tp = (int16*) sp->tbuf;
- }
- _TIFFmemset((tdata_t) tp, 0, npixels*sizeof (tp[0]));
-
- bp = (unsigned char*) tif->tif_rawcp;
- cc = tif->tif_rawcc;
- /* get each byte string */
- for (shft = 2*8; (shft -= 8) >= 0; ) {
- for (i = 0; i < npixels && cc > 0; )
- if (*bp >= 128) { /* run */
- rc = *bp++ + (2-128);
- b = (int16)(*bp++ << shft);
- cc -= 2;
- while (rc-- && i < npixels)
- tp[i++] |= b;
- } else { /* non-run */
- rc = *bp++; /* nul is noop */
- while (--cc && rc-- && i < npixels)
- tp[i++] |= (int16)*bp++ << shft;
- }
- if (i != npixels) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LogL16Decode: Not enough data at row %d (short %d pixels)",
- tif->tif_row, npixels - i);
- tif->tif_rawcp = (tidata_t) bp;
- tif->tif_rawcc = cc;
- return (0);
- }
- }
- (*sp->tfunc)(sp, op, npixels);
- tif->tif_rawcp = (tidata_t) bp;
- tif->tif_rawcc = cc;
- return (1);
-}
-
-/*
- * Decode a string of 24-bit pixels.
- */
-static int
-LogLuvDecode24(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
-{
- LogLuvState* sp = DecoderState(tif);
- int cc, i, npixels;
- unsigned char* bp;
- uint32* tp;
-
- assert(s == 0);
- assert(sp != NULL);
-
- npixels = occ / sp->pixel_size;
-
- if (sp->user_datafmt == SGILOGDATAFMT_RAW)
- tp = (uint32 *)op;
- else {
- assert(sp->tbuflen >= npixels);
- tp = (uint32 *) sp->tbuf;
- }
- /* copy to array of uint32 */
- bp = (unsigned char*) tif->tif_rawcp;
- cc = tif->tif_rawcc;
- for (i = 0; i < npixels && cc > 0; i++) {
- tp[i] = bp[0] << 16 | bp[1] << 8 | bp[2];
- bp += 3;
- cc -= 3;
- }
- tif->tif_rawcp = (tidata_t) bp;
- tif->tif_rawcc = cc;
- if (i != npixels) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LogLuvDecode24: Not enough data at row %d (short %d pixels)",
- tif->tif_row, npixels - i);
- return (0);
- }
- (*sp->tfunc)(sp, op, npixels);
- return (1);
-}
-
-/*
- * Decode a string of 32-bit pixels.
- */
-static int
-LogLuvDecode32(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
-{
- LogLuvState* sp;
- int shft, i, npixels;
- unsigned char* bp;
- uint32* tp;
- uint32 b;
- int cc, rc;
-
- assert(s == 0);
- sp = DecoderState(tif);
- assert(sp != NULL);
-
- npixels = occ / sp->pixel_size;
-
- if (sp->user_datafmt == SGILOGDATAFMT_RAW)
- tp = (uint32*) op;
- else {
- assert(sp->tbuflen >= npixels);
- tp = (uint32*) sp->tbuf;
- }
- _TIFFmemset((tdata_t) tp, 0, npixels*sizeof (tp[0]));
-
- bp = (unsigned char*) tif->tif_rawcp;
- cc = tif->tif_rawcc;
- /* get each byte string */
- for (shft = 4*8; (shft -= 8) >= 0; ) {
- for (i = 0; i < npixels && cc > 0; )
- if (*bp >= 128) { /* run */
- rc = *bp++ + (2-128);
- b = (uint32)*bp++ << shft;
- cc -= 2;
- while (rc-- && i < npixels)
- tp[i++] |= b;
- } else { /* non-run */
- rc = *bp++; /* nul is noop */
- while (--cc && rc-- && i < npixels)
- tp[i++] |= (uint32)*bp++ << shft;
- }
- if (i != npixels) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LogLuvDecode32: Not enough data at row %d (short %d pixels)",
- tif->tif_row, npixels - i);
- tif->tif_rawcp = (tidata_t) bp;
- tif->tif_rawcc = cc;
- return (0);
- }
- }
- (*sp->tfunc)(sp, op, npixels);
- tif->tif_rawcp = (tidata_t) bp;
- tif->tif_rawcc = cc;
- return (1);
-}
-
-/*
- * Decode a strip of pixels. We break it into rows to
- * maintain synchrony with the encode algorithm, which
- * is row by row.
- */
-static int
-LogLuvDecodeStrip(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- tsize_t rowlen = TIFFScanlineSize(tif);
-
- assert(cc%rowlen == 0);
- while (cc && (*tif->tif_decoderow)(tif, bp, rowlen, s))
- bp += rowlen, cc -= rowlen;
- return (cc == 0);
-}
-
-/*
- * Decode a tile of pixels. We break it into rows to
- * maintain synchrony with the encode algorithm, which
- * is row by row.
- */
-static int
-LogLuvDecodeTile(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- tsize_t rowlen = TIFFTileRowSize(tif);
-
- assert(cc%rowlen == 0);
- while (cc && (*tif->tif_decoderow)(tif, bp, rowlen, s))
- bp += rowlen, cc -= rowlen;
- return (cc == 0);
-}
-
-/*
- * Encode a row of 16-bit pixels.
- */
-static int
-LogL16Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- LogLuvState* sp = EncoderState(tif);
- int shft, i, j, npixels;
- tidata_t op;
- int16* tp;
- int16 b;
- int occ, rc=0, mask, beg;
-
- assert(s == 0);
- assert(sp != NULL);
- npixels = cc / sp->pixel_size;
-
- if (sp->user_datafmt == SGILOGDATAFMT_16BIT)
- tp = (int16*) bp;
- else {
- tp = (int16*) sp->tbuf;
- assert(sp->tbuflen >= npixels);
- (*sp->tfunc)(sp, bp, npixels);
- }
- /* compress each byte string */
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- for (shft = 2*8; (shft -= 8) >= 0; )
- for (i = 0; i < npixels; i += rc) {
- if (occ < 4) {
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
- if (!TIFFFlushData1(tif))
- return (-1);
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- }
- mask = 0xff << shft; /* find next run */
- for (beg = i; beg < npixels; beg += rc) {
- b = (int16) (tp[beg] & mask);
- rc = 1;
- while (rc < 127+2 && beg+rc < npixels &&
- (tp[beg+rc] & mask) == b)
- rc++;
- if (rc >= MINRUN)
- break; /* long enough */
- }
- if (beg-i > 1 && beg-i < MINRUN) {
- b = (int16) (tp[i] & mask);/*check short run */
- j = i+1;
- while ((tp[j++] & mask) == b)
- if (j == beg) {
- *op++ = (tidataval_t)(128-2+j-i);
- *op++ = (tidataval_t) (b >> shft);
- occ -= 2;
- i = beg;
- break;
- }
- }
- while (i < beg) { /* write out non-run */
- if ((j = beg-i) > 127) j = 127;
- if (occ < j+3) {
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
- if (!TIFFFlushData1(tif))
- return (-1);
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- }
- *op++ = (tidataval_t) j; occ--;
- while (j--) {
- *op++ = (tidataval_t) (tp[i++] >> shft & 0xff);
- occ--;
- }
- }
- if (rc >= MINRUN) { /* write out run */
- *op++ = (tidataval_t) (128-2+rc);
- *op++ = (tidataval_t) (tp[beg] >> shft & 0xff);
- occ -= 2;
- } else
- rc = 0;
- }
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
-
- return (1);
-}
-
-/*
- * Encode a row of 24-bit pixels.
- */
-static int
-LogLuvEncode24(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- LogLuvState* sp = EncoderState(tif);
- int i, npixels, occ;
- tidata_t op;
- uint32* tp;
-
- assert(s == 0);
- assert(sp != NULL);
- npixels = cc / sp->pixel_size;
-
- if (sp->user_datafmt == SGILOGDATAFMT_RAW)
- tp = (uint32*) bp;
- else {
- tp = (uint32*) sp->tbuf;
- assert(sp->tbuflen >= npixels);
- (*sp->tfunc)(sp, bp, npixels);
- }
- /* write out encoded pixels */
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- for (i = npixels; i--; ) {
- if (occ < 3) {
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
- if (!TIFFFlushData1(tif))
- return (-1);
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- }
- *op++ = (tidataval_t)(*tp >> 16);
- *op++ = (tidataval_t)(*tp >> 8 & 0xff);
- *op++ = (tidataval_t)(*tp++ & 0xff);
- occ -= 3;
- }
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
-
- return (1);
-}
-
-/*
- * Encode a row of 32-bit pixels.
- */
-static int
-LogLuvEncode32(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- LogLuvState* sp = EncoderState(tif);
- int shft, i, j, npixels;
- tidata_t op;
- uint32* tp;
- uint32 b;
- int occ, rc=0, mask, beg;
-
- assert(s == 0);
- assert(sp != NULL);
-
- npixels = cc / sp->pixel_size;
-
- if (sp->user_datafmt == SGILOGDATAFMT_RAW)
- tp = (uint32*) bp;
- else {
- tp = (uint32*) sp->tbuf;
- assert(sp->tbuflen >= npixels);
- (*sp->tfunc)(sp, bp, npixels);
- }
- /* compress each byte string */
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- for (shft = 4*8; (shft -= 8) >= 0; )
- for (i = 0; i < npixels; i += rc) {
- if (occ < 4) {
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
- if (!TIFFFlushData1(tif))
- return (-1);
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- }
- mask = 0xff << shft; /* find next run */
- for (beg = i; beg < npixels; beg += rc) {
- b = tp[beg] & mask;
- rc = 1;
- while (rc < 127+2 && beg+rc < npixels &&
- (tp[beg+rc] & mask) == b)
- rc++;
- if (rc >= MINRUN)
- break; /* long enough */
- }
- if (beg-i > 1 && beg-i < MINRUN) {
- b = tp[i] & mask; /* check short run */
- j = i+1;
- while ((tp[j++] & mask) == b)
- if (j == beg) {
- *op++ = (tidataval_t)(128-2+j-i);
- *op++ = (tidataval_t)(b >> shft);
- occ -= 2;
- i = beg;
- break;
- }
- }
- while (i < beg) { /* write out non-run */
- if ((j = beg-i) > 127) j = 127;
- if (occ < j+3) {
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
- if (!TIFFFlushData1(tif))
- return (-1);
- op = tif->tif_rawcp;
- occ = tif->tif_rawdatasize - tif->tif_rawcc;
- }
- *op++ = (tidataval_t) j; occ--;
- while (j--) {
- *op++ = (tidataval_t)(tp[i++] >> shft & 0xff);
- occ--;
- }
- }
- if (rc >= MINRUN) { /* write out run */
- *op++ = (tidataval_t) (128-2+rc);
- *op++ = (tidataval_t)(tp[beg] >> shft & 0xff);
- occ -= 2;
- } else
- rc = 0;
- }
- tif->tif_rawcp = op;
- tif->tif_rawcc = tif->tif_rawdatasize - occ;
-
- return (1);
-}
-
-/*
- * Encode a strip of pixels. We break it into rows to
- * avoid encoding runs across row boundaries.
- */
-static int
-LogLuvEncodeStrip(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- tsize_t rowlen = TIFFScanlineSize(tif);
-
- assert(cc%rowlen == 0);
- while (cc && (*tif->tif_encoderow)(tif, bp, rowlen, s) == 1)
- bp += rowlen, cc -= rowlen;
- return (cc == 0);
-}
-
-/*
- * Encode a tile of pixels. We break it into rows to
- * avoid encoding runs across row boundaries.
- */
-static int
-LogLuvEncodeTile(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- tsize_t rowlen = TIFFTileRowSize(tif);
-
- assert(cc%rowlen == 0);
- while (cc && (*tif->tif_encoderow)(tif, bp, rowlen, s) == 1)
- bp += rowlen, cc -= rowlen;
- return (cc == 0);
-}
-
-/*
- * Encode/Decode functions for converting to and from user formats.
- */
-
-#include "uvcode.h"
-
-#ifndef UVSCALE
-#define U_NEU 0.210526316
-#define V_NEU 0.473684211
-#define UVSCALE 410.
-#endif
-
-#ifndef M_LN2
-#define M_LN2 0.69314718055994530942
-#endif
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-#define log2(x) ((1./M_LN2)*log(x))
-#define exp2(x) exp(M_LN2*(x))
-
-#define itrunc(x,m) ((m)==SGILOGENCODE_NODITHER ? \
- (int)(x) : \
- (int)((x) + rand()*(1./RAND_MAX) - .5))
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-double
-LogL16toY(int p16) /* compute luminance from 16-bit LogL */
-{
- int Le = p16 & 0x7fff;
- double Y;
-
- if (!Le)
- return (0.);
- Y = exp(M_LN2/256.*(Le+.5) - M_LN2*64.);
- return (!(p16 & 0x8000) ? Y : -Y);
-}
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-int
-LogL16fromY(double Y, int em) /* get 16-bit LogL from Y */
-{
- if (Y >= 1.8371976e19)
- return (0x7fff);
- if (Y <= -1.8371976e19)
- return (0xffff);
- if (Y > 5.4136769e-20)
- return itrunc(256.*(log2(Y) + 64.), em);
- if (Y < -5.4136769e-20)
- return (~0x7fff | itrunc(256.*(log2(-Y) + 64.), em));
- return (0);
-}
-
-static void
-L16toY(LogLuvState* sp, tidata_t op, int n)
-{
- int16* l16 = (int16*) sp->tbuf;
- float* yp = (float*) op;
-
- while (n-- > 0)
- *yp++ = (float)LogL16toY(*l16++);
-}
-
-static void
-L16toGry(LogLuvState* sp, tidata_t op, int n)
-{
- int16* l16 = (int16*) sp->tbuf;
- uint8* gp = (uint8*) op;
-
- while (n-- > 0) {
- double Y = LogL16toY(*l16++);
- *gp++ = (uint8) ((Y <= 0.) ? 0 : (Y >= 1.) ? 255 : (int)(256.*sqrt(Y)));
- }
-}
-
-static void
-L16fromY(LogLuvState* sp, tidata_t op, int n)
-{
- int16* l16 = (int16*) sp->tbuf;
- float* yp = (float*) op;
-
- while (n-- > 0)
- *l16++ = (int16) (LogL16fromY(*yp++, sp->encode_meth));
-}
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-void
-XYZtoRGB24(float xyz[3], uint8 rgb[3])
-{
- double r, g, b;
- /* assume CCIR-709 primaries */
- r = 2.690*xyz[0] + -1.276*xyz[1] + -0.414*xyz[2];
- g = -1.022*xyz[0] + 1.978*xyz[1] + 0.044*xyz[2];
- b = 0.061*xyz[0] + -0.224*xyz[1] + 1.163*xyz[2];
- /* assume 2.0 gamma for speed */
- /* could use integer sqrt approx., but this is probably faster */
- rgb[0] = (uint8)((r<=0.) ? 0 : (r >= 1.) ? 255 : (int)(256.*sqrt(r)));
- rgb[1] = (uint8)((g<=0.) ? 0 : (g >= 1.) ? 255 : (int)(256.*sqrt(g)));
- rgb[2] = (uint8)((b<=0.) ? 0 : (b >= 1.) ? 255 : (int)(256.*sqrt(b)));
-}
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-double
-LogL10toY(int p10) /* compute luminance from 10-bit LogL */
-{
- if (p10 == 0)
- return (0.);
- return (exp(M_LN2/64.*(p10+.5) - M_LN2*12.));
-}
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-int
-LogL10fromY(double Y, int em) /* get 10-bit LogL from Y */
-{
- if (Y >= 15.742)
- return (0x3ff);
- else if (Y <= .00024283)
- return (0);
- else
- return itrunc(64.*(log2(Y) + 12.), em);
-}
-
-#define NANGLES 100
-#define uv2ang(u, v) ( (NANGLES*.499999999/M_PI) \
- * atan2((v)-V_NEU,(u)-U_NEU) + .5*NANGLES )
-
-static int
-oog_encode(double u, double v) /* encode out-of-gamut chroma */
-{
- static int oog_table[NANGLES];
- static int initialized = 0;
- register int i;
-
- if (!initialized) { /* set up perimeter table */
- double eps[NANGLES], ua, va, ang, epsa;
- int ui, vi, ustep;
- for (i = NANGLES; i--; )
- eps[i] = 2.;
- for (vi = UV_NVS; vi--; ) {
- va = UV_VSTART + (vi+.5)*UV_SQSIZ;
- ustep = uv_row[vi].nus-1;
- if (vi == UV_NVS-1 || vi == 0 || ustep <= 0)
- ustep = 1;
- for (ui = uv_row[vi].nus-1; ui >= 0; ui -= ustep) {
- ua = uv_row[vi].ustart + (ui+.5)*UV_SQSIZ;
- ang = uv2ang(ua, va);
- i = (int) ang;
- epsa = fabs(ang - (i+.5));
- if (epsa < eps[i]) {
- oog_table[i] = uv_row[vi].ncum + ui;
- eps[i] = epsa;
- }
- }
- }
- for (i = NANGLES; i--; ) /* fill any holes */
- if (eps[i] > 1.5) {
- int i1, i2;
- for (i1 = 1; i1 < NANGLES/2; i1++)
- if (eps[(i+i1)%NANGLES] < 1.5)
- break;
- for (i2 = 1; i2 < NANGLES/2; i2++)
- if (eps[(i+NANGLES-i2)%NANGLES] < 1.5)
- break;
- if (i1 < i2)
- oog_table[i] =
- oog_table[(i+i1)%NANGLES];
- else
- oog_table[i] =
- oog_table[(i+NANGLES-i2)%NANGLES];
- }
- initialized = 1;
- }
- i = (int) uv2ang(u, v); /* look up hue angle */
- return (oog_table[i]);
-}
-
-#undef uv2ang
-#undef NANGLES
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-int
-uv_encode(double u, double v, int em) /* encode (u',v') coordinates */
-{
- register int vi, ui;
-
- if (v < UV_VSTART)
- return oog_encode(u, v);
- vi = itrunc((v - UV_VSTART)*(1./UV_SQSIZ), em);
- if (vi >= UV_NVS)
- return oog_encode(u, v);
- if (u < uv_row[vi].ustart)
- return oog_encode(u, v);
- ui = itrunc((u - uv_row[vi].ustart)*(1./UV_SQSIZ), em);
- if (ui >= uv_row[vi].nus)
- return oog_encode(u, v);
-
- return (uv_row[vi].ncum + ui);
-}
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-int
-uv_decode(double *up, double *vp, int c) /* decode (u',v') index */
-{
- int upper, lower;
- register int ui, vi;
-
- if (c < 0 || c >= UV_NDIVS)
- return (-1);
- lower = 0; /* binary search */
- upper = UV_NVS;
- while (upper - lower > 1) {
- vi = (lower + upper) >> 1;
- ui = c - uv_row[vi].ncum;
- if (ui > 0)
- lower = vi;
- else if (ui < 0)
- upper = vi;
- else {
- lower = vi;
- break;
- }
- }
- vi = lower;
- ui = c - uv_row[vi].ncum;
- *up = uv_row[vi].ustart + (ui+.5)*UV_SQSIZ;
- *vp = UV_VSTART + (vi+.5)*UV_SQSIZ;
- return (0);
-}
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-void
-LogLuv24toXYZ(uint32 p, float XYZ[3])
-{
- int Ce;
- double L, u, v, s, x, y;
- /* decode luminance */
- L = LogL10toY(p>>14 & 0x3ff);
- if (L <= 0.) {
- XYZ[0] = XYZ[1] = XYZ[2] = 0.;
- return;
- }
- /* decode color */
- Ce = p & 0x3fff;
- if (uv_decode(&u, &v, Ce) < 0) {
- u = U_NEU; v = V_NEU;
- }
- s = 1./(6.*u - 16.*v + 12.);
- x = 9.*u * s;
- y = 4.*v * s;
- /* convert to XYZ */
- XYZ[0] = (float)(x/y * L);
- XYZ[1] = (float)L;
- XYZ[2] = (float)((1.-x-y)/y * L);
-}
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-uint32
-LogLuv24fromXYZ(float XYZ[3], int em)
-{
- int Le, Ce;
- double u, v, s;
- /* encode luminance */
- Le = LogL10fromY(XYZ[1], em);
- /* encode color */
- s = XYZ[0] + 15.*XYZ[1] + 3.*XYZ[2];
- if (!Le || s <= 0.) {
- u = U_NEU;
- v = V_NEU;
- } else {
- u = 4.*XYZ[0] / s;
- v = 9.*XYZ[1] / s;
- }
- Ce = uv_encode(u, v, em);
- if (Ce < 0) /* never happens */
- Ce = uv_encode(U_NEU, V_NEU, SGILOGENCODE_NODITHER);
- /* combine encodings */
- return (Le << 14 | Ce);
-}
-
-static void
-Luv24toXYZ(LogLuvState* sp, tidata_t op, int n)
-{
- uint32* luv = (uint32*) sp->tbuf;
- float* xyz = (float*) op;
-
- while (n-- > 0) {
- LogLuv24toXYZ(*luv, xyz);
- xyz += 3;
- luv++;
- }
-}
-
-static void
-Luv24toLuv48(LogLuvState* sp, tidata_t op, int n)
-{
- uint32* luv = (uint32*) sp->tbuf;
- int16* luv3 = (int16*) op;
-
- while (n-- > 0) {
- double u, v;
-
- *luv3++ = (int16)((*luv >> 12 & 0xffd) + 13314);
- if (uv_decode(&u, &v, *luv&0x3fff) < 0) {
- u = U_NEU;
- v = V_NEU;
- }
- *luv3++ = (int16)(u * (1L<<15));
- *luv3++ = (int16)(v * (1L<<15));
- luv++;
- }
-}
-
-static void
-Luv24toRGB(LogLuvState* sp, tidata_t op, int n)
-{
- uint32* luv = (uint32*) sp->tbuf;
- uint8* rgb = (uint8*) op;
-
- while (n-- > 0) {
- float xyz[3];
-
- LogLuv24toXYZ(*luv++, xyz);
- XYZtoRGB24(xyz, rgb);
- rgb += 3;
- }
-}
-
-static void
-Luv24fromXYZ(LogLuvState* sp, tidata_t op, int n)
-{
- uint32* luv = (uint32*) sp->tbuf;
- float* xyz = (float*) op;
-
- while (n-- > 0) {
- *luv++ = LogLuv24fromXYZ(xyz, sp->encode_meth);
- xyz += 3;
- }
-}
-
-static void
-Luv24fromLuv48(LogLuvState* sp, tidata_t op, int n)
-{
- uint32* luv = (uint32*) sp->tbuf;
- int16* luv3 = (int16*) op;
-
- while (n-- > 0) {
- int Le, Ce;
-
- if (luv3[0] <= 0)
- Le = 0;
- else if (luv3[0] >= (1<<12)+3314)
- Le = (1<<10) - 1;
- else if (sp->encode_meth == SGILOGENCODE_NODITHER)
- Le = (luv3[0]-3314) >> 2;
- else
- Le = itrunc(.25*(luv3[0]-3314.), sp->encode_meth);
-
- Ce = uv_encode((luv3[1]+.5)/(1<<15), (luv3[2]+.5)/(1<<15),
- sp->encode_meth);
- if (Ce < 0) /* never happens */
- Ce = uv_encode(U_NEU, V_NEU, SGILOGENCODE_NODITHER);
- *luv++ = (uint32)Le << 14 | Ce;
- luv3 += 3;
- }
-}
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-void
-LogLuv32toXYZ(uint32 p, float XYZ[3])
-{
- double L, u, v, s, x, y;
- /* decode luminance */
- L = LogL16toY((int)p >> 16);
- if (L <= 0.) {
- XYZ[0] = XYZ[1] = XYZ[2] = 0.;
- return;
- }
- /* decode color */
- u = 1./UVSCALE * ((p>>8 & 0xff) + .5);
- v = 1./UVSCALE * ((p & 0xff) + .5);
- s = 1./(6.*u - 16.*v + 12.);
- x = 9.*u * s;
- y = 4.*v * s;
- /* convert to XYZ */
- XYZ[0] = (float)(x/y * L);
- XYZ[1] = (float)L;
- XYZ[2] = (float)((1.-x-y)/y * L);
-}
-
-#if !LOGLUV_PUBLIC
-static
-#endif
-uint32
-LogLuv32fromXYZ(float XYZ[3], int em)
-{
- unsigned int Le, ue, ve;
- double u, v, s;
- /* encode luminance */
- Le = (unsigned int)LogL16fromY(XYZ[1], em);
- /* encode color */
- s = XYZ[0] + 15.*XYZ[1] + 3.*XYZ[2];
- if (!Le || s <= 0.) {
- u = U_NEU;
- v = V_NEU;
- } else {
- u = 4.*XYZ[0] / s;
- v = 9.*XYZ[1] / s;
- }
- if (u <= 0.) ue = 0;
- else ue = itrunc(UVSCALE*u, em);
- if (ue > 255) ue = 255;
- if (v <= 0.) ve = 0;
- else ve = itrunc(UVSCALE*v, em);
- if (ve > 255) ve = 255;
- /* combine encodings */
- return (Le << 16 | ue << 8 | ve);
-}
-
-static void
-Luv32toXYZ(LogLuvState* sp, tidata_t op, int n)
-{
- uint32* luv = (uint32*) sp->tbuf;
- float* xyz = (float*) op;
-
- while (n-- > 0) {
- LogLuv32toXYZ(*luv++, xyz);
- xyz += 3;
- }
-}
-
-static void
-Luv32toLuv48(LogLuvState* sp, tidata_t op, int n)
-{
- uint32* luv = (uint32*) sp->tbuf;
- int16* luv3 = (int16*) op;
-
- while (n-- > 0) {
- double u, v;
-
- *luv3++ = (int16)(*luv >> 16);
- u = 1./UVSCALE * ((*luv>>8 & 0xff) + .5);
- v = 1./UVSCALE * ((*luv & 0xff) + .5);
- *luv3++ = (int16)(u * (1L<<15));
- *luv3++ = (int16)(v * (1L<<15));
- luv++;
- }
-}
-
-static void
-Luv32toRGB(LogLuvState* sp, tidata_t op, int n)
-{
- uint32* luv = (uint32*) sp->tbuf;
- uint8* rgb = (uint8*) op;
-
- while (n-- > 0) {
- float xyz[3];
-
- LogLuv32toXYZ(*luv++, xyz);
- XYZtoRGB24(xyz, rgb);
- rgb += 3;
- }
-}
-
-static void
-Luv32fromXYZ(LogLuvState* sp, tidata_t op, int n)
-{
- uint32* luv = (uint32*) sp->tbuf;
- float* xyz = (float*) op;
-
- while (n-- > 0) {
- *luv++ = LogLuv32fromXYZ(xyz, sp->encode_meth);
- xyz += 3;
- }
-}
-
-static void
-Luv32fromLuv48(LogLuvState* sp, tidata_t op, int n)
-{
- uint32* luv = (uint32*) sp->tbuf;
- int16* luv3 = (int16*) op;
-
- if (sp->encode_meth == SGILOGENCODE_NODITHER) {
- while (n-- > 0) {
- *luv++ = (uint32)luv3[0] << 16 |
- (luv3[1]*(uint32)(UVSCALE+.5) >> 7 & 0xff00) |
- (luv3[2]*(uint32)(UVSCALE+.5) >> 15 & 0xff);
- luv3 += 3;
- }
- return;
- }
- while (n-- > 0) {
- *luv++ = (uint32)luv3[0] << 16 |
- (itrunc(luv3[1]*(UVSCALE/(1<<15)), sp->encode_meth) << 8 & 0xff00) |
- (itrunc(luv3[2]*(UVSCALE/(1<<15)), sp->encode_meth) & 0xff);
- luv3 += 3;
- }
-}
-
-static void
-_logLuvNop(LogLuvState* sp, tidata_t op, int n)
-{
- (void) sp; (void) op; (void) n;
-}
-
-static int
-LogL16GuessDataFmt(TIFFDirectory *td)
-{
-#define PACK(s,b,f) (((b)<<6)|((s)<<3)|(f))
- switch (PACK(td->td_samplesperpixel, td->td_bitspersample, td->td_sampleformat)) {
- case PACK(1, 32, SAMPLEFORMAT_IEEEFP):
- return (SGILOGDATAFMT_FLOAT);
- case PACK(1, 16, SAMPLEFORMAT_VOID):
- case PACK(1, 16, SAMPLEFORMAT_INT):
- case PACK(1, 16, SAMPLEFORMAT_UINT):
- return (SGILOGDATAFMT_16BIT);
- case PACK(1, 8, SAMPLEFORMAT_VOID):
- case PACK(1, 8, SAMPLEFORMAT_UINT):
- return (SGILOGDATAFMT_8BIT);
- }
-#undef PACK
- return (SGILOGDATAFMT_UNKNOWN);
-}
-
-static uint32
-multiply(size_t m1, size_t m2)
-{
- uint32 bytes = m1 * m2;
-
- if (m1 && bytes / m1 != m2)
- bytes = 0;
-
- return bytes;
-}
-
-static int
-LogL16InitState(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- LogLuvState* sp = DecoderState(tif);
- static const char module[] = "LogL16InitState";
-
- assert(sp != NULL);
- assert(td->td_photometric == PHOTOMETRIC_LOGL);
-
- /* for some reason, we can't do this in TIFFInitLogL16 */
- if (sp->user_datafmt == SGILOGDATAFMT_UNKNOWN)
- sp->user_datafmt = LogL16GuessDataFmt(td);
- switch (sp->user_datafmt) {
- case SGILOGDATAFMT_FLOAT:
- sp->pixel_size = sizeof (float);
- break;
- case SGILOGDATAFMT_16BIT:
- sp->pixel_size = sizeof (int16);
- break;
- case SGILOGDATAFMT_8BIT:
- sp->pixel_size = sizeof (uint8);
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "No support for converting user data format to LogL");
- return (0);
- }
- if( isTiled(tif) )
- sp->tbuflen = multiply(td->td_tilewidth, td->td_tilelength);
- else
- sp->tbuflen = multiply(td->td_imagewidth, td->td_rowsperstrip);
- if (multiply(sp->tbuflen, sizeof (int16)) == 0 ||
- (sp->tbuf = (tidata_t*) _TIFFmalloc(sp->tbuflen * sizeof (int16))) == NULL) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: No space for SGILog translation buffer",
- tif->tif_name);
- return (0);
- }
- return (1);
-}
-
-static int
-LogLuvGuessDataFmt(TIFFDirectory *td)
-{
- int guess;
-
- /*
- * If the user didn't tell us their datafmt,
- * take our best guess from the bitspersample.
- */
-#define PACK(a,b) (((a)<<3)|(b))
- switch (PACK(td->td_bitspersample, td->td_sampleformat)) {
- case PACK(32, SAMPLEFORMAT_IEEEFP):
- guess = SGILOGDATAFMT_FLOAT;
- break;
- case PACK(32, SAMPLEFORMAT_VOID):
- case PACK(32, SAMPLEFORMAT_UINT):
- case PACK(32, SAMPLEFORMAT_INT):
- guess = SGILOGDATAFMT_RAW;
- break;
- case PACK(16, SAMPLEFORMAT_VOID):
- case PACK(16, SAMPLEFORMAT_INT):
- case PACK(16, SAMPLEFORMAT_UINT):
- guess = SGILOGDATAFMT_16BIT;
- break;
- case PACK( 8, SAMPLEFORMAT_VOID):
- case PACK( 8, SAMPLEFORMAT_UINT):
- guess = SGILOGDATAFMT_8BIT;
- break;
- default:
- guess = SGILOGDATAFMT_UNKNOWN;
- break;
-#undef PACK
- }
- /*
- * Double-check samples per pixel.
- */
- switch (td->td_samplesperpixel) {
- case 1:
- if (guess != SGILOGDATAFMT_RAW)
- guess = SGILOGDATAFMT_UNKNOWN;
- break;
- case 3:
- if (guess == SGILOGDATAFMT_RAW)
- guess = SGILOGDATAFMT_UNKNOWN;
- break;
- default:
- guess = SGILOGDATAFMT_UNKNOWN;
- break;
- }
- return (guess);
-}
-
-static int
-LogLuvInitState(TIFF* tif)
-{
- TIFFDirectory* td = &tif->tif_dir;
- LogLuvState* sp = DecoderState(tif);
- static const char module[] = "LogLuvInitState";
-
- assert(sp != NULL);
- assert(td->td_photometric == PHOTOMETRIC_LOGLUV);
-
- /* for some reason, we can't do this in TIFFInitLogLuv */
- if (td->td_planarconfig != PLANARCONFIG_CONTIG) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "SGILog compression cannot handle non-contiguous data");
- return (0);
- }
- if (sp->user_datafmt == SGILOGDATAFMT_UNKNOWN)
- sp->user_datafmt = LogLuvGuessDataFmt(td);
- switch (sp->user_datafmt) {
- case SGILOGDATAFMT_FLOAT:
- sp->pixel_size = 3*sizeof (float);
- break;
- case SGILOGDATAFMT_16BIT:
- sp->pixel_size = 3*sizeof (int16);
- break;
- case SGILOGDATAFMT_RAW:
- sp->pixel_size = sizeof (uint32);
- break;
- case SGILOGDATAFMT_8BIT:
- sp->pixel_size = 3*sizeof (uint8);
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "No support for converting user data format to LogLuv");
- return (0);
- }
- if( isTiled(tif) )
- sp->tbuflen = multiply(td->td_tilewidth, td->td_tilelength);
- else
- sp->tbuflen = multiply(td->td_imagewidth, td->td_rowsperstrip);
- if (multiply(sp->tbuflen, sizeof (uint32)) == 0 ||
- (sp->tbuf = (tidata_t*) _TIFFmalloc(sp->tbuflen * sizeof (uint32))) == NULL) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: No space for SGILog translation buffer",
- tif->tif_name);
- return (0);
- }
- return (1);
-}
-
-static int
-LogLuvSetupDecode(TIFF* tif)
-{
- LogLuvState* sp = DecoderState(tif);
- TIFFDirectory* td = &tif->tif_dir;
-
- tif->tif_postdecode = _TIFFNoPostDecode;
- switch (td->td_photometric) {
- case PHOTOMETRIC_LOGLUV:
- if (!LogLuvInitState(tif))
- break;
- if (td->td_compression == COMPRESSION_SGILOG24) {
- tif->tif_decoderow = LogLuvDecode24;
- switch (sp->user_datafmt) {
- case SGILOGDATAFMT_FLOAT:
- sp->tfunc = Luv24toXYZ;
- break;
- case SGILOGDATAFMT_16BIT:
- sp->tfunc = Luv24toLuv48;
- break;
- case SGILOGDATAFMT_8BIT:
- sp->tfunc = Luv24toRGB;
- break;
- }
- } else {
- tif->tif_decoderow = LogLuvDecode32;
- switch (sp->user_datafmt) {
- case SGILOGDATAFMT_FLOAT:
- sp->tfunc = Luv32toXYZ;
- break;
- case SGILOGDATAFMT_16BIT:
- sp->tfunc = Luv32toLuv48;
- break;
- case SGILOGDATAFMT_8BIT:
- sp->tfunc = Luv32toRGB;
- break;
- }
- }
- return (1);
- case PHOTOMETRIC_LOGL:
- if (!LogL16InitState(tif))
- break;
- tif->tif_decoderow = LogL16Decode;
- switch (sp->user_datafmt) {
- case SGILOGDATAFMT_FLOAT:
- sp->tfunc = L16toY;
- break;
- case SGILOGDATAFMT_8BIT:
- sp->tfunc = L16toGry;
- break;
- }
- return (1);
- default:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Inappropriate photometric interpretation %d for SGILog compression; %s",
- td->td_photometric, "must be either LogLUV or LogL");
- break;
- }
- return (0);
-}
-
-static int
-LogLuvSetupEncode(TIFF* tif)
-{
- LogLuvState* sp = EncoderState(tif);
- TIFFDirectory* td = &tif->tif_dir;
-
- switch (td->td_photometric) {
- case PHOTOMETRIC_LOGLUV:
- if (!LogLuvInitState(tif))
- break;
- if (td->td_compression == COMPRESSION_SGILOG24) {
- tif->tif_encoderow = LogLuvEncode24;
- switch (sp->user_datafmt) {
- case SGILOGDATAFMT_FLOAT:
- sp->tfunc = Luv24fromXYZ;
- break;
- case SGILOGDATAFMT_16BIT:
- sp->tfunc = Luv24fromLuv48;
- break;
- case SGILOGDATAFMT_RAW:
- break;
- default:
- goto notsupported;
- }
- } else {
- tif->tif_encoderow = LogLuvEncode32;
- switch (sp->user_datafmt) {
- case SGILOGDATAFMT_FLOAT:
- sp->tfunc = Luv32fromXYZ;
- break;
- case SGILOGDATAFMT_16BIT:
- sp->tfunc = Luv32fromLuv48;
- break;
- case SGILOGDATAFMT_RAW:
- break;
- default:
- goto notsupported;
- }
- }
- break;
- case PHOTOMETRIC_LOGL:
- if (!LogL16InitState(tif))
- break;
- tif->tif_encoderow = LogL16Encode;
- switch (sp->user_datafmt) {
- case SGILOGDATAFMT_FLOAT:
- sp->tfunc = L16fromY;
- break;
- case SGILOGDATAFMT_16BIT:
- break;
- default:
- goto notsupported;
- }
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Inappropriate photometric interpretation %d for SGILog compression; %s",
- td->td_photometric, "must be either LogLUV or LogL");
- break;
- }
- return (1);
-notsupported:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "SGILog compression supported only for %s, or raw data",
- td->td_photometric == PHOTOMETRIC_LOGL ? "Y, L" : "XYZ, Luv");
- return (0);
-}
-
-static void
-LogLuvClose(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
-
- /*
- * For consistency, we always want to write out the same
- * bitspersample and sampleformat for our TIFF file,
- * regardless of the data format being used by the application.
- * Since this routine is called after tags have been set but
- * before they have been recorded in the file, we reset them here.
- */
- td->td_samplesperpixel =
- (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3;
- td->td_bitspersample = 16;
- td->td_sampleformat = SAMPLEFORMAT_INT;
-}
-
-static void
-LogLuvCleanup(TIFF* tif)
-{
- LogLuvState* sp = (LogLuvState *)tif->tif_data;
-
- assert(sp != 0);
-
- tif->tif_tagmethods.vgetfield = sp->vgetparent;
- tif->tif_tagmethods.vsetfield = sp->vsetparent;
-
- if (sp->tbuf)
- _TIFFfree(sp->tbuf);
- _TIFFfree(sp);
- tif->tif_data = NULL;
-
- _TIFFSetDefaultCompressionState(tif);
-}
-
-static int
-LogLuvVSetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- LogLuvState* sp = DecoderState(tif);
- int bps, fmt;
-
- switch (tag) {
- case TIFFTAG_SGILOGDATAFMT:
- sp->user_datafmt = va_arg(ap, int);
- /*
- * Tweak the TIFF header so that the rest of libtiff knows what
- * size of data will be passed between app and library, and
- * assume that the app knows what it is doing and is not
- * confused by these header manipulations...
- */
- switch (sp->user_datafmt) {
- case SGILOGDATAFMT_FLOAT:
- bps = 32, fmt = SAMPLEFORMAT_IEEEFP;
- break;
- case SGILOGDATAFMT_16BIT:
- bps = 16, fmt = SAMPLEFORMAT_INT;
- break;
- case SGILOGDATAFMT_RAW:
- bps = 32, fmt = SAMPLEFORMAT_UINT;
- TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1);
- break;
- case SGILOGDATAFMT_8BIT:
- bps = 8, fmt = SAMPLEFORMAT_UINT;
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Unknown data format %d for LogLuv compression",
- sp->user_datafmt);
- return (0);
- }
- TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
- TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, fmt);
- /*
- * Must recalculate sizes should bits/sample change.
- */
- tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
- tif->tif_scanlinesize = TIFFScanlineSize(tif);
- return (1);
- case TIFFTAG_SGILOGENCODE:
- sp->encode_meth = va_arg(ap, int);
- if (sp->encode_meth != SGILOGENCODE_NODITHER &&
- sp->encode_meth != SGILOGENCODE_RANDITHER) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Unknown encoding %d for LogLuv compression",
- sp->encode_meth);
- return (0);
- }
- return (1);
- default:
- return (*sp->vsetparent)(tif, tag, ap);
- }
-}
-
-static int
-LogLuvVGetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- LogLuvState *sp = (LogLuvState *)tif->tif_data;
-
- switch (tag) {
- case TIFFTAG_SGILOGDATAFMT:
- *va_arg(ap, int*) = sp->user_datafmt;
- return (1);
- default:
- return (*sp->vgetparent)(tif, tag, ap);
- }
-}
-
-static const TIFFFieldInfo LogLuvFieldInfo[] = {
- { TIFFTAG_SGILOGDATAFMT, 0, 0, TIFF_SHORT, FIELD_PSEUDO,
- TRUE, FALSE, "SGILogDataFmt"},
- { TIFFTAG_SGILOGENCODE, 0, 0, TIFF_SHORT, FIELD_PSEUDO,
- TRUE, FALSE, "SGILogEncode"}
-};
-
-int
-TIFFInitSGILog(TIFF* tif, int scheme)
-{
- static const char module[] = "TIFFInitSGILog";
- LogLuvState* sp;
-
- assert(scheme == COMPRESSION_SGILOG24 || scheme == COMPRESSION_SGILOG);
-
- /*
- * Merge codec-specific tag information.
- */
- if (!_TIFFMergeFieldInfo(tif, LogLuvFieldInfo,
- TIFFArrayCount(LogLuvFieldInfo))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Merging SGILog codec-specific tags failed");
- return 0;
- }
-
- /*
- * Allocate state block so tag methods have storage to record values.
- */
- tif->tif_data = (tidata_t) _TIFFmalloc(sizeof (LogLuvState));
- if (tif->tif_data == NULL)
- goto bad;
- sp = (LogLuvState*) tif->tif_data;
- _TIFFmemset((tdata_t)sp, 0, sizeof (*sp));
- sp->user_datafmt = SGILOGDATAFMT_UNKNOWN;
- sp->encode_meth = (scheme == COMPRESSION_SGILOG24) ?
- SGILOGENCODE_RANDITHER : SGILOGENCODE_NODITHER;
- sp->tfunc = _logLuvNop;
-
- /*
- * Install codec methods.
- * NB: tif_decoderow & tif_encoderow are filled
- * in at setup time.
- */
- tif->tif_setupdecode = LogLuvSetupDecode;
- tif->tif_decodestrip = LogLuvDecodeStrip;
- tif->tif_decodetile = LogLuvDecodeTile;
- tif->tif_setupencode = LogLuvSetupEncode;
- tif->tif_encodestrip = LogLuvEncodeStrip;
- tif->tif_encodetile = LogLuvEncodeTile;
- tif->tif_close = LogLuvClose;
- tif->tif_cleanup = LogLuvCleanup;
-
- /*
- * Override parent get/set field methods.
- */
- sp->vgetparent = tif->tif_tagmethods.vgetfield;
- tif->tif_tagmethods.vgetfield = LogLuvVGetField; /* hook for codec tags */
- sp->vsetparent = tif->tif_tagmethods.vsetfield;
- tif->tif_tagmethods.vsetfield = LogLuvVSetField; /* hook for codec tags */
-
- return (1);
-bad:
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: No space for LogLuv state block", tif->tif_name);
- return (0);
-}
-#endif /* LOGLUV_SUPPORT */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_lzw.c b/src/3rdparty/libtiff/libtiff/tif_lzw.c
deleted file mode 100644
index bc4dac6537..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_lzw.c
+++ /dev/null
@@ -1,1122 +0,0 @@
-/* $Id: tif_lzw.c,v 1.29.2.5 2009-06-22 04:57:31 fwarmerdam Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#include "tiffiop.h"
-#ifdef LZW_SUPPORT
-/*
- * TIFF Library.
- * Rev 5.0 Lempel-Ziv & Welch Compression Support
- *
- * This code is derived from the compress program whose code is
- * derived from software contributed to Berkeley by James A. Woods,
- * derived from original work by Spencer Thomas and Joseph Orost.
- *
- * The original Berkeley copyright notice appears below in its entirety.
- */
-#include "tif_predict.h"
-
-#include <stdio.h>
-
-/*
- * NB: The 5.0 spec describes a different algorithm than Aldus
- * implements. Specifically, Aldus does code length transitions
- * one code earlier than should be done (for real LZW).
- * Earlier versions of this library implemented the correct
- * LZW algorithm, but emitted codes in a bit order opposite
- * to the TIFF spec. Thus, to maintain compatibility w/ Aldus
- * we interpret MSB-LSB ordered codes to be images written w/
- * old versions of this library, but otherwise adhere to the
- * Aldus "off by one" algorithm.
- *
- * Future revisions to the TIFF spec are expected to "clarify this issue".
- */
-#define LZW_COMPAT /* include backwards compatibility code */
-/*
- * Each strip of data is supposed to be terminated by a CODE_EOI.
- * If the following #define is included, the decoder will also
- * check for end-of-strip w/o seeing this code. This makes the
- * library more robust, but also slower.
- */
-#define LZW_CHECKEOS /* include checks for strips w/o EOI code */
-
-#define MAXCODE(n) ((1L<<(n))-1)
-/*
- * The TIFF spec specifies that encoded bit
- * strings range from 9 to 12 bits.
- */
-#define BITS_MIN 9 /* start with 9 bits */
-#define BITS_MAX 12 /* max of 12 bit strings */
-/* predefined codes */
-#define CODE_CLEAR 256 /* code to clear string table */
-#define CODE_EOI 257 /* end-of-information code */
-#define CODE_FIRST 258 /* first free code entry */
-#define CODE_MAX MAXCODE(BITS_MAX)
-#define HSIZE 9001L /* 91% occupancy */
-#define HSHIFT (13-8)
-#ifdef LZW_COMPAT
-/* NB: +1024 is for compatibility with old files */
-#define CSIZE (MAXCODE(BITS_MAX)+1024L)
-#else
-#define CSIZE (MAXCODE(BITS_MAX)+1L)
-#endif
-
-/*
- * State block for each open TIFF file using LZW
- * compression/decompression. Note that the predictor
- * state block must be first in this data structure.
- */
-typedef struct {
- TIFFPredictorState predict; /* predictor super class */
-
- unsigned short nbits; /* # of bits/code */
- unsigned short maxcode; /* maximum code for lzw_nbits */
- unsigned short free_ent; /* next free entry in hash table */
- long nextdata; /* next bits of i/o */
- long nextbits; /* # of valid bits in lzw_nextdata */
-
- int rw_mode; /* preserve rw_mode from init */
-} LZWBaseState;
-
-#define lzw_nbits base.nbits
-#define lzw_maxcode base.maxcode
-#define lzw_free_ent base.free_ent
-#define lzw_nextdata base.nextdata
-#define lzw_nextbits base.nextbits
-
-/*
- * Encoding-specific state.
- */
-typedef uint16 hcode_t; /* codes fit in 16 bits */
-typedef struct {
- long hash;
- hcode_t code;
-} hash_t;
-
-/*
- * Decoding-specific state.
- */
-typedef struct code_ent {
- struct code_ent *next;
- unsigned short length; /* string len, including this token */
- unsigned char value; /* data value */
- unsigned char firstchar; /* first token of string */
-} code_t;
-
-typedef int (*decodeFunc)(TIFF*, tidata_t, tsize_t, tsample_t);
-
-typedef struct {
- LZWBaseState base;
-
- /* Decoding specific data */
- long dec_nbitsmask; /* lzw_nbits 1 bits, right adjusted */
- long dec_restart; /* restart count */
-#ifdef LZW_CHECKEOS
- long dec_bitsleft; /* available bits in raw data */
-#endif
- decodeFunc dec_decode; /* regular or backwards compatible */
- code_t* dec_codep; /* current recognized code */
- code_t* dec_oldcodep; /* previously recognized code */
- code_t* dec_free_entp; /* next free entry */
- code_t* dec_maxcodep; /* max available entry */
- code_t* dec_codetab; /* kept separate for small machines */
-
- /* Encoding specific data */
- int enc_oldcode; /* last code encountered */
- long enc_checkpoint; /* point at which to clear table */
-#define CHECK_GAP 10000 /* enc_ratio check interval */
- long enc_ratio; /* current compression ratio */
- long enc_incount; /* (input) data bytes encoded */
- long enc_outcount; /* encoded (output) bytes */
- tidata_t enc_rawlimit; /* bound on tif_rawdata buffer */
- hash_t* enc_hashtab; /* kept separate for small machines */
-} LZWCodecState;
-
-#define LZWState(tif) ((LZWBaseState*) (tif)->tif_data)
-#define DecoderState(tif) ((LZWCodecState*) LZWState(tif))
-#define EncoderState(tif) ((LZWCodecState*) LZWState(tif))
-
-static int LZWDecode(TIFF*, tidata_t, tsize_t, tsample_t);
-#ifdef LZW_COMPAT
-static int LZWDecodeCompat(TIFF*, tidata_t, tsize_t, tsample_t);
-#endif
-static void cl_hash(LZWCodecState*);
-
-/*
- * LZW Decoder.
- */
-
-#ifdef LZW_CHECKEOS
-/*
- * This check shouldn't be necessary because each
- * strip is suppose to be terminated with CODE_EOI.
- */
-#define NextCode(_tif, _sp, _bp, _code, _get) { \
- if ((_sp)->dec_bitsleft < nbits) { \
- TIFFWarningExt(_tif->tif_clientdata, _tif->tif_name, \
- "LZWDecode: Strip %d not terminated with EOI code", \
- _tif->tif_curstrip); \
- _code = CODE_EOI; \
- } else { \
- _get(_sp,_bp,_code); \
- (_sp)->dec_bitsleft -= nbits; \
- } \
-}
-#else
-#define NextCode(tif, sp, bp, code, get) get(sp, bp, code)
-#endif
-
-static int
-LZWSetupDecode(TIFF* tif)
-{
- LZWCodecState* sp = DecoderState(tif);
- static const char module[] = " LZWSetupDecode";
- int code;
-
- if( sp == NULL )
- {
- /*
- * Allocate state block so tag methods have storage to record
- * values.
- */
- tif->tif_data = (tidata_t) _TIFFmalloc(sizeof(LZWCodecState));
- if (tif->tif_data == NULL)
- {
- TIFFErrorExt(tif->tif_clientdata, "LZWPreDecode", "No space for LZW state block");
- return (0);
- }
-
- DecoderState(tif)->dec_codetab = NULL;
- DecoderState(tif)->dec_decode = NULL;
-
- /*
- * Setup predictor setup.
- */
- (void) TIFFPredictorInit(tif);
-
- sp = DecoderState(tif);
- }
-
- assert(sp != NULL);
-
- if (sp->dec_codetab == NULL) {
- sp->dec_codetab = (code_t*)_TIFFmalloc(CSIZE*sizeof (code_t));
- if (sp->dec_codetab == NULL) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "No space for LZW code table");
- return (0);
- }
- /*
- * Pre-load the table.
- */
- code = 255;
- do {
- sp->dec_codetab[code].value = code;
- sp->dec_codetab[code].firstchar = code;
- sp->dec_codetab[code].length = 1;
- sp->dec_codetab[code].next = NULL;
- } while (code--);
- /*
- * Zero-out the unused entries
- */
- _TIFFmemset(&sp->dec_codetab[CODE_CLEAR], 0,
- (CODE_FIRST - CODE_CLEAR) * sizeof (code_t));
- }
- return (1);
-}
-
-/*
- * Setup state for decoding a strip.
- */
-static int
-LZWPreDecode(TIFF* tif, tsample_t s)
-{
- LZWCodecState *sp = DecoderState(tif);
-
- (void) s;
- assert(sp != NULL);
- if( sp->dec_codetab == NULL )
- {
- tif->tif_setupdecode( tif );
- }
-
- /*
- * Check for old bit-reversed codes.
- */
- if (tif->tif_rawdata[0] == 0 && (tif->tif_rawdata[1] & 0x1)) {
-#ifdef LZW_COMPAT
- if (!sp->dec_decode) {
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "Old-style LZW codes, convert file");
- /*
- * Override default decoding methods with
- * ones that deal with the old coding.
- * Otherwise the predictor versions set
- * above will call the compatibility routines
- * through the dec_decode method.
- */
- tif->tif_decoderow = LZWDecodeCompat;
- tif->tif_decodestrip = LZWDecodeCompat;
- tif->tif_decodetile = LZWDecodeCompat;
- /*
- * If doing horizontal differencing, must
- * re-setup the predictor logic since we
- * switched the basic decoder methods...
- */
- (*tif->tif_setupdecode)(tif);
- sp->dec_decode = LZWDecodeCompat;
- }
- sp->lzw_maxcode = MAXCODE(BITS_MIN);
-#else /* !LZW_COMPAT */
- if (!sp->dec_decode) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Old-style LZW codes not supported");
- sp->dec_decode = LZWDecode;
- }
- return (0);
-#endif/* !LZW_COMPAT */
- } else {
- sp->lzw_maxcode = MAXCODE(BITS_MIN)-1;
- sp->dec_decode = LZWDecode;
- }
- sp->lzw_nbits = BITS_MIN;
- sp->lzw_nextbits = 0;
- sp->lzw_nextdata = 0;
-
- sp->dec_restart = 0;
- sp->dec_nbitsmask = MAXCODE(BITS_MIN);
-#ifdef LZW_CHECKEOS
- sp->dec_bitsleft = tif->tif_rawcc << 3;
-#endif
- sp->dec_free_entp = sp->dec_codetab + CODE_FIRST;
- /*
- * Zero entries that are not yet filled in. We do
- * this to guard against bogus input data that causes
- * us to index into undefined entries. If you can
- * come up with a way to safely bounds-check input codes
- * while decoding then you can remove this operation.
- */
- _TIFFmemset(sp->dec_free_entp, 0, (CSIZE-CODE_FIRST)*sizeof (code_t));
- sp->dec_oldcodep = &sp->dec_codetab[-1];
- sp->dec_maxcodep = &sp->dec_codetab[sp->dec_nbitsmask-1];
- return (1);
-}
-
-/*
- * Decode a "hunk of data".
- */
-#define GetNextCode(sp, bp, code) { \
- nextdata = (nextdata<<8) | *(bp)++; \
- nextbits += 8; \
- if (nextbits < nbits) { \
- nextdata = (nextdata<<8) | *(bp)++; \
- nextbits += 8; \
- } \
- code = (hcode_t)((nextdata >> (nextbits-nbits)) & nbitsmask); \
- nextbits -= nbits; \
-}
-
-static void
-codeLoop(TIFF* tif)
-{
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecode: Bogus encoding, loop in the code table; scanline %d",
- tif->tif_row);
-}
-
-static int
-LZWDecode(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
-{
- LZWCodecState *sp = DecoderState(tif);
- char *op = (char*) op0;
- long occ = (long) occ0;
- char *tp;
- unsigned char *bp;
- hcode_t code;
- int len;
- long nbits, nextbits, nextdata, nbitsmask;
- code_t *codep, *free_entp, *maxcodep, *oldcodep;
-
- (void) s;
- assert(sp != NULL);
- assert(sp->dec_codetab != NULL);
- /*
- * Restart interrupted output operation.
- */
- if (sp->dec_restart) {
- long residue;
-
- codep = sp->dec_codep;
- residue = codep->length - sp->dec_restart;
- if (residue > occ) {
- /*
- * Residue from previous decode is sufficient
- * to satisfy decode request. Skip to the
- * start of the decoded string, place decoded
- * values in the output buffer, and return.
- */
- sp->dec_restart += occ;
- do {
- codep = codep->next;
- } while (--residue > occ && codep);
- if (codep) {
- tp = op + occ;
- do {
- *--tp = codep->value;
- codep = codep->next;
- } while (--occ && codep);
- }
- return (1);
- }
- /*
- * Residue satisfies only part of the decode request.
- */
- op += residue, occ -= residue;
- tp = op;
- do {
- int t;
- --tp;
- t = codep->value;
- codep = codep->next;
- *tp = t;
- } while (--residue && codep);
- sp->dec_restart = 0;
- }
-
- bp = (unsigned char *)tif->tif_rawcp;
- nbits = sp->lzw_nbits;
- nextdata = sp->lzw_nextdata;
- nextbits = sp->lzw_nextbits;
- nbitsmask = sp->dec_nbitsmask;
- oldcodep = sp->dec_oldcodep;
- free_entp = sp->dec_free_entp;
- maxcodep = sp->dec_maxcodep;
-
- while (occ > 0) {
- NextCode(tif, sp, bp, code, GetNextCode);
- if (code == CODE_EOI)
- break;
- if (code == CODE_CLEAR) {
- free_entp = sp->dec_codetab + CODE_FIRST;
- _TIFFmemset(free_entp, 0,
- (CSIZE - CODE_FIRST) * sizeof (code_t));
- nbits = BITS_MIN;
- nbitsmask = MAXCODE(BITS_MIN);
- maxcodep = sp->dec_codetab + nbitsmask-1;
- NextCode(tif, sp, bp, code, GetNextCode);
- if (code == CODE_EOI)
- break;
- if (code == CODE_CLEAR) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecode: Corrupted LZW table at scanline %d",
- tif->tif_row);
- return (0);
- }
- *op++ = (char)code, occ--;
- oldcodep = sp->dec_codetab + code;
- continue;
- }
- codep = sp->dec_codetab + code;
-
- /*
- * Add the new entry to the code table.
- */
- if (free_entp < &sp->dec_codetab[0] ||
- free_entp >= &sp->dec_codetab[CSIZE]) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecode: Corrupted LZW table at scanline %d",
- tif->tif_row);
- return (0);
- }
-
- free_entp->next = oldcodep;
- if (free_entp->next < &sp->dec_codetab[0] ||
- free_entp->next >= &sp->dec_codetab[CSIZE]) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecode: Corrupted LZW table at scanline %d",
- tif->tif_row);
- return (0);
- }
- free_entp->firstchar = free_entp->next->firstchar;
- free_entp->length = free_entp->next->length+1;
- free_entp->value = (codep < free_entp) ?
- codep->firstchar : free_entp->firstchar;
- if (++free_entp > maxcodep) {
- if (++nbits > BITS_MAX) /* should not happen */
- nbits = BITS_MAX;
- nbitsmask = MAXCODE(nbits);
- maxcodep = sp->dec_codetab + nbitsmask-1;
- }
- oldcodep = codep;
- if (code >= 256) {
- /*
- * Code maps to a string, copy string
- * value to output (written in reverse).
- */
- if(codep->length == 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecode: Wrong length of decoded string: "
- "data probably corrupted at scanline %d",
- tif->tif_row);
- return (0);
- }
- if (codep->length > occ) {
- /*
- * String is too long for decode buffer,
- * locate portion that will fit, copy to
- * the decode buffer, and setup restart
- * logic for the next decoding call.
- */
- sp->dec_codep = codep;
- do {
- codep = codep->next;
- } while (codep && codep->length > occ);
- if (codep) {
- sp->dec_restart = occ;
- tp = op + occ;
- do {
- *--tp = codep->value;
- codep = codep->next;
- } while (--occ && codep);
- if (codep)
- codeLoop(tif);
- }
- break;
- }
- len = codep->length;
- tp = op + len;
- do {
- int t;
- --tp;
- t = codep->value;
- codep = codep->next;
- *tp = t;
- } while (codep && tp > op);
- if (codep) {
- codeLoop(tif);
- break;
- }
- op += len, occ -= len;
- } else
- *op++ = (char)code, occ--;
- }
-
- tif->tif_rawcp = (tidata_t) bp;
- sp->lzw_nbits = (unsigned short) nbits;
- sp->lzw_nextdata = nextdata;
- sp->lzw_nextbits = nextbits;
- sp->dec_nbitsmask = nbitsmask;
- sp->dec_oldcodep = oldcodep;
- sp->dec_free_entp = free_entp;
- sp->dec_maxcodep = maxcodep;
-
- if (occ > 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecode: Not enough data at scanline %d (short %ld bytes)",
- tif->tif_row, occ);
- return (0);
- }
- return (1);
-}
-
-#ifdef LZW_COMPAT
-/*
- * Decode a "hunk of data" for old images.
- */
-#define GetNextCodeCompat(sp, bp, code) { \
- nextdata |= (unsigned long) *(bp)++ << nextbits; \
- nextbits += 8; \
- if (nextbits < nbits) { \
- nextdata |= (unsigned long) *(bp)++ << nextbits;\
- nextbits += 8; \
- } \
- code = (hcode_t)(nextdata & nbitsmask); \
- nextdata >>= nbits; \
- nextbits -= nbits; \
-}
-
-static int
-LZWDecodeCompat(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
-{
- LZWCodecState *sp = DecoderState(tif);
- char *op = (char*) op0;
- long occ = (long) occ0;
- char *tp;
- unsigned char *bp;
- int code, nbits;
- long nextbits, nextdata, nbitsmask;
- code_t *codep, *free_entp, *maxcodep, *oldcodep;
-
- (void) s;
- assert(sp != NULL);
- /*
- * Restart interrupted output operation.
- */
- if (sp->dec_restart) {
- long residue;
-
- codep = sp->dec_codep;
- residue = codep->length - sp->dec_restart;
- if (residue > occ) {
- /*
- * Residue from previous decode is sufficient
- * to satisfy decode request. Skip to the
- * start of the decoded string, place decoded
- * values in the output buffer, and return.
- */
- sp->dec_restart += occ;
- do {
- codep = codep->next;
- } while (--residue > occ);
- tp = op + occ;
- do {
- *--tp = codep->value;
- codep = codep->next;
- } while (--occ);
- return (1);
- }
- /*
- * Residue satisfies only part of the decode request.
- */
- op += residue, occ -= residue;
- tp = op;
- do {
- *--tp = codep->value;
- codep = codep->next;
- } while (--residue);
- sp->dec_restart = 0;
- }
-
- bp = (unsigned char *)tif->tif_rawcp;
- nbits = sp->lzw_nbits;
- nextdata = sp->lzw_nextdata;
- nextbits = sp->lzw_nextbits;
- nbitsmask = sp->dec_nbitsmask;
- oldcodep = sp->dec_oldcodep;
- free_entp = sp->dec_free_entp;
- maxcodep = sp->dec_maxcodep;
-
- while (occ > 0) {
- NextCode(tif, sp, bp, code, GetNextCodeCompat);
- if (code == CODE_EOI)
- break;
- if (code == CODE_CLEAR) {
- free_entp = sp->dec_codetab + CODE_FIRST;
- _TIFFmemset(free_entp, 0,
- (CSIZE - CODE_FIRST) * sizeof (code_t));
- nbits = BITS_MIN;
- nbitsmask = MAXCODE(BITS_MIN);
- maxcodep = sp->dec_codetab + nbitsmask;
- NextCode(tif, sp, bp, code, GetNextCodeCompat);
- if (code == CODE_EOI)
- break;
- if (code == CODE_CLEAR) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecode: Corrupted LZW table at scanline %d",
- tif->tif_row);
- return (0);
- }
- *op++ = code, occ--;
- oldcodep = sp->dec_codetab + code;
- continue;
- }
- codep = sp->dec_codetab + code;
-
- /*
- * Add the new entry to the code table.
- */
- if (free_entp < &sp->dec_codetab[0] ||
- free_entp >= &sp->dec_codetab[CSIZE]) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecodeCompat: Corrupted LZW table at scanline %d",
- tif->tif_row);
- return (0);
- }
-
- free_entp->next = oldcodep;
- if (free_entp->next < &sp->dec_codetab[0] ||
- free_entp->next >= &sp->dec_codetab[CSIZE]) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecodeCompat: Corrupted LZW table at scanline %d",
- tif->tif_row);
- return (0);
- }
- free_entp->firstchar = free_entp->next->firstchar;
- free_entp->length = free_entp->next->length+1;
- free_entp->value = (codep < free_entp) ?
- codep->firstchar : free_entp->firstchar;
- if (++free_entp > maxcodep) {
- if (++nbits > BITS_MAX) /* should not happen */
- nbits = BITS_MAX;
- nbitsmask = MAXCODE(nbits);
- maxcodep = sp->dec_codetab + nbitsmask;
- }
- oldcodep = codep;
- if (code >= 256) {
- char *op_orig = op;
- /*
- * Code maps to a string, copy string
- * value to output (written in reverse).
- */
- if(codep->length == 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecodeCompat: Wrong length of decoded "
- "string: data probably corrupted at scanline %d",
- tif->tif_row);
- return (0);
- }
- if (codep->length > occ) {
- /*
- * String is too long for decode buffer,
- * locate portion that will fit, copy to
- * the decode buffer, and setup restart
- * logic for the next decoding call.
- */
- sp->dec_codep = codep;
- do {
- codep = codep->next;
- } while (codep->length > occ);
- sp->dec_restart = occ;
- tp = op + occ;
- do {
- *--tp = codep->value;
- codep = codep->next;
- } while (--occ);
- break;
- }
- op += codep->length, occ -= codep->length;
- tp = op;
- do {
- *--tp = codep->value;
- } while( (codep = codep->next) != NULL && tp > op_orig);
- } else
- *op++ = code, occ--;
- }
-
- tif->tif_rawcp = (tidata_t) bp;
- sp->lzw_nbits = nbits;
- sp->lzw_nextdata = nextdata;
- sp->lzw_nextbits = nextbits;
- sp->dec_nbitsmask = nbitsmask;
- sp->dec_oldcodep = oldcodep;
- sp->dec_free_entp = free_entp;
- sp->dec_maxcodep = maxcodep;
-
- if (occ > 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "LZWDecodeCompat: Not enough data at scanline %d (short %ld bytes)",
- tif->tif_row, occ);
- return (0);
- }
- return (1);
-}
-#endif /* LZW_COMPAT */
-
-/*
- * LZW Encoding.
- */
-
-static int
-LZWSetupEncode(TIFF* tif)
-{
- LZWCodecState* sp = EncoderState(tif);
- static const char module[] = "LZWSetupEncode";
-
- assert(sp != NULL);
- sp->enc_hashtab = (hash_t*) _TIFFmalloc(HSIZE*sizeof (hash_t));
- if (sp->enc_hashtab == NULL) {
- TIFFErrorExt(tif->tif_clientdata, module, "No space for LZW hash table");
- return (0);
- }
- return (1);
-}
-
-/*
- * Reset encoding state at the start of a strip.
- */
-static int
-LZWPreEncode(TIFF* tif, tsample_t s)
-{
- LZWCodecState *sp = EncoderState(tif);
-
- (void) s;
- assert(sp != NULL);
-
- if( sp->enc_hashtab == NULL )
- {
- tif->tif_setupencode( tif );
- }
-
- sp->lzw_nbits = BITS_MIN;
- sp->lzw_maxcode = MAXCODE(BITS_MIN);
- sp->lzw_free_ent = CODE_FIRST;
- sp->lzw_nextbits = 0;
- sp->lzw_nextdata = 0;
- sp->enc_checkpoint = CHECK_GAP;
- sp->enc_ratio = 0;
- sp->enc_incount = 0;
- sp->enc_outcount = 0;
- /*
- * The 4 here insures there is space for 2 max-sized
- * codes in LZWEncode and LZWPostDecode.
- */
- sp->enc_rawlimit = tif->tif_rawdata + tif->tif_rawdatasize-1 - 4;
- cl_hash(sp); /* clear hash table */
- sp->enc_oldcode = (hcode_t) -1; /* generates CODE_CLEAR in LZWEncode */
- return (1);
-}
-
-#define CALCRATIO(sp, rat) { \
- if (incount > 0x007fffff) { /* NB: shift will overflow */\
- rat = outcount >> 8; \
- rat = (rat == 0 ? 0x7fffffff : incount/rat); \
- } else \
- rat = (incount<<8) / outcount; \
-}
-#define PutNextCode(op, c) { \
- nextdata = (nextdata << nbits) | c; \
- nextbits += nbits; \
- *op++ = (unsigned char)(nextdata >> (nextbits-8)); \
- nextbits -= 8; \
- if (nextbits >= 8) { \
- *op++ = (unsigned char)(nextdata >> (nextbits-8)); \
- nextbits -= 8; \
- } \
- outcount += nbits; \
-}
-
-/*
- * Encode a chunk of pixels.
- *
- * Uses an open addressing double hashing (no chaining) on the
- * prefix code/next character combination. We do a variant of
- * Knuth's algorithm D (vol. 3, sec. 6.4) along with G. Knott's
- * relatively-prime secondary probe. Here, the modular division
- * first probe is gives way to a faster exclusive-or manipulation.
- * Also do block compression with an adaptive reset, whereby the
- * code table is cleared when the compression ratio decreases,
- * but after the table fills. The variable-length output codes
- * are re-sized at this point, and a CODE_CLEAR is generated
- * for the decoder.
- */
-static int
-LZWEncode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- register LZWCodecState *sp = EncoderState(tif);
- register long fcode;
- register hash_t *hp;
- register int h, c;
- hcode_t ent;
- long disp;
- long incount, outcount, checkpoint;
- long nextdata, nextbits;
- int free_ent, maxcode, nbits;
- tidata_t op, limit;
-
- (void) s;
- if (sp == NULL)
- return (0);
-
- assert(sp->enc_hashtab != NULL);
-
- /*
- * Load local state.
- */
- incount = sp->enc_incount;
- outcount = sp->enc_outcount;
- checkpoint = sp->enc_checkpoint;
- nextdata = sp->lzw_nextdata;
- nextbits = sp->lzw_nextbits;
- free_ent = sp->lzw_free_ent;
- maxcode = sp->lzw_maxcode;
- nbits = sp->lzw_nbits;
- op = tif->tif_rawcp;
- limit = sp->enc_rawlimit;
- ent = sp->enc_oldcode;
-
- if (ent == (hcode_t) -1 && cc > 0) {
- /*
- * NB: This is safe because it can only happen
- * at the start of a strip where we know there
- * is space in the data buffer.
- */
- PutNextCode(op, CODE_CLEAR);
- ent = *bp++; cc--; incount++;
- }
- while (cc > 0) {
- c = *bp++; cc--; incount++;
- fcode = ((long)c << BITS_MAX) + ent;
- h = (c << HSHIFT) ^ ent; /* xor hashing */
-#ifdef _WINDOWS
- /*
- * Check hash index for an overflow.
- */
- if (h >= HSIZE)
- h -= HSIZE;
-#endif
- hp = &sp->enc_hashtab[h];
- if (hp->hash == fcode) {
- ent = hp->code;
- continue;
- }
- if (hp->hash >= 0) {
- /*
- * Primary hash failed, check secondary hash.
- */
- disp = HSIZE - h;
- if (h == 0)
- disp = 1;
- do {
- /*
- * Avoid pointer arithmetic 'cuz of
- * wraparound problems with segments.
- */
- if ((h -= disp) < 0)
- h += HSIZE;
- hp = &sp->enc_hashtab[h];
- if (hp->hash == fcode) {
- ent = hp->code;
- goto hit;
- }
- } while (hp->hash >= 0);
- }
- /*
- * New entry, emit code and add to table.
- */
- /*
- * Verify there is space in the buffer for the code
- * and any potential Clear code that might be emitted
- * below. The value of limit is setup so that there
- * are at least 4 bytes free--room for 2 codes.
- */
- if (op > limit) {
- tif->tif_rawcc = (tsize_t)(op - tif->tif_rawdata);
- TIFFFlushData1(tif);
- op = tif->tif_rawdata;
- }
- PutNextCode(op, ent);
- ent = c;
- hp->code = free_ent++;
- hp->hash = fcode;
- if (free_ent == CODE_MAX-1) {
- /* table is full, emit clear code and reset */
- cl_hash(sp);
- sp->enc_ratio = 0;
- incount = 0;
- outcount = 0;
- free_ent = CODE_FIRST;
- PutNextCode(op, CODE_CLEAR);
- nbits = BITS_MIN;
- maxcode = MAXCODE(BITS_MIN);
- } else {
- /*
- * If the next entry is going to be too big for
- * the code size, then increase it, if possible.
- */
- if (free_ent > maxcode) {
- nbits++;
- assert(nbits <= BITS_MAX);
- maxcode = (int) MAXCODE(nbits);
- } else if (incount >= checkpoint) {
- long rat;
- /*
- * Check compression ratio and, if things seem
- * to be slipping, clear the hash table and
- * reset state. The compression ratio is a
- * 24+8-bit fractional number.
- */
- checkpoint = incount+CHECK_GAP;
- CALCRATIO(sp, rat);
- if (rat <= sp->enc_ratio) {
- cl_hash(sp);
- sp->enc_ratio = 0;
- incount = 0;
- outcount = 0;
- free_ent = CODE_FIRST;
- PutNextCode(op, CODE_CLEAR);
- nbits = BITS_MIN;
- maxcode = MAXCODE(BITS_MIN);
- } else
- sp->enc_ratio = rat;
- }
- }
- hit:
- ;
- }
-
- /*
- * Restore global state.
- */
- sp->enc_incount = incount;
- sp->enc_outcount = outcount;
- sp->enc_checkpoint = checkpoint;
- sp->enc_oldcode = ent;
- sp->lzw_nextdata = nextdata;
- sp->lzw_nextbits = nextbits;
- sp->lzw_free_ent = free_ent;
- sp->lzw_maxcode = maxcode;
- sp->lzw_nbits = nbits;
- tif->tif_rawcp = op;
- return (1);
-}
-
-/*
- * Finish off an encoded strip by flushing the last
- * string and tacking on an End Of Information code.
- */
-static int
-LZWPostEncode(TIFF* tif)
-{
- register LZWCodecState *sp = EncoderState(tif);
- tidata_t op = tif->tif_rawcp;
- long nextbits = sp->lzw_nextbits;
- long nextdata = sp->lzw_nextdata;
- long outcount = sp->enc_outcount;
- int nbits = sp->lzw_nbits;
-
- if (op > sp->enc_rawlimit) {
- tif->tif_rawcc = (tsize_t)(op - tif->tif_rawdata);
- TIFFFlushData1(tif);
- op = tif->tif_rawdata;
- }
- if (sp->enc_oldcode != (hcode_t) -1) {
- PutNextCode(op, sp->enc_oldcode);
- sp->enc_oldcode = (hcode_t) -1;
- }
- PutNextCode(op, CODE_EOI);
- if (nextbits > 0)
- *op++ = (unsigned char)(nextdata << (8-nextbits));
- tif->tif_rawcc = (tsize_t)(op - tif->tif_rawdata);
- return (1);
-}
-
-/*
- * Reset encoding hash table.
- */
-static void
-cl_hash(LZWCodecState* sp)
-{
- register hash_t *hp = &sp->enc_hashtab[HSIZE-1];
- register long i = HSIZE-8;
-
- do {
- i -= 8;
- hp[-7].hash = -1;
- hp[-6].hash = -1;
- hp[-5].hash = -1;
- hp[-4].hash = -1;
- hp[-3].hash = -1;
- hp[-2].hash = -1;
- hp[-1].hash = -1;
- hp[ 0].hash = -1;
- hp -= 8;
- } while (i >= 0);
- for (i += 8; i > 0; i--, hp--)
- hp->hash = -1;
-}
-
-static void
-LZWCleanup(TIFF* tif)
-{
- (void)TIFFPredictorCleanup(tif);
-
- assert(tif->tif_data != 0);
-
- if (DecoderState(tif)->dec_codetab)
- _TIFFfree(DecoderState(tif)->dec_codetab);
-
- if (EncoderState(tif)->enc_hashtab)
- _TIFFfree(EncoderState(tif)->enc_hashtab);
-
- _TIFFfree(tif->tif_data);
- tif->tif_data = NULL;
-
- _TIFFSetDefaultCompressionState(tif);
-}
-
-int
-TIFFInitLZW(TIFF* tif, int scheme)
-{
- assert(scheme == COMPRESSION_LZW);
- /*
- * Allocate state block so tag methods have storage to record values.
- */
- tif->tif_data = (tidata_t) _TIFFmalloc(sizeof (LZWCodecState));
- if (tif->tif_data == NULL)
- goto bad;
- DecoderState(tif)->dec_codetab = NULL;
- DecoderState(tif)->dec_decode = NULL;
- EncoderState(tif)->enc_hashtab = NULL;
- LZWState(tif)->rw_mode = tif->tif_mode;
-
- /*
- * Install codec methods.
- */
- tif->tif_setupdecode = LZWSetupDecode;
- tif->tif_predecode = LZWPreDecode;
- tif->tif_decoderow = LZWDecode;
- tif->tif_decodestrip = LZWDecode;
- tif->tif_decodetile = LZWDecode;
- tif->tif_setupencode = LZWSetupEncode;
- tif->tif_preencode = LZWPreEncode;
- tif->tif_postencode = LZWPostEncode;
- tif->tif_encoderow = LZWEncode;
- tif->tif_encodestrip = LZWEncode;
- tif->tif_encodetile = LZWEncode;
- tif->tif_cleanup = LZWCleanup;
- /*
- * Setup predictor setup.
- */
- (void) TIFFPredictorInit(tif);
- return (1);
-bad:
- TIFFErrorExt(tif->tif_clientdata, "TIFFInitLZW",
- "No space for LZW state block");
- return (0);
-}
-
-/*
- * Copyright (c) 1985, 1986 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * James A. Woods, derived from original work by Spencer Thomas
- * and Joseph Orost.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley. The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-#endif /* LZW_SUPPORT */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_msdos.c b/src/3rdparty/libtiff/libtiff/tif_msdos.c
deleted file mode 100644
index 72cd39e04b..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_msdos.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_msdos.c,v 1.3 2006/07/25 18:26:33 fwarmerdam Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library MSDOS-specific Routines.
- */
-#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(_MSC_VER)
-#include <io.h> /* for open, close, etc. function prototypes */
-#include <stdio.h>
-#endif
-#include "tiffiop.h"
-
-static tsize_t
-_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- return (read((int) fd, buf, size));
-}
-
-static tsize_t
-_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- return (write((int) fd, buf, size));
-}
-
-static toff_t
-_tiffSeekProc(thandle_t fd, toff_t off, int whence)
-{
- return (lseek((int) fd, (off_t) off, whence));
-}
-
-static int
-_tiffCloseProc(thandle_t fd)
-{
- return (close((int) fd));
-}
-
-#include <sys/stat.h>
-
-static toff_t
-_tiffSizeProc(thandle_t fd)
-{
- struct stat sb;
- return (fstat((int) fd, &sb) < 0 ? 0 : sb.st_size);
-}
-
-static int
-_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
-{
- return (0);
-}
-
-static void
-_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
-{
-}
-
-/*
- * Open a TIFF file descriptor for read/writing.
- */
-TIFF*
-TIFFFdOpen(int fd, const char* name, const char* mode)
-{
- TIFF* tif;
-
- tif = TIFFClientOpen(name, mode,
- (void*) fd,
- _tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
- _tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
- if (tif)
- tif->tif_fd = fd;
- return (tif);
-}
-
-/*
- * Open a TIFF file for read/writing.
- */
-TIFF*
-TIFFOpen(const char* name, const char* mode)
-{
- static const char module[] = "TIFFOpen";
- int m, fd;
- TIFF *ret;
-
- m = _TIFFgetMode(mode, module);
- if (m == -1)
- return ((TIFF*)0);
- fd = open(name, m|O_BINARY, 0666);
- if (fd < 0) {
- TIFFErrorExt(0, module, "%s: Cannot open", name);
- return ((TIFF*)0);
- }
- return (TIFFFdOpen(fd, name, mode));
-
- ret = TIFFFdOpen(fd, name, mode);
-
- if (ret == NULL) close(fd);
-
- return ret;
-}
-
-#ifdef __GNUC__
-extern char* malloc();
-extern char* realloc();
-#else
-#include <malloc.h>
-#endif
-
-tdata_t
-_TIFFmalloc(tsize_t s)
-{
- return (malloc((size_t) s));
-}
-
-void
-_TIFFfree(tdata_t p)
-{
- free(p);
-}
-
-tdata_t
-_TIFFrealloc(tdata_t p, tsize_t s)
-{
- return (realloc(p, (size_t) s));
-}
-
-void
-_TIFFmemset(tdata_t p, int v, tsize_t c)
-{
- memset(p, v, (size_t) c);
-}
-
-void
-_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
-{
- memcpy(d, s, (size_t) c);
-}
-
-int
-_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
-{
- return (memcmp(p1, p2, (size_t) c));
-}
-
-static void
-msdosWarningHandler(const char* module, const char* fmt, va_list ap)
-{
- if (module != NULL)
- fprintf(stderr, "%s: ", module);
- fprintf(stderr, "Warning, ");
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-}
-TIFFErrorHandler _TIFFwarningHandler = msdosWarningHandler;
-
-static void
-msdosErrorHandler(const char* module, const char* fmt, va_list ap)
-{
- if (module != NULL)
- fprintf(stderr, "%s: ", module);
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-}
-TIFFErrorHandler _TIFFerrorHandler = msdosErrorHandler;
diff --git a/src/3rdparty/libtiff/libtiff/tif_next.c b/src/3rdparty/libtiff/libtiff/tif_next.c
deleted file mode 100644
index 0e1842d872..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_next.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* $Id: tif_next.c,v 1.8 2006/10/12 15:00:49 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#include "tiffiop.h"
-#ifdef NEXT_SUPPORT
-/*
- * TIFF Library.
- *
- * NeXT 2-bit Grey Scale Compression Algorithm Support
- */
-
-#define SETPIXEL(op, v) { \
- switch (npixels++ & 3) { \
- case 0: op[0] = (unsigned char) ((v) << 6); break; \
- case 1: op[0] |= (v) << 4; break; \
- case 2: op[0] |= (v) << 2; break; \
- case 3: *op++ |= (v); break; \
- } \
-}
-
-#define LITERALROW 0x00
-#define LITERALSPAN 0x40
-#define WHITE ((1<<2)-1)
-
-static int
-NeXTDecode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
-{
- unsigned char *bp, *op;
- tsize_t cc;
- tidata_t row;
- tsize_t scanline, n;
-
- (void) s;
- /*
- * Each scanline is assumed to start off as all
- * white (we assume a PhotometricInterpretation
- * of ``min-is-black'').
- */
- for (op = buf, cc = occ; cc-- > 0;)
- *op++ = 0xff;
-
- bp = (unsigned char *)tif->tif_rawcp;
- cc = tif->tif_rawcc;
- scanline = tif->tif_scanlinesize;
- for (row = buf; occ > 0; occ -= scanline, row += scanline) {
- n = *bp++, cc--;
- switch (n) {
- case LITERALROW:
- /*
- * The entire scanline is given as literal values.
- */
- if (cc < scanline)
- goto bad;
- _TIFFmemcpy(row, bp, scanline);
- bp += scanline;
- cc -= scanline;
- break;
- case LITERALSPAN: {
- tsize_t off;
- /*
- * The scanline has a literal span that begins at some
- * offset.
- */
- off = (bp[0] * 256) + bp[1];
- n = (bp[2] * 256) + bp[3];
- if (cc < 4+n || off+n > scanline)
- goto bad;
- _TIFFmemcpy(row+off, bp+4, n);
- bp += 4+n;
- cc -= 4+n;
- break;
- }
- default: {
- uint32 npixels = 0, grey;
- uint32 imagewidth = tif->tif_dir.td_imagewidth;
-
- /*
- * The scanline is composed of a sequence of constant
- * color ``runs''. We shift into ``run mode'' and
- * interpret bytes as codes of the form
- * <color><npixels> until we've filled the scanline.
- */
- op = row;
- for (;;) {
- grey = (n>>6) & 0x3;
- n &= 0x3f;
- /*
- * Ensure the run does not exceed the scanline
- * bounds, potentially resulting in a security
- * issue.
- */
- while (n-- > 0 && npixels < imagewidth)
- SETPIXEL(op, grey);
- if (npixels >= imagewidth)
- break;
- if (cc == 0)
- goto bad;
- n = *bp++, cc--;
- }
- break;
- }
- }
- }
- tif->tif_rawcp = (tidata_t) bp;
- tif->tif_rawcc = cc;
- return (1);
-bad:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "NeXTDecode: Not enough data for scanline %ld",
- (long) tif->tif_row);
- return (0);
-}
-
-int
-TIFFInitNeXT(TIFF* tif, int scheme)
-{
- (void) scheme;
- tif->tif_decoderow = NeXTDecode;
- tif->tif_decodestrip = NeXTDecode;
- tif->tif_decodetile = NeXTDecode;
- return (1);
-}
-#endif /* NEXT_SUPPORT */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_ojpeg.c b/src/3rdparty/libtiff/libtiff/tif_ojpeg.c
deleted file mode 100644
index 9d1e8043e8..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_ojpeg.c
+++ /dev/null
@@ -1,2427 +0,0 @@
-/* $Id: tif_ojpeg.c,v 1.24.2.4 2009-09-03 20:45:10 bfriesen Exp $ */
-
-/* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0
- specification is now totally obsolete and deprecated for new applications and
- images. This file was was created solely in order to read unconverted images
- still present on some users' computer systems. It will never be extended
- to write such files. Writing new-style JPEG compressed TIFFs is implemented
- in tif_jpeg.c.
-
- The code is carefully crafted to robustly read all gathered JPEG-in-TIFF
- testfiles, and anticipate as much as possible all other... But still, it may
- fail on some. If you encounter problems, please report them on the TIFF
- mailing list and/or to Joris Van Damme <info@awaresystems.be>.
-
- Please read the file called "TIFF Technical Note #2" if you need to be
- convinced this compression scheme is bad and breaks TIFF. That document
- is linked to from the LibTiff site <http://www.remotesensing.org/libtiff/>
- and from AWare Systems' TIFF section
- <http://www.awaresystems.be/imaging/tiff.html>. It is also absorbed
- in Adobe's specification supplements, marked "draft" up to this day, but
- supported by the TIFF community.
-
- This file interfaces with Release 6B of the JPEG Library written by the
- Independent JPEG Group. Previous versions of this file required a hack inside
- the LibJpeg library. This version no longer requires that. Remember to
- remove the hack if you update from the old version.
-
- Copyright (c) Joris Van Damme <info@awaresystems.be>
- Copyright (c) AWare Systems <http://www.awaresystems.be/>
-
- The licence agreement for this file is the same as the rest of the LibTiff
- library.
-
- IN NO EVENT SHALL JORIS VAN DAMME OR AWARE SYSTEMS BE LIABLE FOR
- ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- OF THIS SOFTWARE.
-
- Joris Van Damme and/or AWare Systems may be available for custom
- developement. If you like what you see, and need anything similar or related,
- contact <info@awaresystems.be>.
-*/
-
-/* What is what, and what is not?
-
- This decoder starts with an input stream, that is essentially the JpegInterchangeFormat
- stream, if any, followed by the strile data, if any. This stream is read in
- OJPEGReadByte and related functions.
-
- It analyzes the start of this stream, until it encounters non-marker data, i.e.
- compressed image data. Some of the header markers it sees have no actual content,
- like the SOI marker, and APP/COM markers that really shouldn't even be there. Some
- other markers do have content, and the valuable bits and pieces of information
- in these markers are saved, checking all to verify that the stream is more or
- less within expected bounds. This happens inside the OJPEGReadHeaderInfoSecStreamXxx
- functions.
-
- Some OJPEG imagery contains no valid JPEG header markers. This situation is picked
- up on if we've seen no SOF marker when we're at the start of the compressed image
- data. In this case, the tables are read from JpegXxxTables tags, and the other
- bits and pieces of information is initialized to its most basic value. This is
- implemented in the OJPEGReadHeaderInfoSecTablesXxx functions.
-
- When this is complete, a good and valid JPEG header can be assembled, and this is
- passed through to LibJpeg. When that's done, the remainder of the input stream, i.e.
- the compressed image data, can be passed through unchanged. This is done in
- OJPEGWriteStream functions.
-
- LibTiff rightly expects to know the subsampling values before decompression. Just like
- in new-style JPEG-in-TIFF, though, or even more so, actually, the YCbCrsubsampling
- tag is notoriously unreliable. To correct these tag values with the ones inside
- the JPEG stream, the first part of the input stream is pre-scanned in
- OJPEGSubsamplingCorrect, making no note of any other data, reporting no warnings
- or errors, up to the point where either these values are read, or it's clear they
- aren't there. This means that some of the data is read twice, but we feel speed
- in correcting these values is important enough to warrant this sacrifice. Allthough
- there is currently no define or other configuration mechanism to disable this behaviour,
- the actual header scanning is build to robustly respond with error report if it
- should encounter an uncorrected mismatch of subsampling values. See
- OJPEGReadHeaderInfoSecStreamSof.
-
- The restart interval and restart markers are the most tricky part... The restart
- interval can be specified in a tag. It can also be set inside the input JPEG stream.
- It can be used inside the input JPEG stream. If reading from strile data, we've
- consistenly discovered the need to insert restart markers in between the different
- striles, as is also probably the most likely interpretation of the original TIFF 6.0
- specification. With all this setting of interval, and actual use of markers that is not
- predictable at the time of valid JPEG header assembly, the restart thing may turn
- out the Achilles heel of this implementation. Fortunately, most OJPEG writer vendors
- succeed in reading back what they write, which may be the reason why we've been able
- to discover ways that seem to work.
-
- Some special provision is made for planarconfig separate OJPEG files. These seem
- to consistently contain header info, a SOS marker, a plane, SOS marker, plane, SOS,
- and plane. This may or may not be a valid JPEG configuration, we don't know and don't
- care. We want LibTiff to be able to access the planes individually, without huge
- buffering inside LibJpeg, anyway. So we compose headers to feed to LibJpeg, in this
- case, that allow us to pass a single plane such that LibJpeg sees a valid
- single-channel JPEG stream. Locating subsequent SOS markers, and thus subsequent
- planes, is done inside OJPEGReadSecondarySos.
-
- The benefit of the scheme is... that it works, basically. We know of no other that
- does. It works without checking software tag, or otherwise going about things in an
- OJPEG flavor specific manner. Instead, it is a single scheme, that covers the cases
- with and without JpegInterchangeFormat, with and without striles, with part of
- the header in JpegInterchangeFormat and remainder in first strile, etc. It is forgiving
- and robust, may likely work with OJPEG flavors we've not seen yet, and makes most out
- of the data.
-
- Another nice side-effect is that a complete JPEG single valid stream is build if
- planarconfig is not separate (vast majority). We may one day use that to build
- converters to JPEG, and/or to new-style JPEG compression inside TIFF.
-
- A dissadvantage is the lack of random access to the individual striles. This is the
- reason for much of the complicated restart-and-position stuff inside OJPEGPreDecode.
- Applications would do well accessing all striles in order, as this will result in
- a single sequential scan of the input stream, and no restarting of LibJpeg decoding
- session.
-*/
-
-
-#include "tiffiop.h"
-#ifdef OJPEG_SUPPORT
-
-/* Configuration defines here are:
- * JPEG_ENCAP_EXTERNAL: The normal way to call libjpeg, uses longjump. In some environments,
- * like eg LibTiffDelphi, this is not possible. For this reason, the actual calls to
- * libjpeg, with longjump stuff, are encapsulated in dedicated functions. When
- * JPEG_ENCAP_EXTERNAL is defined, these encapsulating functions are declared external
- * to this unit, and can be defined elsewhere to use stuff other then longjump.
- * The default mode, without JPEG_ENCAP_EXTERNAL, implements the call encapsulators
- * here, internally, with normal longjump.
- * SETJMP, LONGJMP, JMP_BUF: On some machines/environments a longjump equivalent is
- * conviniently available, but still it may be worthwhile to use _setjmp or sigsetjmp
- * in place of plain setjmp. These macros will make it easier. It is useless
- * to fiddle with these if you define JPEG_ENCAP_EXTERNAL.
- * OJPEG_BUFFER: Define the size of the desired buffer here. Should be small enough so as to guarantee
- * instant processing, optimal streaming and optimal use of processor cache, but also big
- * enough so as to not result in significant call overhead. It should be at least a few
- * bytes to accomodate some structures (this is verified in asserts), but it would not be
- * sensible to make it this small anyway, and it should be at most 64K since it is indexed
- * with uint16. We recommend 2K.
- * EGYPTIANWALK: You could also define EGYPTIANWALK here, but it is not used anywhere and has
- * absolutely no effect. That is why most people insist the EGYPTIANWALK is a bit silly.
- */
-
-/* #define LIBJPEG_ENCAP_EXTERNAL */
-#define SETJMP(jbuf) setjmp(jbuf)
-#define LONGJMP(jbuf,code) longjmp(jbuf,code)
-#define JMP_BUF jmp_buf
-#define OJPEG_BUFFER 2048
-/* define EGYPTIANWALK */
-
-#define JPEG_MARKER_SOF0 0xC0
-#define JPEG_MARKER_SOF1 0xC1
-#define JPEG_MARKER_SOF3 0xC3
-#define JPEG_MARKER_DHT 0xC4
-#define JPEG_MARKER_RST0 0XD0
-#define JPEG_MARKER_SOI 0xD8
-#define JPEG_MARKER_EOI 0xD9
-#define JPEG_MARKER_SOS 0xDA
-#define JPEG_MARKER_DQT 0xDB
-#define JPEG_MARKER_DRI 0xDD
-#define JPEG_MARKER_APP0 0xE0
-#define JPEG_MARKER_COM 0xFE
-
-#define FIELD_OJPEG_JPEGINTERCHANGEFORMAT (FIELD_CODEC+0)
-#define FIELD_OJPEG_JPEGINTERCHANGEFORMATLENGTH (FIELD_CODEC+1)
-#define FIELD_OJPEG_JPEGQTABLES (FIELD_CODEC+2)
-#define FIELD_OJPEG_JPEGDCTABLES (FIELD_CODEC+3)
-#define FIELD_OJPEG_JPEGACTABLES (FIELD_CODEC+4)
-#define FIELD_OJPEG_JPEGPROC (FIELD_CODEC+5)
-#define FIELD_OJPEG_JPEGRESTARTINTERVAL (FIELD_CODEC+6)
-#define FIELD_OJPEG_COUNT 7
-
-static const TIFFFieldInfo ojpeg_field_info[] = {
- {TIFFTAG_JPEGIFOFFSET,1,1,TIFF_LONG,FIELD_OJPEG_JPEGINTERCHANGEFORMAT,TRUE,FALSE,"JpegInterchangeFormat"},
- {TIFFTAG_JPEGIFBYTECOUNT,1,1,TIFF_LONG,FIELD_OJPEG_JPEGINTERCHANGEFORMATLENGTH,TRUE,FALSE,"JpegInterchangeFormatLength"},
- {TIFFTAG_JPEGQTABLES,TIFF_VARIABLE,TIFF_VARIABLE,TIFF_LONG,FIELD_OJPEG_JPEGQTABLES,FALSE,TRUE,"JpegQTables"},
- {TIFFTAG_JPEGDCTABLES,TIFF_VARIABLE,TIFF_VARIABLE,TIFF_LONG,FIELD_OJPEG_JPEGDCTABLES,FALSE,TRUE,"JpegDcTables"},
- {TIFFTAG_JPEGACTABLES,TIFF_VARIABLE,TIFF_VARIABLE,TIFF_LONG,FIELD_OJPEG_JPEGACTABLES,FALSE,TRUE,"JpegAcTables"},
- {TIFFTAG_JPEGPROC,1,1,TIFF_SHORT,FIELD_OJPEG_JPEGPROC,FALSE,FALSE,"JpegProc"},
- {TIFFTAG_JPEGRESTARTINTERVAL,1,1,TIFF_SHORT,FIELD_OJPEG_JPEGRESTARTINTERVAL,FALSE,FALSE,"JpegRestartInterval"},
-};
-
-#ifndef LIBJPEG_ENCAP_EXTERNAL
-#include <setjmp.h>
-#endif
-
-#include "jpeglib.h"
-#include "jerror.h"
-
-typedef struct jpeg_error_mgr jpeg_error_mgr;
-typedef struct jpeg_common_struct jpeg_common_struct;
-typedef struct jpeg_decompress_struct jpeg_decompress_struct;
-typedef struct jpeg_source_mgr jpeg_source_mgr;
-
-typedef enum {
- osibsNotSetYet,
- osibsJpegInterchangeFormat,
- osibsStrile,
- osibsEof
-} OJPEGStateInBufferSource;
-
-typedef enum {
- ososSoi,
- ososQTable0,ososQTable1,ososQTable2,ososQTable3,
- ososDcTable0,ososDcTable1,ososDcTable2,ososDcTable3,
- ososAcTable0,ososAcTable1,ososAcTable2,ososAcTable3,
- ososDri,
- ososSof,
- ososSos,
- ososCompressed,
- ososRst,
- ososEoi
-} OJPEGStateOutState;
-
-typedef struct {
- TIFF* tif;
- #ifndef LIBJPEG_ENCAP_EXTERNAL
- JMP_BUF exit_jmpbuf;
- #endif
- TIFFVGetMethod vgetparent;
- TIFFVSetMethod vsetparent;
- toff_t file_size;
- uint32 image_width;
- uint32 image_length;
- uint32 strile_width;
- uint32 strile_length;
- uint32 strile_length_total;
- uint8 samples_per_pixel;
- uint8 plane_sample_offset;
- uint8 samples_per_pixel_per_plane;
- toff_t jpeg_interchange_format;
- toff_t jpeg_interchange_format_length;
- uint8 jpeg_proc;
- uint8 subsamplingcorrect;
- uint8 subsamplingcorrect_done;
- uint8 subsampling_tag;
- uint8 subsampling_hor;
- uint8 subsampling_ver;
- uint8 subsampling_force_desubsampling_inside_decompression;
- uint8 qtable_offset_count;
- uint8 dctable_offset_count;
- uint8 actable_offset_count;
- toff_t qtable_offset[3];
- toff_t dctable_offset[3];
- toff_t actable_offset[3];
- uint8* qtable[4];
- uint8* dctable[4];
- uint8* actable[4];
- uint16 restart_interval;
- uint8 restart_index;
- uint8 sof_log;
- uint8 sof_marker_id;
- uint32 sof_x;
- uint32 sof_y;
- uint8 sof_c[3];
- uint8 sof_hv[3];
- uint8 sof_tq[3];
- uint8 sos_cs[3];
- uint8 sos_tda[3];
- struct {
- uint8 log;
- OJPEGStateInBufferSource in_buffer_source;
- tstrile_t in_buffer_next_strile;
- toff_t in_buffer_file_pos;
- toff_t in_buffer_file_togo;
- } sos_end[3];
- uint8 readheader_done;
- uint8 writeheader_done;
- tsample_t write_cursample;
- tstrile_t write_curstrile;
- uint8 libjpeg_session_active;
- uint8 libjpeg_jpeg_query_style;
- jpeg_error_mgr libjpeg_jpeg_error_mgr;
- jpeg_decompress_struct libjpeg_jpeg_decompress_struct;
- jpeg_source_mgr libjpeg_jpeg_source_mgr;
- uint8 subsampling_convert_log;
- uint32 subsampling_convert_ylinelen;
- uint32 subsampling_convert_ylines;
- uint32 subsampling_convert_clinelen;
- uint32 subsampling_convert_clines;
- uint32 subsampling_convert_ybuflen;
- uint32 subsampling_convert_cbuflen;
- uint32 subsampling_convert_ycbcrbuflen;
- uint8* subsampling_convert_ycbcrbuf;
- uint8* subsampling_convert_ybuf;
- uint8* subsampling_convert_cbbuf;
- uint8* subsampling_convert_crbuf;
- uint32 subsampling_convert_ycbcrimagelen;
- uint8** subsampling_convert_ycbcrimage;
- uint32 subsampling_convert_clinelenout;
- uint32 subsampling_convert_state;
- uint32 bytes_per_line; /* if the codec outputs subsampled data, a 'line' in bytes_per_line */
- uint32 lines_per_strile; /* and lines_per_strile means subsampling_ver desubsampled rows */
- OJPEGStateInBufferSource in_buffer_source;
- tstrile_t in_buffer_next_strile;
- tstrile_t in_buffer_strile_count;
- toff_t in_buffer_file_pos;
- uint8 in_buffer_file_pos_log;
- toff_t in_buffer_file_togo;
- uint16 in_buffer_togo;
- uint8* in_buffer_cur;
- uint8 in_buffer[OJPEG_BUFFER];
- OJPEGStateOutState out_state;
- uint8 out_buffer[OJPEG_BUFFER];
- uint8* skip_buffer;
-} OJPEGState;
-
-static int OJPEGVGetField(TIFF* tif, ttag_t tag, va_list ap);
-static int OJPEGVSetField(TIFF* tif, ttag_t tag, va_list ap);
-static void OJPEGPrintDir(TIFF* tif, FILE* fd, long flags);
-
-static int OJPEGSetupDecode(TIFF* tif);
-static int OJPEGPreDecode(TIFF* tif, tsample_t s);
-static int OJPEGPreDecodeSkipRaw(TIFF* tif);
-static int OJPEGPreDecodeSkipScanlines(TIFF* tif);
-static int OJPEGDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s);
-static int OJPEGDecodeRaw(TIFF* tif, tidata_t buf, tsize_t cc);
-static int OJPEGDecodeScanlines(TIFF* tif, tidata_t buf, tsize_t cc);
-static void OJPEGPostDecode(TIFF* tif, tidata_t buf, tsize_t cc);
-static int OJPEGSetupEncode(TIFF* tif);
-static int OJPEGPreEncode(TIFF* tif, tsample_t s);
-static int OJPEGEncode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s);
-static int OJPEGPostEncode(TIFF* tif);
-static void OJPEGCleanup(TIFF* tif);
-
-static void OJPEGSubsamplingCorrect(TIFF* tif);
-static int OJPEGReadHeaderInfo(TIFF* tif);
-static int OJPEGReadSecondarySos(TIFF* tif, tsample_t s);
-static int OJPEGWriteHeaderInfo(TIFF* tif);
-static void OJPEGLibjpegSessionAbort(TIFF* tif);
-
-static int OJPEGReadHeaderInfoSec(TIFF* tif);
-static int OJPEGReadHeaderInfoSecStreamDri(TIFF* tif);
-static int OJPEGReadHeaderInfoSecStreamDqt(TIFF* tif);
-static int OJPEGReadHeaderInfoSecStreamDht(TIFF* tif);
-static int OJPEGReadHeaderInfoSecStreamSof(TIFF* tif, uint8 marker_id);
-static int OJPEGReadHeaderInfoSecStreamSos(TIFF* tif);
-static int OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif);
-static int OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif);
-static int OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif);
-
-static int OJPEGReadBufferFill(OJPEGState* sp);
-static int OJPEGReadByte(OJPEGState* sp, uint8* byte);
-static int OJPEGReadBytePeek(OJPEGState* sp, uint8* byte);
-static void OJPEGReadByteAdvance(OJPEGState* sp);
-static int OJPEGReadWord(OJPEGState* sp, uint16* word);
-static int OJPEGReadBlock(OJPEGState* sp, uint16 len, void* mem);
-static void OJPEGReadSkip(OJPEGState* sp, uint16 len);
-
-static int OJPEGWriteStream(TIFF* tif, void** mem, uint32* len);
-static void OJPEGWriteStreamSoi(TIFF* tif, void** mem, uint32* len);
-static void OJPEGWriteStreamQTable(TIFF* tif, uint8 table_index, void** mem, uint32* len);
-static void OJPEGWriteStreamDcTable(TIFF* tif, uint8 table_index, void** mem, uint32* len);
-static void OJPEGWriteStreamAcTable(TIFF* tif, uint8 table_index, void** mem, uint32* len);
-static void OJPEGWriteStreamDri(TIFF* tif, void** mem, uint32* len);
-static void OJPEGWriteStreamSof(TIFF* tif, void** mem, uint32* len);
-static void OJPEGWriteStreamSos(TIFF* tif, void** mem, uint32* len);
-static int OJPEGWriteStreamCompressed(TIFF* tif, void** mem, uint32* len);
-static void OJPEGWriteStreamRst(TIFF* tif, void** mem, uint32* len);
-static void OJPEGWriteStreamEoi(TIFF* tif, void** mem, uint32* len);
-
-#ifdef LIBJPEG_ENCAP_EXTERNAL
-extern int jpeg_create_decompress_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo);
-extern int jpeg_read_header_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo, uint8 require_image);
-extern int jpeg_start_decompress_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo);
-extern int jpeg_read_scanlines_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo, void* scanlines, uint32 max_lines);
-extern int jpeg_read_raw_data_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo, void* data, uint32 max_lines);
-extern void jpeg_encap_unwind(TIFF* tif);
-#else
-static int jpeg_create_decompress_encap(OJPEGState* sp, jpeg_decompress_struct* j);
-static int jpeg_read_header_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo, uint8 require_image);
-static int jpeg_start_decompress_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo);
-static int jpeg_read_scanlines_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo, void* scanlines, uint32 max_lines);
-static int jpeg_read_raw_data_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo, void* data, uint32 max_lines);
-static void jpeg_encap_unwind(TIFF* tif);
-#endif
-
-static void OJPEGLibjpegJpegErrorMgrOutputMessage(jpeg_common_struct* cinfo);
-static void OJPEGLibjpegJpegErrorMgrErrorExit(jpeg_common_struct* cinfo);
-static void OJPEGLibjpegJpegSourceMgrInitSource(jpeg_decompress_struct* cinfo);
-static boolean OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo);
-static void OJPEGLibjpegJpegSourceMgrSkipInputData(jpeg_decompress_struct* cinfo, long num_bytes);
-static boolean OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired);
-static void OJPEGLibjpegJpegSourceMgrTermSource(jpeg_decompress_struct* cinfo);
-
-int
-TIFFInitOJPEG(TIFF* tif, int scheme)
-{
- static const char module[]="TIFFInitOJPEG";
- OJPEGState* sp;
-
- assert(scheme==COMPRESSION_OJPEG);
-
- /*
- * Merge codec-specific tag information.
- */
- if (!_TIFFMergeFieldInfo(tif,ojpeg_field_info,FIELD_OJPEG_COUNT)) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Merging Old JPEG codec-specific tags failed");
- return 0;
- }
-
- /* state block */
- sp=_TIFFmalloc(sizeof(OJPEGState));
- if (sp==NULL)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"No space for OJPEG state block");
- return(0);
- }
- _TIFFmemset(sp,0,sizeof(OJPEGState));
- sp->tif=tif;
- sp->jpeg_proc=1;
- sp->subsampling_hor=2;
- sp->subsampling_ver=2;
- TIFFSetField(tif,TIFFTAG_YCBCRSUBSAMPLING,2,2);
- /* tif codec methods */
- tif->tif_setupdecode=OJPEGSetupDecode;
- tif->tif_predecode=OJPEGPreDecode;
- tif->tif_postdecode=OJPEGPostDecode;
- tif->tif_decoderow=OJPEGDecode;
- tif->tif_decodestrip=OJPEGDecode;
- tif->tif_decodetile=OJPEGDecode;
- tif->tif_setupencode=OJPEGSetupEncode;
- tif->tif_preencode=OJPEGPreEncode;
- tif->tif_postencode=OJPEGPostEncode;
- tif->tif_encoderow=OJPEGEncode;
- tif->tif_encodestrip=OJPEGEncode;
- tif->tif_encodetile=OJPEGEncode;
- tif->tif_cleanup=OJPEGCleanup;
- tif->tif_data=(tidata_t)sp;
- /* tif tag methods */
- sp->vgetparent=tif->tif_tagmethods.vgetfield;
- tif->tif_tagmethods.vgetfield=OJPEGVGetField;
- sp->vsetparent=tif->tif_tagmethods.vsetfield;
- tif->tif_tagmethods.vsetfield=OJPEGVSetField;
- tif->tif_tagmethods.printdir=OJPEGPrintDir;
- /* Some OJPEG files don't have strip or tile offsets or bytecounts tags.
- Some others do, but have totally meaningless or corrupt values
- in these tags. In these cases, the JpegInterchangeFormat stream is
- reliable. In any case, this decoder reads the compressed data itself,
- from the most reliable locations, and we need to notify encapsulating
- LibTiff not to read raw strips or tiles for us. */
- tif->tif_flags|=TIFF_NOREADRAW;
- return(1);
-}
-
-static int
-OJPEGVGetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- switch(tag)
- {
- case TIFFTAG_JPEGIFOFFSET:
- *va_arg(ap,uint32*)=(uint32)sp->jpeg_interchange_format;
- break;
- case TIFFTAG_JPEGIFBYTECOUNT:
- *va_arg(ap,uint32*)=(uint32)sp->jpeg_interchange_format_length;
- break;
- case TIFFTAG_YCBCRSUBSAMPLING:
- if (sp->subsamplingcorrect_done==0)
- OJPEGSubsamplingCorrect(tif);
- *va_arg(ap,uint16*)=(uint16)sp->subsampling_hor;
- *va_arg(ap,uint16*)=(uint16)sp->subsampling_ver;
- break;
- case TIFFTAG_JPEGQTABLES:
- *va_arg(ap,uint32*)=(uint32)sp->qtable_offset_count;
- *va_arg(ap,void**)=(void*)sp->qtable_offset;
- break;
- case TIFFTAG_JPEGDCTABLES:
- *va_arg(ap,uint32*)=(uint32)sp->dctable_offset_count;
- *va_arg(ap,void**)=(void*)sp->dctable_offset;
- break;
- case TIFFTAG_JPEGACTABLES:
- *va_arg(ap,uint32*)=(uint32)sp->actable_offset_count;
- *va_arg(ap,void**)=(void*)sp->actable_offset;
- break;
- case TIFFTAG_JPEGPROC:
- *va_arg(ap,uint16*)=(uint16)sp->jpeg_proc;
- break;
- case TIFFTAG_JPEGRESTARTINTERVAL:
- *va_arg(ap,uint16*)=sp->restart_interval;
- break;
- default:
- return (*sp->vgetparent)(tif,tag,ap);
- }
- return (1);
-}
-
-static int
-OJPEGVSetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- static const char module[]="OJPEGVSetField";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint32 ma;
- uint32* mb;
- uint32 n;
- switch(tag)
- {
- case TIFFTAG_JPEGIFOFFSET:
- sp->jpeg_interchange_format=(toff_t)va_arg(ap,uint32);
- break;
- case TIFFTAG_JPEGIFBYTECOUNT:
- sp->jpeg_interchange_format_length=(toff_t)va_arg(ap,uint32);
- break;
- case TIFFTAG_YCBCRSUBSAMPLING:
- sp->subsampling_tag=1;
- sp->subsampling_hor=(uint8)va_arg(ap,int);
- sp->subsampling_ver=(uint8)va_arg(ap,int);
- tif->tif_dir.td_ycbcrsubsampling[0]=sp->subsampling_hor;
- tif->tif_dir.td_ycbcrsubsampling[1]=sp->subsampling_ver;
- break;
- case TIFFTAG_JPEGQTABLES:
- ma=va_arg(ap,uint32);
- if (ma!=0)
- {
- if (ma>3)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"JpegQTables tag has incorrect count");
- return(0);
- }
- sp->qtable_offset_count=(uint8)ma;
- mb=va_arg(ap,uint32*);
- for (n=0; n<ma; n++)
- sp->qtable_offset[n]=(toff_t)mb[n];
- }
- break;
- case TIFFTAG_JPEGDCTABLES:
- ma=va_arg(ap,uint32);
- if (ma!=0)
- {
- if (ma>3)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"JpegDcTables tag has incorrect count");
- return(0);
- }
- sp->dctable_offset_count=(uint8)ma;
- mb=va_arg(ap,uint32*);
- for (n=0; n<ma; n++)
- sp->dctable_offset[n]=(toff_t)mb[n];
- }
- break;
- case TIFFTAG_JPEGACTABLES:
- ma=va_arg(ap,uint32);
- if (ma!=0)
- {
- if (ma>3)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"JpegAcTables tag has incorrect count");
- return(0);
- }
- sp->actable_offset_count=(uint8)ma;
- mb=va_arg(ap,uint32*);
- for (n=0; n<ma; n++)
- sp->actable_offset[n]=(toff_t)mb[n];
- }
- break;
- case TIFFTAG_JPEGPROC:
- sp->jpeg_proc=(uint8)va_arg(ap,uint32);
- break;
- case TIFFTAG_JPEGRESTARTINTERVAL:
- sp->restart_interval=(uint16)va_arg(ap,uint32);
- break;
- default:
- return (*sp->vsetparent)(tif,tag,ap);
- }
- TIFFSetFieldBit(tif,_TIFFFieldWithTag(tif,tag)->field_bit);
- tif->tif_flags|=TIFF_DIRTYDIRECT;
- return(1);
-}
-
-static void
-OJPEGPrintDir(TIFF* tif, FILE* fd, long flags)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8 m;
- (void)flags;
- assert(sp!=NULL);
- if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGINTERCHANGEFORMAT))
- fprintf(fd," JpegInterchangeFormat: %lu\n",(unsigned long)sp->jpeg_interchange_format);
- if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGINTERCHANGEFORMATLENGTH))
- fprintf(fd," JpegInterchangeFormatLength: %lu\n",(unsigned long)sp->jpeg_interchange_format_length);
- if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGQTABLES))
- {
- fprintf(fd," JpegQTables:");
- for (m=0; m<sp->qtable_offset_count; m++)
- fprintf(fd," %lu",(unsigned long)sp->qtable_offset[m]);
- fprintf(fd,"\n");
- }
- if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGDCTABLES))
- {
- fprintf(fd," JpegDcTables:");
- for (m=0; m<sp->dctable_offset_count; m++)
- fprintf(fd," %lu",(unsigned long)sp->dctable_offset[m]);
- fprintf(fd,"\n");
- }
- if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGACTABLES))
- {
- fprintf(fd," JpegAcTables:");
- for (m=0; m<sp->actable_offset_count; m++)
- fprintf(fd," %lu",(unsigned long)sp->actable_offset[m]);
- fprintf(fd,"\n");
- }
- if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGPROC))
- fprintf(fd," JpegProc: %u\n",(unsigned int)sp->jpeg_proc);
- if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGRESTARTINTERVAL))
- fprintf(fd," JpegRestartInterval: %u\n",(unsigned int)sp->restart_interval);
-}
-
-static int
-OJPEGSetupDecode(TIFF* tif)
-{
- static const char module[]="OJPEGSetupDecode";
- TIFFWarningExt(tif->tif_clientdata,module,"Depreciated and troublesome old-style JPEG compression mode, please convert to new-style JPEG compression and notify vendor of writing software");
- return(1);
-}
-
-static int
-OJPEGPreDecode(TIFF* tif, tsample_t s)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- tstrile_t m;
- if (sp->subsamplingcorrect_done==0)
- OJPEGSubsamplingCorrect(tif);
- if (sp->readheader_done==0)
- {
- if (OJPEGReadHeaderInfo(tif)==0)
- return(0);
- }
- if (sp->sos_end[s].log==0)
- {
- if (OJPEGReadSecondarySos(tif,s)==0)
- return(0);
- }
- if isTiled(tif)
- m=(tstrile_t)tif->tif_curtile;
- else
- m=(tstrile_t)tif->tif_curstrip;
- if ((sp->writeheader_done!=0) && ((sp->write_cursample!=s) || (sp->write_curstrile>m)))
- {
- if (sp->libjpeg_session_active!=0)
- OJPEGLibjpegSessionAbort(tif);
- sp->writeheader_done=0;
- }
- if (sp->writeheader_done==0)
- {
- sp->plane_sample_offset=s;
- sp->write_cursample=s;
- sp->write_curstrile=s*tif->tif_dir.td_stripsperimage;
- if ((sp->in_buffer_file_pos_log==0) ||
- (sp->in_buffer_file_pos-sp->in_buffer_togo!=sp->sos_end[s].in_buffer_file_pos))
- {
- sp->in_buffer_source=sp->sos_end[s].in_buffer_source;
- sp->in_buffer_next_strile=sp->sos_end[s].in_buffer_next_strile;
- sp->in_buffer_file_pos=sp->sos_end[s].in_buffer_file_pos;
- sp->in_buffer_file_pos_log=0;
- sp->in_buffer_file_togo=sp->sos_end[s].in_buffer_file_togo;
- sp->in_buffer_togo=0;
- sp->in_buffer_cur=0;
- }
- if (OJPEGWriteHeaderInfo(tif)==0)
- return(0);
- }
- while (sp->write_curstrile<m)
- {
- if (sp->libjpeg_jpeg_query_style==0)
- {
- if (OJPEGPreDecodeSkipRaw(tif)==0)
- return(0);
- }
- else
- {
- if (OJPEGPreDecodeSkipScanlines(tif)==0)
- return(0);
- }
- sp->write_curstrile++;
- }
- return(1);
-}
-
-static int
-OJPEGPreDecodeSkipRaw(TIFF* tif)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint32 m;
- m=sp->lines_per_strile;
- if (sp->subsampling_convert_state!=0)
- {
- if (sp->subsampling_convert_clines-sp->subsampling_convert_state>=m)
- {
- sp->subsampling_convert_state+=m;
- if (sp->subsampling_convert_state==sp->subsampling_convert_clines)
- sp->subsampling_convert_state=0;
- return(1);
- }
- m-=sp->subsampling_convert_clines-sp->subsampling_convert_state;
- sp->subsampling_convert_state=0;
- }
- while (m>=sp->subsampling_convert_clines)
- {
- if (jpeg_read_raw_data_encap(sp,&(sp->libjpeg_jpeg_decompress_struct),sp->subsampling_convert_ycbcrimage,sp->subsampling_ver*8)==0)
- return(0);
- m-=sp->subsampling_convert_clines;
- }
- if (m>0)
- {
- if (jpeg_read_raw_data_encap(sp,&(sp->libjpeg_jpeg_decompress_struct),sp->subsampling_convert_ycbcrimage,sp->subsampling_ver*8)==0)
- return(0);
- sp->subsampling_convert_state=m;
- }
- return(1);
-}
-
-static int
-OJPEGPreDecodeSkipScanlines(TIFF* tif)
-{
- static const char module[]="OJPEGPreDecodeSkipScanlines";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint32 m;
- if (sp->skip_buffer==NULL)
- {
- sp->skip_buffer=_TIFFmalloc(sp->bytes_per_line);
- if (sp->skip_buffer==NULL)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Out of memory");
- return(0);
- }
- }
- for (m=0; m<sp->lines_per_strile; m++)
- {
- if (jpeg_read_scanlines_encap(sp,&(sp->libjpeg_jpeg_decompress_struct),&sp->skip_buffer,1)==0)
- return(0);
- }
- return(1);
-}
-
-static int
-OJPEGDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- (void)s;
- if (sp->libjpeg_jpeg_query_style==0)
- {
- if (OJPEGDecodeRaw(tif,buf,cc)==0)
- return(0);
- }
- else
- {
- if (OJPEGDecodeScanlines(tif,buf,cc)==0)
- return(0);
- }
- return(1);
-}
-
-static int
-OJPEGDecodeRaw(TIFF* tif, tidata_t buf, tsize_t cc)
-{
- static const char module[]="OJPEGDecodeRaw";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8* m;
- uint32 n;
- uint8* oy;
- uint8* ocb;
- uint8* ocr;
- uint8* p;
- uint32 q;
- uint8* r;
- uint8 sx,sy;
- if (cc%sp->bytes_per_line!=0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Fractional scanline not read");
- return(0);
- }
- assert(cc>0);
- m=buf;
- n=cc;
- do
- {
- if (sp->subsampling_convert_state==0)
- {
- if (jpeg_read_raw_data_encap(sp,&(sp->libjpeg_jpeg_decompress_struct),sp->subsampling_convert_ycbcrimage,sp->subsampling_ver*8)==0)
- return(0);
- }
- oy=sp->subsampling_convert_ybuf+sp->subsampling_convert_state*sp->subsampling_ver*sp->subsampling_convert_ylinelen;
- ocb=sp->subsampling_convert_cbbuf+sp->subsampling_convert_state*sp->subsampling_convert_clinelen;
- ocr=sp->subsampling_convert_crbuf+sp->subsampling_convert_state*sp->subsampling_convert_clinelen;
- p=m;
- for (q=0; q<sp->subsampling_convert_clinelenout; q++)
- {
- r=oy;
- for (sy=0; sy<sp->subsampling_ver; sy++)
- {
- for (sx=0; sx<sp->subsampling_hor; sx++)
- *p++=*r++;
- r+=sp->subsampling_convert_ylinelen-sp->subsampling_hor;
- }
- oy+=sp->subsampling_hor;
- *p++=*ocb++;
- *p++=*ocr++;
- }
- sp->subsampling_convert_state++;
- if (sp->subsampling_convert_state==sp->subsampling_convert_clines)
- sp->subsampling_convert_state=0;
- m+=sp->bytes_per_line;
- n-=sp->bytes_per_line;
- } while(n>0);
- return(1);
-}
-
-static int
-OJPEGDecodeScanlines(TIFF* tif, tidata_t buf, tsize_t cc)
-{
- static const char module[]="OJPEGDecodeScanlines";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8* m;
- uint32 n;
- if (cc%sp->bytes_per_line!=0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Fractional scanline not read");
- return(0);
- }
- assert(cc>0);
- m=buf;
- n=cc;
- do
- {
- if (jpeg_read_scanlines_encap(sp,&(sp->libjpeg_jpeg_decompress_struct),&m,1)==0)
- return(0);
- m+=sp->bytes_per_line;
- n-=sp->bytes_per_line;
- } while(n>0);
- return(1);
-}
-
-static void
-OJPEGPostDecode(TIFF* tif, tidata_t buf, tsize_t cc)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- (void)buf;
- (void)cc;
- sp->write_curstrile++;
- if (sp->write_curstrile%tif->tif_dir.td_stripsperimage==0)
- {
- assert(sp->libjpeg_session_active!=0);
- OJPEGLibjpegSessionAbort(tif);
- sp->writeheader_done=0;
- }
-}
-
-static int
-OJPEGSetupEncode(TIFF* tif)
-{
- static const char module[]="OJPEGSetupEncode";
- TIFFErrorExt(tif->tif_clientdata,module,"OJPEG encoding not supported; use new-style JPEG compression instead");
- return(0);
-}
-
-static int
-OJPEGPreEncode(TIFF* tif, tsample_t s)
-{
- static const char module[]="OJPEGPreEncode";
- (void)s;
- TIFFErrorExt(tif->tif_clientdata,module,"OJPEG encoding not supported; use new-style JPEG compression instead");
- return(0);
-}
-
-static int
-OJPEGEncode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
-{
- static const char module[]="OJPEGEncode";
- (void)buf;
- (void)cc;
- (void)s;
- TIFFErrorExt(tif->tif_clientdata,module,"OJPEG encoding not supported; use new-style JPEG compression instead");
- return(0);
-}
-
-static int
-OJPEGPostEncode(TIFF* tif)
-{
- static const char module[]="OJPEGPostEncode";
- TIFFErrorExt(tif->tif_clientdata,module,"OJPEG encoding not supported; use new-style JPEG compression instead");
- return(0);
-}
-
-static void
-OJPEGCleanup(TIFF* tif)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- if (sp!=0)
- {
- tif->tif_tagmethods.vgetfield=sp->vgetparent;
- tif->tif_tagmethods.vsetfield=sp->vsetparent;
- if (sp->qtable[0]!=0)
- _TIFFfree(sp->qtable[0]);
- if (sp->qtable[1]!=0)
- _TIFFfree(sp->qtable[1]);
- if (sp->qtable[2]!=0)
- _TIFFfree(sp->qtable[2]);
- if (sp->qtable[3]!=0)
- _TIFFfree(sp->qtable[3]);
- if (sp->dctable[0]!=0)
- _TIFFfree(sp->dctable[0]);
- if (sp->dctable[1]!=0)
- _TIFFfree(sp->dctable[1]);
- if (sp->dctable[2]!=0)
- _TIFFfree(sp->dctable[2]);
- if (sp->dctable[3]!=0)
- _TIFFfree(sp->dctable[3]);
- if (sp->actable[0]!=0)
- _TIFFfree(sp->actable[0]);
- if (sp->actable[1]!=0)
- _TIFFfree(sp->actable[1]);
- if (sp->actable[2]!=0)
- _TIFFfree(sp->actable[2]);
- if (sp->actable[3]!=0)
- _TIFFfree(sp->actable[3]);
- if (sp->libjpeg_session_active!=0)
- OJPEGLibjpegSessionAbort(tif);
- if (sp->subsampling_convert_ycbcrbuf!=0)
- _TIFFfree(sp->subsampling_convert_ycbcrbuf);
- if (sp->subsampling_convert_ycbcrimage!=0)
- _TIFFfree(sp->subsampling_convert_ycbcrimage);
- if (sp->skip_buffer!=0)
- _TIFFfree(sp->skip_buffer);
- _TIFFfree(sp);
- tif->tif_data=NULL;
- _TIFFSetDefaultCompressionState(tif);
- }
-}
-
-static void
-OJPEGSubsamplingCorrect(TIFF* tif)
-{
- static const char module[]="OJPEGSubsamplingCorrect";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8 mh;
- uint8 mv;
- assert(sp->subsamplingcorrect_done==0);
- if ((tif->tif_dir.td_samplesperpixel!=3) || ((tif->tif_dir.td_photometric!=PHOTOMETRIC_YCBCR) &&
- (tif->tif_dir.td_photometric!=PHOTOMETRIC_ITULAB)))
- {
- if (sp->subsampling_tag!=0)
- TIFFWarningExt(tif->tif_clientdata,module,"Subsampling tag not appropriate for this Photometric and/or SamplesPerPixel");
- sp->subsampling_hor=1;
- sp->subsampling_ver=1;
- sp->subsampling_force_desubsampling_inside_decompression=0;
- }
- else
- {
- sp->subsamplingcorrect_done=1;
- mh=sp->subsampling_hor;
- mv=sp->subsampling_ver;
- sp->subsamplingcorrect=1;
- OJPEGReadHeaderInfoSec(tif);
- if (sp->subsampling_force_desubsampling_inside_decompression!=0)
- {
- sp->subsampling_hor=1;
- sp->subsampling_ver=1;
- }
- sp->subsamplingcorrect=0;
- if (((sp->subsampling_hor!=mh) || (sp->subsampling_ver!=mv)) && (sp->subsampling_force_desubsampling_inside_decompression==0))
- {
- if (sp->subsampling_tag==0)
- TIFFWarningExt(tif->tif_clientdata,module,"Subsampling tag is not set, yet subsampling inside JPEG data [%d,%d] does not match default values [2,2]; assuming subsampling inside JPEG data is correct",sp->subsampling_hor,sp->subsampling_ver);
- else
- TIFFWarningExt(tif->tif_clientdata,module,"Subsampling inside JPEG data [%d,%d] does not match subsampling tag values [%d,%d]; assuming subsampling inside JPEG data is correct",sp->subsampling_hor,sp->subsampling_ver,mh,mv);
- }
- if (sp->subsampling_force_desubsampling_inside_decompression!=0)
- {
- if (sp->subsampling_tag==0)
- TIFFWarningExt(tif->tif_clientdata,module,"Subsampling tag is not set, yet subsampling inside JPEG data does not match default values [2,2] (nor any other values allowed in TIFF); assuming subsampling inside JPEG data is correct and desubsampling inside JPEG decompression");
- else
- TIFFWarningExt(tif->tif_clientdata,module,"Subsampling inside JPEG data does not match subsampling tag values [%d,%d] (nor any other values allowed in TIFF); assuming subsampling inside JPEG data is correct and desubsampling inside JPEG decompression",mh,mv);
- }
- if (sp->subsampling_force_desubsampling_inside_decompression==0)
- {
- if (sp->subsampling_hor<sp->subsampling_ver)
- TIFFWarningExt(tif->tif_clientdata,module,"Subsampling values [%d,%d] are not allowed in TIFF",sp->subsampling_hor,sp->subsampling_ver);
- }
- }
- sp->subsamplingcorrect_done=1;
-}
-
-static int
-OJPEGReadHeaderInfo(TIFF* tif)
-{
- static const char module[]="OJPEGReadHeaderInfo";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- assert(sp->readheader_done==0);
- sp->image_width=tif->tif_dir.td_imagewidth;
- sp->image_length=tif->tif_dir.td_imagelength;
- if isTiled(tif)
- {
- sp->strile_width=tif->tif_dir.td_tilewidth;
- sp->strile_length=tif->tif_dir.td_tilelength;
- sp->strile_length_total=((sp->image_length+sp->strile_length-1)/sp->strile_length)*sp->strile_length;
- }
- else
- {
- sp->strile_width=sp->image_width;
- sp->strile_length=tif->tif_dir.td_rowsperstrip;
- sp->strile_length_total=sp->image_length;
- }
- sp->samples_per_pixel=tif->tif_dir.td_samplesperpixel;
- if (sp->samples_per_pixel==1)
- {
- sp->plane_sample_offset=0;
- sp->samples_per_pixel_per_plane=sp->samples_per_pixel;
- sp->subsampling_hor=1;
- sp->subsampling_ver=1;
- }
- else
- {
- if (sp->samples_per_pixel!=3)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"SamplesPerPixel %d not supported for this compression scheme",sp->samples_per_pixel);
- return(0);
- }
- sp->plane_sample_offset=0;
- if (tif->tif_dir.td_planarconfig==PLANARCONFIG_CONTIG)
- sp->samples_per_pixel_per_plane=3;
- else
- sp->samples_per_pixel_per_plane=1;
- }
- if (sp->strile_length<sp->image_length)
- {
- if (sp->strile_length%(sp->subsampling_ver*8)!=0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Incompatible vertical subsampling and image strip/tile length");
- return(0);
- }
- sp->restart_interval=((sp->strile_width+sp->subsampling_hor*8-1)/(sp->subsampling_hor*8))*(sp->strile_length/(sp->subsampling_ver*8));
- }
- if (OJPEGReadHeaderInfoSec(tif)==0)
- return(0);
- sp->sos_end[0].log=1;
- sp->sos_end[0].in_buffer_source=sp->in_buffer_source;
- sp->sos_end[0].in_buffer_next_strile=sp->in_buffer_next_strile;
- sp->sos_end[0].in_buffer_file_pos=sp->in_buffer_file_pos-sp->in_buffer_togo;
- sp->sos_end[0].in_buffer_file_togo=sp->in_buffer_file_togo+sp->in_buffer_togo;
- sp->readheader_done=1;
- return(1);
-}
-
-static int
-OJPEGReadSecondarySos(TIFF* tif, tsample_t s)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8 m;
- assert(s>0);
- assert(s<3);
- assert(sp->sos_end[0].log!=0);
- assert(sp->sos_end[s].log==0);
- sp->plane_sample_offset=s-1;
- while(sp->sos_end[sp->plane_sample_offset].log==0)
- sp->plane_sample_offset--;
- sp->in_buffer_source=sp->sos_end[sp->plane_sample_offset].in_buffer_source;
- sp->in_buffer_next_strile=sp->sos_end[sp->plane_sample_offset].in_buffer_next_strile;
- sp->in_buffer_file_pos=sp->sos_end[sp->plane_sample_offset].in_buffer_file_pos;
- sp->in_buffer_file_pos_log=0;
- sp->in_buffer_file_togo=sp->sos_end[sp->plane_sample_offset].in_buffer_file_togo;
- sp->in_buffer_togo=0;
- sp->in_buffer_cur=0;
- while(sp->plane_sample_offset<s)
- {
- do
- {
- if (OJPEGReadByte(sp,&m)==0)
- return(0);
- if (m==255)
- {
- do
- {
- if (OJPEGReadByte(sp,&m)==0)
- return(0);
- if (m!=255)
- break;
- } while(1);
- if (m==JPEG_MARKER_SOS)
- break;
- }
- } while(1);
- sp->plane_sample_offset++;
- if (OJPEGReadHeaderInfoSecStreamSos(tif)==0)
- return(0);
- sp->sos_end[sp->plane_sample_offset].log=1;
- sp->sos_end[sp->plane_sample_offset].in_buffer_source=sp->in_buffer_source;
- sp->sos_end[sp->plane_sample_offset].in_buffer_next_strile=sp->in_buffer_next_strile;
- sp->sos_end[sp->plane_sample_offset].in_buffer_file_pos=sp->in_buffer_file_pos-sp->in_buffer_togo;
- sp->sos_end[sp->plane_sample_offset].in_buffer_file_togo=sp->in_buffer_file_togo+sp->in_buffer_togo;
- }
- return(1);
-}
-
-static int
-OJPEGWriteHeaderInfo(TIFF* tif)
-{
- static const char module[]="OJPEGWriteHeaderInfo";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8** m;
- uint32 n;
- assert(sp->libjpeg_session_active==0);
- sp->out_state=ososSoi;
- sp->restart_index=0;
- jpeg_std_error(&(sp->libjpeg_jpeg_error_mgr));
- sp->libjpeg_jpeg_error_mgr.output_message=OJPEGLibjpegJpegErrorMgrOutputMessage;
- sp->libjpeg_jpeg_error_mgr.error_exit=OJPEGLibjpegJpegErrorMgrErrorExit;
- sp->libjpeg_jpeg_decompress_struct.err=&(sp->libjpeg_jpeg_error_mgr);
- sp->libjpeg_jpeg_decompress_struct.client_data=(void*)tif;
- if (jpeg_create_decompress_encap(sp,&(sp->libjpeg_jpeg_decompress_struct))==0)
- return(0);
- sp->libjpeg_session_active=1;
- sp->libjpeg_jpeg_source_mgr.bytes_in_buffer=0;
- sp->libjpeg_jpeg_source_mgr.init_source=OJPEGLibjpegJpegSourceMgrInitSource;
- sp->libjpeg_jpeg_source_mgr.fill_input_buffer=OJPEGLibjpegJpegSourceMgrFillInputBuffer;
- sp->libjpeg_jpeg_source_mgr.skip_input_data=OJPEGLibjpegJpegSourceMgrSkipInputData;
- sp->libjpeg_jpeg_source_mgr.resync_to_restart=OJPEGLibjpegJpegSourceMgrResyncToRestart;
- sp->libjpeg_jpeg_source_mgr.term_source=OJPEGLibjpegJpegSourceMgrTermSource;
- sp->libjpeg_jpeg_decompress_struct.src=&(sp->libjpeg_jpeg_source_mgr);
- if (jpeg_read_header_encap(sp,&(sp->libjpeg_jpeg_decompress_struct),1)==0)
- return(0);
- if ((sp->subsampling_force_desubsampling_inside_decompression==0) && (sp->samples_per_pixel_per_plane>1))
- {
- sp->libjpeg_jpeg_decompress_struct.raw_data_out=1;
-#if JPEG_LIB_VERSION >= 70
- sp->libjpeg_jpeg_decompress_struct.do_fancy_upsampling=FALSE;
-#endif
- sp->libjpeg_jpeg_query_style=0;
- if (sp->subsampling_convert_log==0)
- {
- assert(sp->subsampling_convert_ycbcrbuf==0);
- assert(sp->subsampling_convert_ycbcrimage==0);
- sp->subsampling_convert_ylinelen=((sp->strile_width+sp->subsampling_hor*8-1)/(sp->subsampling_hor*8)*sp->subsampling_hor*8);
- sp->subsampling_convert_ylines=sp->subsampling_ver*8;
- sp->subsampling_convert_clinelen=sp->subsampling_convert_ylinelen/sp->subsampling_hor;
- sp->subsampling_convert_clines=8;
- sp->subsampling_convert_ybuflen=sp->subsampling_convert_ylinelen*sp->subsampling_convert_ylines;
- sp->subsampling_convert_cbuflen=sp->subsampling_convert_clinelen*sp->subsampling_convert_clines;
- sp->subsampling_convert_ycbcrbuflen=sp->subsampling_convert_ybuflen+2*sp->subsampling_convert_cbuflen;
- sp->subsampling_convert_ycbcrbuf=_TIFFmalloc(sp->subsampling_convert_ycbcrbuflen);
- if (sp->subsampling_convert_ycbcrbuf==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Out of memory");
- return(0);
- }
- sp->subsampling_convert_ybuf=sp->subsampling_convert_ycbcrbuf;
- sp->subsampling_convert_cbbuf=sp->subsampling_convert_ybuf+sp->subsampling_convert_ybuflen;
- sp->subsampling_convert_crbuf=sp->subsampling_convert_cbbuf+sp->subsampling_convert_cbuflen;
- sp->subsampling_convert_ycbcrimagelen=3+sp->subsampling_convert_ylines+2*sp->subsampling_convert_clines;
- sp->subsampling_convert_ycbcrimage=_TIFFmalloc(sp->subsampling_convert_ycbcrimagelen*sizeof(uint8*));
- if (sp->subsampling_convert_ycbcrimage==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Out of memory");
- return(0);
- }
- m=sp->subsampling_convert_ycbcrimage;
- *m++=(uint8*)(sp->subsampling_convert_ycbcrimage+3);
- *m++=(uint8*)(sp->subsampling_convert_ycbcrimage+3+sp->subsampling_convert_ylines);
- *m++=(uint8*)(sp->subsampling_convert_ycbcrimage+3+sp->subsampling_convert_ylines+sp->subsampling_convert_clines);
- for (n=0; n<sp->subsampling_convert_ylines; n++)
- *m++=sp->subsampling_convert_ybuf+n*sp->subsampling_convert_ylinelen;
- for (n=0; n<sp->subsampling_convert_clines; n++)
- *m++=sp->subsampling_convert_cbbuf+n*sp->subsampling_convert_clinelen;
- for (n=0; n<sp->subsampling_convert_clines; n++)
- *m++=sp->subsampling_convert_crbuf+n*sp->subsampling_convert_clinelen;
- sp->subsampling_convert_clinelenout=((sp->strile_width+sp->subsampling_hor-1)/sp->subsampling_hor);
- sp->subsampling_convert_state=0;
- sp->bytes_per_line=sp->subsampling_convert_clinelenout*(sp->subsampling_ver*sp->subsampling_hor+2);
- sp->lines_per_strile=((sp->strile_length+sp->subsampling_ver-1)/sp->subsampling_ver);
- sp->subsampling_convert_log=1;
- }
- }
- else
- {
- sp->libjpeg_jpeg_decompress_struct.jpeg_color_space=JCS_UNKNOWN;
- sp->libjpeg_jpeg_decompress_struct.out_color_space=JCS_UNKNOWN;
- sp->libjpeg_jpeg_query_style=1;
- sp->bytes_per_line=sp->samples_per_pixel_per_plane*sp->strile_width;
- sp->lines_per_strile=sp->strile_length;
- }
- if (jpeg_start_decompress_encap(sp,&(sp->libjpeg_jpeg_decompress_struct))==0)
- return(0);
- sp->writeheader_done=1;
- return(1);
-}
-
-static void
-OJPEGLibjpegSessionAbort(TIFF* tif)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- assert(sp->libjpeg_session_active!=0);
- jpeg_destroy((jpeg_common_struct*)(&(sp->libjpeg_jpeg_decompress_struct)));
- sp->libjpeg_session_active=0;
-}
-
-static int
-OJPEGReadHeaderInfoSec(TIFF* tif)
-{
- static const char module[]="OJPEGReadHeaderInfoSec";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8 m;
- uint16 n;
- uint8 o;
- if (sp->file_size==0)
- sp->file_size=TIFFGetFileSize(tif);
- if (sp->jpeg_interchange_format!=0)
- {
- if (sp->jpeg_interchange_format>=sp->file_size)
- {
- sp->jpeg_interchange_format=0;
- sp->jpeg_interchange_format_length=0;
- }
- else
- {
- if ((sp->jpeg_interchange_format_length==0) || (sp->jpeg_interchange_format+sp->jpeg_interchange_format_length>sp->file_size))
- sp->jpeg_interchange_format_length=sp->file_size-sp->jpeg_interchange_format;
- }
- }
- sp->in_buffer_source=osibsNotSetYet;
- sp->in_buffer_next_strile=0;
- sp->in_buffer_strile_count=tif->tif_dir.td_nstrips;
- sp->in_buffer_file_togo=0;
- sp->in_buffer_togo=0;
- do
- {
- if (OJPEGReadBytePeek(sp,&m)==0)
- return(0);
- if (m!=255)
- break;
- OJPEGReadByteAdvance(sp);
- do
- {
- if (OJPEGReadByte(sp,&m)==0)
- return(0);
- } while(m==255);
- switch(m)
- {
- case JPEG_MARKER_SOI:
- /* this type of marker has no data, and should be skipped */
- break;
- case JPEG_MARKER_COM:
- case JPEG_MARKER_APP0:
- case JPEG_MARKER_APP0+1:
- case JPEG_MARKER_APP0+2:
- case JPEG_MARKER_APP0+3:
- case JPEG_MARKER_APP0+4:
- case JPEG_MARKER_APP0+5:
- case JPEG_MARKER_APP0+6:
- case JPEG_MARKER_APP0+7:
- case JPEG_MARKER_APP0+8:
- case JPEG_MARKER_APP0+9:
- case JPEG_MARKER_APP0+10:
- case JPEG_MARKER_APP0+11:
- case JPEG_MARKER_APP0+12:
- case JPEG_MARKER_APP0+13:
- case JPEG_MARKER_APP0+14:
- case JPEG_MARKER_APP0+15:
- /* this type of marker has data, but it has no use to us (and no place here) and should be skipped */
- if (OJPEGReadWord(sp,&n)==0)
- return(0);
- if (n<2)
- {
- if (sp->subsamplingcorrect==0)
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt JPEG data");
- return(0);
- }
- if (n>2)
- OJPEGReadSkip(sp,n-2);
- break;
- case JPEG_MARKER_DRI:
- if (OJPEGReadHeaderInfoSecStreamDri(tif)==0)
- return(0);
- break;
- case JPEG_MARKER_DQT:
- if (OJPEGReadHeaderInfoSecStreamDqt(tif)==0)
- return(0);
- break;
- case JPEG_MARKER_DHT:
- if (OJPEGReadHeaderInfoSecStreamDht(tif)==0)
- return(0);
- break;
- case JPEG_MARKER_SOF0:
- case JPEG_MARKER_SOF1:
- case JPEG_MARKER_SOF3:
- if (OJPEGReadHeaderInfoSecStreamSof(tif,m)==0)
- return(0);
- if (sp->subsamplingcorrect!=0)
- return(1);
- break;
- case JPEG_MARKER_SOS:
- if (sp->subsamplingcorrect!=0)
- return(1);
- assert(sp->plane_sample_offset==0);
- if (OJPEGReadHeaderInfoSecStreamSos(tif)==0)
- return(0);
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata,module,"Unknown marker type %d in JPEG data",m);
- return(0);
- }
- } while(m!=JPEG_MARKER_SOS);
- if (sp->subsamplingcorrect)
- return(1);
- if (sp->sof_log==0)
- {
- if (OJPEGReadHeaderInfoSecTablesQTable(tif)==0)
- return(0);
- sp->sof_marker_id=JPEG_MARKER_SOF0;
- for (o=0; o<sp->samples_per_pixel; o++)
- sp->sof_c[o]=o;
- sp->sof_hv[0]=((sp->subsampling_hor<<4)|sp->subsampling_ver);
- for (o=1; o<sp->samples_per_pixel; o++)
- sp->sof_hv[o]=17;
- sp->sof_x=sp->strile_width;
- sp->sof_y=sp->strile_length_total;
- sp->sof_log=1;
- if (OJPEGReadHeaderInfoSecTablesDcTable(tif)==0)
- return(0);
- if (OJPEGReadHeaderInfoSecTablesAcTable(tif)==0)
- return(0);
- for (o=1; o<sp->samples_per_pixel; o++)
- sp->sos_cs[o]=o;
- }
- return(1);
-}
-
-static int
-OJPEGReadHeaderInfoSecStreamDri(TIFF* tif)
-{
- /* this could easilly cause trouble in some cases... but no such cases have occured sofar */
- static const char module[]="OJPEGReadHeaderInfoSecStreamDri";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint16 m;
- if (OJPEGReadWord(sp,&m)==0)
- return(0);
- if (m!=4)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt DRI marker in JPEG data");
- return(0);
- }
- if (OJPEGReadWord(sp,&m)==0)
- return(0);
- sp->restart_interval=m;
- return(1);
-}
-
-static int
-OJPEGReadHeaderInfoSecStreamDqt(TIFF* tif)
-{
- /* this is a table marker, and it is to be saved as a whole for exact pushing on the jpeg stream later on */
- static const char module[]="OJPEGReadHeaderInfoSecStreamDqt";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint16 m;
- uint32 na;
- uint8* nb;
- uint8 o;
- if (OJPEGReadWord(sp,&m)==0)
- return(0);
- if (m<=2)
- {
- if (sp->subsamplingcorrect==0)
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt DQT marker in JPEG data");
- return(0);
- }
- if (sp->subsamplingcorrect!=0)
- OJPEGReadSkip(sp,m-2);
- else
- {
- m-=2;
- do
- {
- if (m<65)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt DQT marker in JPEG data");
- return(0);
- }
- na=sizeof(uint32)+69;
- nb=_TIFFmalloc(na);
- if (nb==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Out of memory");
- return(0);
- }
- *(uint32*)nb=na;
- nb[sizeof(uint32)]=255;
- nb[sizeof(uint32)+1]=JPEG_MARKER_DQT;
- nb[sizeof(uint32)+2]=0;
- nb[sizeof(uint32)+3]=67;
- if (OJPEGReadBlock(sp,65,&nb[sizeof(uint32)+4])==0)
- return(0);
- o=nb[sizeof(uint32)+4]&15;
- if (3<o)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt DQT marker in JPEG data");
- return(0);
- }
- if (sp->qtable[o]!=0)
- _TIFFfree(sp->qtable[o]);
- sp->qtable[o]=nb;
- m-=65;
- } while(m>0);
- }
- return(1);
-}
-
-static int
-OJPEGReadHeaderInfoSecStreamDht(TIFF* tif)
-{
- /* this is a table marker, and it is to be saved as a whole for exact pushing on the jpeg stream later on */
- /* TODO: the following assumes there is only one table in this marker... but i'm not quite sure that assumption is guaranteed correct */
- static const char module[]="OJPEGReadHeaderInfoSecStreamDht";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint16 m;
- uint32 na;
- uint8* nb;
- uint8 o;
- if (OJPEGReadWord(sp,&m)==0)
- return(0);
- if (m<=2)
- {
- if (sp->subsamplingcorrect==0)
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt DHT marker in JPEG data");
- return(0);
- }
- if (sp->subsamplingcorrect!=0)
- {
- OJPEGReadSkip(sp,m-2);
- }
- else
- {
- na=sizeof(uint32)+2+m;
- nb=_TIFFmalloc(na);
- if (nb==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Out of memory");
- return(0);
- }
- *(uint32*)nb=na;
- nb[sizeof(uint32)]=255;
- nb[sizeof(uint32)+1]=JPEG_MARKER_DHT;
- nb[sizeof(uint32)+2]=(m>>8);
- nb[sizeof(uint32)+3]=(m&255);
- if (OJPEGReadBlock(sp,m-2,&nb[sizeof(uint32)+4])==0)
- return(0);
- o=nb[sizeof(uint32)+4];
- if ((o&240)==0)
- {
- if (3<o)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt DHT marker in JPEG data");
- return(0);
- }
- if (sp->dctable[o]!=0)
- _TIFFfree(sp->dctable[o]);
- sp->dctable[o]=nb;
- }
- else
- {
- if ((o&240)!=16)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt DHT marker in JPEG data");
- return(0);
- }
- o&=15;
- if (3<o)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt DHT marker in JPEG data");
- return(0);
- }
- if (sp->actable[o]!=0)
- _TIFFfree(sp->actable[o]);
- sp->actable[o]=nb;
- }
- }
- return(1);
-}
-
-static int
-OJPEGReadHeaderInfoSecStreamSof(TIFF* tif, uint8 marker_id)
-{
- /* this marker needs to be checked, and part of its data needs to be saved for regeneration later on */
- static const char module[]="OJPEGReadHeaderInfoSecStreamSof";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint16 m;
- uint16 n;
- uint8 o;
- uint16 p;
- uint16 q;
- if (sp->sof_log!=0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt JPEG data");
- return(0);
- }
- if (sp->subsamplingcorrect==0)
- sp->sof_marker_id=marker_id;
- /* Lf: data length */
- if (OJPEGReadWord(sp,&m)==0)
- return(0);
- if (m<11)
- {
- if (sp->subsamplingcorrect==0)
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt SOF marker in JPEG data");
- return(0);
- }
- m-=8;
- if (m%3!=0)
- {
- if (sp->subsamplingcorrect==0)
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt SOF marker in JPEG data");
- return(0);
- }
- n=m/3;
- if (sp->subsamplingcorrect==0)
- {
- if (n!=sp->samples_per_pixel)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"JPEG compressed data indicates unexpected number of samples");
- return(0);
- }
- }
- /* P: Sample precision */
- if (OJPEGReadByte(sp,&o)==0)
- return(0);
- if (o!=8)
- {
- if (sp->subsamplingcorrect==0)
- TIFFErrorExt(tif->tif_clientdata,module,"JPEG compressed data indicates unexpected number of bits per sample");
- return(0);
- }
- /* Y: Number of lines, X: Number of samples per line */
- if (sp->subsamplingcorrect)
- OJPEGReadSkip(sp,4);
- else
- {
- /* TODO: probably best to also add check on allowed upper bound, especially x, may cause buffer overflow otherwise i think */
- /* Y: Number of lines */
- if (OJPEGReadWord(sp,&p)==0)
- return(0);
- if ((p<sp->image_length) && (p<sp->strile_length_total))
- {
- TIFFErrorExt(tif->tif_clientdata,module,"JPEG compressed data indicates unexpected height");
- return(0);
- }
- sp->sof_y=p;
- /* X: Number of samples per line */
- if (OJPEGReadWord(sp,&p)==0)
- return(0);
- if ((p<sp->image_width) && (p<sp->strile_width))
- {
- TIFFErrorExt(tif->tif_clientdata,module,"JPEG compressed data indicates unexpected width");
- return(0);
- }
- sp->sof_x=p;
- }
- /* Nf: Number of image components in frame */
- if (OJPEGReadByte(sp,&o)==0)
- return(0);
- if (o!=n)
- {
- if (sp->subsamplingcorrect==0)
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt SOF marker in JPEG data");
- return(0);
- }
- /* per component stuff */
- /* TODO: double-check that flow implies that n cannot be as big as to make us overflow sof_c, sof_hv and sof_tq arrays */
- for (q=0; q<n; q++)
- {
- /* C: Component identifier */
- if (OJPEGReadByte(sp,&o)==0)
- return(0);
- if (sp->subsamplingcorrect==0)
- sp->sof_c[q]=o;
- /* H: Horizontal sampling factor, and V: Vertical sampling factor */
- if (OJPEGReadByte(sp,&o)==0)
- return(0);
- if (sp->subsamplingcorrect!=0)
- {
- if (q==0)
- {
- sp->subsampling_hor=(o>>4);
- sp->subsampling_ver=(o&15);
- if (((sp->subsampling_hor!=1) && (sp->subsampling_hor!=2) && (sp->subsampling_hor!=4)) ||
- ((sp->subsampling_ver!=1) && (sp->subsampling_ver!=2) && (sp->subsampling_ver!=4)))
- sp->subsampling_force_desubsampling_inside_decompression=1;
- }
- else
- {
- if (o!=17)
- sp->subsampling_force_desubsampling_inside_decompression=1;
- }
- }
- else
- {
- sp->sof_hv[q]=o;
- if (sp->subsampling_force_desubsampling_inside_decompression==0)
- {
- if (q==0)
- {
- if (o!=((sp->subsampling_hor<<4)|sp->subsampling_ver))
- {
- TIFFErrorExt(tif->tif_clientdata,module,"JPEG compressed data indicates unexpected subsampling values");
- return(0);
- }
- }
- else
- {
- if (o!=17)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"JPEG compressed data indicates unexpected subsampling values");
- return(0);
- }
- }
- }
- }
- /* Tq: Quantization table destination selector */
- if (OJPEGReadByte(sp,&o)==0)
- return(0);
- if (sp->subsamplingcorrect==0)
- sp->sof_tq[q]=o;
- }
- if (sp->subsamplingcorrect==0)
- sp->sof_log=1;
- return(1);
-}
-
-static int
-OJPEGReadHeaderInfoSecStreamSos(TIFF* tif)
-{
- /* this marker needs to be checked, and part of its data needs to be saved for regeneration later on */
- static const char module[]="OJPEGReadHeaderInfoSecStreamSos";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint16 m;
- uint8 n;
- uint8 o;
- assert(sp->subsamplingcorrect==0);
- if (sp->sof_log==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt SOS marker in JPEG data");
- return(0);
- }
- /* Ls */
- if (OJPEGReadWord(sp,&m)==0)
- return(0);
- if (m!=6+sp->samples_per_pixel_per_plane*2)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt SOS marker in JPEG data");
- return(0);
- }
- /* Ns */
- if (OJPEGReadByte(sp,&n)==0)
- return(0);
- if (n!=sp->samples_per_pixel_per_plane)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt SOS marker in JPEG data");
- return(0);
- }
- /* Cs, Td, and Ta */
- for (o=0; o<sp->samples_per_pixel_per_plane; o++)
- {
- /* Cs */
- if (OJPEGReadByte(sp,&n)==0)
- return(0);
- sp->sos_cs[sp->plane_sample_offset+o]=n;
- /* Td and Ta */
- if (OJPEGReadByte(sp,&n)==0)
- return(0);
- sp->sos_tda[sp->plane_sample_offset+o]=n;
- }
- /* skip Ss, Se, Ah, en Al -> no check, as per Tom Lane recommendation, as per LibJpeg source */
- OJPEGReadSkip(sp,3);
- return(1);
-}
-
-static int
-OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif)
-{
- static const char module[]="OJPEGReadHeaderInfoSecTablesQTable";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8 m;
- uint8 n;
- uint32 oa;
- uint8* ob;
- uint32 p;
- if (sp->qtable_offset[0]==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Missing JPEG tables");
- return(0);
- }
- sp->in_buffer_file_pos_log=0;
- for (m=0; m<sp->samples_per_pixel; m++)
- {
- if ((sp->qtable_offset[m]!=0) && ((m==0) || (sp->qtable_offset[m]!=sp->qtable_offset[m-1])))
- {
- for (n=0; n<m-1; n++)
- {
- if (sp->qtable_offset[m]==sp->qtable_offset[n])
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt JpegQTables tag value");
- return(0);
- }
- }
- oa=sizeof(uint32)+69;
- ob=_TIFFmalloc(oa);
- if (ob==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Out of memory");
- return(0);
- }
- *(uint32*)ob=oa;
- ob[sizeof(uint32)]=255;
- ob[sizeof(uint32)+1]=JPEG_MARKER_DQT;
- ob[sizeof(uint32)+2]=0;
- ob[sizeof(uint32)+3]=67;
- ob[sizeof(uint32)+4]=m;
- TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET);
- p=TIFFReadFile(tif,&ob[sizeof(uint32)+5],64);
- if (p!=64)
- return(0);
- sp->qtable[m]=ob;
- sp->sof_tq[m]=m;
- }
- else
- sp->sof_tq[m]=sp->sof_tq[m-1];
- }
- return(1);
-}
-
-static int
-OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif)
-{
- static const char module[]="OJPEGReadHeaderInfoSecTablesDcTable";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8 m;
- uint8 n;
- uint8 o[16];
- uint32 p;
- uint32 q;
- uint32 ra;
- uint8* rb;
- if (sp->dctable_offset[0]==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Missing JPEG tables");
- return(0);
- }
- sp->in_buffer_file_pos_log=0;
- for (m=0; m<sp->samples_per_pixel; m++)
- {
- if ((sp->dctable_offset[m]!=0) && ((m==0) || (sp->dctable_offset[m]!=sp->dctable_offset[m-1])))
- {
- for (n=0; n<m-1; n++)
- {
- if (sp->dctable_offset[m]==sp->dctable_offset[n])
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt JpegDcTables tag value");
- return(0);
- }
- }
- TIFFSeekFile(tif,sp->dctable_offset[m],SEEK_SET);
- p=TIFFReadFile(tif,o,16);
- if (p!=16)
- return(0);
- q=0;
- for (n=0; n<16; n++)
- q+=o[n];
- ra=sizeof(uint32)+21+q;
- rb=_TIFFmalloc(ra);
- if (rb==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Out of memory");
- return(0);
- }
- *(uint32*)rb=ra;
- rb[sizeof(uint32)]=255;
- rb[sizeof(uint32)+1]=JPEG_MARKER_DHT;
- rb[sizeof(uint32)+2]=((19+q)>>8);
- rb[sizeof(uint32)+3]=((19+q)&255);
- rb[sizeof(uint32)+4]=m;
- for (n=0; n<16; n++)
- rb[sizeof(uint32)+5+n]=o[n];
- p=TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q);
- if (p!=q)
- return(0);
- sp->dctable[m]=rb;
- sp->sos_tda[m]=(m<<4);
- }
- else
- sp->sos_tda[m]=sp->sos_tda[m-1];
- }
- return(1);
-}
-
-static int
-OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif)
-{
- static const char module[]="OJPEGReadHeaderInfoSecTablesAcTable";
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8 m;
- uint8 n;
- uint8 o[16];
- uint32 p;
- uint32 q;
- uint32 ra;
- uint8* rb;
- if (sp->actable_offset[0]==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Missing JPEG tables");
- return(0);
- }
- sp->in_buffer_file_pos_log=0;
- for (m=0; m<sp->samples_per_pixel; m++)
- {
- if ((sp->actable_offset[m]!=0) && ((m==0) || (sp->actable_offset[m]!=sp->actable_offset[m-1])))
- {
- for (n=0; n<m-1; n++)
- {
- if (sp->actable_offset[m]==sp->actable_offset[n])
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Corrupt JpegAcTables tag value");
- return(0);
- }
- }
- TIFFSeekFile(tif,sp->actable_offset[m],SEEK_SET);
- p=TIFFReadFile(tif,o,16);
- if (p!=16)
- return(0);
- q=0;
- for (n=0; n<16; n++)
- q+=o[n];
- ra=sizeof(uint32)+21+q;
- rb=_TIFFmalloc(ra);
- if (rb==0)
- {
- TIFFErrorExt(tif->tif_clientdata,module,"Out of memory");
- return(0);
- }
- *(uint32*)rb=ra;
- rb[sizeof(uint32)]=255;
- rb[sizeof(uint32)+1]=JPEG_MARKER_DHT;
- rb[sizeof(uint32)+2]=((19+q)>>8);
- rb[sizeof(uint32)+3]=((19+q)&255);
- rb[sizeof(uint32)+4]=(16|m);
- for (n=0; n<16; n++)
- rb[sizeof(uint32)+5+n]=o[n];
- p=TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q);
- if (p!=q)
- return(0);
- sp->actable[m]=rb;
- sp->sos_tda[m]=(sp->sos_tda[m]|m);
- }
- else
- sp->sos_tda[m]=(sp->sos_tda[m]|(sp->sos_tda[m-1]&15));
- }
- return(1);
-}
-
-static int
-OJPEGReadBufferFill(OJPEGState* sp)
-{
- uint16 m;
- tsize_t n;
- /* TODO: double-check: when subsamplingcorrect is set, no call to TIFFErrorExt or TIFFWarningExt should be made
- * in any other case, seek or read errors should be passed through */
- do
- {
- if (sp->in_buffer_file_togo!=0)
- {
- if (sp->in_buffer_file_pos_log==0)
- {
- TIFFSeekFile(sp->tif,sp->in_buffer_file_pos,SEEK_SET);
- sp->in_buffer_file_pos_log=1;
- }
- m=OJPEG_BUFFER;
- if (m>sp->in_buffer_file_togo)
- m=(uint16)sp->in_buffer_file_togo;
- n=TIFFReadFile(sp->tif,sp->in_buffer,(tsize_t)m);
- if (n==0)
- return(0);
- assert(n>0);
- assert(n<=OJPEG_BUFFER);
- assert(n<65536);
- assert((uint16)n<=sp->in_buffer_file_togo);
- m=(uint16)n;
- sp->in_buffer_togo=m;
- sp->in_buffer_cur=sp->in_buffer;
- sp->in_buffer_file_togo-=m;
- sp->in_buffer_file_pos+=m;
- break;
- }
- sp->in_buffer_file_pos_log=0;
- switch(sp->in_buffer_source)
- {
- case osibsNotSetYet:
- if (sp->jpeg_interchange_format!=0)
- {
- sp->in_buffer_file_pos=sp->jpeg_interchange_format;
- sp->in_buffer_file_togo=sp->jpeg_interchange_format_length;
- }
- sp->in_buffer_source=osibsJpegInterchangeFormat;
- break;
- case osibsJpegInterchangeFormat:
- sp->in_buffer_source=osibsStrile;
- case osibsStrile:
- if (sp->in_buffer_next_strile==sp->in_buffer_strile_count)
- sp->in_buffer_source=osibsEof;
- else
- {
- sp->in_buffer_file_pos=sp->tif->tif_dir.td_stripoffset[sp->in_buffer_next_strile];
- if (sp->in_buffer_file_pos!=0)
- {
- if (sp->in_buffer_file_pos>=sp->file_size)
- sp->in_buffer_file_pos=0;
- else
- {
- sp->in_buffer_file_togo=sp->tif->tif_dir.td_stripbytecount[sp->in_buffer_next_strile];
- if (sp->in_buffer_file_togo==0)
- sp->in_buffer_file_pos=0;
- else if (sp->in_buffer_file_pos+sp->in_buffer_file_togo>sp->file_size)
- sp->in_buffer_file_togo=sp->file_size-sp->in_buffer_file_pos;
- }
- }
- sp->in_buffer_next_strile++;
- }
- break;
- default:
- return(0);
- }
- } while (1);
- return(1);
-}
-
-static int
-OJPEGReadByte(OJPEGState* sp, uint8* byte)
-{
- if (sp->in_buffer_togo==0)
- {
- if (OJPEGReadBufferFill(sp)==0)
- return(0);
- assert(sp->in_buffer_togo>0);
- }
- *byte=*(sp->in_buffer_cur);
- sp->in_buffer_cur++;
- sp->in_buffer_togo--;
- return(1);
-}
-
-static int
-OJPEGReadBytePeek(OJPEGState* sp, uint8* byte)
-{
- if (sp->in_buffer_togo==0)
- {
- if (OJPEGReadBufferFill(sp)==0)
- return(0);
- assert(sp->in_buffer_togo>0);
- }
- *byte=*(sp->in_buffer_cur);
- return(1);
-}
-
-static void
-OJPEGReadByteAdvance(OJPEGState* sp)
-{
- assert(sp->in_buffer_togo>0);
- sp->in_buffer_cur++;
- sp->in_buffer_togo--;
-}
-
-static int
-OJPEGReadWord(OJPEGState* sp, uint16* word)
-{
- uint8 m;
- if (OJPEGReadByte(sp,&m)==0)
- return(0);
- *word=(m<<8);
- if (OJPEGReadByte(sp,&m)==0)
- return(0);
- *word|=m;
- return(1);
-}
-
-static int
-OJPEGReadBlock(OJPEGState* sp, uint16 len, void* mem)
-{
- uint16 mlen;
- uint8* mmem;
- uint16 n;
- assert(len>0);
- mlen=len;
- mmem=mem;
- do
- {
- if (sp->in_buffer_togo==0)
- {
- if (OJPEGReadBufferFill(sp)==0)
- return(0);
- assert(sp->in_buffer_togo>0);
- }
- n=mlen;
- if (n>sp->in_buffer_togo)
- n=sp->in_buffer_togo;
- _TIFFmemcpy(mmem,sp->in_buffer_cur,n);
- sp->in_buffer_cur+=n;
- sp->in_buffer_togo-=n;
- mlen-=n;
- mmem+=n;
- } while(mlen>0);
- return(1);
-}
-
-static void
-OJPEGReadSkip(OJPEGState* sp, uint16 len)
-{
- uint16 m;
- uint16 n;
- m=len;
- n=m;
- if (n>sp->in_buffer_togo)
- n=sp->in_buffer_togo;
- sp->in_buffer_cur+=n;
- sp->in_buffer_togo-=n;
- m-=n;
- if (m>0)
- {
- assert(sp->in_buffer_togo==0);
- n=m;
- if (n>sp->in_buffer_file_togo)
- n=sp->in_buffer_file_togo;
- sp->in_buffer_file_pos+=n;
- sp->in_buffer_file_togo-=n;
- sp->in_buffer_file_pos_log=0;
- /* we don't skip past jpeginterchangeformat/strile block...
- * if that is asked from us, we're dealing with totally bazurk
- * data anyway, and we've not seen this happening on any
- * testfile, so we might as well likely cause some other
- * meaningless error to be passed at some later time
- */
- }
-}
-
-static int
-OJPEGWriteStream(TIFF* tif, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- *len=0;
- do
- {
- assert(sp->out_state<=ososEoi);
- switch(sp->out_state)
- {
- case ososSoi:
- OJPEGWriteStreamSoi(tif,mem,len);
- break;
- case ososQTable0:
- OJPEGWriteStreamQTable(tif,0,mem,len);
- break;
- case ososQTable1:
- OJPEGWriteStreamQTable(tif,1,mem,len);
- break;
- case ososQTable2:
- OJPEGWriteStreamQTable(tif,2,mem,len);
- break;
- case ososQTable3:
- OJPEGWriteStreamQTable(tif,3,mem,len);
- break;
- case ososDcTable0:
- OJPEGWriteStreamDcTable(tif,0,mem,len);
- break;
- case ososDcTable1:
- OJPEGWriteStreamDcTable(tif,1,mem,len);
- break;
- case ososDcTable2:
- OJPEGWriteStreamDcTable(tif,2,mem,len);
- break;
- case ososDcTable3:
- OJPEGWriteStreamDcTable(tif,3,mem,len);
- break;
- case ososAcTable0:
- OJPEGWriteStreamAcTable(tif,0,mem,len);
- break;
- case ososAcTable1:
- OJPEGWriteStreamAcTable(tif,1,mem,len);
- break;
- case ososAcTable2:
- OJPEGWriteStreamAcTable(tif,2,mem,len);
- break;
- case ososAcTable3:
- OJPEGWriteStreamAcTable(tif,3,mem,len);
- break;
- case ososDri:
- OJPEGWriteStreamDri(tif,mem,len);
- break;
- case ososSof:
- OJPEGWriteStreamSof(tif,mem,len);
- break;
- case ososSos:
- OJPEGWriteStreamSos(tif,mem,len);
- break;
- case ososCompressed:
- if (OJPEGWriteStreamCompressed(tif,mem,len)==0)
- return(0);
- break;
- case ososRst:
- OJPEGWriteStreamRst(tif,mem,len);
- break;
- case ososEoi:
- OJPEGWriteStreamEoi(tif,mem,len);
- break;
- }
- } while (*len==0);
- return(1);
-}
-
-static void
-OJPEGWriteStreamSoi(TIFF* tif, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- assert(OJPEG_BUFFER>=2);
- sp->out_buffer[0]=255;
- sp->out_buffer[1]=JPEG_MARKER_SOI;
- *len=2;
- *mem=(void*)sp->out_buffer;
- sp->out_state++;
-}
-
-static void
-OJPEGWriteStreamQTable(TIFF* tif, uint8 table_index, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- if (sp->qtable[table_index]!=0)
- {
- *mem=(void*)(sp->qtable[table_index]+sizeof(uint32));
- *len=*((uint32*)sp->qtable[table_index])-sizeof(uint32);
- }
- sp->out_state++;
-}
-
-static void
-OJPEGWriteStreamDcTable(TIFF* tif, uint8 table_index, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- if (sp->dctable[table_index]!=0)
- {
- *mem=(void*)(sp->dctable[table_index]+sizeof(uint32));
- *len=*((uint32*)sp->dctable[table_index])-sizeof(uint32);
- }
- sp->out_state++;
-}
-
-static void
-OJPEGWriteStreamAcTable(TIFF* tif, uint8 table_index, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- if (sp->actable[table_index]!=0)
- {
- *mem=(void*)(sp->actable[table_index]+sizeof(uint32));
- *len=*((uint32*)sp->actable[table_index])-sizeof(uint32);
- }
- sp->out_state++;
-}
-
-static void
-OJPEGWriteStreamDri(TIFF* tif, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- assert(OJPEG_BUFFER>=6);
- if (sp->restart_interval!=0)
- {
- sp->out_buffer[0]=255;
- sp->out_buffer[1]=JPEG_MARKER_DRI;
- sp->out_buffer[2]=0;
- sp->out_buffer[3]=4;
- sp->out_buffer[4]=(sp->restart_interval>>8);
- sp->out_buffer[5]=(sp->restart_interval&255);
- *len=6;
- *mem=(void*)sp->out_buffer;
- }
- sp->out_state++;
-}
-
-static void
-OJPEGWriteStreamSof(TIFF* tif, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8 m;
- assert(OJPEG_BUFFER>=2+8+sp->samples_per_pixel_per_plane*3);
- assert(255>=8+sp->samples_per_pixel_per_plane*3);
- sp->out_buffer[0]=255;
- sp->out_buffer[1]=sp->sof_marker_id;
- /* Lf */
- sp->out_buffer[2]=0;
- sp->out_buffer[3]=8+sp->samples_per_pixel_per_plane*3;
- /* P */
- sp->out_buffer[4]=8;
- /* Y */
- sp->out_buffer[5]=(sp->sof_y>>8);
- sp->out_buffer[6]=(sp->sof_y&255);
- /* X */
- sp->out_buffer[7]=(sp->sof_x>>8);
- sp->out_buffer[8]=(sp->sof_x&255);
- /* Nf */
- sp->out_buffer[9]=sp->samples_per_pixel_per_plane;
- for (m=0; m<sp->samples_per_pixel_per_plane; m++)
- {
- /* C */
- sp->out_buffer[10+m*3]=sp->sof_c[sp->plane_sample_offset+m];
- /* H and V */
- sp->out_buffer[10+m*3+1]=sp->sof_hv[sp->plane_sample_offset+m];
- /* Tq */
- sp->out_buffer[10+m*3+2]=sp->sof_tq[sp->plane_sample_offset+m];
- }
- *len=10+sp->samples_per_pixel_per_plane*3;
- *mem=(void*)sp->out_buffer;
- sp->out_state++;
-}
-
-static void
-OJPEGWriteStreamSos(TIFF* tif, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- uint8 m;
- assert(OJPEG_BUFFER>=2+6+sp->samples_per_pixel_per_plane*2);
- assert(255>=6+sp->samples_per_pixel_per_plane*2);
- sp->out_buffer[0]=255;
- sp->out_buffer[1]=JPEG_MARKER_SOS;
- /* Ls */
- sp->out_buffer[2]=0;
- sp->out_buffer[3]=6+sp->samples_per_pixel_per_plane*2;
- /* Ns */
- sp->out_buffer[4]=sp->samples_per_pixel_per_plane;
- for (m=0; m<sp->samples_per_pixel_per_plane; m++)
- {
- /* Cs */
- sp->out_buffer[5+m*2]=sp->sos_cs[sp->plane_sample_offset+m];
- /* Td and Ta */
- sp->out_buffer[5+m*2+1]=sp->sos_tda[sp->plane_sample_offset+m];
- }
- /* Ss */
- sp->out_buffer[5+sp->samples_per_pixel_per_plane*2]=0;
- /* Se */
- sp->out_buffer[5+sp->samples_per_pixel_per_plane*2+1]=63;
- /* Ah and Al */
- sp->out_buffer[5+sp->samples_per_pixel_per_plane*2+2]=0;
- *len=8+sp->samples_per_pixel_per_plane*2;
- *mem=(void*)sp->out_buffer;
- sp->out_state++;
-}
-
-static int
-OJPEGWriteStreamCompressed(TIFF* tif, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- if (sp->in_buffer_togo==0)
- {
- if (OJPEGReadBufferFill(sp)==0)
- return(0);
- assert(sp->in_buffer_togo>0);
- }
- *len=sp->in_buffer_togo;
- *mem=(void*)sp->in_buffer_cur;
- sp->in_buffer_togo=0;
- if (sp->in_buffer_file_togo==0)
- {
- switch(sp->in_buffer_source)
- {
- case osibsStrile:
- if (sp->in_buffer_next_strile<sp->in_buffer_strile_count)
- sp->out_state=ososRst;
- else
- sp->out_state=ososEoi;
- break;
- case osibsEof:
- sp->out_state=ososEoi;
- break;
- default:
- break;
- }
- }
- return(1);
-}
-
-static void
-OJPEGWriteStreamRst(TIFF* tif, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- assert(OJPEG_BUFFER>=2);
- sp->out_buffer[0]=255;
- sp->out_buffer[1]=JPEG_MARKER_RST0+sp->restart_index;
- sp->restart_index++;
- if (sp->restart_index==8)
- sp->restart_index=0;
- *len=2;
- *mem=(void*)sp->out_buffer;
- sp->out_state=ososCompressed;
-}
-
-static void
-OJPEGWriteStreamEoi(TIFF* tif, void** mem, uint32* len)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- assert(OJPEG_BUFFER>=2);
- sp->out_buffer[0]=255;
- sp->out_buffer[1]=JPEG_MARKER_EOI;
- *len=2;
- *mem=(void*)sp->out_buffer;
-}
-
-#ifndef LIBJPEG_ENCAP_EXTERNAL
-static int
-jpeg_create_decompress_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo)
-{
- return(SETJMP(sp->exit_jmpbuf)?0:(jpeg_create_decompress(cinfo),1));
-}
-#endif
-
-#ifndef LIBJPEG_ENCAP_EXTERNAL
-static int
-jpeg_read_header_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo, uint8 require_image)
-{
- return(SETJMP(sp->exit_jmpbuf)?0:(jpeg_read_header(cinfo,require_image),1));
-}
-#endif
-
-#ifndef LIBJPEG_ENCAP_EXTERNAL
-static int
-jpeg_start_decompress_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo)
-{
- return(SETJMP(sp->exit_jmpbuf)?0:(jpeg_start_decompress(cinfo),1));
-}
-#endif
-
-#ifndef LIBJPEG_ENCAP_EXTERNAL
-static int
-jpeg_read_scanlines_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo, void* scanlines, uint32 max_lines)
-{
- return(SETJMP(sp->exit_jmpbuf)?0:(jpeg_read_scanlines(cinfo,scanlines,max_lines),1));
-}
-#endif
-
-#ifndef LIBJPEG_ENCAP_EXTERNAL
-static int
-jpeg_read_raw_data_encap(OJPEGState* sp, jpeg_decompress_struct* cinfo, void* data, uint32 max_lines)
-{
- return(SETJMP(sp->exit_jmpbuf)?0:(jpeg_read_raw_data(cinfo,data,max_lines),1));
-}
-#endif
-
-#ifndef LIBJPEG_ENCAP_EXTERNAL
-static void
-jpeg_encap_unwind(TIFF* tif)
-{
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- LONGJMP(sp->exit_jmpbuf,1);
-}
-#endif
-
-static void
-OJPEGLibjpegJpegErrorMgrOutputMessage(jpeg_common_struct* cinfo)
-{
- char buffer[JMSG_LENGTH_MAX];
- (*cinfo->err->format_message)(cinfo,buffer);
- TIFFWarningExt(((TIFF*)(cinfo->client_data))->tif_clientdata,"LibJpeg", "%s", buffer);
-}
-
-static void
-OJPEGLibjpegJpegErrorMgrErrorExit(jpeg_common_struct* cinfo)
-{
- char buffer[JMSG_LENGTH_MAX];
- (*cinfo->err->format_message)(cinfo,buffer);
- TIFFErrorExt(((TIFF*)(cinfo->client_data))->tif_clientdata,"LibJpeg", "%s", buffer);
- jpeg_encap_unwind((TIFF*)(cinfo->client_data));
-}
-
-static void
-OJPEGLibjpegJpegSourceMgrInitSource(jpeg_decompress_struct* cinfo)
-{
- (void)cinfo;
-}
-
-static boolean
-OJPEGLibjpegJpegSourceMgrFillInputBuffer(jpeg_decompress_struct* cinfo)
-{
- TIFF* tif=(TIFF*)cinfo->client_data;
- OJPEGState* sp=(OJPEGState*)tif->tif_data;
- void* mem=0;
- uint32 len=0;
- if (OJPEGWriteStream(tif,&mem,&len)==0)
- {
- TIFFErrorExt(tif->tif_clientdata,"LibJpeg","Premature end of JPEG data");
- jpeg_encap_unwind(tif);
- }
- sp->libjpeg_jpeg_source_mgr.bytes_in_buffer=len;
- sp->libjpeg_jpeg_source_mgr.next_input_byte=mem;
- return(1);
-}
-
-static void
-OJPEGLibjpegJpegSourceMgrSkipInputData(jpeg_decompress_struct* cinfo, long num_bytes)
-{
- TIFF* tif=(TIFF*)cinfo->client_data;
- (void)num_bytes;
- TIFFErrorExt(tif->tif_clientdata,"LibJpeg","Unexpected error");
- jpeg_encap_unwind(tif);
-}
-
-static boolean
-OJPEGLibjpegJpegSourceMgrResyncToRestart(jpeg_decompress_struct* cinfo, int desired)
-{
- TIFF* tif=(TIFF*)cinfo->client_data;
- (void)desired;
- TIFFErrorExt(tif->tif_clientdata,"LibJpeg","Unexpected error");
- jpeg_encap_unwind(tif);
- return(0);
-}
-
-static void
-OJPEGLibjpegJpegSourceMgrTermSource(jpeg_decompress_struct* cinfo)
-{
- (void)cinfo;
-}
-
-#endif
-
-
diff --git a/src/3rdparty/libtiff/libtiff/tif_open.c b/src/3rdparty/libtiff/libtiff/tif_open.c
deleted file mode 100644
index a567056ce7..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_open.c
+++ /dev/null
@@ -1,688 +0,0 @@
-/* $Id: tif_open.c,v 1.33 2006/06/08 14:27:17 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- */
-#include "tiffiop.h"
-
-static const long typemask[13] = {
- (long)0L, /* TIFF_NOTYPE */
- (long)0x000000ffL, /* TIFF_BYTE */
- (long)0xffffffffL, /* TIFF_ASCII */
- (long)0x0000ffffL, /* TIFF_SHORT */
- (long)0xffffffffL, /* TIFF_LONG */
- (long)0xffffffffL, /* TIFF_RATIONAL */
- (long)0x000000ffL, /* TIFF_SBYTE */
- (long)0x000000ffL, /* TIFF_UNDEFINED */
- (long)0x0000ffffL, /* TIFF_SSHORT */
- (long)0xffffffffL, /* TIFF_SLONG */
- (long)0xffffffffL, /* TIFF_SRATIONAL */
- (long)0xffffffffL, /* TIFF_FLOAT */
- (long)0xffffffffL, /* TIFF_DOUBLE */
-};
-static const int bigTypeshift[13] = {
- 0, /* TIFF_NOTYPE */
- 24, /* TIFF_BYTE */
- 0, /* TIFF_ASCII */
- 16, /* TIFF_SHORT */
- 0, /* TIFF_LONG */
- 0, /* TIFF_RATIONAL */
- 24, /* TIFF_SBYTE */
- 24, /* TIFF_UNDEFINED */
- 16, /* TIFF_SSHORT */
- 0, /* TIFF_SLONG */
- 0, /* TIFF_SRATIONAL */
- 0, /* TIFF_FLOAT */
- 0, /* TIFF_DOUBLE */
-};
-static const int litTypeshift[13] = {
- 0, /* TIFF_NOTYPE */
- 0, /* TIFF_BYTE */
- 0, /* TIFF_ASCII */
- 0, /* TIFF_SHORT */
- 0, /* TIFF_LONG */
- 0, /* TIFF_RATIONAL */
- 0, /* TIFF_SBYTE */
- 0, /* TIFF_UNDEFINED */
- 0, /* TIFF_SSHORT */
- 0, /* TIFF_SLONG */
- 0, /* TIFF_SRATIONAL */
- 0, /* TIFF_FLOAT */
- 0, /* TIFF_DOUBLE */
-};
-
-/*
- * Dummy functions to fill the omitted client procedures.
- */
-static int
-_tiffDummyMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
-{
- (void) fd; (void) pbase; (void) psize;
- return (0);
-}
-
-static void
-_tiffDummyUnmapProc(thandle_t fd, tdata_t base, toff_t size)
-{
- (void) fd; (void) base; (void) size;
-}
-
-/*
- * Initialize the shift & mask tables, and the
- * byte swapping state according to the file
- * contents and the machine architecture.
- */
-static void
-TIFFInitOrder(TIFF* tif, int magic)
-{
- tif->tif_typemask = typemask;
- if (magic == TIFF_BIGENDIAN) {
- tif->tif_typeshift = bigTypeshift;
-#ifndef WORDS_BIGENDIAN
- tif->tif_flags |= TIFF_SWAB;
-#endif
- } else {
- tif->tif_typeshift = litTypeshift;
-#ifdef WORDS_BIGENDIAN
- tif->tif_flags |= TIFF_SWAB;
-#endif
- }
-}
-
-int
-_TIFFgetMode(const char* mode, const char* module)
-{
- int m = -1;
-
- switch (mode[0]) {
- case 'r':
- m = O_RDONLY;
- if (mode[1] == '+')
- m = O_RDWR;
- break;
- case 'w':
- case 'a':
- m = O_RDWR|O_CREAT;
- if (mode[0] == 'w')
- m |= O_TRUNC;
- break;
- default:
- TIFFErrorExt(0, module, "\"%s\": Bad mode", mode);
- break;
- }
- return (m);
-}
-
-TIFF*
-TIFFClientOpen(
- const char* name, const char* mode,
- thandle_t clientdata,
- TIFFReadWriteProc readproc,
- TIFFReadWriteProc writeproc,
- TIFFSeekProc seekproc,
- TIFFCloseProc closeproc,
- TIFFSizeProc sizeproc,
- TIFFMapFileProc mapproc,
- TIFFUnmapFileProc unmapproc
-)
-{
- static const char module[] = "TIFFClientOpen";
- TIFF *tif;
- int m;
- const char* cp;
-
- m = _TIFFgetMode(mode, module);
- if (m == -1)
- goto bad2;
- tif = (TIFF *)_TIFFmalloc(sizeof (TIFF) + strlen(name) + 1);
- if (tif == NULL) {
- TIFFErrorExt(clientdata, module, "%s: Out of memory (TIFF structure)", name);
- goto bad2;
- }
- _TIFFmemset(tif, 0, sizeof (*tif));
- tif->tif_name = (char *)tif + sizeof (TIFF);
- strcpy(tif->tif_name, name);
- tif->tif_mode = m &~ (O_CREAT|O_TRUNC);
- tif->tif_curdir = (tdir_t) -1; /* non-existent directory */
- tif->tif_curoff = 0;
- tif->tif_curstrip = (tstrip_t) -1; /* invalid strip */
- tif->tif_row = (uint32) -1; /* read/write pre-increment */
- tif->tif_clientdata = clientdata;
- if (!readproc || !writeproc || !seekproc || !closeproc || !sizeproc) {
- TIFFErrorExt(clientdata, module,
- "One of the client procedures is NULL pointer.");
- goto bad2;
- }
- tif->tif_readproc = readproc;
- tif->tif_writeproc = writeproc;
- tif->tif_seekproc = seekproc;
- tif->tif_closeproc = closeproc;
- tif->tif_sizeproc = sizeproc;
- if (mapproc)
- tif->tif_mapproc = mapproc;
- else
- tif->tif_mapproc = _tiffDummyMapProc;
- if (unmapproc)
- tif->tif_unmapproc = unmapproc;
- else
- tif->tif_unmapproc = _tiffDummyUnmapProc;
- _TIFFSetDefaultCompressionState(tif); /* setup default state */
- /*
- * Default is to return data MSB2LSB and enable the
- * use of memory-mapped files and strip chopping when
- * a file is opened read-only.
- */
- tif->tif_flags = FILLORDER_MSB2LSB;
- if (m == O_RDONLY )
- tif->tif_flags |= TIFF_MAPPED;
-
-#ifdef STRIPCHOP_DEFAULT
- if (m == O_RDONLY || m == O_RDWR)
- tif->tif_flags |= STRIPCHOP_DEFAULT;
-#endif
-
- /*
- * Process library-specific flags in the open mode string.
- * The following flags may be used to control intrinsic library
- * behaviour that may or may not be desirable (usually for
- * compatibility with some application that claims to support
- * TIFF but only supports some braindead idea of what the
- * vendor thinks TIFF is):
- *
- * 'l' use little-endian byte order for creating a file
- * 'b' use big-endian byte order for creating a file
- * 'L' read/write information using LSB2MSB bit order
- * 'B' read/write information using MSB2LSB bit order
- * 'H' read/write information using host bit order
- * 'M' enable use of memory-mapped files when supported
- * 'm' disable use of memory-mapped files
- * 'C' enable strip chopping support when reading
- * 'c' disable strip chopping support
- * 'h' read TIFF header only, do not load the first IFD
- *
- * The use of the 'l' and 'b' flags is strongly discouraged.
- * These flags are provided solely because numerous vendors,
- * typically on the PC, do not correctly support TIFF; they
- * only support the Intel little-endian byte order. This
- * support is not configured by default because it supports
- * the violation of the TIFF spec that says that readers *MUST*
- * support both byte orders. It is strongly recommended that
- * you not use this feature except to deal with busted apps
- * that write invalid TIFF. And even in those cases you should
- * bang on the vendors to fix their software.
- *
- * The 'L', 'B', and 'H' flags are intended for applications
- * that can optimize operations on data by using a particular
- * bit order. By default the library returns data in MSB2LSB
- * bit order for compatibiltiy with older versions of this
- * library. Returning data in the bit order of the native cpu
- * makes the most sense but also requires applications to check
- * the value of the FillOrder tag; something they probably do
- * not do right now.
- *
- * The 'M' and 'm' flags are provided because some virtual memory
- * systems exhibit poor behaviour when large images are mapped.
- * These options permit clients to control the use of memory-mapped
- * files on a per-file basis.
- *
- * The 'C' and 'c' flags are provided because the library support
- * for chopping up large strips into multiple smaller strips is not
- * application-transparent and as such can cause problems. The 'c'
- * option permits applications that only want to look at the tags,
- * for example, to get the unadulterated TIFF tag information.
- */
- for (cp = mode; *cp; cp++)
- switch (*cp) {
- case 'b':
-#ifndef WORDS_BIGENDIAN
- if (m&O_CREAT)
- tif->tif_flags |= TIFF_SWAB;
-#endif
- break;
- case 'l':
-#ifdef WORDS_BIGENDIAN
- if ((m&O_CREAT))
- tif->tif_flags |= TIFF_SWAB;
-#endif
- break;
- case 'B':
- tif->tif_flags = (tif->tif_flags &~ TIFF_FILLORDER) |
- FILLORDER_MSB2LSB;
- break;
- case 'L':
- tif->tif_flags = (tif->tif_flags &~ TIFF_FILLORDER) |
- FILLORDER_LSB2MSB;
- break;
- case 'H':
- tif->tif_flags = (tif->tif_flags &~ TIFF_FILLORDER) |
- HOST_FILLORDER;
- break;
- case 'M':
- if (m == O_RDONLY)
- tif->tif_flags |= TIFF_MAPPED;
- break;
- case 'm':
- if (m == O_RDONLY)
- tif->tif_flags &= ~TIFF_MAPPED;
- break;
- case 'C':
- if (m == O_RDONLY)
- tif->tif_flags |= TIFF_STRIPCHOP;
- break;
- case 'c':
- if (m == O_RDONLY)
- tif->tif_flags &= ~TIFF_STRIPCHOP;
- break;
- case 'h':
- tif->tif_flags |= TIFF_HEADERONLY;
- break;
- }
- /*
- * Read in TIFF header.
- */
- if (tif->tif_mode & O_TRUNC ||
- !ReadOK(tif, &tif->tif_header, sizeof (TIFFHeader))) {
- if (tif->tif_mode == O_RDONLY) {
- TIFFErrorExt(tif->tif_clientdata, name,
- "Cannot read TIFF header");
- goto bad;
- }
- /*
- * Setup header and write.
- */
-#ifdef WORDS_BIGENDIAN
- tif->tif_header.tiff_magic = tif->tif_flags & TIFF_SWAB
- ? TIFF_LITTLEENDIAN : TIFF_BIGENDIAN;
-#else
- tif->tif_header.tiff_magic = tif->tif_flags & TIFF_SWAB
- ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN;
-#endif
- tif->tif_header.tiff_version = TIFF_VERSION;
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabShort(&tif->tif_header.tiff_version);
- tif->tif_header.tiff_diroff = 0; /* filled in later */
-
-
- /*
- * The doc for "fopen" for some STD_C_LIBs says that if you
- * open a file for modify ("+"), then you must fseek (or
- * fflush?) between any freads and fwrites. This is not
- * necessary on most systems, but has been shown to be needed
- * on Solaris.
- */
- TIFFSeekFile( tif, 0, SEEK_SET );
-
- if (!WriteOK(tif, &tif->tif_header, sizeof (TIFFHeader))) {
- TIFFErrorExt(tif->tif_clientdata, name,
- "Error writing TIFF header");
- goto bad;
- }
- /*
- * Setup the byte order handling.
- */
- TIFFInitOrder(tif, tif->tif_header.tiff_magic);
- /*
- * Setup default directory.
- */
- if (!TIFFDefaultDirectory(tif))
- goto bad;
- tif->tif_diroff = 0;
- tif->tif_dirlist = NULL;
- tif->tif_dirlistsize = 0;
- tif->tif_dirnumber = 0;
- return (tif);
- }
- /*
- * Setup the byte order handling.
- */
- if (tif->tif_header.tiff_magic != TIFF_BIGENDIAN &&
- tif->tif_header.tiff_magic != TIFF_LITTLEENDIAN
-#if MDI_SUPPORT
- &&
-#if HOST_BIGENDIAN
- tif->tif_header.tiff_magic != MDI_BIGENDIAN
-#else
- tif->tif_header.tiff_magic != MDI_LITTLEENDIAN
-#endif
- ) {
- TIFFErrorExt(tif->tif_clientdata, name,
- "Not a TIFF or MDI file, bad magic number %d (0x%x)",
-#else
- ) {
- TIFFErrorExt(tif->tif_clientdata, name,
- "Not a TIFF file, bad magic number %d (0x%x)",
-#endif
- tif->tif_header.tiff_magic,
- tif->tif_header.tiff_magic);
- goto bad;
- }
- TIFFInitOrder(tif, tif->tif_header.tiff_magic);
- /*
- * Swap header if required.
- */
- if (tif->tif_flags & TIFF_SWAB) {
- TIFFSwabShort(&tif->tif_header.tiff_version);
- TIFFSwabLong(&tif->tif_header.tiff_diroff);
- }
- /*
- * Now check version (if needed, it's been byte-swapped).
- * Note that this isn't actually a version number, it's a
- * magic number that doesn't change (stupid).
- */
- if (tif->tif_header.tiff_version == TIFF_BIGTIFF_VERSION) {
- TIFFErrorExt(tif->tif_clientdata, name,
- "This is a BigTIFF file. This format not supported\n"
- "by this version of libtiff." );
- goto bad;
- }
- if (tif->tif_header.tiff_version != TIFF_VERSION) {
- TIFFErrorExt(tif->tif_clientdata, name,
- "Not a TIFF file, bad version number %d (0x%x)",
- tif->tif_header.tiff_version,
- tif->tif_header.tiff_version);
- goto bad;
- }
- tif->tif_flags |= TIFF_MYBUFFER;
- tif->tif_rawcp = tif->tif_rawdata = 0;
- tif->tif_rawdatasize = 0;
-
- /*
- * Sometimes we do not want to read the first directory (for example,
- * it may be broken) and want to proceed to other directories. I this
- * case we use the TIFF_HEADERONLY flag to open file and return
- * immediately after reading TIFF header.
- */
- if (tif->tif_flags & TIFF_HEADERONLY)
- return (tif);
-
- /*
- * Setup initial directory.
- */
- switch (mode[0]) {
- case 'r':
- tif->tif_nextdiroff = tif->tif_header.tiff_diroff;
- /*
- * Try to use a memory-mapped file if the client
- * has not explicitly suppressed usage with the
- * 'm' flag in the open mode (see above).
- */
- if ((tif->tif_flags & TIFF_MAPPED) &&
- !TIFFMapFileContents(tif, (tdata_t*) &tif->tif_base, &tif->tif_size))
- tif->tif_flags &= ~TIFF_MAPPED;
- if (TIFFReadDirectory(tif)) {
- tif->tif_rawcc = -1;
- tif->tif_flags |= TIFF_BUFFERSETUP;
- return (tif);
- }
- break;
- case 'a':
- /*
- * New directories are automatically append
- * to the end of the directory chain when they
- * are written out (see TIFFWriteDirectory).
- */
- if (!TIFFDefaultDirectory(tif))
- goto bad;
- return (tif);
- }
-bad:
- tif->tif_mode = O_RDONLY; /* XXX avoid flush */
- TIFFCleanup(tif);
-bad2:
- return ((TIFF*)0);
-}
-
-/*
- * Query functions to access private data.
- */
-
-/*
- * Return open file's name.
- */
-const char *
-TIFFFileName(TIFF* tif)
-{
- return (tif->tif_name);
-}
-
-/*
- * Set the file name.
- */
-const char *
-TIFFSetFileName(TIFF* tif, const char *name)
-{
- const char* old_name = tif->tif_name;
- tif->tif_name = (char *)name;
- return (old_name);
-}
-
-/*
- * Return open file's I/O descriptor.
- */
-int
-TIFFFileno(TIFF* tif)
-{
- return (tif->tif_fd);
-}
-
-/*
- * Set open file's I/O descriptor, and return previous value.
- */
-int
-TIFFSetFileno(TIFF* tif, int fd)
-{
- int old_fd = tif->tif_fd;
- tif->tif_fd = fd;
- return old_fd;
-}
-
-/*
- * Return open file's clientdata.
- */
-thandle_t
-TIFFClientdata(TIFF* tif)
-{
- return (tif->tif_clientdata);
-}
-
-/*
- * Set open file's clientdata, and return previous value.
- */
-thandle_t
-TIFFSetClientdata(TIFF* tif, thandle_t newvalue)
-{
- thandle_t m = tif->tif_clientdata;
- tif->tif_clientdata = newvalue;
- return m;
-}
-
-/*
- * Return read/write mode.
- */
-int
-TIFFGetMode(TIFF* tif)
-{
- return (tif->tif_mode);
-}
-
-/*
- * Return read/write mode.
- */
-int
-TIFFSetMode(TIFF* tif, int mode)
-{
- int old_mode = tif->tif_mode;
- tif->tif_mode = mode;
- return (old_mode);
-}
-
-/*
- * Return nonzero if file is organized in
- * tiles; zero if organized as strips.
- */
-int
-TIFFIsTiled(TIFF* tif)
-{
- return (isTiled(tif));
-}
-
-/*
- * Return current row being read/written.
- */
-uint32
-TIFFCurrentRow(TIFF* tif)
-{
- return (tif->tif_row);
-}
-
-/*
- * Return index of the current directory.
- */
-tdir_t
-TIFFCurrentDirectory(TIFF* tif)
-{
- return (tif->tif_curdir);
-}
-
-/*
- * Return current strip.
- */
-tstrip_t
-TIFFCurrentStrip(TIFF* tif)
-{
- return (tif->tif_curstrip);
-}
-
-/*
- * Return current tile.
- */
-ttile_t
-TIFFCurrentTile(TIFF* tif)
-{
- return (tif->tif_curtile);
-}
-
-/*
- * Return nonzero if the file has byte-swapped data.
- */
-int
-TIFFIsByteSwapped(TIFF* tif)
-{
- return ((tif->tif_flags & TIFF_SWAB) != 0);
-}
-
-/*
- * Return nonzero if the data is returned up-sampled.
- */
-int
-TIFFIsUpSampled(TIFF* tif)
-{
- return (isUpSampled(tif));
-}
-
-/*
- * Return nonzero if the data is returned in MSB-to-LSB bit order.
- */
-int
-TIFFIsMSB2LSB(TIFF* tif)
-{
- return (isFillOrder(tif, FILLORDER_MSB2LSB));
-}
-
-/*
- * Return nonzero if given file was written in big-endian order.
- */
-int
-TIFFIsBigEndian(TIFF* tif)
-{
- return (tif->tif_header.tiff_magic == TIFF_BIGENDIAN);
-}
-
-/*
- * Return pointer to file read method.
- */
-TIFFReadWriteProc
-TIFFGetReadProc(TIFF* tif)
-{
- return (tif->tif_readproc);
-}
-
-/*
- * Return pointer to file write method.
- */
-TIFFReadWriteProc
-TIFFGetWriteProc(TIFF* tif)
-{
- return (tif->tif_writeproc);
-}
-
-/*
- * Return pointer to file seek method.
- */
-TIFFSeekProc
-TIFFGetSeekProc(TIFF* tif)
-{
- return (tif->tif_seekproc);
-}
-
-/*
- * Return pointer to file close method.
- */
-TIFFCloseProc
-TIFFGetCloseProc(TIFF* tif)
-{
- return (tif->tif_closeproc);
-}
-
-/*
- * Return pointer to file size requesting method.
- */
-TIFFSizeProc
-TIFFGetSizeProc(TIFF* tif)
-{
- return (tif->tif_sizeproc);
-}
-
-/*
- * Return pointer to memory mapping method.
- */
-TIFFMapFileProc
-TIFFGetMapFileProc(TIFF* tif)
-{
- return (tif->tif_mapproc);
-}
-
-/*
- * Return pointer to memory unmapping method.
- */
-TIFFUnmapFileProc
-TIFFGetUnmapFileProc(TIFF* tif)
-{
- return (tif->tif_unmapproc);
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_packbits.c b/src/3rdparty/libtiff/libtiff/tif_packbits.c
deleted file mode 100644
index 171a2692a8..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_packbits.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* $Id: tif_packbits.c,v 1.13.2.1 2009-01-01 00:10:43 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#include "tiffiop.h"
-#ifdef PACKBITS_SUPPORT
-/*
- * TIFF Library.
- *
- * PackBits Compression Algorithm Support
- */
-#include <stdio.h>
-
-static int
-PackBitsPreEncode(TIFF* tif, tsample_t s)
-{
- (void) s;
-
- if (!(tif->tif_data = (tidata_t)_TIFFmalloc(sizeof(tsize_t))))
- return (0);
- /*
- * Calculate the scanline/tile-width size in bytes.
- */
- if (isTiled(tif))
- *(tsize_t*)tif->tif_data = TIFFTileRowSize(tif);
- else
- *(tsize_t*)tif->tif_data = TIFFScanlineSize(tif);
- return (1);
-}
-
-static int
-PackBitsPostEncode(TIFF* tif)
-{
- if (tif->tif_data)
- _TIFFfree(tif->tif_data);
- return (1);
-}
-
-/*
- * NB: tidata is the type representing *(tidata_t);
- * if tidata_t is made signed then this type must
- * be adjusted accordingly.
- */
-typedef unsigned char tidata;
-
-/*
- * Encode a run of pixels.
- */
-static int
-PackBitsEncode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s)
-{
- unsigned char* bp = (unsigned char*) buf;
- tidata_t op, ep, lastliteral;
- long n, slop;
- int b;
- enum { BASE, LITERAL, RUN, LITERAL_RUN } state;
-
- (void) s;
- op = tif->tif_rawcp;
- ep = tif->tif_rawdata + tif->tif_rawdatasize;
- state = BASE;
- lastliteral = 0;
- while (cc > 0) {
- /*
- * Find the longest string of identical bytes.
- */
- b = *bp++, cc--, n = 1;
- for (; cc > 0 && b == *bp; cc--, bp++)
- n++;
- again:
- if (op + 2 >= ep) { /* insure space for new data */
- /*
- * Be careful about writing the last
- * literal. Must write up to that point
- * and then copy the remainder to the
- * front of the buffer.
- */
- if (state == LITERAL || state == LITERAL_RUN) {
- slop = op - lastliteral;
- tif->tif_rawcc += lastliteral - tif->tif_rawcp;
- if (!TIFFFlushData1(tif))
- return (-1);
- op = tif->tif_rawcp;
- while (slop-- > 0)
- *op++ = *lastliteral++;
- lastliteral = tif->tif_rawcp;
- } else {
- tif->tif_rawcc += op - tif->tif_rawcp;
- if (!TIFFFlushData1(tif))
- return (-1);
- op = tif->tif_rawcp;
- }
- }
- switch (state) {
- case BASE: /* initial state, set run/literal */
- if (n > 1) {
- state = RUN;
- if (n > 128) {
- *op++ = (tidata) -127;
- *op++ = (tidataval_t) b;
- n -= 128;
- goto again;
- }
- *op++ = (tidataval_t)(-(n-1));
- *op++ = (tidataval_t) b;
- } else {
- lastliteral = op;
- *op++ = 0;
- *op++ = (tidataval_t) b;
- state = LITERAL;
- }
- break;
- case LITERAL: /* last object was literal string */
- if (n > 1) {
- state = LITERAL_RUN;
- if (n > 128) {
- *op++ = (tidata) -127;
- *op++ = (tidataval_t) b;
- n -= 128;
- goto again;
- }
- *op++ = (tidataval_t)(-(n-1)); /* encode run */
- *op++ = (tidataval_t) b;
- } else { /* extend literal */
- if (++(*lastliteral) == 127)
- state = BASE;
- *op++ = (tidataval_t) b;
- }
- break;
- case RUN: /* last object was run */
- if (n > 1) {
- if (n > 128) {
- *op++ = (tidata) -127;
- *op++ = (tidataval_t) b;
- n -= 128;
- goto again;
- }
- *op++ = (tidataval_t)(-(n-1));
- *op++ = (tidataval_t) b;
- } else {
- lastliteral = op;
- *op++ = 0;
- *op++ = (tidataval_t) b;
- state = LITERAL;
- }
- break;
- case LITERAL_RUN: /* literal followed by a run */
- /*
- * Check to see if previous run should
- * be converted to a literal, in which
- * case we convert literal-run-literal
- * to a single literal.
- */
- if (n == 1 && op[-2] == (tidata) -1 &&
- *lastliteral < 126) {
- state = (((*lastliteral) += 2) == 127 ?
- BASE : LITERAL);
- op[-2] = op[-1]; /* replicate */
- } else
- state = RUN;
- goto again;
- }
- }
- tif->tif_rawcc += op - tif->tif_rawcp;
- tif->tif_rawcp = op;
- return (1);
-}
-
-/*
- * Encode a rectangular chunk of pixels. We break it up
- * into row-sized pieces to insure that encoded runs do
- * not span rows. Otherwise, there can be problems with
- * the decoder if data is read, for example, by scanlines
- * when it was encoded by strips.
- */
-static int
-PackBitsEncodeChunk(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- tsize_t rowsize = *(tsize_t*)tif->tif_data;
-
- while ((long)cc > 0) {
- int chunk = rowsize;
-
- if( cc < chunk )
- chunk = cc;
-
- if (PackBitsEncode(tif, bp, chunk, s) < 0)
- return (-1);
- bp += chunk;
- cc -= chunk;
- }
- return (1);
-}
-
-static int
-PackBitsDecode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
-{
- char *bp;
- tsize_t cc;
- long n;
- int b;
-
- (void) s;
- bp = (char*) tif->tif_rawcp;
- cc = tif->tif_rawcc;
- while (cc > 0 && (long)occ > 0) {
- n = (long) *bp++, cc--;
- /*
- * Watch out for compilers that
- * don't sign extend chars...
- */
- if (n >= 128)
- n -= 256;
- if (n < 0) { /* replicate next byte -n+1 times */
- if (n == -128) /* nop */
- continue;
- n = -n + 1;
- if( occ < n )
- {
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "PackBitsDecode: discarding %ld bytes "
- "to avoid buffer overrun",
- n - occ);
- n = occ;
- }
- occ -= n;
- b = *bp++, cc--;
- while (n-- > 0)
- *op++ = (tidataval_t) b;
- } else { /* copy next n+1 bytes literally */
- if (occ < n + 1)
- {
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "PackBitsDecode: discarding %ld bytes "
- "to avoid buffer overrun",
- n - occ + 1);
- n = occ - 1;
- }
- _TIFFmemcpy(op, bp, ++n);
- op += n; occ -= n;
- bp += n; cc -= n;
- }
- }
- tif->tif_rawcp = (tidata_t) bp;
- tif->tif_rawcc = cc;
- if (occ > 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "PackBitsDecode: Not enough data for scanline %ld",
- (long) tif->tif_row);
- return (0);
- }
- return (1);
-}
-
-int
-TIFFInitPackBits(TIFF* tif, int scheme)
-{
- (void) scheme;
- tif->tif_decoderow = PackBitsDecode;
- tif->tif_decodestrip = PackBitsDecode;
- tif->tif_decodetile = PackBitsDecode;
- tif->tif_preencode = PackBitsPreEncode;
- tif->tif_postencode = PackBitsPostEncode;
- tif->tif_encoderow = PackBitsEncode;
- tif->tif_encodestrip = PackBitsEncodeChunk;
- tif->tif_encodetile = PackBitsEncodeChunk;
- return (1);
-}
-#endif /* PACKBITS_SUPPORT */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_pixarlog.c b/src/3rdparty/libtiff/libtiff/tif_pixarlog.c
deleted file mode 100644
index 5ad84f8b80..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_pixarlog.c
+++ /dev/null
@@ -1,1364 +0,0 @@
-/* $Id: tif_pixarlog.c,v 1.15.2.3 2009-01-01 00:10:43 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1996-1997 Sam Leffler
- * Copyright (c) 1996 Pixar
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Pixar, Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Pixar, Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL PIXAR, SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#include "tiffiop.h"
-#ifdef PIXARLOG_SUPPORT
-
-/*
- * TIFF Library.
- * PixarLog Compression Support
- *
- * Contributed by Dan McCoy.
- *
- * PixarLog film support uses the TIFF library to store companded
- * 11 bit values into a tiff file, which are compressed using the
- * zip compressor.
- *
- * The codec can take as input and produce as output 32-bit IEEE float values
- * as well as 16-bit or 8-bit unsigned integer values.
- *
- * On writing any of the above are converted into the internal
- * 11-bit log format. In the case of 8 and 16 bit values, the
- * input is assumed to be unsigned linear color values that represent
- * the range 0-1. In the case of IEEE values, the 0-1 range is assumed to
- * be the normal linear color range, in addition over 1 values are
- * accepted up to a value of about 25.0 to encode "hot" hightlights and such.
- * The encoding is lossless for 8-bit values, slightly lossy for the
- * other bit depths. The actual color precision should be better
- * than the human eye can perceive with extra room to allow for
- * error introduced by further image computation. As with any quantized
- * color format, it is possible to perform image calculations which
- * expose the quantization error. This format should certainly be less
- * susceptable to such errors than standard 8-bit encodings, but more
- * susceptable than straight 16-bit or 32-bit encodings.
- *
- * On reading the internal format is converted to the desired output format.
- * The program can request which format it desires by setting the internal
- * pseudo tag TIFFTAG_PIXARLOGDATAFMT to one of these possible values:
- * PIXARLOGDATAFMT_FLOAT = provide IEEE float values.
- * PIXARLOGDATAFMT_16BIT = provide unsigned 16-bit integer values
- * PIXARLOGDATAFMT_8BIT = provide unsigned 8-bit integer values
- *
- * alternately PIXARLOGDATAFMT_8BITABGR provides unsigned 8-bit integer
- * values with the difference that if there are exactly three or four channels
- * (rgb or rgba) it swaps the channel order (bgr or abgr).
- *
- * PIXARLOGDATAFMT_11BITLOG provides the internal encoding directly
- * packed in 16-bit values. However no tools are supplied for interpreting
- * these values.
- *
- * "hot" (over 1.0) areas written in floating point get clamped to
- * 1.0 in the integer data types.
- *
- * When the file is closed after writing, the bit depth and sample format
- * are set always to appear as if 8-bit data has been written into it.
- * That way a naive program unaware of the particulars of the encoding
- * gets the format it is most likely able to handle.
- *
- * The codec does it's own horizontal differencing step on the coded
- * values so the libraries predictor stuff should be turned off.
- * The codec also handle byte swapping the encoded values as necessary
- * since the library does not have the information necessary
- * to know the bit depth of the raw unencoded buffer.
- *
- */
-
-#include "tif_predict.h"
-#include "zlib.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-/* Tables for converting to/from 11 bit coded values */
-
-#define TSIZE 2048 /* decode table size (11-bit tokens) */
-#define TSIZEP1 2049 /* Plus one for slop */
-#define ONE 1250 /* token value of 1.0 exactly */
-#define RATIO 1.004 /* nominal ratio for log part */
-
-#define CODE_MASK 0x7ff /* 11 bits. */
-
-static float Fltsize;
-static float LogK1, LogK2;
-
-#define REPEAT(n, op) { int i; i=n; do { i--; op; } while (i>0); }
-
-static void
-horizontalAccumulateF(uint16 *wp, int n, int stride, float *op,
- float *ToLinearF)
-{
- register unsigned int cr, cg, cb, ca, mask;
- register float t0, t1, t2, t3;
-
- if (n >= stride) {
- mask = CODE_MASK;
- if (stride == 3) {
- t0 = ToLinearF[cr = wp[0]];
- t1 = ToLinearF[cg = wp[1]];
- t2 = ToLinearF[cb = wp[2]];
- op[0] = t0;
- op[1] = t1;
- op[2] = t2;
- n -= 3;
- while (n > 0) {
- wp += 3;
- op += 3;
- n -= 3;
- t0 = ToLinearF[(cr += wp[0]) & mask];
- t1 = ToLinearF[(cg += wp[1]) & mask];
- t2 = ToLinearF[(cb += wp[2]) & mask];
- op[0] = t0;
- op[1] = t1;
- op[2] = t2;
- }
- } else if (stride == 4) {
- t0 = ToLinearF[cr = wp[0]];
- t1 = ToLinearF[cg = wp[1]];
- t2 = ToLinearF[cb = wp[2]];
- t3 = ToLinearF[ca = wp[3]];
- op[0] = t0;
- op[1] = t1;
- op[2] = t2;
- op[3] = t3;
- n -= 4;
- while (n > 0) {
- wp += 4;
- op += 4;
- n -= 4;
- t0 = ToLinearF[(cr += wp[0]) & mask];
- t1 = ToLinearF[(cg += wp[1]) & mask];
- t2 = ToLinearF[(cb += wp[2]) & mask];
- t3 = ToLinearF[(ca += wp[3]) & mask];
- op[0] = t0;
- op[1] = t1;
- op[2] = t2;
- op[3] = t3;
- }
- } else {
- REPEAT(stride, *op = ToLinearF[*wp&mask]; wp++; op++)
- n -= stride;
- while (n > 0) {
- REPEAT(stride,
- wp[stride] += *wp; *op = ToLinearF[*wp&mask]; wp++; op++)
- n -= stride;
- }
- }
- }
-}
-
-static void
-horizontalAccumulate12(uint16 *wp, int n, int stride, int16 *op,
- float *ToLinearF)
-{
- register unsigned int cr, cg, cb, ca, mask;
- register float t0, t1, t2, t3;
-
-#define SCALE12 2048.0F
-#define CLAMP12(t) (((t) < 3071) ? (uint16) (t) : 3071)
-
- if (n >= stride) {
- mask = CODE_MASK;
- if (stride == 3) {
- t0 = ToLinearF[cr = wp[0]] * SCALE12;
- t1 = ToLinearF[cg = wp[1]] * SCALE12;
- t2 = ToLinearF[cb = wp[2]] * SCALE12;
- op[0] = CLAMP12(t0);
- op[1] = CLAMP12(t1);
- op[2] = CLAMP12(t2);
- n -= 3;
- while (n > 0) {
- wp += 3;
- op += 3;
- n -= 3;
- t0 = ToLinearF[(cr += wp[0]) & mask] * SCALE12;
- t1 = ToLinearF[(cg += wp[1]) & mask] * SCALE12;
- t2 = ToLinearF[(cb += wp[2]) & mask] * SCALE12;
- op[0] = CLAMP12(t0);
- op[1] = CLAMP12(t1);
- op[2] = CLAMP12(t2);
- }
- } else if (stride == 4) {
- t0 = ToLinearF[cr = wp[0]] * SCALE12;
- t1 = ToLinearF[cg = wp[1]] * SCALE12;
- t2 = ToLinearF[cb = wp[2]] * SCALE12;
- t3 = ToLinearF[ca = wp[3]] * SCALE12;
- op[0] = CLAMP12(t0);
- op[1] = CLAMP12(t1);
- op[2] = CLAMP12(t2);
- op[3] = CLAMP12(t3);
- n -= 4;
- while (n > 0) {
- wp += 4;
- op += 4;
- n -= 4;
- t0 = ToLinearF[(cr += wp[0]) & mask] * SCALE12;
- t1 = ToLinearF[(cg += wp[1]) & mask] * SCALE12;
- t2 = ToLinearF[(cb += wp[2]) & mask] * SCALE12;
- t3 = ToLinearF[(ca += wp[3]) & mask] * SCALE12;
- op[0] = CLAMP12(t0);
- op[1] = CLAMP12(t1);
- op[2] = CLAMP12(t2);
- op[3] = CLAMP12(t3);
- }
- } else {
- REPEAT(stride, t0 = ToLinearF[*wp&mask] * SCALE12;
- *op = CLAMP12(t0); wp++; op++)
- n -= stride;
- while (n > 0) {
- REPEAT(stride,
- wp[stride] += *wp; t0 = ToLinearF[wp[stride]&mask]*SCALE12;
- *op = CLAMP12(t0); wp++; op++)
- n -= stride;
- }
- }
- }
-}
-
-static void
-horizontalAccumulate16(uint16 *wp, int n, int stride, uint16 *op,
- uint16 *ToLinear16)
-{
- register unsigned int cr, cg, cb, ca, mask;
-
- if (n >= stride) {
- mask = CODE_MASK;
- if (stride == 3) {
- op[0] = ToLinear16[cr = wp[0]];
- op[1] = ToLinear16[cg = wp[1]];
- op[2] = ToLinear16[cb = wp[2]];
- n -= 3;
- while (n > 0) {
- wp += 3;
- op += 3;
- n -= 3;
- op[0] = ToLinear16[(cr += wp[0]) & mask];
- op[1] = ToLinear16[(cg += wp[1]) & mask];
- op[2] = ToLinear16[(cb += wp[2]) & mask];
- }
- } else if (stride == 4) {
- op[0] = ToLinear16[cr = wp[0]];
- op[1] = ToLinear16[cg = wp[1]];
- op[2] = ToLinear16[cb = wp[2]];
- op[3] = ToLinear16[ca = wp[3]];
- n -= 4;
- while (n > 0) {
- wp += 4;
- op += 4;
- n -= 4;
- op[0] = ToLinear16[(cr += wp[0]) & mask];
- op[1] = ToLinear16[(cg += wp[1]) & mask];
- op[2] = ToLinear16[(cb += wp[2]) & mask];
- op[3] = ToLinear16[(ca += wp[3]) & mask];
- }
- } else {
- REPEAT(stride, *op = ToLinear16[*wp&mask]; wp++; op++)
- n -= stride;
- while (n > 0) {
- REPEAT(stride,
- wp[stride] += *wp; *op = ToLinear16[*wp&mask]; wp++; op++)
- n -= stride;
- }
- }
- }
-}
-
-/*
- * Returns the log encoded 11-bit values with the horizontal
- * differencing undone.
- */
-static void
-horizontalAccumulate11(uint16 *wp, int n, int stride, uint16 *op)
-{
- register unsigned int cr, cg, cb, ca, mask;
-
- if (n >= stride) {
- mask = CODE_MASK;
- if (stride == 3) {
- op[0] = cr = wp[0]; op[1] = cg = wp[1]; op[2] = cb = wp[2];
- n -= 3;
- while (n > 0) {
- wp += 3;
- op += 3;
- n -= 3;
- op[0] = (cr += wp[0]) & mask;
- op[1] = (cg += wp[1]) & mask;
- op[2] = (cb += wp[2]) & mask;
- }
- } else if (stride == 4) {
- op[0] = cr = wp[0]; op[1] = cg = wp[1];
- op[2] = cb = wp[2]; op[3] = ca = wp[3];
- n -= 4;
- while (n > 0) {
- wp += 4;
- op += 4;
- n -= 4;
- op[0] = (cr += wp[0]) & mask;
- op[1] = (cg += wp[1]) & mask;
- op[2] = (cb += wp[2]) & mask;
- op[3] = (ca += wp[3]) & mask;
- }
- } else {
- REPEAT(stride, *op = *wp&mask; wp++; op++)
- n -= stride;
- while (n > 0) {
- REPEAT(stride,
- wp[stride] += *wp; *op = *wp&mask; wp++; op++)
- n -= stride;
- }
- }
- }
-}
-
-static void
-horizontalAccumulate8(uint16 *wp, int n, int stride, unsigned char *op,
- unsigned char *ToLinear8)
-{
- register unsigned int cr, cg, cb, ca, mask;
-
- if (n >= stride) {
- mask = CODE_MASK;
- if (stride == 3) {
- op[0] = ToLinear8[cr = wp[0]];
- op[1] = ToLinear8[cg = wp[1]];
- op[2] = ToLinear8[cb = wp[2]];
- n -= 3;
- while (n > 0) {
- n -= 3;
- wp += 3;
- op += 3;
- op[0] = ToLinear8[(cr += wp[0]) & mask];
- op[1] = ToLinear8[(cg += wp[1]) & mask];
- op[2] = ToLinear8[(cb += wp[2]) & mask];
- }
- } else if (stride == 4) {
- op[0] = ToLinear8[cr = wp[0]];
- op[1] = ToLinear8[cg = wp[1]];
- op[2] = ToLinear8[cb = wp[2]];
- op[3] = ToLinear8[ca = wp[3]];
- n -= 4;
- while (n > 0) {
- n -= 4;
- wp += 4;
- op += 4;
- op[0] = ToLinear8[(cr += wp[0]) & mask];
- op[1] = ToLinear8[(cg += wp[1]) & mask];
- op[2] = ToLinear8[(cb += wp[2]) & mask];
- op[3] = ToLinear8[(ca += wp[3]) & mask];
- }
- } else {
- REPEAT(stride, *op = ToLinear8[*wp&mask]; wp++; op++)
- n -= stride;
- while (n > 0) {
- REPEAT(stride,
- wp[stride] += *wp; *op = ToLinear8[*wp&mask]; wp++; op++)
- n -= stride;
- }
- }
- }
-}
-
-
-static void
-horizontalAccumulate8abgr(uint16 *wp, int n, int stride, unsigned char *op,
- unsigned char *ToLinear8)
-{
- register unsigned int cr, cg, cb, ca, mask;
- register unsigned char t0, t1, t2, t3;
-
- if (n >= stride) {
- mask = CODE_MASK;
- if (stride == 3) {
- op[0] = 0;
- t1 = ToLinear8[cb = wp[2]];
- t2 = ToLinear8[cg = wp[1]];
- t3 = ToLinear8[cr = wp[0]];
- op[1] = t1;
- op[2] = t2;
- op[3] = t3;
- n -= 3;
- while (n > 0) {
- n -= 3;
- wp += 3;
- op += 4;
- op[0] = 0;
- t1 = ToLinear8[(cb += wp[2]) & mask];
- t2 = ToLinear8[(cg += wp[1]) & mask];
- t3 = ToLinear8[(cr += wp[0]) & mask];
- op[1] = t1;
- op[2] = t2;
- op[3] = t3;
- }
- } else if (stride == 4) {
- t0 = ToLinear8[ca = wp[3]];
- t1 = ToLinear8[cb = wp[2]];
- t2 = ToLinear8[cg = wp[1]];
- t3 = ToLinear8[cr = wp[0]];
- op[0] = t0;
- op[1] = t1;
- op[2] = t2;
- op[3] = t3;
- n -= 4;
- while (n > 0) {
- n -= 4;
- wp += 4;
- op += 4;
- t0 = ToLinear8[(ca += wp[3]) & mask];
- t1 = ToLinear8[(cb += wp[2]) & mask];
- t2 = ToLinear8[(cg += wp[1]) & mask];
- t3 = ToLinear8[(cr += wp[0]) & mask];
- op[0] = t0;
- op[1] = t1;
- op[2] = t2;
- op[3] = t3;
- }
- } else {
- REPEAT(stride, *op = ToLinear8[*wp&mask]; wp++; op++)
- n -= stride;
- while (n > 0) {
- REPEAT(stride,
- wp[stride] += *wp; *op = ToLinear8[*wp&mask]; wp++; op++)
- n -= stride;
- }
- }
- }
-}
-
-/*
- * State block for each open TIFF
- * file using PixarLog compression/decompression.
- */
-typedef struct {
- TIFFPredictorState predict;
- z_stream stream;
- uint16 *tbuf;
- uint16 stride;
- int state;
- int user_datafmt;
- int quality;
-#define PLSTATE_INIT 1
-
- TIFFVSetMethod vgetparent; /* super-class method */
- TIFFVSetMethod vsetparent; /* super-class method */
-
- float *ToLinearF;
- uint16 *ToLinear16;
- unsigned char *ToLinear8;
- uint16 *FromLT2;
- uint16 *From14; /* Really for 16-bit data, but we shift down 2 */
- uint16 *From8;
-
-} PixarLogState;
-
-static int
-PixarLogMakeTables(PixarLogState *sp)
-{
-
-/*
- * We make several tables here to convert between various external
- * representations (float, 16-bit, and 8-bit) and the internal
- * 11-bit companded representation. The 11-bit representation has two
- * distinct regions. A linear bottom end up through .018316 in steps
- * of about .000073, and a region of constant ratio up to about 25.
- * These floating point numbers are stored in the main table ToLinearF.
- * All other tables are derived from this one. The tables (and the
- * ratios) are continuous at the internal seam.
- */
-
- int nlin, lt2size;
- int i, j;
- double b, c, linstep, v;
- float *ToLinearF;
- uint16 *ToLinear16;
- unsigned char *ToLinear8;
- uint16 *FromLT2;
- uint16 *From14; /* Really for 16-bit data, but we shift down 2 */
- uint16 *From8;
-
- c = log(RATIO);
- nlin = (int)(1./c); /* nlin must be an integer */
- c = 1./nlin;
- b = exp(-c*ONE); /* multiplicative scale factor [b*exp(c*ONE) = 1] */
- linstep = b*c*exp(1.);
-
- LogK1 = (float)(1./c); /* if (v >= 2) token = k1*log(v*k2) */
- LogK2 = (float)(1./b);
- lt2size = (int)(2./linstep) + 1;
- FromLT2 = (uint16 *)_TIFFmalloc(lt2size*sizeof(uint16));
- From14 = (uint16 *)_TIFFmalloc(16384*sizeof(uint16));
- From8 = (uint16 *)_TIFFmalloc(256*sizeof(uint16));
- ToLinearF = (float *)_TIFFmalloc(TSIZEP1 * sizeof(float));
- ToLinear16 = (uint16 *)_TIFFmalloc(TSIZEP1 * sizeof(uint16));
- ToLinear8 = (unsigned char *)_TIFFmalloc(TSIZEP1 * sizeof(unsigned char));
- if (FromLT2 == NULL || From14 == NULL || From8 == NULL ||
- ToLinearF == NULL || ToLinear16 == NULL || ToLinear8 == NULL) {
- if (FromLT2) _TIFFfree(FromLT2);
- if (From14) _TIFFfree(From14);
- if (From8) _TIFFfree(From8);
- if (ToLinearF) _TIFFfree(ToLinearF);
- if (ToLinear16) _TIFFfree(ToLinear16);
- if (ToLinear8) _TIFFfree(ToLinear8);
- sp->FromLT2 = NULL;
- sp->From14 = NULL;
- sp->From8 = NULL;
- sp->ToLinearF = NULL;
- sp->ToLinear16 = NULL;
- sp->ToLinear8 = NULL;
- return 0;
- }
-
- j = 0;
-
- for (i = 0; i < nlin; i++) {
- v = i * linstep;
- ToLinearF[j++] = (float)v;
- }
-
- for (i = nlin; i < TSIZE; i++)
- ToLinearF[j++] = (float)(b*exp(c*i));
-
- ToLinearF[2048] = ToLinearF[2047];
-
- for (i = 0; i < TSIZEP1; i++) {
- v = ToLinearF[i]*65535.0 + 0.5;
- ToLinear16[i] = (v > 65535.0) ? 65535 : (uint16)v;
- v = ToLinearF[i]*255.0 + 0.5;
- ToLinear8[i] = (v > 255.0) ? 255 : (unsigned char)v;
- }
-
- j = 0;
- for (i = 0; i < lt2size; i++) {
- if ((i*linstep)*(i*linstep) > ToLinearF[j]*ToLinearF[j+1])
- j++;
- FromLT2[i] = j;
- }
-
- /*
- * Since we lose info anyway on 16-bit data, we set up a 14-bit
- * table and shift 16-bit values down two bits on input.
- * saves a little table space.
- */
- j = 0;
- for (i = 0; i < 16384; i++) {
- while ((i/16383.)*(i/16383.) > ToLinearF[j]*ToLinearF[j+1])
- j++;
- From14[i] = j;
- }
-
- j = 0;
- for (i = 0; i < 256; i++) {
- while ((i/255.)*(i/255.) > ToLinearF[j]*ToLinearF[j+1])
- j++;
- From8[i] = j;
- }
-
- Fltsize = (float)(lt2size/2);
-
- sp->ToLinearF = ToLinearF;
- sp->ToLinear16 = ToLinear16;
- sp->ToLinear8 = ToLinear8;
- sp->FromLT2 = FromLT2;
- sp->From14 = From14;
- sp->From8 = From8;
-
- return 1;
-}
-
-#define DecoderState(tif) ((PixarLogState*) (tif)->tif_data)
-#define EncoderState(tif) ((PixarLogState*) (tif)->tif_data)
-
-static int PixarLogEncode(TIFF*, tidata_t, tsize_t, tsample_t);
-static int PixarLogDecode(TIFF*, tidata_t, tsize_t, tsample_t);
-
-#define PIXARLOGDATAFMT_UNKNOWN -1
-
-static int
-PixarLogGuessDataFmt(TIFFDirectory *td)
-{
- int guess = PIXARLOGDATAFMT_UNKNOWN;
- int format = td->td_sampleformat;
-
- /* If the user didn't tell us his datafmt,
- * take our best guess from the bitspersample.
- */
- switch (td->td_bitspersample) {
- case 32:
- if (format == SAMPLEFORMAT_IEEEFP)
- guess = PIXARLOGDATAFMT_FLOAT;
- break;
- case 16:
- if (format == SAMPLEFORMAT_VOID || format == SAMPLEFORMAT_UINT)
- guess = PIXARLOGDATAFMT_16BIT;
- break;
- case 12:
- if (format == SAMPLEFORMAT_VOID || format == SAMPLEFORMAT_INT)
- guess = PIXARLOGDATAFMT_12BITPICIO;
- break;
- case 11:
- if (format == SAMPLEFORMAT_VOID || format == SAMPLEFORMAT_UINT)
- guess = PIXARLOGDATAFMT_11BITLOG;
- break;
- case 8:
- if (format == SAMPLEFORMAT_VOID || format == SAMPLEFORMAT_UINT)
- guess = PIXARLOGDATAFMT_8BIT;
- break;
- }
-
- return guess;
-}
-
-static uint32
-multiply(size_t m1, size_t m2)
-{
- uint32 bytes = m1 * m2;
-
- if (m1 && bytes / m1 != m2)
- bytes = 0;
-
- return bytes;
-}
-
-static int
-PixarLogSetupDecode(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- PixarLogState* sp = DecoderState(tif);
- tsize_t tbuf_size;
- static const char module[] = "PixarLogSetupDecode";
-
- assert(sp != NULL);
-
- /* Make sure no byte swapping happens on the data
- * after decompression. */
- tif->tif_postdecode = _TIFFNoPostDecode;
-
- /* for some reason, we can't do this in TIFFInitPixarLog */
-
- sp->stride = (td->td_planarconfig == PLANARCONFIG_CONTIG ?
- td->td_samplesperpixel : 1);
- tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth),
- td->td_rowsperstrip), sizeof(uint16));
- if (tbuf_size == 0)
- return (0);
- sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size);
- if (sp->tbuf == NULL)
- return (0);
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
- sp->user_datafmt = PixarLogGuessDataFmt(td);
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "PixarLog compression can't handle bits depth/data format combination (depth: %d)",
- td->td_bitspersample);
- return (0);
- }
-
- if (inflateInit(&sp->stream) != Z_OK) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: %s", tif->tif_name, sp->stream.msg);
- return (0);
- } else {
- sp->state |= PLSTATE_INIT;
- return (1);
- }
-}
-
-/*
- * Setup state for decoding a strip.
- */
-static int
-PixarLogPreDecode(TIFF* tif, tsample_t s)
-{
- PixarLogState* sp = DecoderState(tif);
-
- (void) s;
- assert(sp != NULL);
- sp->stream.next_in = tif->tif_rawdata;
- sp->stream.avail_in = tif->tif_rawcc;
- return (inflateReset(&sp->stream) == Z_OK);
-}
-
-static int
-PixarLogDecode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
-{
- TIFFDirectory *td = &tif->tif_dir;
- PixarLogState* sp = DecoderState(tif);
- static const char module[] = "PixarLogDecode";
- int i, nsamples, llen;
- uint16 *up;
-
- switch (sp->user_datafmt) {
- case PIXARLOGDATAFMT_FLOAT:
- nsamples = occ / sizeof(float); /* XXX float == 32 bits */
- break;
- case PIXARLOGDATAFMT_16BIT:
- case PIXARLOGDATAFMT_12BITPICIO:
- case PIXARLOGDATAFMT_11BITLOG:
- nsamples = occ / sizeof(uint16); /* XXX uint16 == 16 bits */
- break;
- case PIXARLOGDATAFMT_8BIT:
- case PIXARLOGDATAFMT_8BITABGR:
- nsamples = occ;
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%d bit input not supported in PixarLog",
- td->td_bitspersample);
- return 0;
- }
-
- llen = sp->stride * td->td_imagewidth;
-
- (void) s;
- assert(sp != NULL);
- sp->stream.next_out = (unsigned char *) sp->tbuf;
- sp->stream.avail_out = nsamples * sizeof(uint16);
- do {
- int state = inflate(&sp->stream, Z_PARTIAL_FLUSH);
- if (state == Z_STREAM_END) {
- break; /* XXX */
- }
- if (state == Z_DATA_ERROR) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Decoding error at scanline %d, %s",
- tif->tif_name, tif->tif_row, sp->stream.msg);
- if (inflateSync(&sp->stream) != Z_OK)
- return (0);
- continue;
- }
- if (state != Z_OK) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
- tif->tif_name, sp->stream.msg);
- return (0);
- }
- } while (sp->stream.avail_out > 0);
-
- /* hopefully, we got all the bytes we needed */
- if (sp->stream.avail_out != 0) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Not enough data at scanline %d (short %d bytes)",
- tif->tif_name, tif->tif_row, sp->stream.avail_out);
- return (0);
- }
-
- up = sp->tbuf;
- /* Swap bytes in the data if from a different endian machine. */
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabArrayOfShort(up, nsamples);
-
- /*
- * if llen is not an exact multiple of nsamples, the decode operation
- * may overflow the output buffer, so truncate it enough to prevent
- * that but still salvage as much data as possible.
- */
- if (nsamples % llen) {
- TIFFWarningExt(tif->tif_clientdata, module,
- "%s: stride %d is not a multiple of sample count, "
- "%d, data truncated.", tif->tif_name, llen, nsamples);
- nsamples -= nsamples % llen;
- }
-
- for (i = 0; i < nsamples; i += llen, up += llen) {
- switch (sp->user_datafmt) {
- case PIXARLOGDATAFMT_FLOAT:
- horizontalAccumulateF(up, llen, sp->stride,
- (float *)op, sp->ToLinearF);
- op += llen * sizeof(float);
- break;
- case PIXARLOGDATAFMT_16BIT:
- horizontalAccumulate16(up, llen, sp->stride,
- (uint16 *)op, sp->ToLinear16);
- op += llen * sizeof(uint16);
- break;
- case PIXARLOGDATAFMT_12BITPICIO:
- horizontalAccumulate12(up, llen, sp->stride,
- (int16 *)op, sp->ToLinearF);
- op += llen * sizeof(int16);
- break;
- case PIXARLOGDATAFMT_11BITLOG:
- horizontalAccumulate11(up, llen, sp->stride,
- (uint16 *)op);
- op += llen * sizeof(uint16);
- break;
- case PIXARLOGDATAFMT_8BIT:
- horizontalAccumulate8(up, llen, sp->stride,
- (unsigned char *)op, sp->ToLinear8);
- op += llen * sizeof(unsigned char);
- break;
- case PIXARLOGDATAFMT_8BITABGR:
- horizontalAccumulate8abgr(up, llen, sp->stride,
- (unsigned char *)op, sp->ToLinear8);
- op += llen * sizeof(unsigned char);
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "PixarLogDecode: unsupported bits/sample: %d",
- td->td_bitspersample);
- return (0);
- }
- }
-
- return (1);
-}
-
-static int
-PixarLogSetupEncode(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- PixarLogState* sp = EncoderState(tif);
- tsize_t tbuf_size;
- static const char module[] = "PixarLogSetupEncode";
-
- assert(sp != NULL);
-
- /* for some reason, we can't do this in TIFFInitPixarLog */
-
- sp->stride = (td->td_planarconfig == PLANARCONFIG_CONTIG ?
- td->td_samplesperpixel : 1);
- tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth),
- td->td_rowsperstrip), sizeof(uint16));
- if (tbuf_size == 0)
- return (0);
- sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size);
- if (sp->tbuf == NULL)
- return (0);
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
- sp->user_datafmt = PixarLogGuessDataFmt(td);
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {
- TIFFErrorExt(tif->tif_clientdata, module, "PixarLog compression can't handle %d bit linear encodings", td->td_bitspersample);
- return (0);
- }
-
- if (deflateInit(&sp->stream, sp->quality) != Z_OK) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: %s", tif->tif_name, sp->stream.msg);
- return (0);
- } else {
- sp->state |= PLSTATE_INIT;
- return (1);
- }
-}
-
-/*
- * Reset encoding state at the start of a strip.
- */
-static int
-PixarLogPreEncode(TIFF* tif, tsample_t s)
-{
- PixarLogState *sp = EncoderState(tif);
-
- (void) s;
- assert(sp != NULL);
- sp->stream.next_out = tif->tif_rawdata;
- sp->stream.avail_out = tif->tif_rawdatasize;
- return (deflateReset(&sp->stream) == Z_OK);
-}
-
-static void
-horizontalDifferenceF(float *ip, int n, int stride, uint16 *wp, uint16 *FromLT2)
-{
-
- int32 r1, g1, b1, a1, r2, g2, b2, a2, mask;
- float fltsize = Fltsize;
-
-#define CLAMP(v) ( (v<(float)0.) ? 0 \
- : (v<(float)2.) ? FromLT2[(int)(v*fltsize)] \
- : (v>(float)24.2) ? 2047 \
- : LogK1*log(v*LogK2) + 0.5 )
-
- mask = CODE_MASK;
- if (n >= stride) {
- if (stride == 3) {
- r2 = wp[0] = (uint16) CLAMP(ip[0]);
- g2 = wp[1] = (uint16) CLAMP(ip[1]);
- b2 = wp[2] = (uint16) CLAMP(ip[2]);
- n -= 3;
- while (n > 0) {
- n -= 3;
- wp += 3;
- ip += 3;
- r1 = (int32) CLAMP(ip[0]); wp[0] = (r1-r2) & mask; r2 = r1;
- g1 = (int32) CLAMP(ip[1]); wp[1] = (g1-g2) & mask; g2 = g1;
- b1 = (int32) CLAMP(ip[2]); wp[2] = (b1-b2) & mask; b2 = b1;
- }
- } else if (stride == 4) {
- r2 = wp[0] = (uint16) CLAMP(ip[0]);
- g2 = wp[1] = (uint16) CLAMP(ip[1]);
- b2 = wp[2] = (uint16) CLAMP(ip[2]);
- a2 = wp[3] = (uint16) CLAMP(ip[3]);
- n -= 4;
- while (n > 0) {
- n -= 4;
- wp += 4;
- ip += 4;
- r1 = (int32) CLAMP(ip[0]); wp[0] = (r1-r2) & mask; r2 = r1;
- g1 = (int32) CLAMP(ip[1]); wp[1] = (g1-g2) & mask; g2 = g1;
- b1 = (int32) CLAMP(ip[2]); wp[2] = (b1-b2) & mask; b2 = b1;
- a1 = (int32) CLAMP(ip[3]); wp[3] = (a1-a2) & mask; a2 = a1;
- }
- } else {
- ip += n - 1; /* point to last one */
- wp += n - 1; /* point to last one */
- n -= stride;
- while (n > 0) {
- REPEAT(stride, wp[0] = (uint16) CLAMP(ip[0]);
- wp[stride] -= wp[0];
- wp[stride] &= mask;
- wp--; ip--)
- n -= stride;
- }
- REPEAT(stride, wp[0] = (uint16) CLAMP(ip[0]); wp--; ip--)
- }
- }
-}
-
-static void
-horizontalDifference16(unsigned short *ip, int n, int stride,
- unsigned short *wp, uint16 *From14)
-{
- register int r1, g1, b1, a1, r2, g2, b2, a2, mask;
-
-/* assumption is unsigned pixel values */
-#undef CLAMP
-#define CLAMP(v) From14[(v) >> 2]
-
- mask = CODE_MASK;
- if (n >= stride) {
- if (stride == 3) {
- r2 = wp[0] = CLAMP(ip[0]); g2 = wp[1] = CLAMP(ip[1]);
- b2 = wp[2] = CLAMP(ip[2]);
- n -= 3;
- while (n > 0) {
- n -= 3;
- wp += 3;
- ip += 3;
- r1 = CLAMP(ip[0]); wp[0] = (r1-r2) & mask; r2 = r1;
- g1 = CLAMP(ip[1]); wp[1] = (g1-g2) & mask; g2 = g1;
- b1 = CLAMP(ip[2]); wp[2] = (b1-b2) & mask; b2 = b1;
- }
- } else if (stride == 4) {
- r2 = wp[0] = CLAMP(ip[0]); g2 = wp[1] = CLAMP(ip[1]);
- b2 = wp[2] = CLAMP(ip[2]); a2 = wp[3] = CLAMP(ip[3]);
- n -= 4;
- while (n > 0) {
- n -= 4;
- wp += 4;
- ip += 4;
- r1 = CLAMP(ip[0]); wp[0] = (r1-r2) & mask; r2 = r1;
- g1 = CLAMP(ip[1]); wp[1] = (g1-g2) & mask; g2 = g1;
- b1 = CLAMP(ip[2]); wp[2] = (b1-b2) & mask; b2 = b1;
- a1 = CLAMP(ip[3]); wp[3] = (a1-a2) & mask; a2 = a1;
- }
- } else {
- ip += n - 1; /* point to last one */
- wp += n - 1; /* point to last one */
- n -= stride;
- while (n > 0) {
- REPEAT(stride, wp[0] = CLAMP(ip[0]);
- wp[stride] -= wp[0];
- wp[stride] &= mask;
- wp--; ip--)
- n -= stride;
- }
- REPEAT(stride, wp[0] = CLAMP(ip[0]); wp--; ip--)
- }
- }
-}
-
-
-static void
-horizontalDifference8(unsigned char *ip, int n, int stride,
- unsigned short *wp, uint16 *From8)
-{
- register int r1, g1, b1, a1, r2, g2, b2, a2, mask;
-
-#undef CLAMP
-#define CLAMP(v) (From8[(v)])
-
- mask = CODE_MASK;
- if (n >= stride) {
- if (stride == 3) {
- r2 = wp[0] = CLAMP(ip[0]); g2 = wp[1] = CLAMP(ip[1]);
- b2 = wp[2] = CLAMP(ip[2]);
- n -= 3;
- while (n > 0) {
- n -= 3;
- r1 = CLAMP(ip[3]); wp[3] = (r1-r2) & mask; r2 = r1;
- g1 = CLAMP(ip[4]); wp[4] = (g1-g2) & mask; g2 = g1;
- b1 = CLAMP(ip[5]); wp[5] = (b1-b2) & mask; b2 = b1;
- wp += 3;
- ip += 3;
- }
- } else if (stride == 4) {
- r2 = wp[0] = CLAMP(ip[0]); g2 = wp[1] = CLAMP(ip[1]);
- b2 = wp[2] = CLAMP(ip[2]); a2 = wp[3] = CLAMP(ip[3]);
- n -= 4;
- while (n > 0) {
- n -= 4;
- r1 = CLAMP(ip[4]); wp[4] = (r1-r2) & mask; r2 = r1;
- g1 = CLAMP(ip[5]); wp[5] = (g1-g2) & mask; g2 = g1;
- b1 = CLAMP(ip[6]); wp[6] = (b1-b2) & mask; b2 = b1;
- a1 = CLAMP(ip[7]); wp[7] = (a1-a2) & mask; a2 = a1;
- wp += 4;
- ip += 4;
- }
- } else {
- wp += n + stride - 1; /* point to last one */
- ip += n + stride - 1; /* point to last one */
- n -= stride;
- while (n > 0) {
- REPEAT(stride, wp[0] = CLAMP(ip[0]);
- wp[stride] -= wp[0];
- wp[stride] &= mask;
- wp--; ip--)
- n -= stride;
- }
- REPEAT(stride, wp[0] = CLAMP(ip[0]); wp--; ip--)
- }
- }
-}
-
-/*
- * Encode a chunk of pixels.
- */
-static int
-PixarLogEncode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- TIFFDirectory *td = &tif->tif_dir;
- PixarLogState *sp = EncoderState(tif);
- static const char module[] = "PixarLogEncode";
- int i, n, llen;
- unsigned short * up;
-
- (void) s;
-
- switch (sp->user_datafmt) {
- case PIXARLOGDATAFMT_FLOAT:
- n = cc / sizeof(float); /* XXX float == 32 bits */
- break;
- case PIXARLOGDATAFMT_16BIT:
- case PIXARLOGDATAFMT_12BITPICIO:
- case PIXARLOGDATAFMT_11BITLOG:
- n = cc / sizeof(uint16); /* XXX uint16 == 16 bits */
- break;
- case PIXARLOGDATAFMT_8BIT:
- case PIXARLOGDATAFMT_8BITABGR:
- n = cc;
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%d bit input not supported in PixarLog",
- td->td_bitspersample);
- return 0;
- }
-
- llen = sp->stride * td->td_imagewidth;
-
- for (i = 0, up = sp->tbuf; i < n; i += llen, up += llen) {
- switch (sp->user_datafmt) {
- case PIXARLOGDATAFMT_FLOAT:
- horizontalDifferenceF((float *)bp, llen,
- sp->stride, up, sp->FromLT2);
- bp += llen * sizeof(float);
- break;
- case PIXARLOGDATAFMT_16BIT:
- horizontalDifference16((uint16 *)bp, llen,
- sp->stride, up, sp->From14);
- bp += llen * sizeof(uint16);
- break;
- case PIXARLOGDATAFMT_8BIT:
- horizontalDifference8((unsigned char *)bp, llen,
- sp->stride, up, sp->From8);
- bp += llen * sizeof(unsigned char);
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%d bit input not supported in PixarLog",
- td->td_bitspersample);
- return 0;
- }
- }
-
- sp->stream.next_in = (unsigned char *) sp->tbuf;
- sp->stream.avail_in = n * sizeof(uint16);
-
- do {
- if (deflate(&sp->stream, Z_NO_FLUSH) != Z_OK) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Encoder error: %s",
- tif->tif_name, sp->stream.msg);
- return (0);
- }
- if (sp->stream.avail_out == 0) {
- tif->tif_rawcc = tif->tif_rawdatasize;
- TIFFFlushData1(tif);
- sp->stream.next_out = tif->tif_rawdata;
- sp->stream.avail_out = tif->tif_rawdatasize;
- }
- } while (sp->stream.avail_in > 0);
- return (1);
-}
-
-/*
- * Finish off an encoded strip by flushing the last
- * string and tacking on an End Of Information code.
- */
-
-static int
-PixarLogPostEncode(TIFF* tif)
-{
- PixarLogState *sp = EncoderState(tif);
- static const char module[] = "PixarLogPostEncode";
- int state;
-
- sp->stream.avail_in = 0;
-
- do {
- state = deflate(&sp->stream, Z_FINISH);
- switch (state) {
- case Z_STREAM_END:
- case Z_OK:
- if (sp->stream.avail_out != (uint32)tif->tif_rawdatasize) {
- tif->tif_rawcc =
- tif->tif_rawdatasize - sp->stream.avail_out;
- TIFFFlushData1(tif);
- sp->stream.next_out = tif->tif_rawdata;
- sp->stream.avail_out = tif->tif_rawdatasize;
- }
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
- tif->tif_name, sp->stream.msg);
- return (0);
- }
- } while (state != Z_STREAM_END);
- return (1);
-}
-
-static void
-PixarLogClose(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
-
- /* In a really sneaky maneuver, on close, we covertly modify both
- * bitspersample and sampleformat in the directory to indicate
- * 8-bit linear. This way, the decode "just works" even for
- * readers that don't know about PixarLog, or how to set
- * the PIXARLOGDATFMT pseudo-tag.
- */
- td->td_bitspersample = 8;
- td->td_sampleformat = SAMPLEFORMAT_UINT;
-}
-
-static void
-PixarLogCleanup(TIFF* tif)
-{
- PixarLogState* sp = (PixarLogState*) tif->tif_data;
-
- assert(sp != 0);
-
- (void)TIFFPredictorCleanup(tif);
-
- tif->tif_tagmethods.vgetfield = sp->vgetparent;
- tif->tif_tagmethods.vsetfield = sp->vsetparent;
-
- if (sp->FromLT2) _TIFFfree(sp->FromLT2);
- if (sp->From14) _TIFFfree(sp->From14);
- if (sp->From8) _TIFFfree(sp->From8);
- if (sp->ToLinearF) _TIFFfree(sp->ToLinearF);
- if (sp->ToLinear16) _TIFFfree(sp->ToLinear16);
- if (sp->ToLinear8) _TIFFfree(sp->ToLinear8);
- if (sp->state&PLSTATE_INIT) {
- if (tif->tif_mode == O_RDONLY)
- inflateEnd(&sp->stream);
- else
- deflateEnd(&sp->stream);
- }
- if (sp->tbuf)
- _TIFFfree(sp->tbuf);
- _TIFFfree(sp);
- tif->tif_data = NULL;
-
- _TIFFSetDefaultCompressionState(tif);
-}
-
-static int
-PixarLogVSetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- PixarLogState *sp = (PixarLogState *)tif->tif_data;
- int result;
- static const char module[] = "PixarLogVSetField";
-
- switch (tag) {
- case TIFFTAG_PIXARLOGQUALITY:
- sp->quality = va_arg(ap, int);
- if (tif->tif_mode != O_RDONLY && (sp->state&PLSTATE_INIT)) {
- if (deflateParams(&sp->stream,
- sp->quality, Z_DEFAULT_STRATEGY) != Z_OK) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
- tif->tif_name, sp->stream.msg);
- return (0);
- }
- }
- return (1);
- case TIFFTAG_PIXARLOGDATAFMT:
- sp->user_datafmt = va_arg(ap, int);
- /* Tweak the TIFF header so that the rest of libtiff knows what
- * size of data will be passed between app and library, and
- * assume that the app knows what it is doing and is not
- * confused by these header manipulations...
- */
- switch (sp->user_datafmt) {
- case PIXARLOGDATAFMT_8BIT:
- case PIXARLOGDATAFMT_8BITABGR:
- TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
- TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
- break;
- case PIXARLOGDATAFMT_11BITLOG:
- TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 16);
- TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
- break;
- case PIXARLOGDATAFMT_12BITPICIO:
- TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 16);
- TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_INT);
- break;
- case PIXARLOGDATAFMT_16BIT:
- TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 16);
- TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
- break;
- case PIXARLOGDATAFMT_FLOAT:
- TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 32);
- TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_IEEEFP);
- break;
- }
- /*
- * Must recalculate sizes should bits/sample change.
- */
- tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
- tif->tif_scanlinesize = TIFFScanlineSize(tif);
- result = 1; /* NB: pseudo tag */
- break;
- default:
- result = (*sp->vsetparent)(tif, tag, ap);
- }
- return (result);
-}
-
-static int
-PixarLogVGetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- PixarLogState *sp = (PixarLogState *)tif->tif_data;
-
- switch (tag) {
- case TIFFTAG_PIXARLOGQUALITY:
- *va_arg(ap, int*) = sp->quality;
- break;
- case TIFFTAG_PIXARLOGDATAFMT:
- *va_arg(ap, int*) = sp->user_datafmt;
- break;
- default:
- return (*sp->vgetparent)(tif, tag, ap);
- }
- return (1);
-}
-
-static const TIFFFieldInfo pixarlogFieldInfo[] = {
- {TIFFTAG_PIXARLOGDATAFMT,0,0,TIFF_ANY, FIELD_PSEUDO,FALSE,FALSE,""},
- {TIFFTAG_PIXARLOGQUALITY,0,0,TIFF_ANY, FIELD_PSEUDO,FALSE,FALSE,""}
-};
-
-int
-TIFFInitPixarLog(TIFF* tif, int scheme)
-{
- static const char module[] = "TIFFInitPixarLog";
-
- PixarLogState* sp;
-
- assert(scheme == COMPRESSION_PIXARLOG);
-
- /*
- * Merge codec-specific tag information.
- */
- if (!_TIFFMergeFieldInfo(tif, pixarlogFieldInfo,
- TIFFArrayCount(pixarlogFieldInfo))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Merging PixarLog codec-specific tags failed");
- return 0;
- }
-
- /*
- * Allocate state block so tag methods have storage to record values.
- */
- tif->tif_data = (tidata_t) _TIFFmalloc(sizeof (PixarLogState));
- if (tif->tif_data == NULL)
- goto bad;
- sp = (PixarLogState*) tif->tif_data;
- _TIFFmemset(sp, 0, sizeof (*sp));
- sp->stream.data_type = Z_BINARY;
- sp->user_datafmt = PIXARLOGDATAFMT_UNKNOWN;
-
- /*
- * Install codec methods.
- */
- tif->tif_setupdecode = PixarLogSetupDecode;
- tif->tif_predecode = PixarLogPreDecode;
- tif->tif_decoderow = PixarLogDecode;
- tif->tif_decodestrip = PixarLogDecode;
- tif->tif_decodetile = PixarLogDecode;
- tif->tif_setupencode = PixarLogSetupEncode;
- tif->tif_preencode = PixarLogPreEncode;
- tif->tif_postencode = PixarLogPostEncode;
- tif->tif_encoderow = PixarLogEncode;
- tif->tif_encodestrip = PixarLogEncode;
- tif->tif_encodetile = PixarLogEncode;
- tif->tif_close = PixarLogClose;
- tif->tif_cleanup = PixarLogCleanup;
-
- /* Override SetField so we can handle our private pseudo-tag */
- sp->vgetparent = tif->tif_tagmethods.vgetfield;
- tif->tif_tagmethods.vgetfield = PixarLogVGetField; /* hook for codec tags */
- sp->vsetparent = tif->tif_tagmethods.vsetfield;
- tif->tif_tagmethods.vsetfield = PixarLogVSetField; /* hook for codec tags */
-
- /* Default values for codec-specific fields */
- sp->quality = Z_DEFAULT_COMPRESSION; /* default comp. level */
- sp->state = 0;
-
- /* we don't wish to use the predictor,
- * the default is none, which predictor value 1
- */
- (void) TIFFPredictorInit(tif);
-
- /*
- * build the companding tables
- */
- PixarLogMakeTables(sp);
-
- return (1);
-bad:
- TIFFErrorExt(tif->tif_clientdata, module,
- "No space for PixarLog state block");
- return (0);
-}
-#endif /* PIXARLOG_SUPPORT */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_predict.c b/src/3rdparty/libtiff/libtiff/tif_predict.c
deleted file mode 100644
index 052a8e2f0a..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_predict.c
+++ /dev/null
@@ -1,729 +0,0 @@
-/* $Id: tif_predict.c,v 1.11.2.3 2009-01-23 15:57:18 fwarmerdam Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Predictor Tag Support (used by multiple codecs).
- */
-#include "tiffiop.h"
-#include "tif_predict.h"
-
-#define PredictorState(tif) ((TIFFPredictorState*) (tif)->tif_data)
-
-static void horAcc8(TIFF*, tidata_t, tsize_t);
-static void horAcc16(TIFF*, tidata_t, tsize_t);
-static void horAcc32(TIFF*, tidata_t, tsize_t);
-static void swabHorAcc16(TIFF*, tidata_t, tsize_t);
-static void swabHorAcc32(TIFF*, tidata_t, tsize_t);
-static void horDiff8(TIFF*, tidata_t, tsize_t);
-static void horDiff16(TIFF*, tidata_t, tsize_t);
-static void horDiff32(TIFF*, tidata_t, tsize_t);
-static void fpAcc(TIFF*, tidata_t, tsize_t);
-static void fpDiff(TIFF*, tidata_t, tsize_t);
-static int PredictorDecodeRow(TIFF*, tidata_t, tsize_t, tsample_t);
-static int PredictorDecodeTile(TIFF*, tidata_t, tsize_t, tsample_t);
-static int PredictorEncodeRow(TIFF*, tidata_t, tsize_t, tsample_t);
-static int PredictorEncodeTile(TIFF*, tidata_t, tsize_t, tsample_t);
-
-static int
-PredictorSetup(TIFF* tif)
-{
- static const char module[] = "PredictorSetup";
-
- TIFFPredictorState* sp = PredictorState(tif);
- TIFFDirectory* td = &tif->tif_dir;
-
- switch (sp->predictor) /* no differencing */
- {
- case PREDICTOR_NONE:
- return 1;
- case PREDICTOR_HORIZONTAL:
- if (td->td_bitspersample != 8
- && td->td_bitspersample != 16
- && td->td_bitspersample != 32) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Horizontal differencing \"Predictor\" not supported with %d-bit samples",
- td->td_bitspersample);
- return 0;
- }
- break;
- case PREDICTOR_FLOATINGPOINT:
- if (td->td_sampleformat != SAMPLEFORMAT_IEEEFP) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Floating point \"Predictor\" not supported with %d data format",
- td->td_sampleformat);
- return 0;
- }
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, module,
- "\"Predictor\" value %d not supported",
- sp->predictor);
- return 0;
- }
- sp->stride = (td->td_planarconfig == PLANARCONFIG_CONTIG ?
- td->td_samplesperpixel : 1);
- /*
- * Calculate the scanline/tile-width size in bytes.
- */
- if (isTiled(tif))
- sp->rowsize = TIFFTileRowSize(tif);
- else
- sp->rowsize = TIFFScanlineSize(tif);
-
- return 1;
-}
-
-static int
-PredictorSetupDecode(TIFF* tif)
-{
- TIFFPredictorState* sp = PredictorState(tif);
- TIFFDirectory* td = &tif->tif_dir;
-
- if (!(*sp->setupdecode)(tif) || !PredictorSetup(tif))
- return 0;
-
- if (sp->predictor == 2) {
- switch (td->td_bitspersample) {
- case 8: sp->decodepfunc = horAcc8; break;
- case 16: sp->decodepfunc = horAcc16; break;
- case 32: sp->decodepfunc = horAcc32; break;
- }
- /*
- * Override default decoding method with one that does the
- * predictor stuff.
- */
- if( tif->tif_decoderow != PredictorDecodeRow )
- {
- sp->decoderow = tif->tif_decoderow;
- tif->tif_decoderow = PredictorDecodeRow;
- sp->decodestrip = tif->tif_decodestrip;
- tif->tif_decodestrip = PredictorDecodeTile;
- sp->decodetile = tif->tif_decodetile;
- tif->tif_decodetile = PredictorDecodeTile;
- }
- /*
- * If the data is horizontally differenced 16-bit data that
- * requires byte-swapping, then it must be byte swapped before
- * the accumulation step. We do this with a special-purpose
- * routine and override the normal post decoding logic that
- * the library setup when the directory was read.
- */
- if (tif->tif_flags & TIFF_SWAB) {
- if (sp->decodepfunc == horAcc16) {
- sp->decodepfunc = swabHorAcc16;
- tif->tif_postdecode = _TIFFNoPostDecode;
- } else if (sp->decodepfunc == horAcc32) {
- sp->decodepfunc = swabHorAcc32;
- tif->tif_postdecode = _TIFFNoPostDecode;
- }
- }
- }
-
- else if (sp->predictor == 3) {
- sp->decodepfunc = fpAcc;
- /*
- * Override default decoding method with one that does the
- * predictor stuff.
- */
- if( tif->tif_decoderow != PredictorDecodeRow )
- {
- sp->decoderow = tif->tif_decoderow;
- tif->tif_decoderow = PredictorDecodeRow;
- sp->decodestrip = tif->tif_decodestrip;
- tif->tif_decodestrip = PredictorDecodeTile;
- sp->decodetile = tif->tif_decodetile;
- tif->tif_decodetile = PredictorDecodeTile;
- }
- /*
- * The data should not be swapped outside of the floating
- * point predictor, the accumulation routine should return
- * byres in the native order.
- */
- if (tif->tif_flags & TIFF_SWAB) {
- tif->tif_postdecode = _TIFFNoPostDecode;
- }
- /*
- * Allocate buffer to keep the decoded bytes before
- * rearranging in the ight order
- */
- }
-
- return 1;
-}
-
-static int
-PredictorSetupEncode(TIFF* tif)
-{
- TIFFPredictorState* sp = PredictorState(tif);
- TIFFDirectory* td = &tif->tif_dir;
-
- if (!(*sp->setupencode)(tif) || !PredictorSetup(tif))
- return 0;
-
- if (sp->predictor == 2) {
- switch (td->td_bitspersample) {
- case 8: sp->encodepfunc = horDiff8; break;
- case 16: sp->encodepfunc = horDiff16; break;
- case 32: sp->encodepfunc = horDiff32; break;
- }
- /*
- * Override default encoding method with one that does the
- * predictor stuff.
- */
- if( tif->tif_encoderow != PredictorEncodeRow )
- {
- sp->encoderow = tif->tif_encoderow;
- tif->tif_encoderow = PredictorEncodeRow;
- sp->encodestrip = tif->tif_encodestrip;
- tif->tif_encodestrip = PredictorEncodeTile;
- sp->encodetile = tif->tif_encodetile;
- tif->tif_encodetile = PredictorEncodeTile;
- }
- }
-
- else if (sp->predictor == 3) {
- sp->encodepfunc = fpDiff;
- /*
- * Override default encoding method with one that does the
- * predictor stuff.
- */
- if( tif->tif_encoderow != PredictorEncodeRow )
- {
- sp->encoderow = tif->tif_encoderow;
- tif->tif_encoderow = PredictorEncodeRow;
- sp->encodestrip = tif->tif_encodestrip;
- tif->tif_encodestrip = PredictorEncodeTile;
- sp->encodetile = tif->tif_encodetile;
- tif->tif_encodetile = PredictorEncodeTile;
- }
- }
-
- return 1;
-}
-
-#define REPEAT4(n, op) \
- switch (n) { \
- default: { int i; for (i = n-4; i > 0; i--) { op; } } \
- case 4: op; \
- case 3: op; \
- case 2: op; \
- case 1: op; \
- case 0: ; \
- }
-
-static void
-horAcc8(TIFF* tif, tidata_t cp0, tsize_t cc)
-{
- tsize_t stride = PredictorState(tif)->stride;
-
- char* cp = (char*) cp0;
- if (cc > stride) {
- cc -= stride;
- /*
- * Pipeline the most common cases.
- */
- if (stride == 3) {
- unsigned int cr = cp[0];
- unsigned int cg = cp[1];
- unsigned int cb = cp[2];
- do {
- cc -= 3, cp += 3;
- cp[0] = (char) (cr += cp[0]);
- cp[1] = (char) (cg += cp[1]);
- cp[2] = (char) (cb += cp[2]);
- } while ((int32) cc > 0);
- } else if (stride == 4) {
- unsigned int cr = cp[0];
- unsigned int cg = cp[1];
- unsigned int cb = cp[2];
- unsigned int ca = cp[3];
- do {
- cc -= 4, cp += 4;
- cp[0] = (char) (cr += cp[0]);
- cp[1] = (char) (cg += cp[1]);
- cp[2] = (char) (cb += cp[2]);
- cp[3] = (char) (ca += cp[3]);
- } while ((int32) cc > 0);
- } else {
- do {
- REPEAT4(stride, cp[stride] =
- (char) (cp[stride] + *cp); cp++)
- cc -= stride;
- } while ((int32) cc > 0);
- }
- }
-}
-
-static void
-swabHorAcc16(TIFF* tif, tidata_t cp0, tsize_t cc)
-{
- tsize_t stride = PredictorState(tif)->stride;
- uint16* wp = (uint16*) cp0;
- tsize_t wc = cc / 2;
-
- if (wc > stride) {
- TIFFSwabArrayOfShort(wp, wc);
- wc -= stride;
- do {
- REPEAT4(stride, wp[stride] += wp[0]; wp++)
- wc -= stride;
- } while ((int32) wc > 0);
- }
-}
-
-static void
-horAcc16(TIFF* tif, tidata_t cp0, tsize_t cc)
-{
- tsize_t stride = PredictorState(tif)->stride;
- uint16* wp = (uint16*) cp0;
- tsize_t wc = cc / 2;
-
- if (wc > stride) {
- wc -= stride;
- do {
- REPEAT4(stride, wp[stride] += wp[0]; wp++)
- wc -= stride;
- } while ((int32) wc > 0);
- }
-}
-
-static void
-swabHorAcc32(TIFF* tif, tidata_t cp0, tsize_t cc)
-{
- tsize_t stride = PredictorState(tif)->stride;
- uint32* wp = (uint32*) cp0;
- tsize_t wc = cc / 4;
-
- if (wc > stride) {
- TIFFSwabArrayOfLong(wp, wc);
- wc -= stride;
- do {
- REPEAT4(stride, wp[stride] += wp[0]; wp++)
- wc -= stride;
- } while ((int32) wc > 0);
- }
-}
-
-static void
-horAcc32(TIFF* tif, tidata_t cp0, tsize_t cc)
-{
- tsize_t stride = PredictorState(tif)->stride;
- uint32* wp = (uint32*) cp0;
- tsize_t wc = cc / 4;
-
- if (wc > stride) {
- wc -= stride;
- do {
- REPEAT4(stride, wp[stride] += wp[0]; wp++)
- wc -= stride;
- } while ((int32) wc > 0);
- }
-}
-
-/*
- * Floating point predictor accumulation routine.
- */
-static void
-fpAcc(TIFF* tif, tidata_t cp0, tsize_t cc)
-{
- tsize_t stride = PredictorState(tif)->stride;
- uint32 bps = tif->tif_dir.td_bitspersample / 8;
- tsize_t wc = cc / bps;
- tsize_t count = cc;
- uint8 *cp = (uint8 *) cp0;
- uint8 *tmp = (uint8 *)_TIFFmalloc(cc);
-
- if (!tmp)
- return;
-
- while (count > stride) {
- REPEAT4(stride, cp[stride] += cp[0]; cp++)
- count -= stride;
- }
-
- _TIFFmemcpy(tmp, cp0, cc);
- cp = (uint8 *) cp0;
- for (count = 0; count < wc; count++) {
- uint32 byte;
- for (byte = 0; byte < bps; byte++) {
-#if WORDS_BIGENDIAN
- cp[bps * count + byte] = tmp[byte * wc + count];
-#else
- cp[bps * count + byte] =
- tmp[(bps - byte - 1) * wc + count];
-#endif
- }
- }
- _TIFFfree(tmp);
-}
-
-/*
- * Decode a scanline and apply the predictor routine.
- */
-static int
-PredictorDecodeRow(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
-{
- TIFFPredictorState *sp = PredictorState(tif);
-
- assert(sp != NULL);
- assert(sp->decoderow != NULL);
- assert(sp->decodepfunc != NULL);
-
- if ((*sp->decoderow)(tif, op0, occ0, s)) {
- (*sp->decodepfunc)(tif, op0, occ0);
- return 1;
- } else
- return 0;
-}
-
-/*
- * Decode a tile/strip and apply the predictor routine.
- * Note that horizontal differencing must be done on a
- * row-by-row basis. The width of a "row" has already
- * been calculated at pre-decode time according to the
- * strip/tile dimensions.
- */
-static int
-PredictorDecodeTile(TIFF* tif, tidata_t op0, tsize_t occ0, tsample_t s)
-{
- TIFFPredictorState *sp = PredictorState(tif);
-
- assert(sp != NULL);
- assert(sp->decodetile != NULL);
-
- if ((*sp->decodetile)(tif, op0, occ0, s)) {
- tsize_t rowsize = sp->rowsize;
- assert(rowsize > 0);
- assert(sp->decodepfunc != NULL);
- while ((long)occ0 > 0) {
- (*sp->decodepfunc)(tif, op0, (tsize_t) rowsize);
- occ0 -= rowsize;
- op0 += rowsize;
- }
- return 1;
- } else
- return 0;
-}
-
-static void
-horDiff8(TIFF* tif, tidata_t cp0, tsize_t cc)
-{
- TIFFPredictorState* sp = PredictorState(tif);
- tsize_t stride = sp->stride;
- char* cp = (char*) cp0;
-
- if (cc > stride) {
- cc -= stride;
- /*
- * Pipeline the most common cases.
- */
- if (stride == 3) {
- int r1, g1, b1;
- int r2 = cp[0];
- int g2 = cp[1];
- int b2 = cp[2];
- do {
- r1 = cp[3]; cp[3] = r1-r2; r2 = r1;
- g1 = cp[4]; cp[4] = g1-g2; g2 = g1;
- b1 = cp[5]; cp[5] = b1-b2; b2 = b1;
- cp += 3;
- } while ((int32)(cc -= 3) > 0);
- } else if (stride == 4) {
- int r1, g1, b1, a1;
- int r2 = cp[0];
- int g2 = cp[1];
- int b2 = cp[2];
- int a2 = cp[3];
- do {
- r1 = cp[4]; cp[4] = r1-r2; r2 = r1;
- g1 = cp[5]; cp[5] = g1-g2; g2 = g1;
- b1 = cp[6]; cp[6] = b1-b2; b2 = b1;
- a1 = cp[7]; cp[7] = a1-a2; a2 = a1;
- cp += 4;
- } while ((int32)(cc -= 4) > 0);
- } else {
- cp += cc - 1;
- do {
- REPEAT4(stride, cp[stride] -= cp[0]; cp--)
- } while ((int32)(cc -= stride) > 0);
- }
- }
-}
-
-static void
-horDiff16(TIFF* tif, tidata_t cp0, tsize_t cc)
-{
- TIFFPredictorState* sp = PredictorState(tif);
- tsize_t stride = sp->stride;
- int16 *wp = (int16*) cp0;
- tsize_t wc = cc/2;
-
- if (wc > stride) {
- wc -= stride;
- wp += wc - 1;
- do {
- REPEAT4(stride, wp[stride] -= wp[0]; wp--)
- wc -= stride;
- } while ((int32) wc > 0);
- }
-}
-
-static void
-horDiff32(TIFF* tif, tidata_t cp0, tsize_t cc)
-{
- TIFFPredictorState* sp = PredictorState(tif);
- tsize_t stride = sp->stride;
- int32 *wp = (int32*) cp0;
- tsize_t wc = cc/4;
-
- if (wc > stride) {
- wc -= stride;
- wp += wc - 1;
- do {
- REPEAT4(stride, wp[stride] -= wp[0]; wp--)
- wc -= stride;
- } while ((int32) wc > 0);
- }
-}
-
-/*
- * Floating point predictor differencing routine.
- */
-static void
-fpDiff(TIFF* tif, tidata_t cp0, tsize_t cc)
-{
- tsize_t stride = PredictorState(tif)->stride;
- uint32 bps = tif->tif_dir.td_bitspersample / 8;
- tsize_t wc = cc / bps;
- tsize_t count;
- uint8 *cp = (uint8 *) cp0;
- uint8 *tmp = (uint8 *)_TIFFmalloc(cc);
-
- if (!tmp)
- return;
-
- _TIFFmemcpy(tmp, cp0, cc);
- for (count = 0; count < wc; count++) {
- uint32 byte;
- for (byte = 0; byte < bps; byte++) {
-#if WORDS_BIGENDIAN
- cp[byte * wc + count] = tmp[bps * count + byte];
-#else
- cp[(bps - byte - 1) * wc + count] =
- tmp[bps * count + byte];
-#endif
- }
- }
- _TIFFfree(tmp);
-
- cp = (uint8 *) cp0;
- cp += cc - stride - 1;
- for (count = cc; count > stride; count -= stride)
- REPEAT4(stride, cp[stride] -= cp[0]; cp--)
-}
-
-static int
-PredictorEncodeRow(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- TIFFPredictorState *sp = PredictorState(tif);
-
- assert(sp != NULL);
- assert(sp->encodepfunc != NULL);
- assert(sp->encoderow != NULL);
-
- /* XXX horizontal differencing alters user's data XXX */
- (*sp->encodepfunc)(tif, bp, cc);
- return (*sp->encoderow)(tif, bp, cc, s);
-}
-
-static int
-PredictorEncodeTile(TIFF* tif, tidata_t bp0, tsize_t cc0, tsample_t s)
-{
- static const char module[] = "PredictorEncodeTile";
- TIFFPredictorState *sp = PredictorState(tif);
- uint8 *working_copy;
- tsize_t cc = cc0, rowsize;
- unsigned char* bp;
- int result_code;
-
- assert(sp != NULL);
- assert(sp->encodepfunc != NULL);
- assert(sp->encodetile != NULL);
-
- /*
- * Do predictor manipulation in a working buffer to avoid altering
- * the callers buffer. http://trac.osgeo.org/gdal/ticket/1965
- */
- working_copy = (uint8*) _TIFFmalloc(cc0);
- if( working_copy == NULL )
- {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Out of memory allocating %d byte temp buffer.",
- cc0 );
- return 0;
- }
- memcpy( working_copy, bp0, cc0 );
- bp = working_copy;
-
- rowsize = sp->rowsize;
- assert(rowsize > 0);
- assert((cc0%rowsize)==0);
- while (cc > 0) {
- (*sp->encodepfunc)(tif, bp, rowsize);
- cc -= rowsize;
- bp += rowsize;
- }
- result_code = (*sp->encodetile)(tif, working_copy, cc0, s);
-
- _TIFFfree( working_copy );
-
- return result_code;
-}
-
-#define FIELD_PREDICTOR (FIELD_CODEC+0) /* XXX */
-
-static const TIFFFieldInfo predictFieldInfo[] = {
- { TIFFTAG_PREDICTOR, 1, 1, TIFF_SHORT, FIELD_PREDICTOR,
- FALSE, FALSE, "Predictor" },
-};
-
-static int
-PredictorVSetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- TIFFPredictorState *sp = PredictorState(tif);
-
- assert(sp != NULL);
- assert(sp->vsetparent != NULL);
-
- switch (tag) {
- case TIFFTAG_PREDICTOR:
- sp->predictor = (uint16) va_arg(ap, int);
- TIFFSetFieldBit(tif, FIELD_PREDICTOR);
- break;
- default:
- return (*sp->vsetparent)(tif, tag, ap);
- }
- tif->tif_flags |= TIFF_DIRTYDIRECT;
- return 1;
-}
-
-static int
-PredictorVGetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- TIFFPredictorState *sp = PredictorState(tif);
-
- assert(sp != NULL);
- assert(sp->vgetparent != NULL);
-
- switch (tag) {
- case TIFFTAG_PREDICTOR:
- *va_arg(ap, uint16*) = sp->predictor;
- break;
- default:
- return (*sp->vgetparent)(tif, tag, ap);
- }
- return 1;
-}
-
-static void
-PredictorPrintDir(TIFF* tif, FILE* fd, long flags)
-{
- TIFFPredictorState* sp = PredictorState(tif);
-
- (void) flags;
- if (TIFFFieldSet(tif,FIELD_PREDICTOR)) {
- fprintf(fd, " Predictor: ");
- switch (sp->predictor) {
- case 1: fprintf(fd, "none "); break;
- case 2: fprintf(fd, "horizontal differencing "); break;
- case 3: fprintf(fd, "floating point predictor "); break;
- }
- fprintf(fd, "%u (0x%x)\n", sp->predictor, sp->predictor);
- }
- if (sp->printdir)
- (*sp->printdir)(tif, fd, flags);
-}
-
-int
-TIFFPredictorInit(TIFF* tif)
-{
- TIFFPredictorState* sp = PredictorState(tif);
-
- assert(sp != 0);
-
- /*
- * Merge codec-specific tag information.
- */
- if (!_TIFFMergeFieldInfo(tif, predictFieldInfo,
- TIFFArrayCount(predictFieldInfo))) {
- TIFFErrorExt(tif->tif_clientdata, "TIFFPredictorInit",
- "Merging Predictor codec-specific tags failed");
- return 0;
- }
-
- /*
- * Override parent get/set field methods.
- */
- sp->vgetparent = tif->tif_tagmethods.vgetfield;
- tif->tif_tagmethods.vgetfield =
- PredictorVGetField;/* hook for predictor tag */
- sp->vsetparent = tif->tif_tagmethods.vsetfield;
- tif->tif_tagmethods.vsetfield =
- PredictorVSetField;/* hook for predictor tag */
- sp->printdir = tif->tif_tagmethods.printdir;
- tif->tif_tagmethods.printdir =
- PredictorPrintDir; /* hook for predictor tag */
-
- sp->setupdecode = tif->tif_setupdecode;
- tif->tif_setupdecode = PredictorSetupDecode;
- sp->setupencode = tif->tif_setupencode;
- tif->tif_setupencode = PredictorSetupEncode;
-
- sp->predictor = 1; /* default value */
- sp->encodepfunc = NULL; /* no predictor routine */
- sp->decodepfunc = NULL; /* no predictor routine */
- return 1;
-}
-
-int
-TIFFPredictorCleanup(TIFF* tif)
-{
- TIFFPredictorState* sp = PredictorState(tif);
-
- assert(sp != 0);
-
- tif->tif_tagmethods.vgetfield = sp->vgetparent;
- tif->tif_tagmethods.vsetfield = sp->vsetparent;
- tif->tif_tagmethods.printdir = sp->printdir;
- tif->tif_setupdecode = sp->setupdecode;
- tif->tif_setupencode = sp->setupencode;
-
- return 1;
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_predict.h b/src/3rdparty/libtiff/libtiff/tif_predict.h
deleted file mode 100644
index 0c1aefccdc..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_predict.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $Id: tif_predict.h,v 1.3.2.1 2007/11/22 21:24:51 fwarmerdam Exp $ */
-
-/*
- * Copyright (c) 1995-1997 Sam Leffler
- * Copyright (c) 1995-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _TIFFPREDICT_
-#define _TIFFPREDICT_
-/*
- * ``Library-private'' Support for the Predictor Tag
- */
-
-/*
- * Codecs that want to support the Predictor tag must place
- * this structure first in their private state block so that
- * the predictor code can cast tif_data to find its state.
- */
-typedef struct {
- int predictor; /* predictor tag value */
- int stride; /* sample stride over data */
- tsize_t rowsize; /* tile/strip row size */
-
- TIFFCodeMethod encoderow; /* parent codec encode/decode row */
- TIFFCodeMethod encodestrip; /* parent codec encode/decode strip */
- TIFFCodeMethod encodetile; /* parent codec encode/decode tile */
- TIFFPostMethod encodepfunc; /* horizontal differencer */
-
- TIFFCodeMethod decoderow; /* parent codec encode/decode row */
- TIFFCodeMethod decodestrip; /* parent codec encode/decode strip */
- TIFFCodeMethod decodetile; /* parent codec encode/decode tile */
- TIFFPostMethod decodepfunc; /* horizontal accumulator */
-
- TIFFVGetMethod vgetparent; /* super-class method */
- TIFFVSetMethod vsetparent; /* super-class method */
- TIFFPrintMethod printdir; /* super-class method */
- TIFFBoolMethod setupdecode; /* super-class method */
- TIFFBoolMethod setupencode; /* super-class method */
-} TIFFPredictorState;
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-extern int TIFFPredictorInit(TIFF*);
-extern int TIFFPredictorCleanup(TIFF*);
-#if defined(__cplusplus)
-}
-#endif
-#endif /* _TIFFPREDICT_ */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_print.c b/src/3rdparty/libtiff/libtiff/tif_print.c
deleted file mode 100644
index 871fffd614..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_print.c
+++ /dev/null
@@ -1,639 +0,0 @@
-/* $Id: tif_print.c,v 1.36.2.2 2009-09-17 18:00:28 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Directory Printing Support
- */
-#include "tiffiop.h"
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-static const char *photoNames[] = {
- "min-is-white", /* PHOTOMETRIC_MINISWHITE */
- "min-is-black", /* PHOTOMETRIC_MINISBLACK */
- "RGB color", /* PHOTOMETRIC_RGB */
- "palette color (RGB from colormap)", /* PHOTOMETRIC_PALETTE */
- "transparency mask", /* PHOTOMETRIC_MASK */
- "separated", /* PHOTOMETRIC_SEPARATED */
- "YCbCr", /* PHOTOMETRIC_YCBCR */
- "7 (0x7)",
- "CIE L*a*b*", /* PHOTOMETRIC_CIELAB */
-};
-#define NPHOTONAMES (sizeof (photoNames) / sizeof (photoNames[0]))
-
-static const char *orientNames[] = {
- "0 (0x0)",
- "row 0 top, col 0 lhs", /* ORIENTATION_TOPLEFT */
- "row 0 top, col 0 rhs", /* ORIENTATION_TOPRIGHT */
- "row 0 bottom, col 0 rhs", /* ORIENTATION_BOTRIGHT */
- "row 0 bottom, col 0 lhs", /* ORIENTATION_BOTLEFT */
- "row 0 lhs, col 0 top", /* ORIENTATION_LEFTTOP */
- "row 0 rhs, col 0 top", /* ORIENTATION_RIGHTTOP */
- "row 0 rhs, col 0 bottom", /* ORIENTATION_RIGHTBOT */
- "row 0 lhs, col 0 bottom", /* ORIENTATION_LEFTBOT */
-};
-#define NORIENTNAMES (sizeof (orientNames) / sizeof (orientNames[0]))
-
-static void
-_TIFFPrintField(FILE* fd, const TIFFFieldInfo *fip,
- uint32 value_count, void *raw_data)
-{
- uint32 j;
-
- fprintf(fd, " %s: ", fip->field_name);
-
- for(j = 0; j < value_count; j++) {
- if(fip->field_type == TIFF_BYTE)
- fprintf(fd, "%u", ((uint8 *) raw_data)[j]);
- else if(fip->field_type == TIFF_UNDEFINED)
- fprintf(fd, "0x%x",
- (unsigned int) ((unsigned char *) raw_data)[j]);
- else if(fip->field_type == TIFF_SBYTE)
- fprintf(fd, "%d", ((int8 *) raw_data)[j]);
- else if(fip->field_type == TIFF_SHORT)
- fprintf(fd, "%u", ((uint16 *) raw_data)[j]);
- else if(fip->field_type == TIFF_SSHORT)
- fprintf(fd, "%d", ((int16 *) raw_data)[j]);
- else if(fip->field_type == TIFF_LONG)
- fprintf(fd, "%lu",
- (unsigned long)((uint32 *) raw_data)[j]);
- else if(fip->field_type == TIFF_SLONG)
- fprintf(fd, "%ld", (long)((int32 *) raw_data)[j]);
- else if(fip->field_type == TIFF_RATIONAL
- || fip->field_type == TIFF_SRATIONAL
- || fip->field_type == TIFF_FLOAT)
- fprintf(fd, "%f", ((float *) raw_data)[j]);
- else if(fip->field_type == TIFF_IFD)
- fprintf(fd, "0x%ulx", ((uint32 *) raw_data)[j]);
- else if(fip->field_type == TIFF_ASCII) {
- fprintf(fd, "%s", (char *) raw_data);
- break;
- }
- else if(fip->field_type == TIFF_DOUBLE)
- fprintf(fd, "%f", ((double *) raw_data)[j]);
- else if(fip->field_type == TIFF_FLOAT)
- fprintf(fd, "%f", ((float *)raw_data)[j]);
- else {
- fprintf(fd, "<unsupported data type in TIFFPrint>");
- break;
- }
-
- if(j < value_count - 1)
- fprintf(fd, ",");
- }
-
- fprintf(fd, "\n");
-}
-
-static int
-_TIFFPrettyPrintField(TIFF* tif, FILE* fd, ttag_t tag,
- uint32 value_count, void *raw_data)
-{
- TIFFDirectory *td = &tif->tif_dir;
-
- switch (tag)
- {
- case TIFFTAG_INKSET:
- fprintf(fd, " Ink Set: ");
- switch (*((uint16*)raw_data)) {
- case INKSET_CMYK:
- fprintf(fd, "CMYK\n");
- break;
- default:
- fprintf(fd, "%u (0x%x)\n",
- *((uint16*)raw_data),
- *((uint16*)raw_data));
- break;
- }
- return 1;
- case TIFFTAG_DOTRANGE:
- fprintf(fd, " Dot Range: %u-%u\n",
- ((uint16*)raw_data)[0], ((uint16*)raw_data)[1]);
- return 1;
- case TIFFTAG_WHITEPOINT:
- fprintf(fd, " White Point: %g-%g\n",
- ((float *)raw_data)[0], ((float *)raw_data)[1]); return 1;
- case TIFFTAG_REFERENCEBLACKWHITE:
- {
- uint16 i;
-
- fprintf(fd, " Reference Black/White:\n");
- for (i = 0; i < td->td_samplesperpixel; i++)
- fprintf(fd, " %2d: %5g %5g\n", i,
- ((float *)raw_data)[2*i+0],
- ((float *)raw_data)[2*i+1]);
- return 1;
- }
- case TIFFTAG_XMLPACKET:
- {
- uint32 i;
-
- fprintf(fd, " XMLPacket (XMP Metadata):\n" );
- for(i = 0; i < value_count; i++)
- fputc(((char *)raw_data)[i], fd);
- fprintf( fd, "\n" );
- return 1;
- }
- case TIFFTAG_RICHTIFFIPTC:
- /*
- * XXX: for some weird reason RichTIFFIPTC tag
- * defined as array of LONG values.
- */
- fprintf(fd,
- " RichTIFFIPTC Data: <present>, %lu bytes\n",
- (unsigned long) value_count * 4);
- return 1;
- case TIFFTAG_PHOTOSHOP:
- fprintf(fd, " Photoshop Data: <present>, %lu bytes\n",
- (unsigned long) value_count);
- return 1;
- case TIFFTAG_ICCPROFILE:
- fprintf(fd, " ICC Profile: <present>, %lu bytes\n",
- (unsigned long) value_count);
- return 1;
- case TIFFTAG_STONITS:
- fprintf(fd,
- " Sample to Nits conversion factor: %.4e\n",
- *((double*)raw_data));
- return 1;
- }
-
- return 0;
-}
-
-/*
- * Print the contents of the current directory
- * to the specified stdio file stream.
- */
-void
-TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
-{
- TIFFDirectory *td = &tif->tif_dir;
- char *sep;
- uint16 i;
- long l, n;
-
- fprintf(fd, "TIFF Directory at offset 0x%lx (%lu)\n",
- (unsigned long)tif->tif_diroff, (unsigned long)tif->tif_diroff);
- if (TIFFFieldSet(tif,FIELD_SUBFILETYPE)) {
- fprintf(fd, " Subfile Type:");
- sep = " ";
- if (td->td_subfiletype & FILETYPE_REDUCEDIMAGE) {
- fprintf(fd, "%sreduced-resolution image", sep);
- sep = "/";
- }
- if (td->td_subfiletype & FILETYPE_PAGE) {
- fprintf(fd, "%smulti-page document", sep);
- sep = "/";
- }
- if (td->td_subfiletype & FILETYPE_MASK)
- fprintf(fd, "%stransparency mask", sep);
- fprintf(fd, " (%lu = 0x%lx)\n",
- (long) td->td_subfiletype, (long) td->td_subfiletype);
- }
- if (TIFFFieldSet(tif,FIELD_IMAGEDIMENSIONS)) {
- fprintf(fd, " Image Width: %lu Image Length: %lu",
- (unsigned long) td->td_imagewidth, (unsigned long) td->td_imagelength);
- if (TIFFFieldSet(tif,FIELD_IMAGEDEPTH))
- fprintf(fd, " Image Depth: %lu",
- (unsigned long) td->td_imagedepth);
- fprintf(fd, "\n");
- }
- if (TIFFFieldSet(tif,FIELD_TILEDIMENSIONS)) {
- fprintf(fd, " Tile Width: %lu Tile Length: %lu",
- (unsigned long) td->td_tilewidth, (unsigned long) td->td_tilelength);
- if (TIFFFieldSet(tif,FIELD_TILEDEPTH))
- fprintf(fd, " Tile Depth: %lu",
- (unsigned long) td->td_tiledepth);
- fprintf(fd, "\n");
- }
- if (TIFFFieldSet(tif,FIELD_RESOLUTION)) {
- fprintf(fd, " Resolution: %g, %g",
- td->td_xresolution, td->td_yresolution);
- if (TIFFFieldSet(tif,FIELD_RESOLUTIONUNIT)) {
- switch (td->td_resolutionunit) {
- case RESUNIT_NONE:
- fprintf(fd, " (unitless)");
- break;
- case RESUNIT_INCH:
- fprintf(fd, " pixels/inch");
- break;
- case RESUNIT_CENTIMETER:
- fprintf(fd, " pixels/cm");
- break;
- default:
- fprintf(fd, " (unit %u = 0x%x)",
- td->td_resolutionunit,
- td->td_resolutionunit);
- break;
- }
- }
- fprintf(fd, "\n");
- }
- if (TIFFFieldSet(tif,FIELD_POSITION))
- fprintf(fd, " Position: %g, %g\n",
- td->td_xposition, td->td_yposition);
- if (TIFFFieldSet(tif,FIELD_BITSPERSAMPLE))
- fprintf(fd, " Bits/Sample: %u\n", td->td_bitspersample);
- if (TIFFFieldSet(tif,FIELD_SAMPLEFORMAT)) {
- fprintf(fd, " Sample Format: ");
- switch (td->td_sampleformat) {
- case SAMPLEFORMAT_VOID:
- fprintf(fd, "void\n");
- break;
- case SAMPLEFORMAT_INT:
- fprintf(fd, "signed integer\n");
- break;
- case SAMPLEFORMAT_UINT:
- fprintf(fd, "unsigned integer\n");
- break;
- case SAMPLEFORMAT_IEEEFP:
- fprintf(fd, "IEEE floating point\n");
- break;
- case SAMPLEFORMAT_COMPLEXINT:
- fprintf(fd, "complex signed integer\n");
- break;
- case SAMPLEFORMAT_COMPLEXIEEEFP:
- fprintf(fd, "complex IEEE floating point\n");
- break;
- default:
- fprintf(fd, "%u (0x%x)\n",
- td->td_sampleformat, td->td_sampleformat);
- break;
- }
- }
- if (TIFFFieldSet(tif,FIELD_COMPRESSION)) {
- const TIFFCodec* c = TIFFFindCODEC(td->td_compression);
- fprintf(fd, " Compression Scheme: ");
- if (c)
- fprintf(fd, "%s\n", c->name);
- else
- fprintf(fd, "%u (0x%x)\n",
- td->td_compression, td->td_compression);
- }
- if (TIFFFieldSet(tif,FIELD_PHOTOMETRIC)) {
- fprintf(fd, " Photometric Interpretation: ");
- if (td->td_photometric < NPHOTONAMES)
- fprintf(fd, "%s\n", photoNames[td->td_photometric]);
- else {
- switch (td->td_photometric) {
- case PHOTOMETRIC_LOGL:
- fprintf(fd, "CIE Log2(L)\n");
- break;
- case PHOTOMETRIC_LOGLUV:
- fprintf(fd, "CIE Log2(L) (u',v')\n");
- break;
- default:
- fprintf(fd, "%u (0x%x)\n",
- td->td_photometric, td->td_photometric);
- break;
- }
- }
- }
- if (TIFFFieldSet(tif,FIELD_EXTRASAMPLES) && td->td_extrasamples) {
- fprintf(fd, " Extra Samples: %u<", td->td_extrasamples);
- sep = "";
- for (i = 0; i < td->td_extrasamples; i++) {
- switch (td->td_sampleinfo[i]) {
- case EXTRASAMPLE_UNSPECIFIED:
- fprintf(fd, "%sunspecified", sep);
- break;
- case EXTRASAMPLE_ASSOCALPHA:
- fprintf(fd, "%sassoc-alpha", sep);
- break;
- case EXTRASAMPLE_UNASSALPHA:
- fprintf(fd, "%sunassoc-alpha", sep);
- break;
- default:
- fprintf(fd, "%s%u (0x%x)", sep,
- td->td_sampleinfo[i], td->td_sampleinfo[i]);
- break;
- }
- sep = ", ";
- }
- fprintf(fd, ">\n");
- }
- if (TIFFFieldSet(tif,FIELD_INKNAMES)) {
- char* cp;
- fprintf(fd, " Ink Names: ");
- i = td->td_samplesperpixel;
- sep = "";
- for (cp = td->td_inknames; i > 0; cp = strchr(cp,'\0')+1, i--) {
- fputs(sep, fd);
- _TIFFprintAscii(fd, cp);
- sep = ", ";
- }
- fputs("\n", fd);
- }
- if (TIFFFieldSet(tif,FIELD_THRESHHOLDING)) {
- fprintf(fd, " Thresholding: ");
- switch (td->td_threshholding) {
- case THRESHHOLD_BILEVEL:
- fprintf(fd, "bilevel art scan\n");
- break;
- case THRESHHOLD_HALFTONE:
- fprintf(fd, "halftone or dithered scan\n");
- break;
- case THRESHHOLD_ERRORDIFFUSE:
- fprintf(fd, "error diffused\n");
- break;
- default:
- fprintf(fd, "%u (0x%x)\n",
- td->td_threshholding, td->td_threshholding);
- break;
- }
- }
- if (TIFFFieldSet(tif,FIELD_FILLORDER)) {
- fprintf(fd, " FillOrder: ");
- switch (td->td_fillorder) {
- case FILLORDER_MSB2LSB:
- fprintf(fd, "msb-to-lsb\n");
- break;
- case FILLORDER_LSB2MSB:
- fprintf(fd, "lsb-to-msb\n");
- break;
- default:
- fprintf(fd, "%u (0x%x)\n",
- td->td_fillorder, td->td_fillorder);
- break;
- }
- }
- if (TIFFFieldSet(tif,FIELD_YCBCRSUBSAMPLING))
- {
- /*
- * For hacky reasons (see tif_jpeg.c - JPEGFixupTestSubsampling),
- * we need to fetch this rather than trust what is in our
- * structures.
- */
- uint16 subsampling[2];
-
- TIFFGetField( tif, TIFFTAG_YCBCRSUBSAMPLING,
- subsampling + 0, subsampling + 1 );
- fprintf(fd, " YCbCr Subsampling: %u, %u\n",
- subsampling[0], subsampling[1] );
- }
- if (TIFFFieldSet(tif,FIELD_YCBCRPOSITIONING)) {
- fprintf(fd, " YCbCr Positioning: ");
- switch (td->td_ycbcrpositioning) {
- case YCBCRPOSITION_CENTERED:
- fprintf(fd, "centered\n");
- break;
- case YCBCRPOSITION_COSITED:
- fprintf(fd, "cosited\n");
- break;
- default:
- fprintf(fd, "%u (0x%x)\n",
- td->td_ycbcrpositioning, td->td_ycbcrpositioning);
- break;
- }
- }
- if (TIFFFieldSet(tif,FIELD_HALFTONEHINTS))
- fprintf(fd, " Halftone Hints: light %u dark %u\n",
- td->td_halftonehints[0], td->td_halftonehints[1]);
- if (TIFFFieldSet(tif,FIELD_ORIENTATION)) {
- fprintf(fd, " Orientation: ");
- if (td->td_orientation < NORIENTNAMES)
- fprintf(fd, "%s\n", orientNames[td->td_orientation]);
- else
- fprintf(fd, "%u (0x%x)\n",
- td->td_orientation, td->td_orientation);
- }
- if (TIFFFieldSet(tif,FIELD_SAMPLESPERPIXEL))
- fprintf(fd, " Samples/Pixel: %u\n", td->td_samplesperpixel);
- if (TIFFFieldSet(tif,FIELD_ROWSPERSTRIP)) {
- fprintf(fd, " Rows/Strip: ");
- if (td->td_rowsperstrip == (uint32) -1)
- fprintf(fd, "(infinite)\n");
- else
- fprintf(fd, "%lu\n", (unsigned long) td->td_rowsperstrip);
- }
- if (TIFFFieldSet(tif,FIELD_MINSAMPLEVALUE))
- fprintf(fd, " Min Sample Value: %u\n", td->td_minsamplevalue);
- if (TIFFFieldSet(tif,FIELD_MAXSAMPLEVALUE))
- fprintf(fd, " Max Sample Value: %u\n", td->td_maxsamplevalue);
- if (TIFFFieldSet(tif,FIELD_SMINSAMPLEVALUE))
- fprintf(fd, " SMin Sample Value: %g\n",
- td->td_sminsamplevalue);
- if (TIFFFieldSet(tif,FIELD_SMAXSAMPLEVALUE))
- fprintf(fd, " SMax Sample Value: %g\n",
- td->td_smaxsamplevalue);
- if (TIFFFieldSet(tif,FIELD_PLANARCONFIG)) {
- fprintf(fd, " Planar Configuration: ");
- switch (td->td_planarconfig) {
- case PLANARCONFIG_CONTIG:
- fprintf(fd, "single image plane\n");
- break;
- case PLANARCONFIG_SEPARATE:
- fprintf(fd, "separate image planes\n");
- break;
- default:
- fprintf(fd, "%u (0x%x)\n",
- td->td_planarconfig, td->td_planarconfig);
- break;
- }
- }
- if (TIFFFieldSet(tif,FIELD_PAGENUMBER))
- fprintf(fd, " Page Number: %u-%u\n",
- td->td_pagenumber[0], td->td_pagenumber[1]);
- if (TIFFFieldSet(tif,FIELD_COLORMAP)) {
- fprintf(fd, " Color Map: ");
- if (flags & TIFFPRINT_COLORMAP) {
- fprintf(fd, "\n");
- n = 1L<<td->td_bitspersample;
- for (l = 0; l < n; l++)
- fprintf(fd, " %5lu: %5u %5u %5u\n",
- l,
- td->td_colormap[0][l],
- td->td_colormap[1][l],
- td->td_colormap[2][l]);
- } else
- fprintf(fd, "(present)\n");
- }
- if (TIFFFieldSet(tif,FIELD_TRANSFERFUNCTION)) {
- fprintf(fd, " Transfer Function: ");
- if (flags & TIFFPRINT_CURVES) {
- fprintf(fd, "\n");
- n = 1L<<td->td_bitspersample;
- for (l = 0; l < n; l++) {
- fprintf(fd, " %2lu: %5u",
- l, td->td_transferfunction[0][l]);
- for (i = 1; i < td->td_samplesperpixel; i++)
- fprintf(fd, " %5u",
- td->td_transferfunction[i][l]);
- fputc('\n', fd);
- }
- } else
- fprintf(fd, "(present)\n");
- }
- if (TIFFFieldSet(tif, FIELD_SUBIFD) && (td->td_subifd)) {
- fprintf(fd, " SubIFD Offsets:");
- for (i = 0; i < td->td_nsubifd; i++)
- fprintf(fd, " %5lu", (long) td->td_subifd[i]);
- fputc('\n', fd);
- }
-
- /*
- ** Custom tag support.
- */
- {
- int i;
- short count;
-
- count = (short) TIFFGetTagListCount(tif);
- for(i = 0; i < count; i++) {
- ttag_t tag = TIFFGetTagListEntry(tif, i);
- const TIFFFieldInfo *fip;
- uint32 value_count;
- int mem_alloc = 0;
- void *raw_data;
-
- fip = TIFFFieldWithTag(tif, tag);
- if(fip == NULL)
- continue;
-
- if(fip->field_passcount) {
- if(TIFFGetField(tif, tag, &value_count, &raw_data) != 1)
- continue;
- } else {
- if (fip->field_readcount == TIFF_VARIABLE
- || fip->field_readcount == TIFF_VARIABLE2)
- value_count = 1;
- else if (fip->field_readcount == TIFF_SPP)
- value_count = td->td_samplesperpixel;
- else
- value_count = fip->field_readcount;
- if ((fip->field_type == TIFF_ASCII
- || fip->field_readcount == TIFF_VARIABLE
- || fip->field_readcount == TIFF_VARIABLE2
- || fip->field_readcount == TIFF_SPP
- || value_count > 1)
- && fip->field_tag != TIFFTAG_PAGENUMBER
- && fip->field_tag != TIFFTAG_HALFTONEHINTS
- && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
- && fip->field_tag != TIFFTAG_DOTRANGE) {
- if(TIFFGetField(tif, tag, &raw_data) != 1)
- continue;
- } else if (fip->field_tag != TIFFTAG_PAGENUMBER
- && fip->field_tag != TIFFTAG_HALFTONEHINTS
- && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
- && fip->field_tag != TIFFTAG_DOTRANGE) {
- raw_data = _TIFFmalloc(
- _TIFFDataSize(fip->field_type)
- * value_count);
- mem_alloc = 1;
- if(TIFFGetField(tif, tag, raw_data) != 1) {
- _TIFFfree(raw_data);
- continue;
- }
- } else {
- /*
- * XXX: Should be fixed and removed, see the
- * notes related to TIFFTAG_PAGENUMBER,
- * TIFFTAG_HALFTONEHINTS,
- * TIFFTAG_YCBCRSUBSAMPLING and
- * TIFFTAG_DOTRANGE tags in tif_dir.c. */
- char *tmp;
- raw_data = _TIFFmalloc(
- _TIFFDataSize(fip->field_type)
- * value_count);
- tmp = raw_data;
- mem_alloc = 1;
- if(TIFFGetField(tif, tag, tmp,
- tmp + _TIFFDataSize(fip->field_type)) != 1) {
- _TIFFfree(raw_data);
- continue;
- }
- }
- }
-
- /*
- * Catch the tags which needs to be specially handled and
- * pretty print them. If tag not handled in
- * _TIFFPrettyPrintField() fall down and print it as any other
- * tag.
- */
- if (_TIFFPrettyPrintField(tif, fd, tag, value_count, raw_data)) {
- if(mem_alloc)
- _TIFFfree(raw_data);
- continue;
- }
- else
- _TIFFPrintField(fd, fip, value_count, raw_data);
-
- if(mem_alloc)
- _TIFFfree(raw_data);
- }
- }
-
- if (tif->tif_tagmethods.printdir)
- (*tif->tif_tagmethods.printdir)(tif, fd, flags);
- if ((flags & TIFFPRINT_STRIPS) &&
- TIFFFieldSet(tif,FIELD_STRIPOFFSETS)) {
- tstrip_t s;
-
- fprintf(fd, " %lu %s:\n",
- (long) td->td_nstrips,
- isTiled(tif) ? "Tiles" : "Strips");
- for (s = 0; s < td->td_nstrips; s++)
- fprintf(fd, " %3lu: [%8lu, %8lu]\n",
- (unsigned long) s,
- (unsigned long) td->td_stripoffset[s],
- (unsigned long) td->td_stripbytecount[s]);
- }
-}
-
-void
-_TIFFprintAscii(FILE* fd, const char* cp)
-{
- for (; *cp != '\0'; cp++) {
- const char* tp;
-
- if (isprint((int)*cp)) {
- fputc(*cp, fd);
- continue;
- }
- for (tp = "\tt\bb\rr\nn\vv"; *tp; tp++)
- if (*tp++ == *cp)
- break;
- if (*tp)
- fprintf(fd, "\\%c", *tp);
- else
- fprintf(fd, "\\%03o", *cp & 0xff);
- }
-}
-
-void
-_TIFFprintAsciiTag(FILE* fd, const char* name, const char* value)
-{
- fprintf(fd, " %s: \"", name);
- _TIFFprintAscii(fd, value);
- fprintf(fd, "\"\n");
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_read.c b/src/3rdparty/libtiff/libtiff/tif_read.c
deleted file mode 100644
index 92e47469e2..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_read.c
+++ /dev/null
@@ -1,741 +0,0 @@
-/* $Id: tif_read.c,v 1.16 2007/02/22 11:33:44 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- * Scanline-oriented Read Support
- */
-#include "tiffiop.h"
-#include <stdio.h>
-
- int TIFFFillStrip(TIFF*, tstrip_t);
- int TIFFFillTile(TIFF*, ttile_t);
-static int TIFFStartStrip(TIFF*, tstrip_t);
-static int TIFFStartTile(TIFF*, ttile_t);
-static int TIFFCheckRead(TIFF*, int);
-
-#define NOSTRIP ((tstrip_t) -1) /* undefined state */
-#define NOTILE ((ttile_t) -1) /* undefined state */
-
-/*
- * Seek to a random row+sample in a file.
- */
-static int
-TIFFSeek(TIFF* tif, uint32 row, tsample_t sample)
-{
- register TIFFDirectory *td = &tif->tif_dir;
- tstrip_t strip;
-
- if (row >= td->td_imagelength) { /* out of range */
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Row out of range, max %lu",
- (unsigned long) row,
- (unsigned long) td->td_imagelength);
- return (0);
- }
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
- if (sample >= td->td_samplesperpixel) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Sample out of range, max %lu",
- (unsigned long) sample, (unsigned long) td->td_samplesperpixel);
- return (0);
- }
- strip = sample*td->td_stripsperimage + row/td->td_rowsperstrip;
- } else
- strip = row / td->td_rowsperstrip;
- if (strip != tif->tif_curstrip) { /* different strip, refill */
- if (!TIFFFillStrip(tif, strip))
- return (0);
- } else if (row < tif->tif_row) {
- /*
- * Moving backwards within the same strip: backup
- * to the start and then decode forward (below).
- *
- * NB: If you're planning on lots of random access within a
- * strip, it's better to just read and decode the entire
- * strip, and then access the decoded data in a random fashion.
- */
- if (!TIFFStartStrip(tif, strip))
- return (0);
- }
- if (row != tif->tif_row) {
- /*
- * Seek forward to the desired row.
- */
- if (!(*tif->tif_seek)(tif, row - tif->tif_row))
- return (0);
- tif->tif_row = row;
- }
- return (1);
-}
-
-int
-TIFFReadScanline(TIFF* tif, tdata_t buf, uint32 row, tsample_t sample)
-{
- int e;
-
- if (!TIFFCheckRead(tif, 0))
- return (-1);
- if( (e = TIFFSeek(tif, row, sample)) != 0) {
- /*
- * Decompress desired row into user buffer.
- */
- e = (*tif->tif_decoderow)
- (tif, (tidata_t) buf, tif->tif_scanlinesize, sample);
-
- /* we are now poised at the beginning of the next row */
- tif->tif_row = row + 1;
-
- if (e)
- (*tif->tif_postdecode)(tif, (tidata_t) buf,
- tif->tif_scanlinesize);
- }
- return (e > 0 ? 1 : -1);
-}
-
-/*
- * Read a strip of data and decompress the specified
- * amount into the user-supplied buffer.
- */
-tsize_t
-TIFFReadEncodedStrip(TIFF* tif, tstrip_t strip, tdata_t buf, tsize_t size)
-{
- TIFFDirectory *td = &tif->tif_dir;
- uint32 nrows;
- tsize_t stripsize;
- tstrip_t sep_strip, strips_per_sep;
-
- if (!TIFFCheckRead(tif, 0))
- return (-1);
- if (strip >= td->td_nstrips) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%ld: Strip out of range, max %ld",
- (long) strip, (long) td->td_nstrips);
- return (-1);
- }
- /*
- * Calculate the strip size according to the number of
- * rows in the strip (check for truncated last strip on any
- * of the separations).
- */
- if( td->td_rowsperstrip >= td->td_imagelength )
- strips_per_sep = 1;
- else
- strips_per_sep = (td->td_imagelength+td->td_rowsperstrip-1)
- / td->td_rowsperstrip;
-
- sep_strip = strip % strips_per_sep;
-
- if (sep_strip != strips_per_sep-1 ||
- (nrows = td->td_imagelength % td->td_rowsperstrip) == 0)
- nrows = td->td_rowsperstrip;
-
- stripsize = TIFFVStripSize(tif, nrows);
- if (size == (tsize_t) -1)
- size = stripsize;
- else if (size > stripsize)
- size = stripsize;
- if (TIFFFillStrip(tif, strip)
- && (*tif->tif_decodestrip)(tif, (tidata_t) buf, size,
- (tsample_t)(strip / td->td_stripsperimage)) > 0 ) {
- (*tif->tif_postdecode)(tif, (tidata_t) buf, size);
- return (size);
- } else
- return ((tsize_t) -1);
-}
-
-static tsize_t
-TIFFReadRawStrip1(TIFF* tif,
- tstrip_t strip, tdata_t buf, tsize_t size, const char* module)
-{
- TIFFDirectory *td = &tif->tif_dir;
-
- assert((tif->tif_flags&TIFF_NOREADRAW)==0);
- if (!isMapped(tif)) {
- tsize_t cc;
-
- if (!SeekOK(tif, td->td_stripoffset[strip])) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Seek error at scanline %lu, strip %lu",
- tif->tif_name,
- (unsigned long) tif->tif_row, (unsigned long) strip);
- return (-1);
- }
- cc = TIFFReadFile(tif, buf, size);
- if (cc != size) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Read error at scanline %lu; got %lu bytes, expected %lu",
- tif->tif_name,
- (unsigned long) tif->tif_row,
- (unsigned long) cc,
- (unsigned long) size);
- return (-1);
- }
- } else {
- if (td->td_stripoffset[strip] + size > tif->tif_size) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Read error at scanline %lu, strip %lu; got %lu bytes, expected %lu",
- tif->tif_name,
- (unsigned long) tif->tif_row,
- (unsigned long) strip,
- (unsigned long) tif->tif_size - td->td_stripoffset[strip],
- (unsigned long) size);
- return (-1);
- }
- _TIFFmemcpy(buf, tif->tif_base + td->td_stripoffset[strip],
- size);
- }
- return (size);
-}
-
-/*
- * Read a strip of data from the file.
- */
-tsize_t
-TIFFReadRawStrip(TIFF* tif, tstrip_t strip, tdata_t buf, tsize_t size)
-{
- static const char module[] = "TIFFReadRawStrip";
- TIFFDirectory *td = &tif->tif_dir;
- /*
- * FIXME: butecount should have tsize_t type, but for now libtiff
- * defines tsize_t as a signed 32-bit integer and we are losing
- * ability to read arrays larger than 2^31 bytes. So we are using
- * uint32 instead of tsize_t here.
- */
- uint32 bytecount;
-
- if (!TIFFCheckRead(tif, 0))
- return ((tsize_t) -1);
- if (strip >= td->td_nstrips) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Strip out of range, max %lu",
- (unsigned long) strip,
- (unsigned long) td->td_nstrips);
- return ((tsize_t) -1);
- }
- if (tif->tif_flags&TIFF_NOREADRAW)
- {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Compression scheme does not support access to raw uncompressed data");
- return ((tsize_t) -1);
- }
- bytecount = td->td_stripbytecount[strip];
- if (bytecount <= 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Invalid strip byte count, strip %lu",
- (unsigned long) bytecount, (unsigned long) strip);
- return ((tsize_t) -1);
- }
- if (size != (tsize_t)-1 && (uint32)size < bytecount)
- bytecount = size;
- return (TIFFReadRawStrip1(tif, strip, buf, bytecount, module));
-}
-
-/*
- * Read the specified strip and setup for decoding. The data buffer is
- * expanded, as necessary, to hold the strip's data.
- */
-int
-TIFFFillStrip(TIFF* tif, tstrip_t strip)
-{
- static const char module[] = "TIFFFillStrip";
- TIFFDirectory *td = &tif->tif_dir;
-
- if ((tif->tif_flags&TIFF_NOREADRAW)==0)
- {
- /*
- * FIXME: butecount should have tsize_t type, but for now
- * libtiff defines tsize_t as a signed 32-bit integer and we
- * are losing ability to read arrays larger than 2^31 bytes.
- * So we are using uint32 instead of tsize_t here.
- */
- uint32 bytecount = td->td_stripbytecount[strip];
- if (bytecount <= 0) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Invalid strip byte count %lu, strip %lu",
- tif->tif_name, (unsigned long) bytecount,
- (unsigned long) strip);
- return (0);
- }
- if (isMapped(tif) &&
- (isFillOrder(tif, td->td_fillorder)
- || (tif->tif_flags & TIFF_NOBITREV))) {
- /*
- * The image is mapped into memory and we either don't
- * need to flip bits or the compression routine is
- * going to handle this operation itself. In this
- * case, avoid copying the raw data and instead just
- * reference the data from the memory mapped file
- * image. This assumes that the decompression
- * routines do not modify the contents of the raw data
- * buffer (if they try to, the application will get a
- * fault since the file is mapped read-only).
- */
- if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
- _TIFFfree(tif->tif_rawdata);
- tif->tif_flags &= ~TIFF_MYBUFFER;
- /*
- * We must check for overflow, potentially causing
- * an OOB read. Instead of simple
- *
- * td->td_stripoffset[strip]+bytecount > tif->tif_size
- *
- * comparison (which can overflow) we do the following
- * two comparisons:
- */
- if (bytecount > tif->tif_size ||
- td->td_stripoffset[strip] > tif->tif_size - bytecount) {
- /*
- * This error message might seem strange, but
- * it's what would happen if a read were done
- * instead.
- */
- TIFFErrorExt(tif->tif_clientdata, module,
-
- "%s: Read error on strip %lu; "
- "got %lu bytes, expected %lu",
- tif->tif_name, (unsigned long) strip,
- (unsigned long) tif->tif_size - td->td_stripoffset[strip],
- (unsigned long) bytecount);
- tif->tif_curstrip = NOSTRIP;
- return (0);
- }
- tif->tif_rawdatasize = bytecount;
- tif->tif_rawdata = tif->tif_base + td->td_stripoffset[strip];
- } else {
- /*
- * Expand raw data buffer, if needed, to hold data
- * strip coming from file (perhaps should set upper
- * bound on the size of a buffer we'll use?).
- */
- if (bytecount > (uint32)tif->tif_rawdatasize) {
- tif->tif_curstrip = NOSTRIP;
- if ((tif->tif_flags & TIFF_MYBUFFER) == 0) {
- TIFFErrorExt(tif->tif_clientdata,
- module,
- "%s: Data buffer too small to hold strip %lu",
- tif->tif_name,
- (unsigned long) strip);
- return (0);
- }
- if (!TIFFReadBufferSetup(tif, 0,
- TIFFroundup(bytecount, 1024)))
- return (0);
- }
- if ((uint32)TIFFReadRawStrip1(tif, strip,
- (unsigned char *)tif->tif_rawdata,
- bytecount, module) != bytecount)
- return (0);
- if (!isFillOrder(tif, td->td_fillorder) &&
- (tif->tif_flags & TIFF_NOBITREV) == 0)
- TIFFReverseBits(tif->tif_rawdata, bytecount);
- }
- }
- return (TIFFStartStrip(tif, strip));
-}
-
-/*
- * Tile-oriented Read Support
- * Contributed by Nancy Cam (Silicon Graphics).
- */
-
-/*
- * Read and decompress a tile of data. The
- * tile is selected by the (x,y,z,s) coordinates.
- */
-tsize_t
-TIFFReadTile(TIFF* tif,
- tdata_t buf, uint32 x, uint32 y, uint32 z, tsample_t s)
-{
- if (!TIFFCheckRead(tif, 1) || !TIFFCheckTile(tif, x, y, z, s))
- return (-1);
- return (TIFFReadEncodedTile(tif,
- TIFFComputeTile(tif, x, y, z, s), buf, (tsize_t) -1));
-}
-
-/*
- * Read a tile of data and decompress the specified
- * amount into the user-supplied buffer.
- */
-tsize_t
-TIFFReadEncodedTile(TIFF* tif, ttile_t tile, tdata_t buf, tsize_t size)
-{
- TIFFDirectory *td = &tif->tif_dir;
- tsize_t tilesize = tif->tif_tilesize;
-
- if (!TIFFCheckRead(tif, 1))
- return (-1);
- if (tile >= td->td_nstrips) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%ld: Tile out of range, max %ld",
- (long) tile, (unsigned long) td->td_nstrips);
- return (-1);
- }
- if (size == (tsize_t) -1)
- size = tilesize;
- else if (size > tilesize)
- size = tilesize;
- if (TIFFFillTile(tif, tile) && (*tif->tif_decodetile)(tif,
- (tidata_t) buf, size, (tsample_t)(tile/td->td_stripsperimage))) {
- (*tif->tif_postdecode)(tif, (tidata_t) buf, size);
- return (size);
- } else
- return (-1);
-}
-
-static tsize_t
-TIFFReadRawTile1(TIFF* tif,
- ttile_t tile, tdata_t buf, tsize_t size, const char* module)
-{
- TIFFDirectory *td = &tif->tif_dir;
-
- assert((tif->tif_flags&TIFF_NOREADRAW)==0);
- if (!isMapped(tif)) {
- tsize_t cc;
-
- if (!SeekOK(tif, td->td_stripoffset[tile])) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Seek error at row %ld, col %ld, tile %ld",
- tif->tif_name,
- (long) tif->tif_row,
- (long) tif->tif_col,
- (long) tile);
- return ((tsize_t) -1);
- }
- cc = TIFFReadFile(tif, buf, size);
- if (cc != size) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Read error at row %ld, col %ld; got %lu bytes, expected %lu",
- tif->tif_name,
- (long) tif->tif_row,
- (long) tif->tif_col,
- (unsigned long) cc,
- (unsigned long) size);
- return ((tsize_t) -1);
- }
- } else {
- if (td->td_stripoffset[tile] + size > tif->tif_size) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Read error at row %ld, col %ld, tile %ld; got %lu bytes, expected %lu",
- tif->tif_name,
- (long) tif->tif_row,
- (long) tif->tif_col,
- (long) tile,
- (unsigned long) tif->tif_size - td->td_stripoffset[tile],
- (unsigned long) size);
- return ((tsize_t) -1);
- }
- _TIFFmemcpy(buf, tif->tif_base + td->td_stripoffset[tile], size);
- }
- return (size);
-}
-
-/*
- * Read a tile of data from the file.
- */
-tsize_t
-TIFFReadRawTile(TIFF* tif, ttile_t tile, tdata_t buf, tsize_t size)
-{
- static const char module[] = "TIFFReadRawTile";
- TIFFDirectory *td = &tif->tif_dir;
- /*
- * FIXME: butecount should have tsize_t type, but for now libtiff
- * defines tsize_t as a signed 32-bit integer and we are losing
- * ability to read arrays larger than 2^31 bytes. So we are using
- * uint32 instead of tsize_t here.
- */
- uint32 bytecount;
-
- if (!TIFFCheckRead(tif, 1))
- return ((tsize_t) -1);
- if (tile >= td->td_nstrips) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Tile out of range, max %lu",
- (unsigned long) tile, (unsigned long) td->td_nstrips);
- return ((tsize_t) -1);
- }
- if (tif->tif_flags&TIFF_NOREADRAW)
- {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Compression scheme does not support access to raw uncompressed data");
- return ((tsize_t) -1);
- }
- bytecount = td->td_stripbytecount[tile];
- if (size != (tsize_t) -1 && (uint32)size < bytecount)
- bytecount = size;
- return (TIFFReadRawTile1(tif, tile, buf, bytecount, module));
-}
-
-/*
- * Read the specified tile and setup for decoding. The data buffer is
- * expanded, as necessary, to hold the tile's data.
- */
-int
-TIFFFillTile(TIFF* tif, ttile_t tile)
-{
- static const char module[] = "TIFFFillTile";
- TIFFDirectory *td = &tif->tif_dir;
-
- if ((tif->tif_flags&TIFF_NOREADRAW)==0)
- {
- /*
- * FIXME: butecount should have tsize_t type, but for now
- * libtiff defines tsize_t as a signed 32-bit integer and we
- * are losing ability to read arrays larger than 2^31 bytes.
- * So we are using uint32 instead of tsize_t here.
- */
- uint32 bytecount = td->td_stripbytecount[tile];
- if (bytecount <= 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Invalid tile byte count, tile %lu",
- (unsigned long) bytecount, (unsigned long) tile);
- return (0);
- }
- if (isMapped(tif) &&
- (isFillOrder(tif, td->td_fillorder)
- || (tif->tif_flags & TIFF_NOBITREV))) {
- /*
- * The image is mapped into memory and we either don't
- * need to flip bits or the compression routine is
- * going to handle this operation itself. In this
- * case, avoid copying the raw data and instead just
- * reference the data from the memory mapped file
- * image. This assumes that the decompression
- * routines do not modify the contents of the raw data
- * buffer (if they try to, the application will get a
- * fault since the file is mapped read-only).
- */
- if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
- _TIFFfree(tif->tif_rawdata);
- tif->tif_flags &= ~TIFF_MYBUFFER;
- /*
- * We must check for overflow, potentially causing
- * an OOB read. Instead of simple
- *
- * td->td_stripoffset[tile]+bytecount > tif->tif_size
- *
- * comparison (which can overflow) we do the following
- * two comparisons:
- */
- if (bytecount > tif->tif_size ||
- td->td_stripoffset[tile] > tif->tif_size - bytecount) {
- tif->tif_curtile = NOTILE;
- return (0);
- }
- tif->tif_rawdatasize = bytecount;
- tif->tif_rawdata =
- tif->tif_base + td->td_stripoffset[tile];
- } else {
- /*
- * Expand raw data buffer, if needed, to hold data
- * tile coming from file (perhaps should set upper
- * bound on the size of a buffer we'll use?).
- */
- if (bytecount > (uint32)tif->tif_rawdatasize) {
- tif->tif_curtile = NOTILE;
- if ((tif->tif_flags & TIFF_MYBUFFER) == 0) {
- TIFFErrorExt(tif->tif_clientdata,
- module,
- "%s: Data buffer too small to hold tile %ld",
- tif->tif_name,
- (long) tile);
- return (0);
- }
- if (!TIFFReadBufferSetup(tif, 0,
- TIFFroundup(bytecount, 1024)))
- return (0);
- }
- if ((uint32)TIFFReadRawTile1(tif, tile,
- (unsigned char *)tif->tif_rawdata,
- bytecount, module) != bytecount)
- return (0);
- if (!isFillOrder(tif, td->td_fillorder) &&
- (tif->tif_flags & TIFF_NOBITREV) == 0)
- TIFFReverseBits(tif->tif_rawdata, bytecount);
- }
- }
- return (TIFFStartTile(tif, tile));
-}
-
-/*
- * Setup the raw data buffer in preparation for
- * reading a strip of raw data. If the buffer
- * is specified as zero, then a buffer of appropriate
- * size is allocated by the library. Otherwise,
- * the client must guarantee that the buffer is
- * large enough to hold any individual strip of
- * raw data.
- */
-int
-TIFFReadBufferSetup(TIFF* tif, tdata_t bp, tsize_t size)
-{
- static const char module[] = "TIFFReadBufferSetup";
-
- assert((tif->tif_flags&TIFF_NOREADRAW)==0);
- if (tif->tif_rawdata) {
- if (tif->tif_flags & TIFF_MYBUFFER)
- _TIFFfree(tif->tif_rawdata);
- tif->tif_rawdata = NULL;
- }
- if (bp) {
- tif->tif_rawdatasize = size;
- tif->tif_rawdata = (tidata_t) bp;
- tif->tif_flags &= ~TIFF_MYBUFFER;
- } else {
- tif->tif_rawdatasize = TIFFroundup(size, 1024);
- tif->tif_rawdata = (tidata_t) _TIFFmalloc(tif->tif_rawdatasize);
- tif->tif_flags |= TIFF_MYBUFFER;
- }
- if (tif->tif_rawdata == NULL) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: No space for data buffer at scanline %ld",
- tif->tif_name, (long) tif->tif_row);
- tif->tif_rawdatasize = 0;
- return (0);
- }
- return (1);
-}
-
-/*
- * Set state to appear as if a
- * strip has just been read in.
- */
-static int
-TIFFStartStrip(TIFF* tif, tstrip_t strip)
-{
- TIFFDirectory *td = &tif->tif_dir;
-
- if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
- if (!(*tif->tif_setupdecode)(tif))
- return (0);
- tif->tif_flags |= TIFF_CODERSETUP;
- }
- tif->tif_curstrip = strip;
- tif->tif_row = (strip % td->td_stripsperimage) * td->td_rowsperstrip;
- if (tif->tif_flags&TIFF_NOREADRAW)
- {
- tif->tif_rawcp = NULL;
- tif->tif_rawcc = 0;
- }
- else
- {
- tif->tif_rawcp = tif->tif_rawdata;
- tif->tif_rawcc = td->td_stripbytecount[strip];
- }
- return ((*tif->tif_predecode)(tif,
- (tsample_t)(strip / td->td_stripsperimage)));
-}
-
-/*
- * Set state to appear as if a
- * tile has just been read in.
- */
-static int
-TIFFStartTile(TIFF* tif, ttile_t tile)
-{
- TIFFDirectory *td = &tif->tif_dir;
-
- if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
- if (!(*tif->tif_setupdecode)(tif))
- return (0);
- tif->tif_flags |= TIFF_CODERSETUP;
- }
- tif->tif_curtile = tile;
- tif->tif_row =
- (tile % TIFFhowmany(td->td_imagewidth, td->td_tilewidth)) *
- td->td_tilelength;
- tif->tif_col =
- (tile % TIFFhowmany(td->td_imagelength, td->td_tilelength)) *
- td->td_tilewidth;
- if (tif->tif_flags&TIFF_NOREADRAW)
- {
- tif->tif_rawcp = NULL;
- tif->tif_rawcc = 0;
- }
- else
- {
- tif->tif_rawcp = tif->tif_rawdata;
- tif->tif_rawcc = td->td_stripbytecount[tile];
- }
- return ((*tif->tif_predecode)(tif,
- (tsample_t)(tile/td->td_stripsperimage)));
-}
-
-static int
-TIFFCheckRead(TIFF* tif, int tiles)
-{
- if (tif->tif_mode == O_WRONLY) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "File not open for reading");
- return (0);
- }
- if (tiles ^ isTiled(tif)) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, tiles ?
- "Can not read tiles from a stripped image" :
- "Can not read scanlines from a tiled image");
- return (0);
- }
- return (1);
-}
-
-void
-_TIFFNoPostDecode(TIFF* tif, tidata_t buf, tsize_t cc)
-{
- (void) tif; (void) buf; (void) cc;
-}
-
-void
-_TIFFSwab16BitData(TIFF* tif, tidata_t buf, tsize_t cc)
-{
- (void) tif;
- assert((cc & 1) == 0);
- TIFFSwabArrayOfShort((uint16*) buf, cc/2);
-}
-
-void
-_TIFFSwab24BitData(TIFF* tif, tidata_t buf, tsize_t cc)
-{
- (void) tif;
- assert((cc % 3) == 0);
- TIFFSwabArrayOfTriples((uint8*) buf, cc/3);
-}
-
-void
-_TIFFSwab32BitData(TIFF* tif, tidata_t buf, tsize_t cc)
-{
- (void) tif;
- assert((cc & 3) == 0);
- TIFFSwabArrayOfLong((uint32*) buf, cc/4);
-}
-
-void
-_TIFFSwab64BitData(TIFF* tif, tidata_t buf, tsize_t cc)
-{
- (void) tif;
- assert((cc & 7) == 0);
- TIFFSwabArrayOfDouble((double*) buf, cc/8);
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_stream.cxx b/src/3rdparty/libtiff/libtiff/tif_stream.cxx
deleted file mode 100644
index 2a2351b2ba..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_stream.cxx
+++ /dev/null
@@ -1,295 +0,0 @@
-/* $Id: tif_stream.cxx,v 1.6.2.1 2009-01-01 00:10:43 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1996 Sam Leffler
- * Copyright (c) 1991-1996 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library UNIX-specific Routines.
- */
-#include "tiffiop.h"
-#include <iostream>
-
-#ifndef __VMS
-using namespace std;
-#endif
-
-class tiffis_data
-{
- public:
-
- istream *myIS;
- long myStreamStartPos;
-};
-
-class tiffos_data
-{
- public:
-
- ostream *myOS;
- long myStreamStartPos;
-};
-
-static tsize_t
-_tiffosReadProc(thandle_t, tdata_t, tsize_t)
-{
- return 0;
-}
-
-static tsize_t
-_tiffisReadProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- tiffis_data *data = (tiffis_data *)fd;
-
- data->myIS->read((char *)buf, (int)size);
-
- return data->myIS->gcount();
-}
-
-static tsize_t
-_tiffosWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- tiffos_data *data = (tiffos_data *)fd;
- ostream *os = data->myOS;
- int pos = os->tellp();
-
- os->write((const char *)buf, size);
-
- return ((int)os->tellp()) - pos;
-}
-
-static tsize_t
-_tiffisWriteProc(thandle_t, tdata_t, tsize_t)
-{
- return 0;
-}
-
-static toff_t
-_tiffosSeekProc(thandle_t fd, toff_t off, int whence)
-{
- tiffos_data *data = (tiffos_data *)fd;
- ostream *os = data->myOS;
-
- // if the stream has already failed, don't do anything
- if( os->fail() )
- return os->tellp();
-
- switch(whence) {
- case SEEK_SET:
- os->seekp(data->myStreamStartPos + off, ios::beg);
- break;
- case SEEK_CUR:
- os->seekp(off, ios::cur);
- break;
- case SEEK_END:
- os->seekp(off, ios::end);
- break;
- }
-
- // Attempt to workaround problems with seeking past the end of the
- // stream. ofstream doesn't have a problem with this but
- // ostrstream/ostringstream does. In that situation, add intermediate
- // '\0' characters.
- if( os->fail() ) {
-#ifdef __VMS
- int old_state;
-#else
- ios::iostate old_state;
-#endif
- toff_t origin=0;
-
- old_state = os->rdstate();
- // reset the fail bit or else tellp() won't work below
- os->clear(os->rdstate() & ~ios::failbit);
- switch( whence ) {
- case SEEK_SET:
- origin = data->myStreamStartPos;
- break;
- case SEEK_CUR:
- origin = os->tellp();
- break;
- case SEEK_END:
- os->seekp(0, ios::end);
- origin = os->tellp();
- break;
- }
- // restore original stream state
- os->clear(old_state);
-
- // only do something if desired seek position is valid
- if( origin + off > data->myStreamStartPos ) {
- toff_t num_fill;
-
- // clear the fail bit
- os->clear(os->rdstate() & ~ios::failbit);
-
- // extend the stream to the expected size
- os->seekp(0, ios::end);
- num_fill = origin + off - (toff_t)os->tellp();
- for( toff_t i = 0; i < num_fill; i++ )
- os->put('\0');
-
- // retry the seek
- os->seekp(origin + off, ios::beg);
- }
- }
-
- return os->tellp();
-}
-
-static toff_t
-_tiffisSeekProc(thandle_t fd, toff_t off, int whence)
-{
- tiffis_data *data = (tiffis_data *)fd;
-
- switch(whence) {
- case SEEK_SET:
- data->myIS->seekg(data->myStreamStartPos + off, ios::beg);
- break;
- case SEEK_CUR:
- data->myIS->seekg(off, ios::cur);
- break;
- case SEEK_END:
- data->myIS->seekg(off, ios::end);
- break;
- }
-
- return ((long)data->myIS->tellg()) - data->myStreamStartPos;
-}
-
-static toff_t
-_tiffosSizeProc(thandle_t fd)
-{
- tiffos_data *data = (tiffos_data *)fd;
- ostream *os = data->myOS;
- toff_t pos = os->tellp();
- toff_t len;
-
- os->seekp(0, ios::end);
- len = os->tellp();
- os->seekp(pos);
-
- return len;
-}
-
-static toff_t
-_tiffisSizeProc(thandle_t fd)
-{
- tiffis_data *data = (tiffis_data *)fd;
- int pos = data->myIS->tellg();
- int len;
-
- data->myIS->seekg(0, ios::end);
- len = data->myIS->tellg();
- data->myIS->seekg(pos);
-
- return len;
-}
-
-static int
-_tiffosCloseProc(thandle_t fd)
-{
- // Our stream was not allocated by us, so it shouldn't be closed by us.
- delete (tiffos_data *)fd;
- return 0;
-}
-
-static int
-_tiffisCloseProc(thandle_t fd)
-{
- // Our stream was not allocated by us, so it shouldn't be closed by us.
- delete (tiffis_data *)fd;
- return 0;
-}
-
-static int
-_tiffDummyMapProc(thandle_t , tdata_t* , toff_t* )
-{
- return (0);
-}
-
-static void
-_tiffDummyUnmapProc(thandle_t , tdata_t , toff_t )
-{
-}
-
-/*
- * Open a TIFF file descriptor for read/writing.
- */
-static TIFF*
-_tiffStreamOpen(const char* name, const char* mode, void *fd)
-{
- TIFF* tif;
-
- if( strchr(mode, 'w') ) {
- tiffos_data *data = new tiffos_data;
- data->myOS = (ostream *)fd;
- data->myStreamStartPos = data->myOS->tellp();
-
- // Open for writing.
- tif = TIFFClientOpen(name, mode,
- (thandle_t) data,
- _tiffosReadProc, _tiffosWriteProc,
- _tiffosSeekProc, _tiffosCloseProc,
- _tiffosSizeProc,
- _tiffDummyMapProc, _tiffDummyUnmapProc);
- } else {
- tiffis_data *data = new tiffis_data;
- data->myIS = (istream *)fd;
- data->myStreamStartPos = data->myIS->tellg();
- // Open for reading.
- tif = TIFFClientOpen(name, mode,
- (thandle_t) data,
- _tiffisReadProc, _tiffisWriteProc,
- _tiffisSeekProc, _tiffisCloseProc,
- _tiffisSizeProc,
- _tiffDummyMapProc, _tiffDummyUnmapProc);
- }
-
- return (tif);
-}
-
-TIFF*
-TIFFStreamOpen(const char* name, ostream *os)
-{
- // If os is either a ostrstream or ostringstream, and has no data
- // written to it yet, then tellp() will return -1 which will break us.
- // We workaround this by writing out a dummy character and
- // then seek back to the beginning.
- if( !os->fail() && (int)os->tellp() < 0 ) {
- *os << '\0';
- os->seekp(0);
- }
-
- // NB: We don't support mapped files with streams so add 'm'
- return _tiffStreamOpen(name, "wm", os);
-}
-
-TIFF*
-TIFFStreamOpen(const char* name, istream *is)
-{
- // NB: We don't support mapped files with streams so add 'm'
- return _tiffStreamOpen(name, "rm", is);
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_strip.c b/src/3rdparty/libtiff/libtiff/tif_strip.c
deleted file mode 100644
index 962d3fa7bc..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_strip.c
+++ /dev/null
@@ -1,363 +0,0 @@
-/* $Id: tif_strip.c,v 1.19 2006/03/25 18:04:35 joris Exp $ */
-
-/*
- * Copyright (c) 1991-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Strip-organized Image Support Routines.
- */
-#include "tiffiop.h"
-
-static uint32
-summarize(TIFF* tif, size_t summand1, size_t summand2, const char* where)
-{
- /*
- * XXX: We are using casting to uint32 here, bacause sizeof(size_t)
- * may be larger than sizeof(uint32) on 64-bit architectures.
- */
- uint32 bytes = summand1 + summand2;
-
- if (bytes - summand1 != summand2) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Integer overflow in %s", where);
- bytes = 0;
- }
-
- return (bytes);
-}
-
-static uint32
-multiply(TIFF* tif, size_t nmemb, size_t elem_size, const char* where)
-{
- uint32 bytes = nmemb * elem_size;
-
- if (elem_size && bytes / elem_size != nmemb) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Integer overflow in %s", where);
- bytes = 0;
- }
-
- return (bytes);
-}
-
-/*
- * Compute which strip a (row,sample) value is in.
- */
-tstrip_t
-TIFFComputeStrip(TIFF* tif, uint32 row, tsample_t sample)
-{
- TIFFDirectory *td = &tif->tif_dir;
- tstrip_t strip;
-
- strip = row / td->td_rowsperstrip;
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
- if (sample >= td->td_samplesperpixel) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Sample out of range, max %lu",
- (unsigned long) sample, (unsigned long) td->td_samplesperpixel);
- return ((tstrip_t) 0);
- }
- strip += sample*td->td_stripsperimage;
- }
- return (strip);
-}
-
-/*
- * Compute how many strips are in an image.
- */
-tstrip_t
-TIFFNumberOfStrips(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- tstrip_t nstrips;
-
- nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 :
- TIFFhowmany(td->td_imagelength, td->td_rowsperstrip));
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
- nstrips = multiply(tif, nstrips, td->td_samplesperpixel,
- "TIFFNumberOfStrips");
- return (nstrips);
-}
-
-/*
- * Compute the # bytes in a variable height, row-aligned strip.
- */
-tsize_t
-TIFFVStripSize(TIFF* tif, uint32 nrows)
-{
- TIFFDirectory *td = &tif->tif_dir;
-
- if (nrows == (uint32) -1)
- nrows = td->td_imagelength;
- if (td->td_planarconfig == PLANARCONFIG_CONTIG &&
- td->td_photometric == PHOTOMETRIC_YCBCR &&
- !isUpSampled(tif)) {
- /*
- * Packed YCbCr data contain one Cb+Cr for every
- * HorizontalSampling*VerticalSampling Y values.
- * Must also roundup width and height when calculating
- * since images that are not a multiple of the
- * horizontal/vertical subsampling area include
- * YCbCr data for the extended image.
- */
- uint16 ycbcrsubsampling[2];
- tsize_t w, scanline, samplingarea;
-
- TIFFGetField( tif, TIFFTAG_YCBCRSUBSAMPLING,
- ycbcrsubsampling + 0,
- ycbcrsubsampling + 1 );
-
- samplingarea = ycbcrsubsampling[0]*ycbcrsubsampling[1];
- if (samplingarea == 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Invalid YCbCr subsampling");
- return 0;
- }
-
- w = TIFFroundup(td->td_imagewidth, ycbcrsubsampling[0]);
- scanline = TIFFhowmany8(multiply(tif, w, td->td_bitspersample,
- "TIFFVStripSize"));
- nrows = TIFFroundup(nrows, ycbcrsubsampling[1]);
- /* NB: don't need TIFFhowmany here 'cuz everything is rounded */
- scanline = multiply(tif, nrows, scanline, "TIFFVStripSize");
- return ((tsize_t)
- summarize(tif, scanline,
- multiply(tif, 2, scanline / samplingarea,
- "TIFFVStripSize"), "TIFFVStripSize"));
- } else
- return ((tsize_t) multiply(tif, nrows, TIFFScanlineSize(tif),
- "TIFFVStripSize"));
-}
-
-
-/*
- * Compute the # bytes in a raw strip.
- */
-tsize_t
-TIFFRawStripSize(TIFF* tif, tstrip_t strip)
-{
- TIFFDirectory* td = &tif->tif_dir;
- tsize_t bytecount = td->td_stripbytecount[strip];
-
- if (bytecount <= 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Invalid strip byte count, strip %lu",
- (unsigned long) bytecount, (unsigned long) strip);
- bytecount = (tsize_t) -1;
- }
-
- return bytecount;
-}
-
-/*
- * Compute the # bytes in a (row-aligned) strip.
- *
- * Note that if RowsPerStrip is larger than the
- * recorded ImageLength, then the strip size is
- * truncated to reflect the actual space required
- * to hold the strip.
- */
-tsize_t
-TIFFStripSize(TIFF* tif)
-{
- TIFFDirectory* td = &tif->tif_dir;
- uint32 rps = td->td_rowsperstrip;
- if (rps > td->td_imagelength)
- rps = td->td_imagelength;
- return (TIFFVStripSize(tif, rps));
-}
-
-/*
- * Compute a default strip size based on the image
- * characteristics and a requested value. If the
- * request is <1 then we choose a strip size according
- * to certain heuristics.
- */
-uint32
-TIFFDefaultStripSize(TIFF* tif, uint32 request)
-{
- return (*tif->tif_defstripsize)(tif, request);
-}
-
-uint32
-_TIFFDefaultStripSize(TIFF* tif, uint32 s)
-{
- if ((int32) s < 1) {
- /*
- * If RowsPerStrip is unspecified, try to break the
- * image up into strips that are approximately
- * STRIP_SIZE_DEFAULT bytes long.
- */
- tsize_t scanline = TIFFScanlineSize(tif);
- s = (uint32)STRIP_SIZE_DEFAULT / (scanline == 0 ? 1 : scanline);
- if (s == 0) /* very wide images */
- s = 1;
- }
- return (s);
-}
-
-/*
- * Return the number of bytes to read/write in a call to
- * one of the scanline-oriented i/o routines. Note that
- * this number may be 1/samples-per-pixel if data is
- * stored as separate planes.
- */
-tsize_t
-TIFFScanlineSize(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- tsize_t scanline;
-
- if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
- if (td->td_photometric == PHOTOMETRIC_YCBCR
- && !isUpSampled(tif)) {
- uint16 ycbcrsubsampling[2];
-
- TIFFGetField(tif, TIFFTAG_YCBCRSUBSAMPLING,
- ycbcrsubsampling + 0,
- ycbcrsubsampling + 1);
-
- if (ycbcrsubsampling[0] == 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Invalid YCbCr subsampling");
- return 0;
- }
-
- scanline = TIFFroundup(td->td_imagewidth,
- ycbcrsubsampling[0]);
- scanline = TIFFhowmany8(multiply(tif, scanline,
- td->td_bitspersample,
- "TIFFScanlineSize"));
- return ((tsize_t)
- summarize(tif, scanline,
- multiply(tif, 2,
- scanline / ycbcrsubsampling[0],
- "TIFFVStripSize"),
- "TIFFVStripSize"));
- } else {
- scanline = multiply(tif, td->td_imagewidth,
- td->td_samplesperpixel,
- "TIFFScanlineSize");
- }
- } else
- scanline = td->td_imagewidth;
- return ((tsize_t) TIFFhowmany8(multiply(tif, scanline,
- td->td_bitspersample,
- "TIFFScanlineSize")));
-}
-
-/*
- * Some stuff depends on this older version of TIFFScanlineSize
- * TODO: resolve this
- */
-tsize_t
-TIFFOldScanlineSize(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- tsize_t scanline;
-
- scanline = multiply (tif, td->td_bitspersample, td->td_imagewidth,
- "TIFFScanlineSize");
- if (td->td_planarconfig == PLANARCONFIG_CONTIG)
- scanline = multiply (tif, scanline, td->td_samplesperpixel,
- "TIFFScanlineSize");
- return ((tsize_t) TIFFhowmany8(scanline));
-}
-
-/*
- * Return the number of bytes to read/write in a call to
- * one of the scanline-oriented i/o routines. Note that
- * this number may be 1/samples-per-pixel if data is
- * stored as separate planes.
- * The ScanlineSize in case of YCbCrSubsampling is defined as the
- * strip size divided by the strip height, i.e. the size of a pack of vertical
- * subsampling lines divided by vertical subsampling. It should thus make
- * sense when multiplied by a multiple of vertical subsampling.
- * Some stuff depends on this newer version of TIFFScanlineSize
- * TODO: resolve this
- */
-tsize_t
-TIFFNewScanlineSize(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- tsize_t scanline;
-
- if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
- if (td->td_photometric == PHOTOMETRIC_YCBCR
- && !isUpSampled(tif)) {
- uint16 ycbcrsubsampling[2];
-
- TIFFGetField(tif, TIFFTAG_YCBCRSUBSAMPLING,
- ycbcrsubsampling + 0,
- ycbcrsubsampling + 1);
-
- if (ycbcrsubsampling[0]*ycbcrsubsampling[1] == 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Invalid YCbCr subsampling");
- return 0;
- }
-
- return((tsize_t) ((((td->td_imagewidth+ycbcrsubsampling[0]-1)
- /ycbcrsubsampling[0])
- *(ycbcrsubsampling[0]*ycbcrsubsampling[1]+2)
- *td->td_bitspersample+7)
- /8)/ycbcrsubsampling[1]);
-
- } else {
- scanline = multiply(tif, td->td_imagewidth,
- td->td_samplesperpixel,
- "TIFFScanlineSize");
- }
- } else
- scanline = td->td_imagewidth;
- return ((tsize_t) TIFFhowmany8(multiply(tif, scanline,
- td->td_bitspersample,
- "TIFFScanlineSize")));
-}
-
-/*
- * Return the number of bytes required to store a complete
- * decoded and packed raster scanline (as opposed to the
- * I/O size returned by TIFFScanlineSize which may be less
- * if data is store as separate planes).
- */
-tsize_t
-TIFFRasterScanlineSize(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- tsize_t scanline;
-
- scanline = multiply (tif, td->td_bitspersample, td->td_imagewidth,
- "TIFFRasterScanlineSize");
- if (td->td_planarconfig == PLANARCONFIG_CONTIG) {
- scanline = multiply (tif, scanline, td->td_samplesperpixel,
- "TIFFRasterScanlineSize");
- return ((tsize_t) TIFFhowmany8(scanline));
- } else
- return ((tsize_t) multiply (tif, TIFFhowmany8(scanline),
- td->td_samplesperpixel,
- "TIFFRasterScanlineSize"));
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_swab.c b/src/3rdparty/libtiff/libtiff/tif_swab.c
deleted file mode 100644
index 97cc88825c..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_swab.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* $Id: tif_swab.c,v 1.4 2005/04/13 14:06:21 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library Bit & Byte Swapping Support.
- *
- * XXX We assume short = 16-bits and long = 32-bits XXX
- */
-#include "tiffiop.h"
-
-#ifndef TIFFSwabShort
-void
-TIFFSwabShort(uint16* wp)
-{
- register unsigned char* cp = (unsigned char*) wp;
- unsigned char t;
-
- t = cp[1]; cp[1] = cp[0]; cp[0] = t;
-}
-#endif
-
-#ifndef TIFFSwabLong
-void
-TIFFSwabLong(uint32* lp)
-{
- register unsigned char* cp = (unsigned char*) lp;
- unsigned char t;
-
- t = cp[3]; cp[3] = cp[0]; cp[0] = t;
- t = cp[2]; cp[2] = cp[1]; cp[1] = t;
-}
-#endif
-
-#ifndef TIFFSwabArrayOfShort
-void
-TIFFSwabArrayOfShort(uint16* wp, register unsigned long n)
-{
- register unsigned char* cp;
- register unsigned char t;
-
- /* XXX unroll loop some */
- while (n-- > 0) {
- cp = (unsigned char*) wp;
- t = cp[1]; cp[1] = cp[0]; cp[0] = t;
- wp++;
- }
-}
-#endif
-
-#ifndef TIFFSwabArrayOfTriples
-void
-TIFFSwabArrayOfTriples(uint8* tp, unsigned long n)
-{
- unsigned char* cp;
- unsigned char t;
-
- /* XXX unroll loop some */
- while (n-- > 0) {
- cp = (unsigned char*) tp;
- t = cp[2]; cp[2] = cp[0]; cp[0] = t;
- tp += 3;
- }
-}
-#endif
-
-#ifndef TIFFSwabArrayOfLong
-void
-TIFFSwabArrayOfLong(register uint32* lp, register unsigned long n)
-{
- register unsigned char *cp;
- register unsigned char t;
-
- /* XXX unroll loop some */
- while (n-- > 0) {
- cp = (unsigned char *)lp;
- t = cp[3]; cp[3] = cp[0]; cp[0] = t;
- t = cp[2]; cp[2] = cp[1]; cp[1] = t;
- lp++;
- }
-}
-#endif
-
-#ifndef TIFFSwabDouble
-void
-TIFFSwabDouble(double *dp)
-{
- register uint32* lp = (uint32*) dp;
- uint32 t;
-
- TIFFSwabArrayOfLong(lp, 2);
- t = lp[0]; lp[0] = lp[1]; lp[1] = t;
-}
-#endif
-
-#ifndef TIFFSwabArrayOfDouble
-void
-TIFFSwabArrayOfDouble(double* dp, register unsigned long n)
-{
- register uint32* lp = (uint32*) dp;
- register uint32 t;
-
- TIFFSwabArrayOfLong(lp, n + n);
- while (n-- > 0) {
- t = lp[0]; lp[0] = lp[1]; lp[1] = t;
- lp += 2;
- }
-}
-#endif
-
-/*
- * Bit reversal tables. TIFFBitRevTable[<byte>] gives
- * the bit reversed value of <byte>. Used in various
- * places in the library when the FillOrder requires
- * bit reversal of byte values (e.g. CCITT Fax 3
- * encoding/decoding). TIFFNoBitRevTable is provided
- * for algorithms that want an equivalent table that
- * do not reverse bit values.
- */
-static const unsigned char TIFFBitRevTable[256] = {
- 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
- 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
- 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
- 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
- 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
- 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
- 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
- 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
- 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
- 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
- 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
- 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
- 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
- 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
- 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
- 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
- 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
- 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
- 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
- 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
- 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
- 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
- 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
- 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
- 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
- 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
- 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
- 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
- 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
- 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
- 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
- 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
-};
-static const unsigned char TIFFNoBitRevTable[256] = {
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
- 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
- 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
- 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
- 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
- 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
- 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
- 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
- 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
- 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
- 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
- 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
- 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
- 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
- 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
- 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
- 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
- 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
- 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
- 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
- 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
- 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
- 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
- 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
- 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
- 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
- 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
- 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
- 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
- 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-};
-
-const unsigned char*
-TIFFGetBitRevTable(int reversed)
-{
- return (reversed ? TIFFBitRevTable : TIFFNoBitRevTable);
-}
-
-void
-TIFFReverseBits(register unsigned char* cp, register unsigned long n)
-{
- for (; n > 8; n -= 8) {
- cp[0] = TIFFBitRevTable[cp[0]];
- cp[1] = TIFFBitRevTable[cp[1]];
- cp[2] = TIFFBitRevTable[cp[2]];
- cp[3] = TIFFBitRevTable[cp[3]];
- cp[4] = TIFFBitRevTable[cp[4]];
- cp[5] = TIFFBitRevTable[cp[5]];
- cp[6] = TIFFBitRevTable[cp[6]];
- cp[7] = TIFFBitRevTable[cp[7]];
- cp += 8;
- }
- while (n-- > 0)
- *cp = TIFFBitRevTable[*cp], cp++;
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_thunder.c b/src/3rdparty/libtiff/libtiff/tif_thunder.c
deleted file mode 100644
index 94496eccb1..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_thunder.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* $Id: tif_thunder.c,v 1.5 2005/12/21 12:23:13 joris Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#include "tiffiop.h"
-#ifdef THUNDER_SUPPORT
-/*
- * TIFF Library.
- *
- * ThunderScan 4-bit Compression Algorithm Support
- */
-
-/*
- * ThunderScan uses an encoding scheme designed for
- * 4-bit pixel values. Data is encoded in bytes, with
- * each byte split into a 2-bit code word and a 6-bit
- * data value. The encoding gives raw data, runs of
- * pixels, or pixel values encoded as a delta from the
- * previous pixel value. For the latter, either 2-bit
- * or 3-bit delta values are used, with the deltas packed
- * into a single byte.
- */
-#define THUNDER_DATA 0x3f /* mask for 6-bit data */
-#define THUNDER_CODE 0xc0 /* mask for 2-bit code word */
-/* code values */
-#define THUNDER_RUN 0x00 /* run of pixels w/ encoded count */
-#define THUNDER_2BITDELTAS 0x40 /* 3 pixels w/ encoded 2-bit deltas */
-#define DELTA2_SKIP 2 /* skip code for 2-bit deltas */
-#define THUNDER_3BITDELTAS 0x80 /* 2 pixels w/ encoded 3-bit deltas */
-#define DELTA3_SKIP 4 /* skip code for 3-bit deltas */
-#define THUNDER_RAW 0xc0 /* raw data encoded */
-
-static const int twobitdeltas[4] = { 0, 1, 0, -1 };
-static const int threebitdeltas[8] = { 0, 1, 2, 3, 0, -3, -2, -1 };
-
-#define SETPIXEL(op, v) { \
- lastpixel = (v) & 0xf; \
- if (npixels++ & 1) \
- *op++ |= lastpixel; \
- else \
- op[0] = (tidataval_t) (lastpixel << 4); \
-}
-
-static int
-ThunderDecode(TIFF* tif, tidata_t op, tsize_t maxpixels)
-{
- register unsigned char *bp;
- register tsize_t cc;
- unsigned int lastpixel;
- tsize_t npixels;
-
- bp = (unsigned char *)tif->tif_rawcp;
- cc = tif->tif_rawcc;
- lastpixel = 0;
- npixels = 0;
- while (cc > 0 && npixels < maxpixels) {
- int n, delta;
-
- n = *bp++, cc--;
- switch (n & THUNDER_CODE) {
- case THUNDER_RUN: /* pixel run */
- /*
- * Replicate the last pixel n times,
- * where n is the lower-order 6 bits.
- */
- if (npixels & 1) {
- op[0] |= lastpixel;
- lastpixel = *op++; npixels++; n--;
- } else
- lastpixel |= lastpixel << 4;
- npixels += n;
- if (npixels < maxpixels) {
- for (; n > 0; n -= 2)
- *op++ = (tidataval_t) lastpixel;
- }
- if (n == -1)
- *--op &= 0xf0;
- lastpixel &= 0xf;
- break;
- case THUNDER_2BITDELTAS: /* 2-bit deltas */
- if ((delta = ((n >> 4) & 3)) != DELTA2_SKIP)
- SETPIXEL(op, lastpixel + twobitdeltas[delta]);
- if ((delta = ((n >> 2) & 3)) != DELTA2_SKIP)
- SETPIXEL(op, lastpixel + twobitdeltas[delta]);
- if ((delta = (n & 3)) != DELTA2_SKIP)
- SETPIXEL(op, lastpixel + twobitdeltas[delta]);
- break;
- case THUNDER_3BITDELTAS: /* 3-bit deltas */
- if ((delta = ((n >> 3) & 7)) != DELTA3_SKIP)
- SETPIXEL(op, lastpixel + threebitdeltas[delta]);
- if ((delta = (n & 7)) != DELTA3_SKIP)
- SETPIXEL(op, lastpixel + threebitdeltas[delta]);
- break;
- case THUNDER_RAW: /* raw data */
- SETPIXEL(op, n);
- break;
- }
- }
- tif->tif_rawcp = (tidata_t) bp;
- tif->tif_rawcc = cc;
- if (npixels != maxpixels) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "ThunderDecode: %s data at scanline %ld (%lu != %lu)",
- npixels < maxpixels ? "Not enough" : "Too much",
- (long) tif->tif_row, (long) npixels, (long) maxpixels);
- return (0);
- }
- return (1);
-}
-
-static int
-ThunderDecodeRow(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
-{
- tidata_t row = buf;
-
- (void) s;
- while ((long)occ > 0) {
- if (!ThunderDecode(tif, row, tif->tif_dir.td_imagewidth))
- return (0);
- occ -= tif->tif_scanlinesize;
- row += tif->tif_scanlinesize;
- }
- return (1);
-}
-
-int
-TIFFInitThunderScan(TIFF* tif, int scheme)
-{
- (void) scheme;
- tif->tif_decoderow = ThunderDecodeRow;
- tif->tif_decodestrip = ThunderDecodeRow;
- return (1);
-}
-#endif /* THUNDER_SUPPORT */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_tile.c b/src/3rdparty/libtiff/libtiff/tif_tile.c
deleted file mode 100644
index 454fe5cd24..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_tile.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* $Id: tif_tile.c,v 1.12 2006/02/09 16:15:43 dron Exp $ */
-
-/*
- * Copyright (c) 1991-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Tiled Image Support Routines.
- */
-#include "tiffiop.h"
-
-static uint32
-summarize(TIFF* tif, size_t summand1, size_t summand2, const char* where)
-{
- /*
- * XXX: We are using casting to uint32 here, because sizeof(size_t)
- * may be larger than sizeof(uint32) on 64-bit architectures.
- */
- uint32 bytes = summand1 + summand2;
-
- if (bytes - summand1 != summand2) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Integer overflow in %s", where);
- bytes = 0;
- }
-
- return (bytes);
-}
-
-static uint32
-multiply(TIFF* tif, size_t nmemb, size_t elem_size, const char* where)
-{
- uint32 bytes = nmemb * elem_size;
-
- if (elem_size && bytes / elem_size != nmemb) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Integer overflow in %s", where);
- bytes = 0;
- }
-
- return (bytes);
-}
-
-/*
- * Compute which tile an (x,y,z,s) value is in.
- */
-ttile_t
-TIFFComputeTile(TIFF* tif, uint32 x, uint32 y, uint32 z, tsample_t s)
-{
- TIFFDirectory *td = &tif->tif_dir;
- uint32 dx = td->td_tilewidth;
- uint32 dy = td->td_tilelength;
- uint32 dz = td->td_tiledepth;
- ttile_t tile = 1;
-
- if (td->td_imagedepth == 1)
- z = 0;
- if (dx == (uint32) -1)
- dx = td->td_imagewidth;
- if (dy == (uint32) -1)
- dy = td->td_imagelength;
- if (dz == (uint32) -1)
- dz = td->td_imagedepth;
- if (dx != 0 && dy != 0 && dz != 0) {
- uint32 xpt = TIFFhowmany(td->td_imagewidth, dx);
- uint32 ypt = TIFFhowmany(td->td_imagelength, dy);
- uint32 zpt = TIFFhowmany(td->td_imagedepth, dz);
-
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
- tile = (xpt*ypt*zpt)*s +
- (xpt*ypt)*(z/dz) +
- xpt*(y/dy) +
- x/dx;
- else
- tile = (xpt*ypt)*(z/dz) + xpt*(y/dy) + x/dx;
- }
- return (tile);
-}
-
-/*
- * Check an (x,y,z,s) coordinate
- * against the image bounds.
- */
-int
-TIFFCheckTile(TIFF* tif, uint32 x, uint32 y, uint32 z, tsample_t s)
-{
- TIFFDirectory *td = &tif->tif_dir;
-
- if (x >= td->td_imagewidth) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Col out of range, max %lu",
- (unsigned long) x,
- (unsigned long) (td->td_imagewidth - 1));
- return (0);
- }
- if (y >= td->td_imagelength) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Row out of range, max %lu",
- (unsigned long) y,
- (unsigned long) (td->td_imagelength - 1));
- return (0);
- }
- if (z >= td->td_imagedepth) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Depth out of range, max %lu",
- (unsigned long) z,
- (unsigned long) (td->td_imagedepth - 1));
- return (0);
- }
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE &&
- s >= td->td_samplesperpixel) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%lu: Sample out of range, max %lu",
- (unsigned long) s,
- (unsigned long) (td->td_samplesperpixel - 1));
- return (0);
- }
- return (1);
-}
-
-/*
- * Compute how many tiles are in an image.
- */
-ttile_t
-TIFFNumberOfTiles(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- uint32 dx = td->td_tilewidth;
- uint32 dy = td->td_tilelength;
- uint32 dz = td->td_tiledepth;
- ttile_t ntiles;
-
- if (dx == (uint32) -1)
- dx = td->td_imagewidth;
- if (dy == (uint32) -1)
- dy = td->td_imagelength;
- if (dz == (uint32) -1)
- dz = td->td_imagedepth;
- ntiles = (dx == 0 || dy == 0 || dz == 0) ? 0 :
- multiply(tif, multiply(tif, TIFFhowmany(td->td_imagewidth, dx),
- TIFFhowmany(td->td_imagelength, dy),
- "TIFFNumberOfTiles"),
- TIFFhowmany(td->td_imagedepth, dz), "TIFFNumberOfTiles");
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
- ntiles = multiply(tif, ntiles, td->td_samplesperpixel,
- "TIFFNumberOfTiles");
- return (ntiles);
-}
-
-/*
- * Compute the # bytes in each row of a tile.
- */
-tsize_t
-TIFFTileRowSize(TIFF* tif)
-{
- TIFFDirectory *td = &tif->tif_dir;
- tsize_t rowsize;
-
- if (td->td_tilelength == 0 || td->td_tilewidth == 0)
- return ((tsize_t) 0);
- rowsize = multiply(tif, td->td_bitspersample, td->td_tilewidth,
- "TIFFTileRowSize");
- if (td->td_planarconfig == PLANARCONFIG_CONTIG)
- rowsize = multiply(tif, rowsize, td->td_samplesperpixel,
- "TIFFTileRowSize");
- return ((tsize_t) TIFFhowmany8(rowsize));
-}
-
-/*
- * Compute the # bytes in a variable length, row-aligned tile.
- */
-tsize_t
-TIFFVTileSize(TIFF* tif, uint32 nrows)
-{
- TIFFDirectory *td = &tif->tif_dir;
- tsize_t tilesize;
-
- if (td->td_tilelength == 0 || td->td_tilewidth == 0 ||
- td->td_tiledepth == 0)
- return ((tsize_t) 0);
- if (td->td_planarconfig == PLANARCONFIG_CONTIG &&
- td->td_photometric == PHOTOMETRIC_YCBCR &&
- !isUpSampled(tif)) {
- /*
- * Packed YCbCr data contain one Cb+Cr for every
- * HorizontalSampling*VerticalSampling Y values.
- * Must also roundup width and height when calculating
- * since images that are not a multiple of the
- * horizontal/vertical subsampling area include
- * YCbCr data for the extended image.
- */
- tsize_t w =
- TIFFroundup(td->td_tilewidth, td->td_ycbcrsubsampling[0]);
- tsize_t rowsize =
- TIFFhowmany8(multiply(tif, w, td->td_bitspersample,
- "TIFFVTileSize"));
- tsize_t samplingarea =
- td->td_ycbcrsubsampling[0]*td->td_ycbcrsubsampling[1];
- if (samplingarea == 0) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, "Invalid YCbCr subsampling");
- return 0;
- }
- nrows = TIFFroundup(nrows, td->td_ycbcrsubsampling[1]);
- /* NB: don't need TIFFhowmany here 'cuz everything is rounded */
- tilesize = multiply(tif, nrows, rowsize, "TIFFVTileSize");
- tilesize = summarize(tif, tilesize,
- multiply(tif, 2, tilesize / samplingarea,
- "TIFFVTileSize"),
- "TIFFVTileSize");
- } else
- tilesize = multiply(tif, nrows, TIFFTileRowSize(tif),
- "TIFFVTileSize");
- return ((tsize_t)
- multiply(tif, tilesize, td->td_tiledepth, "TIFFVTileSize"));
-}
-
-/*
- * Compute the # bytes in a row-aligned tile.
- */
-tsize_t
-TIFFTileSize(TIFF* tif)
-{
- return (TIFFVTileSize(tif, tif->tif_dir.td_tilelength));
-}
-
-/*
- * Compute a default tile size based on the image
- * characteristics and a requested value. If a
- * request is <1 then we choose a size according
- * to certain heuristics.
- */
-void
-TIFFDefaultTileSize(TIFF* tif, uint32* tw, uint32* th)
-{
- (*tif->tif_deftilesize)(tif, tw, th);
-}
-
-void
-_TIFFDefaultTileSize(TIFF* tif, uint32* tw, uint32* th)
-{
- (void) tif;
- if (*(int32*) tw < 1)
- *tw = 256;
- if (*(int32*) th < 1)
- *th = 256;
- /* roundup to a multiple of 16 per the spec */
- if (*tw & 0xf)
- *tw = TIFFroundup(*tw, 16);
- if (*th & 0xf)
- *th = TIFFroundup(*th, 16);
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_unix.c b/src/3rdparty/libtiff/libtiff/tif_unix.c
deleted file mode 100644
index 2c3bf7d33c..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_unix.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* $Id: tif_unix.c,v 1.12 2006/03/21 16:37:51 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library UNIX-specific Routines. These are should also work with the
- * Windows Common RunTime Library.
- */
-#include "tif_config.h"
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
-#ifdef HAVE_IO_H
-# include <io.h>
-#endif
-
-#include "tiffiop.h"
-
-static tsize_t
-_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- return ((tsize_t) read((int) fd, buf, (size_t) size));
-}
-
-static tsize_t
-_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- return ((tsize_t) write((int) fd, buf, (size_t) size));
-}
-
-static toff_t
-_tiffSeekProc(thandle_t fd, toff_t off, int whence)
-{
- return ((toff_t) lseek((int) fd, (off_t) off, whence));
-}
-
-static int
-_tiffCloseProc(thandle_t fd)
-{
- return (close((int) fd));
-}
-
-
-static toff_t
-_tiffSizeProc(thandle_t fd)
-{
-#ifdef _AM29K
- long fsize;
- return ((fsize = lseek((int) fd, 0, SEEK_END)) < 0 ? 0 : fsize);
-#else
- struct stat sb;
- return (toff_t) (fstat((int) fd, &sb) < 0 ? 0 : sb.st_size);
-#endif
-}
-
-#ifdef HAVE_MMAP
-#include <sys/mman.h>
-
-static int
-_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
-{
- toff_t size = _tiffSizeProc(fd);
- if (size != (toff_t) -1) {
- *pbase = (tdata_t)
- mmap(0, size, PROT_READ, MAP_SHARED, (int) fd, 0);
- if (*pbase != (tdata_t) -1) {
- *psize = size;
- return (1);
- }
- }
- return (0);
-}
-
-static void
-_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
-{
- (void) fd;
- (void) munmap(base, (off_t) size);
-}
-#else /* !HAVE_MMAP */
-static int
-_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
-{
- (void) fd; (void) pbase; (void) psize;
- return (0);
-}
-
-static void
-_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
-{
- (void) fd; (void) base; (void) size;
-}
-#endif /* !HAVE_MMAP */
-
-/*
- * Open a TIFF file descriptor for read/writing.
- */
-TIFF*
-TIFFFdOpen(int fd, const char* name, const char* mode)
-{
- TIFF* tif;
-
- tif = TIFFClientOpen(name, mode,
- (thandle_t) fd,
- _tiffReadProc, _tiffWriteProc,
- _tiffSeekProc, _tiffCloseProc, _tiffSizeProc,
- _tiffMapProc, _tiffUnmapProc);
- if (tif)
- tif->tif_fd = fd;
- return (tif);
-}
-
-/*
- * Open a TIFF file for read/writing.
- */
-TIFF*
-TIFFOpen(const char* name, const char* mode)
-{
- static const char module[] = "TIFFOpen";
- int m, fd;
- TIFF* tif;
-
- m = _TIFFgetMode(mode, module);
- if (m == -1)
- return ((TIFF*)0);
-
-/* for cygwin and mingw */
-#ifdef O_BINARY
- m |= O_BINARY;
-#endif
-
-#ifdef _AM29K
- fd = open(name, m);
-#else
- fd = open(name, m, 0666);
-#endif
- if (fd < 0) {
- TIFFErrorExt(0, module, "%s: Cannot open", name);
- return ((TIFF *)0);
- }
-
- tif = TIFFFdOpen((int)fd, name, mode);
- if(!tif)
- close(fd);
- return tif;
-}
-
-#if defined (__WIN32__) && !defined(__SYMBIAN32__)
-#include <windows.h>
-/*
- * Open a TIFF file with a Unicode filename, for read/writing.
- */
-TIFF*
-TIFFOpenW(const wchar_t* name, const char* mode)
-{
- static const char module[] = "TIFFOpenW";
- int m, fd;
- int mbsize;
- char *mbname;
- TIFF* tif;
-
- m = _TIFFgetMode(mode, module);
- if (m == -1)
- return ((TIFF*)0);
-
-/* for cygwin and mingw */
-#ifdef O_BINARY
- m |= O_BINARY;
-#endif
-
- fd = _wopen(name, m, 0666);
- if (fd < 0) {
- TIFFErrorExt(0, module, "%s: Cannot open", name);
- return ((TIFF *)0);
- }
-
- mbname = NULL;
- mbsize = WideCharToMultiByte(CP_ACP, 0, name, -1, NULL, 0, NULL, NULL);
- if (mbsize > 0) {
- mbname = _TIFFmalloc(mbsize);
- if (!mbname) {
- TIFFErrorExt(0, module,
- "Can't allocate space for filename conversion buffer");
- return ((TIFF*)0);
- }
-
- WideCharToMultiByte(CP_ACP, 0, name, -1, mbname, mbsize,
- NULL, NULL);
- }
-
- tif = TIFFFdOpen((int)fd, (mbname != NULL) ? mbname : "<unknown>",
- mode);
-
- _TIFFfree(mbname);
-
- if(!tif)
- close(fd);
- return tif;
-}
-#endif
-
-void*
-_TIFFmalloc(tsize_t s)
-{
- return (malloc((size_t) s));
-}
-
-void
-_TIFFfree(tdata_t p)
-{
- free(p);
-}
-
-void*
-_TIFFrealloc(tdata_t p, tsize_t s)
-{
- return (realloc(p, (size_t) s));
-}
-
-void
-_TIFFmemset(tdata_t p, int v, tsize_t c)
-{
- memset(p, v, (size_t) c);
-}
-
-void
-_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
-{
- memcpy(d, s, (size_t) c);
-}
-
-int
-_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
-{
- return (memcmp(p1, p2, (size_t) c));
-}
-
-static void
-unixWarningHandler(const char* module, const char* fmt, va_list ap)
-{
- if (module != NULL)
- fprintf(stderr, "%s: ", module);
- fprintf(stderr, "Warning, ");
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-}
-TIFFErrorHandler _TIFFwarningHandler = unixWarningHandler;
-
-static void
-unixErrorHandler(const char* module, const char* fmt, va_list ap)
-{
- if (module != NULL)
- fprintf(stderr, "%s: ", module);
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-}
-TIFFErrorHandler _TIFFerrorHandler = unixErrorHandler;
diff --git a/src/3rdparty/libtiff/libtiff/tif_version.c b/src/3rdparty/libtiff/libtiff/tif_version.c
deleted file mode 100644
index 1264b71591..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_version.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_version.c,v 1.2 2000/11/13 14:42:38 warmerda Exp $ */
-/*
- * Copyright (c) 1992-1997 Sam Leffler
- * Copyright (c) 1992-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-#include "tiffiop.h"
-
-static const char TIFFVersion[] = TIFFLIB_VERSION_STR;
-
-const char*
-TIFFGetVersion(void)
-{
- return (TIFFVersion);
-}
diff --git a/src/3rdparty/libtiff/libtiff/tif_warning.c b/src/3rdparty/libtiff/libtiff/tif_warning.c
deleted file mode 100644
index d593469d2d..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_warning.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_warning.c,v 1.2 2005/12/23 01:18:59 joris Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- */
-#include "tiffiop.h"
-
-TIFFErrorHandlerExt _TIFFwarningHandlerExt = NULL;
-
-TIFFErrorHandler
-TIFFSetWarningHandler(TIFFErrorHandler handler)
-{
- TIFFErrorHandler prev = _TIFFwarningHandler;
- _TIFFwarningHandler = handler;
- return (prev);
-}
-
-TIFFErrorHandlerExt
-TIFFSetWarningHandlerExt(TIFFErrorHandlerExt handler)
-{
- TIFFErrorHandlerExt prev = _TIFFwarningHandlerExt;
- _TIFFwarningHandlerExt = handler;
- return (prev);
-}
-
-void
-TIFFWarning(const char* module, const char* fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- if (_TIFFwarningHandler)
- (*_TIFFwarningHandler)(module, fmt, ap);
- if (_TIFFwarningHandlerExt)
- (*_TIFFwarningHandlerExt)(0, module, fmt, ap);
- va_end(ap);
-}
-
-void
-TIFFWarningExt(thandle_t fd, const char* module, const char* fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- if (_TIFFwarningHandler)
- (*_TIFFwarningHandler)(module, fmt, ap);
- if (_TIFFwarningHandlerExt)
- (*_TIFFwarningHandlerExt)(fd, module, fmt, ap);
- va_end(ap);
-}
-
-
diff --git a/src/3rdparty/libtiff/libtiff/tif_win3.c b/src/3rdparty/libtiff/libtiff/tif_win3.c
deleted file mode 100644
index b16b214da3..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_win3.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_win3.c,v 1.2 2005/12/21 12:23:13 joris Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library Windows 3.x-specific Routines.
- */
-#include "tiffiop.h"
-#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(_MSC_VER)
-#include <io.h> /* for open, close, etc. function prototypes */
-#endif
-
-#include <windows.h>
-#include <windowsx.h>
-#include <memory.h>
-
-static tsize_t
-_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- return (_hread(fd, buf, size));
-}
-
-static tsize_t
-_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- return (_hwrite(fd, buf, size));
-}
-
-static toff_t
-_tiffSeekProc(thandle_t fd, toff_t off, int whence)
-{
- return (_llseek(fd, (off_t) off, whence));
-}
-
-static int
-_tiffCloseProc(thandle_t fd)
-{
- return (_lclose(fd));
-}
-
-#include <sys/stat.h>
-
-static toff_t
-_tiffSizeProc(thandle_t fd)
-{
- struct stat sb;
- return (fstat((int) fd, &sb) < 0 ? 0 : sb.st_size);
-}
-
-static int
-_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
-{
- return (0);
-}
-
-static void
-_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
-{
-}
-
-/*
- * Open a TIFF file descriptor for read/writing.
- */
-TIFF*
-TIFFFdOpen(int fd, const char* name, const char* mode)
-{
- TIFF* tif;
-
- tif = TIFFClientOpen(name, mode,
- (thandle_t) fd,
- _tiffReadProc, _tiffWriteProc, _tiffSeekProc, _tiffCloseProc,
- _tiffSizeProc, _tiffMapProc, _tiffUnmapProc);
- if (tif)
- tif->tif_fd = fd;
- return (tif);
-}
-
-/*
- * Open a TIFF file for read/writing.
- */
-TIFF*
-TIFFOpen(const char* name, const char* mode)
-{
- static const char module[] = "TIFFOpen";
- int m, fd;
- OFSTRUCT of;
- int mm = 0;
-
- m = _TIFFgetMode(mode, module);
- if (m == -1)
- return ((TIFF*)0);
- if (m & O_CREAT) {
- if ((m & O_TRUNC) || OpenFile(name, &of, OF_EXIST) != HFILE_ERROR)
- mm |= OF_CREATE;
- }
- if (m & O_WRONLY)
- mm |= OF_WRITE;
- if (m & O_RDWR)
- mm |= OF_READWRITE;
- fd = OpenFile(name, &of, mm);
- if (fd < 0) {
- TIFFErrorExt(0, module, "%s: Cannot open", name);
- return ((TIFF*)0);
- }
- return (TIFFFdOpen(fd, name, mode));
-}
-
-tdata_t
-_TIFFmalloc(tsize_t s)
-{
- return (tdata_t) GlobalAllocPtr(GHND, (DWORD) s);
-}
-
-void
-_TIFFfree(tdata_t p)
-{
- GlobalFreePtr(p);
-}
-
-tdata_t
-_TIFFrealloc(tdata_t p, tsize_t s)
-{
- return (tdata_t) GlobalReAllocPtr(p, (DWORD) s, GHND);
-}
-
-void
-_TIFFmemset(tdata_t p, int v, tsize_t c)
-{
- char* pp = (char*) p;
-
- while (c > 0) {
- tsize_t chunk = 0x10000 - ((uint32) pp & 0xffff);/* What's left in segment */
- if (chunk > 0xff00) /* No more than 0xff00 */
- chunk = 0xff00;
- if (chunk > c) /* No more than needed */
- chunk = c;
- memset(pp, v, chunk);
- pp = (char*) (chunk + (char huge*) pp);
- c -= chunk;
- }
-}
-
-void
-_TIFFmemcpy(tdata_t d, const tdata_t s, tsize_t c)
-{
- if (c > 0xFFFF)
- hmemcpy((void _huge*) d, (void _huge*) s, c);
- else
- (void) memcpy(d, s, (size_t) c);
-}
-
-int
-_TIFFmemcmp(const tdata_t d, const tdata_t s, tsize_t c)
-{
- char* dd = (char*) d;
- char* ss = (char*) s;
- tsize_t chunks, chunkd, chunk;
- int result;
-
- while (c > 0) {
- chunks = 0x10000 - ((uint32) ss & 0xffff); /* What's left in segment */
- chunkd = 0x10000 - ((uint32) dd & 0xffff); /* What's left in segment */
- chunk = c; /* Get the largest of */
- if (chunk > chunks) /* c, chunks, chunkd, */
- chunk = chunks; /* 0xff00 */
- if (chunk > chunkd)
- chunk = chunkd;
- if (chunk > 0xff00)
- chunk = 0xff00;
- result = memcmp(dd, ss, chunk);
- if (result != 0)
- return (result);
- dd = (char*) (chunk + (char huge*) dd);
- ss = (char*) (chunk + (char huge*) ss);
- c -= chunk;
- }
- return (0);
-}
-
-static void
-win3WarningHandler(const char* module, const char* fmt, va_list ap)
-{
- char e[512] = { '\0' };
- if (module != NULL)
- strcat(strcpy(e, module), ":");
- vsprintf(e+strlen(e), fmt, ap);
- strcat(e, ".");
- MessageBox(GetActiveWindow(), e, "LibTIFF Warning",
- MB_OK|MB_ICONEXCLAMATION);
-}
-TIFFErrorHandler _TIFFwarningHandler = win3WarningHandler;
-
-static void
-win3ErrorHandler(const char* module, const char* fmt, va_list ap)
-{
- char e[512] = { '\0' };
- if (module != NULL)
- strcat(strcpy(e, module), ":");
- vsprintf(e+strlen(e), fmt, ap);
- strcat(e, ".");
- MessageBox(GetActiveWindow(), e, "LibTIFF Error", MB_OK|MB_ICONSTOP);
-}
-TIFFErrorHandler _TIFFerrorHandler = win3ErrorHandler;
diff --git a/src/3rdparty/libtiff/libtiff/tif_win32.c b/src/3rdparty/libtiff/libtiff/tif_win32.c
deleted file mode 100644
index d7f33de374..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_win32.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/* $Id: tif_win32.c,v 1.21 2007/03/07 17:10:31 joris Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library Win32-specific Routines. Adapted from tif_unix.c 4/5/95 by
- * Scott Wagner (wagner@itek.com), Itek Graphix, Rochester, NY USA
- */
-#include "tiffiop.h"
-#include <windows.h>
-
-#include <windows.h>
-
-static tsize_t
-_tiffReadProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- DWORD dwSizeRead;
- if (!ReadFile(fd, buf, size, &dwSizeRead, NULL))
- return(0);
- return ((tsize_t) dwSizeRead);
-}
-
-static tsize_t
-_tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size)
-{
- DWORD dwSizeWritten;
- if (!WriteFile(fd, buf, size, &dwSizeWritten, NULL))
- return(0);
- return ((tsize_t) dwSizeWritten);
-}
-
-static toff_t
-_tiffSeekProc(thandle_t fd, toff_t off, int whence)
-{
- ULARGE_INTEGER li;
- DWORD dwMoveMethod;
-
- li.QuadPart = off;
-
- switch(whence)
- {
- case SEEK_SET:
- dwMoveMethod = FILE_BEGIN;
- break;
- case SEEK_CUR:
- dwMoveMethod = FILE_CURRENT;
- break;
- case SEEK_END:
- dwMoveMethod = FILE_END;
- break;
- default:
- dwMoveMethod = FILE_BEGIN;
- break;
- }
- return ((toff_t)SetFilePointer(fd, (LONG) li.LowPart,
- (PLONG)&li.HighPart, dwMoveMethod));
-}
-
-static int
-_tiffCloseProc(thandle_t fd)
-{
- return (CloseHandle(fd) ? 0 : -1);
-}
-
-static toff_t
-_tiffSizeProc(thandle_t fd)
-{
- return ((toff_t)GetFileSize(fd, NULL));
-}
-
-static int
-_tiffDummyMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
-{
- (void) fd;
- (void) pbase;
- (void) psize;
- return (0);
-}
-
-/*
- * From "Hermann Josef Hill" <lhill@rhein-zeitung.de>:
- *
- * Windows uses both a handle and a pointer for file mapping,
- * but according to the SDK documentation and Richter's book
- * "Advanced Windows Programming" it is safe to free the handle
- * after obtaining the file mapping pointer
- *
- * This removes a nasty OS dependency and cures a problem
- * with Visual C++ 5.0
- */
-static int
-_tiffMapProc(thandle_t fd, tdata_t* pbase, toff_t* psize)
-{
- toff_t size;
- HANDLE hMapFile;
-
- if ((size = _tiffSizeProc(fd)) == 0xFFFFFFFF)
- return (0);
- hMapFile = CreateFileMapping(fd, NULL, PAGE_READONLY, 0, size, NULL);
- if (hMapFile == NULL)
- return (0);
- *pbase = MapViewOfFile(hMapFile, FILE_MAP_READ, 0, 0, 0);
- CloseHandle(hMapFile);
- if (*pbase == NULL)
- return (0);
- *psize = size;
- return(1);
-}
-
-static void
-_tiffDummyUnmapProc(thandle_t fd, tdata_t base, toff_t size)
-{
- (void) fd;
- (void) base;
- (void) size;
-}
-
-static void
-_tiffUnmapProc(thandle_t fd, tdata_t base, toff_t size)
-{
- UnmapViewOfFile(base);
-}
-
-/*
- * Open a TIFF file descriptor for read/writing.
- * Note that TIFFFdOpen and TIFFOpen recognise the character 'u' in the mode
- * string, which forces the file to be opened unmapped.
- */
-TIFF*
-TIFFFdOpen(int ifd, const char* name, const char* mode)
-{
- TIFF* tif;
- BOOL fSuppressMap = (mode[1] == 'u' || (mode[1]!=0 && mode[2] == 'u'));
-
- tif = TIFFClientOpen(name, mode, (thandle_t)ifd,
- _tiffReadProc, _tiffWriteProc,
- _tiffSeekProc, _tiffCloseProc, _tiffSizeProc,
- fSuppressMap ? _tiffDummyMapProc : _tiffMapProc,
- fSuppressMap ? _tiffDummyUnmapProc : _tiffUnmapProc);
- if (tif)
- tif->tif_fd = ifd;
- return (tif);
-}
-
-#ifndef _WIN32_WCE
-
-/*
- * Open a TIFF file for read/writing.
- */
-TIFF*
-TIFFOpen(const char* name, const char* mode)
-{
- static const char module[] = "TIFFOpen";
- thandle_t fd;
- int m;
- DWORD dwMode;
- TIFF* tif;
-
- m = _TIFFgetMode(mode, module);
-
- switch(m)
- {
- case O_RDONLY:
- dwMode = OPEN_EXISTING;
- break;
- case O_RDWR:
- dwMode = OPEN_ALWAYS;
- break;
- case O_RDWR|O_CREAT:
- dwMode = OPEN_ALWAYS;
- break;
- case O_RDWR|O_TRUNC:
- dwMode = CREATE_ALWAYS;
- break;
- case O_RDWR|O_CREAT|O_TRUNC:
- dwMode = CREATE_ALWAYS;
- break;
- default:
- return ((TIFF*)0);
- }
- fd = (thandle_t)CreateFileA(name,
- (m == O_RDONLY)?GENERIC_READ:(GENERIC_READ | GENERIC_WRITE),
- FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, dwMode,
- (m == O_RDONLY)?FILE_ATTRIBUTE_READONLY:FILE_ATTRIBUTE_NORMAL,
- NULL);
- if (fd == INVALID_HANDLE_VALUE) {
- TIFFErrorExt(0, module, "%s: Cannot open", name);
- return ((TIFF *)0);
- }
-
- tif = TIFFFdOpen((int)fd, name, mode);
- if(!tif)
- CloseHandle(fd);
- return tif;
-}
-
-/*
- * Open a TIFF file with a Unicode filename, for read/writing.
- */
-TIFF*
-TIFFOpenW(const wchar_t* name, const char* mode)
-{
- static const char module[] = "TIFFOpenW";
- thandle_t fd;
- int m;
- DWORD dwMode;
- int mbsize;
- char *mbname;
- TIFF *tif;
-
- m = _TIFFgetMode(mode, module);
-
- switch(m) {
- case O_RDONLY: dwMode = OPEN_EXISTING; break;
- case O_RDWR: dwMode = OPEN_ALWAYS; break;
- case O_RDWR|O_CREAT: dwMode = OPEN_ALWAYS; break;
- case O_RDWR|O_TRUNC: dwMode = CREATE_ALWAYS; break;
- case O_RDWR|O_CREAT|O_TRUNC: dwMode = CREATE_ALWAYS; break;
- default: return ((TIFF*)0);
- }
-
- fd = (thandle_t)CreateFileW(name,
- (m == O_RDONLY)?GENERIC_READ:(GENERIC_READ|GENERIC_WRITE),
- FILE_SHARE_READ, NULL, dwMode,
- (m == O_RDONLY)?FILE_ATTRIBUTE_READONLY:FILE_ATTRIBUTE_NORMAL,
- NULL);
- if (fd == INVALID_HANDLE_VALUE) {
- TIFFErrorExt(0, module, "%S: Cannot open", name);
- return ((TIFF *)0);
- }
-
- mbname = NULL;
- mbsize = WideCharToMultiByte(CP_ACP, 0, name, -1, NULL, 0, NULL, NULL);
- if (mbsize > 0) {
- mbname = (char *)_TIFFmalloc(mbsize);
- if (!mbname) {
- TIFFErrorExt(0, module,
- "Can't allocate space for filename conversion buffer");
- return ((TIFF*)0);
- }
-
- WideCharToMultiByte(CP_ACP, 0, name, -1, mbname, mbsize,
- NULL, NULL);
- }
-
- tif = TIFFFdOpen((int)fd,
- (mbname != NULL) ? mbname : "<unknown>", mode);
- if(!tif)
- CloseHandle(fd);
-
- _TIFFfree(mbname);
-
- return tif;
-}
-
-#endif /* ndef _WIN32_WCE */
-
-
-tdata_t
-_TIFFmalloc(tsize_t s)
-{
- return ((tdata_t)GlobalAlloc(GMEM_FIXED, s));
-}
-
-void
-_TIFFfree(tdata_t p)
-{
- GlobalFree(p);
- return;
-}
-
-tdata_t
-_TIFFrealloc(tdata_t p, tsize_t s)
-{
- void* pvTmp;
- tsize_t old;
-
- if(p == NULL)
- return ((tdata_t)GlobalAlloc(GMEM_FIXED, s));
-
- old = GlobalSize(p);
-
- if (old>=s) {
- if ((pvTmp = GlobalAlloc(GMEM_FIXED, s)) != NULL) {
- CopyMemory(pvTmp, p, s);
- GlobalFree(p);
- }
- } else {
- if ((pvTmp = GlobalAlloc(GMEM_FIXED, s)) != NULL) {
- CopyMemory(pvTmp, p, old);
- GlobalFree(p);
- }
- }
- return ((tdata_t)pvTmp);
-}
-
-void
-_TIFFmemset(void* p, int v, tsize_t c)
-{
- FillMemory(p, c, (BYTE)v);
-}
-
-void
-_TIFFmemcpy(void* d, const tdata_t s, tsize_t c)
-{
- CopyMemory(d, s, c);
-}
-
-int
-_TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
-{
- register const BYTE *pb1 = (const BYTE *) p1;
- register const BYTE *pb2 = (const BYTE *) p2;
- register DWORD dwTmp = c;
- register int iTmp;
- for (iTmp = 0; dwTmp-- && !iTmp; iTmp = (int)*pb1++ - (int)*pb2++)
- ;
- return (iTmp);
-}
-
-#ifndef _WIN32_WCE
-
-static void
-Win32WarningHandler(const char* module, const char* fmt, va_list ap)
-{
-#ifndef TIF_PLATFORM_CONSOLE
- LPTSTR szTitle;
- LPTSTR szTmp;
- LPCTSTR szTitleText = "%s Warning";
- LPCTSTR szDefaultModule = "LIBTIFF";
- LPCTSTR szTmpModule = (module == NULL) ? szDefaultModule : module;
- if ((szTitle = (LPTSTR)LocalAlloc(LMEM_FIXED, (strlen(szTmpModule) +
- strlen(szTitleText) + strlen(fmt) + 128)*sizeof(char))) == NULL)
- return;
- sprintf(szTitle, szTitleText, szTmpModule);
- szTmp = szTitle + (strlen(szTitle)+2)*sizeof(char);
- vsprintf(szTmp, fmt, ap);
- MessageBoxA(GetFocus(), szTmp, szTitle, MB_OK | MB_ICONINFORMATION);
- LocalFree(szTitle);
- return;
-#else
- if (module != NULL)
- fprintf(stderr, "%s: ", module);
- fprintf(stderr, "Warning, ");
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-#endif
-}
-TIFFErrorHandler _TIFFwarningHandler = Win32WarningHandler;
-
-static void
-Win32ErrorHandler(const char* module, const char* fmt, va_list ap)
-{
-#ifndef TIF_PLATFORM_CONSOLE
- LPTSTR szTitle;
- LPTSTR szTmp;
- LPCTSTR szTitleText = "%s Error";
- LPCTSTR szDefaultModule = "LIBTIFF";
- LPCTSTR szTmpModule = (module == NULL) ? szDefaultModule : module;
- if ((szTitle = (LPTSTR)LocalAlloc(LMEM_FIXED, (strlen(szTmpModule) +
- strlen(szTitleText) + strlen(fmt) + 128)*sizeof(char))) == NULL)
- return;
- sprintf(szTitle, szTitleText, szTmpModule);
- szTmp = szTitle + (strlen(szTitle)+2)*sizeof(char);
- vsprintf(szTmp, fmt, ap);
- MessageBoxA(GetFocus(), szTmp, szTitle, MB_OK | MB_ICONEXCLAMATION);
- LocalFree(szTitle);
- return;
-#else
- if (module != NULL)
- fprintf(stderr, "%s: ", module);
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, ".\n");
-#endif
-}
-TIFFErrorHandler _TIFFerrorHandler = Win32ErrorHandler;
-
-#endif /* ndef _WIN32_WCE */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_wince.c b/src/3rdparty/libtiff/libtiff/tif_wince.c
deleted file mode 100644
index 4e283daf69..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_wince.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/* $Id: tif_wince.c,v 1.1 2007-01-15 18:40:39 mloskot Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * Windows CE-specific routines for TIFF Library.
- * Adapted from tif_win32.c 01/10/2006 by Mateusz Loskot (mateusz@loskot.net)
- */
-
-#ifndef _WIN32_WCE
-# error "Only Windows CE target is supported!"
-#endif
-
-#include "tiffiop.h"
-#include <windows.h>
-
-/* Turn off console support on Windows CE. */
-#undef TIF_PLATFORM_CONSOLE
-
-
-/*
- * Open a TIFF file for read/writing.
- */
-TIFF*
-TIFFOpen(const char* name, const char* mode)
-{
- static const char module[] = "TIFFOpen";
- thandle_t fd;
- int m;
- DWORD dwMode;
- TIFF* tif;
- size_t nLen;
- size_t nWideLen;
- wchar_t* wchName;
-
- m = _TIFFgetMode(mode, module);
-
- switch(m)
- {
- case O_RDONLY:
- dwMode = OPEN_EXISTING;
- break;
- case O_RDWR:
- dwMode = OPEN_ALWAYS;
- break;
- case O_RDWR|O_CREAT:
- dwMode = OPEN_ALWAYS;
- break;
- case O_RDWR|O_TRUNC:
- dwMode = CREATE_ALWAYS;
- break;
- case O_RDWR|O_CREAT|O_TRUNC:
- dwMode = CREATE_ALWAYS;
- break;
- default:
- return ((TIFF*)0);
- }
-
- /* On Windows CE, CreateFile is mapped to CreateFileW,
- * but file path is passed as char-based string,
- * so the path has to be converted to wchar_t.
- */
-
- nWideLen = 0;
- wchName = NULL;
- nLen = strlen(name) + 1;
-
- nWideLen = MultiByteToWideChar(CP_ACP, 0, name, nLen, NULL, 0);
- wchName = (wchar_t*)malloc(sizeof(wchar_t) * nWideLen);
- if (NULL == wchName)
- {
- TIFFErrorExt(0, module, "Memory allocation error!");
- return ((TIFF *)0);
- }
- memset(wchName, 0, sizeof(wchar_t) * nWideLen);
- MultiByteToWideChar(CP_ACP, 0, name, nLen, wchName, nWideLen);
-
- fd = (thandle_t)CreateFile(wchName,
- (m == O_RDONLY)?GENERIC_READ:(GENERIC_READ | GENERIC_WRITE),
- FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, dwMode,
- (m == O_RDONLY)?FILE_ATTRIBUTE_READONLY:FILE_ATTRIBUTE_NORMAL,
- NULL);
-
- free(wchName);
-
- if (fd == INVALID_HANDLE_VALUE) {
- TIFFErrorExt(0, module, "%s: Cannot open", name);
- return ((TIFF *)0);
- }
-
- /* TODO - mloskot: change to TIFFdOpenW and pass wchar path */
-
- tif = TIFFFdOpen((int)fd, name, mode);
- if(!tif)
- CloseHandle(fd);
- return tif;
-}
-
-/*
- * Open a TIFF file with a Unicode filename, for read/writing.
- */
-TIFF*
-TIFFOpenW(const wchar_t* name, const char* mode)
-{
- static const char module[] = "TIFFOpenW";
- thandle_t fd;
- int m;
- DWORD dwMode;
- int mbsize;
- char *mbname;
- TIFF *tif;
-
- m = _TIFFgetMode(mode, module);
-
- switch(m) {
- case O_RDONLY: dwMode = OPEN_EXISTING; break;
- case O_RDWR: dwMode = OPEN_ALWAYS; break;
- case O_RDWR|O_CREAT: dwMode = OPEN_ALWAYS; break;
- case O_RDWR|O_TRUNC: dwMode = CREATE_ALWAYS; break;
- case O_RDWR|O_CREAT|O_TRUNC: dwMode = CREATE_ALWAYS; break;
- default: return ((TIFF*)0);
- }
-
- /* On Windows CE, CreateFile is mapped to CreateFileW,
- * so no conversion of wchar_t to char is required.
- */
-
- fd = (thandle_t)CreateFile(name,
- (m == O_RDONLY)?GENERIC_READ:(GENERIC_READ|GENERIC_WRITE),
- FILE_SHARE_READ, NULL, dwMode,
- (m == O_RDONLY)?FILE_ATTRIBUTE_READONLY:FILE_ATTRIBUTE_NORMAL,
- NULL);
- if (fd == INVALID_HANDLE_VALUE) {
- TIFFErrorExt(0, module, "%S: Cannot open", name);
- return ((TIFF *)0);
- }
-
- mbname = NULL;
- mbsize = WideCharToMultiByte(CP_ACP, 0, name, -1, NULL, 0, NULL, NULL);
- if (mbsize > 0) {
- mbname = (char *)_TIFFmalloc(mbsize);
- if (!mbname) {
- TIFFErrorExt(0, module,
- "Can't allocate space for filename conversion buffer");
- return ((TIFF*)0);
- }
-
- WideCharToMultiByte(CP_ACP, 0, name, -1, mbname, mbsize,
- NULL, NULL);
- }
-
- tif = TIFFFdOpen((int)fd,
- (mbname != NULL) ? mbname : "<unknown>", mode);
- if(!tif)
- CloseHandle(fd);
-
- _TIFFfree(mbname);
-
- return tif;
-}
-
-static void
-Win32WarningHandler(const char* module, const char* fmt, va_list ap)
-{
- /* On Windows CE, MessageBox is mapped to wide-char based MessageBoxW. */
-
- size_t nWideLen = 0;
- LPTSTR szWideTitle = NULL;
- LPTSTR szWideMsg = NULL;
-
- LPSTR szTitle;
- LPSTR szTmp;
- LPCSTR szTitleText = "%s Warning";
- LPCSTR szDefaultModule = "LIBTIFF";
- LPCSTR szTmpModule;
-
- szTmpModule = (module == NULL) ? szDefaultModule : module;
- if ((szTitle = (LPSTR)LocalAlloc(LMEM_FIXED,
- (strlen(szTmpModule) + strlen(szTitleText)
- + strlen(fmt) + 128) * sizeof(char))) == NULL)
- return;
-
- sprintf(szTitle, szTitleText, szTmpModule);
- szTmp = szTitle + (strlen(szTitle) + 2) * sizeof(char);
- vsprintf(szTmp, fmt, ap);
-
- /* Convert error message to Unicode. */
-
- nWideLen = MultiByteToWideChar(CP_ACP, 0, szTitle, -1, NULL, 0);
- szWideTitle = (wchar_t*)malloc(sizeof(wchar_t) * nWideLen);
- MultiByteToWideChar(CP_ACP, 0, szTitle, -1, szWideTitle, nWideLen);
-
- nWideLen = MultiByteToWideChar(CP_ACP, 0, szTmp, -1, NULL, 0);
- szWideMsg = (wchar_t*)malloc(sizeof(wchar_t) * nWideLen);
- MultiByteToWideChar(CP_ACP, 0, szTmp, -1, szWideMsg, nWideLen);
-
- /* Display message */
-
- MessageBox(GetFocus(), szWideMsg, szWideTitle, MB_OK | MB_ICONEXCLAMATION);
-
- /* Free resources */
-
- LocalFree(szTitle);
- free(szWideMsg);
- free(szWideTitle);
-}
-
-TIFFErrorHandler _TIFFwarningHandler = Win32WarningHandler;
-
-static void
-Win32ErrorHandler(const char* module, const char* fmt, va_list ap)
-{
- /* On Windows CE, MessageBox is mapped to wide-char based MessageBoxW. */
-
- size_t nWideLen = 0;
- LPTSTR szWideTitle = NULL;
- LPTSTR szWideMsg = NULL;
-
- LPSTR szTitle;
- LPSTR szTmp;
- LPCSTR szTitleText = "%s Error";
- LPCSTR szDefaultModule = "LIBTIFF";
- LPCSTR szTmpModule;
-
- szTmpModule = (module == NULL) ? szDefaultModule : module;
- if ((szTitle = (LPSTR)LocalAlloc(LMEM_FIXED,
- (strlen(szTmpModule) + strlen(szTitleText)
- + strlen(fmt) + 128) * sizeof(char))) == NULL)
- return;
-
- sprintf(szTitle, szTitleText, szTmpModule);
- szTmp = szTitle + (strlen(szTitle) + 2) * sizeof(char);
- vsprintf(szTmp, fmt, ap);
-
- /* Convert error message to Unicode. */
-
- nWideLen = MultiByteToWideChar(CP_ACP, 0, szTitle, -1, NULL, 0);
- szWideTitle = (wchar_t*)malloc(sizeof(wchar_t) * nWideLen);
- MultiByteToWideChar(CP_ACP, 0, szTitle, -1, szWideTitle, nWideLen);
-
- nWideLen = MultiByteToWideChar(CP_ACP, 0, szTmp, -1, NULL, 0);
- szWideMsg = (wchar_t*)malloc(sizeof(wchar_t) * nWideLen);
- MultiByteToWideChar(CP_ACP, 0, szTmp, -1, szWideMsg, nWideLen);
-
- /* Display message */
-
- MessageBox(GetFocus(), szWideMsg, szWideTitle, MB_OK | MB_ICONEXCLAMATION);
-
- /* Free resources */
-
- LocalFree(szTitle);
- free(szWideMsg);
- free(szWideTitle);
-}
-
-TIFFErrorHandler _TIFFerrorHandler = Win32ErrorHandler;
-
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_write.c b/src/3rdparty/libtiff/libtiff/tif_write.c
deleted file mode 100644
index ec371361e0..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_write.c
+++ /dev/null
@@ -1,711 +0,0 @@
-/* $Id: tif_write.c,v 1.22.2.4 2009-08-28 02:23:19 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/*
- * TIFF Library.
- *
- * Scanline-oriented Write Support
- */
-#include "tiffiop.h"
-#include <stdio.h>
-
-#define STRIPINCR 20 /* expansion factor on strip array */
-
-#define WRITECHECKSTRIPS(tif, module) \
- (((tif)->tif_flags&TIFF_BEENWRITING) || TIFFWriteCheck((tif),0,module))
-#define WRITECHECKTILES(tif, module) \
- (((tif)->tif_flags&TIFF_BEENWRITING) || TIFFWriteCheck((tif),1,module))
-#define BUFFERCHECK(tif) \
- ((((tif)->tif_flags & TIFF_BUFFERSETUP) && tif->tif_rawdata) || \
- TIFFWriteBufferSetup((tif), NULL, (tsize_t) -1))
-
-static int TIFFGrowStrips(TIFF*, int, const char*);
-static int TIFFAppendToStrip(TIFF*, tstrip_t, tidata_t, tsize_t);
-
-int
-TIFFWriteScanline(TIFF* tif, tdata_t buf, uint32 row, tsample_t sample)
-{
- static const char module[] = "TIFFWriteScanline";
- register TIFFDirectory *td;
- int status, imagegrew = 0;
- tstrip_t strip;
-
- if (!WRITECHECKSTRIPS(tif, module))
- return (-1);
- /*
- * Handle delayed allocation of data buffer. This
- * permits it to be sized more intelligently (using
- * directory information).
- */
- if (!BUFFERCHECK(tif))
- return (-1);
- td = &tif->tif_dir;
- /*
- * Extend image length if needed
- * (but only for PlanarConfig=1).
- */
- if (row >= td->td_imagelength) { /* extend image */
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Can not change \"ImageLength\" when using separate planes");
- return (-1);
- }
- td->td_imagelength = row+1;
- imagegrew = 1;
- }
- /*
- * Calculate strip and check for crossings.
- */
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
- if (sample >= td->td_samplesperpixel) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%d: Sample out of range, max %d",
- sample, td->td_samplesperpixel);
- return (-1);
- }
- strip = sample*td->td_stripsperimage + row/td->td_rowsperstrip;
- } else
- strip = row / td->td_rowsperstrip;
- /*
- * Check strip array to make sure there's space. We don't support
- * dynamically growing files that have data organized in separate
- * bitplanes because it's too painful. In that case we require that
- * the imagelength be set properly before the first write (so that the
- * strips array will be fully allocated above).
- */
- if (strip >= td->td_nstrips && !TIFFGrowStrips(tif, 1, module))
- return (-1);
- if (strip != tif->tif_curstrip) {
- /*
- * Changing strips -- flush any data present.
- */
- if (!TIFFFlushData(tif))
- return (-1);
- tif->tif_curstrip = strip;
- /*
- * Watch out for a growing image. The value of strips/image
- * will initially be 1 (since it can't be deduced until the
- * imagelength is known).
- */
- if (strip >= td->td_stripsperimage && imagegrew)
- td->td_stripsperimage =
- TIFFhowmany(td->td_imagelength,td->td_rowsperstrip);
- tif->tif_row =
- (strip % td->td_stripsperimage) * td->td_rowsperstrip;
- if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
- if (!(*tif->tif_setupencode)(tif))
- return (-1);
- tif->tif_flags |= TIFF_CODERSETUP;
- }
-
- tif->tif_rawcc = 0;
- tif->tif_rawcp = tif->tif_rawdata;
-
- if( td->td_stripbytecount[strip] > 0 )
- {
- /* if we are writing over existing tiles, zero length */
- td->td_stripbytecount[strip] = 0;
-
- /* this forces TIFFAppendToStrip() to do a seek */
- tif->tif_curoff = 0;
- }
-
- if (!(*tif->tif_preencode)(tif, sample))
- return (-1);
- tif->tif_flags |= TIFF_POSTENCODE;
- }
- /*
- * Ensure the write is either sequential or at the
- * beginning of a strip (or that we can randomly
- * access the data -- i.e. no encoding).
- */
- if (row != tif->tif_row) {
- if (row < tif->tif_row) {
- /*
- * Moving backwards within the same strip:
- * backup to the start and then decode
- * forward (below).
- */
- tif->tif_row = (strip % td->td_stripsperimage) *
- td->td_rowsperstrip;
- tif->tif_rawcp = tif->tif_rawdata;
- }
- /*
- * Seek forward to the desired row.
- */
- if (!(*tif->tif_seek)(tif, row - tif->tif_row))
- return (-1);
- tif->tif_row = row;
- }
-
- /* swab if needed - note that source buffer will be altered */
- tif->tif_postdecode( tif, (tidata_t) buf, tif->tif_scanlinesize );
-
- status = (*tif->tif_encoderow)(tif, (tidata_t) buf,
- tif->tif_scanlinesize, sample);
-
- /* we are now poised at the beginning of the next row */
- tif->tif_row = row + 1;
- return (status);
-}
-
-/*
- * Encode the supplied data and write it to the
- * specified strip.
- *
- * NB: Image length must be setup before writing.
- */
-tsize_t
-TIFFWriteEncodedStrip(TIFF* tif, tstrip_t strip, tdata_t data, tsize_t cc)
-{
- static const char module[] = "TIFFWriteEncodedStrip";
- TIFFDirectory *td = &tif->tif_dir;
- tsample_t sample;
-
- if (!WRITECHECKSTRIPS(tif, module))
- return ((tsize_t) -1);
- /*
- * Check strip array to make sure there's space.
- * We don't support dynamically growing files that
- * have data organized in separate bitplanes because
- * it's too painful. In that case we require that
- * the imagelength be set properly before the first
- * write (so that the strips array will be fully
- * allocated above).
- */
- if (strip >= td->td_nstrips) {
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Can not grow image by strips when using separate planes");
- return ((tsize_t) -1);
- }
- if (!TIFFGrowStrips(tif, 1, module))
- return ((tsize_t) -1);
- td->td_stripsperimage =
- TIFFhowmany(td->td_imagelength, td->td_rowsperstrip);
- }
- /*
- * Handle delayed allocation of data buffer. This
- * permits it to be sized according to the directory
- * info.
- */
- if (!BUFFERCHECK(tif))
- return ((tsize_t) -1);
- tif->tif_curstrip = strip;
- tif->tif_row = (strip % td->td_stripsperimage) * td->td_rowsperstrip;
- if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
- if (!(*tif->tif_setupencode)(tif))
- return ((tsize_t) -1);
- tif->tif_flags |= TIFF_CODERSETUP;
- }
-
- tif->tif_rawcc = 0;
- tif->tif_rawcp = tif->tif_rawdata;
-
- if( td->td_stripbytecount[strip] > 0 )
- {
- /* Force TIFFAppendToStrip() to consider placing data at end
- of file. */
- tif->tif_curoff = 0;
- }
-
- tif->tif_flags &= ~TIFF_POSTENCODE;
- sample = (tsample_t)(strip / td->td_stripsperimage);
- if (!(*tif->tif_preencode)(tif, sample))
- return ((tsize_t) -1);
-
- /* swab if needed - note that source buffer will be altered */
- tif->tif_postdecode( tif, (tidata_t) data, cc );
-
- if (!(*tif->tif_encodestrip)(tif, (tidata_t) data, cc, sample))
- return ((tsize_t) 0);
- if (!(*tif->tif_postencode)(tif))
- return ((tsize_t) -1);
- if (!isFillOrder(tif, td->td_fillorder) &&
- (tif->tif_flags & TIFF_NOBITREV) == 0)
- TIFFReverseBits(tif->tif_rawdata, tif->tif_rawcc);
- if (tif->tif_rawcc > 0 &&
- !TIFFAppendToStrip(tif, strip, tif->tif_rawdata, tif->tif_rawcc))
- return ((tsize_t) -1);
- tif->tif_rawcc = 0;
- tif->tif_rawcp = tif->tif_rawdata;
- return (cc);
-}
-
-/*
- * Write the supplied data to the specified strip.
- *
- * NB: Image length must be setup before writing.
- */
-tsize_t
-TIFFWriteRawStrip(TIFF* tif, tstrip_t strip, tdata_t data, tsize_t cc)
-{
- static const char module[] = "TIFFWriteRawStrip";
- TIFFDirectory *td = &tif->tif_dir;
-
- if (!WRITECHECKSTRIPS(tif, module))
- return ((tsize_t) -1);
- /*
- * Check strip array to make sure there's space.
- * We don't support dynamically growing files that
- * have data organized in separate bitplanes because
- * it's too painful. In that case we require that
- * the imagelength be set properly before the first
- * write (so that the strips array will be fully
- * allocated above).
- */
- if (strip >= td->td_nstrips) {
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Can not grow image by strips when using separate planes");
- return ((tsize_t) -1);
- }
- /*
- * Watch out for a growing image. The value of
- * strips/image will initially be 1 (since it
- * can't be deduced until the imagelength is known).
- */
- if (strip >= td->td_stripsperimage)
- td->td_stripsperimage =
- TIFFhowmany(td->td_imagelength,td->td_rowsperstrip);
- if (!TIFFGrowStrips(tif, 1, module))
- return ((tsize_t) -1);
- }
- tif->tif_curstrip = strip;
- tif->tif_row = (strip % td->td_stripsperimage) * td->td_rowsperstrip;
- return (TIFFAppendToStrip(tif, strip, (tidata_t) data, cc) ?
- cc : (tsize_t) -1);
-}
-
-/*
- * Write and compress a tile of data. The
- * tile is selected by the (x,y,z,s) coordinates.
- */
-tsize_t
-TIFFWriteTile(TIFF* tif,
- tdata_t buf, uint32 x, uint32 y, uint32 z, tsample_t s)
-{
- if (!TIFFCheckTile(tif, x, y, z, s))
- return (-1);
- /*
- * NB: A tile size of -1 is used instead of tif_tilesize knowing
- * that TIFFWriteEncodedTile will clamp this to the tile size.
- * This is done because the tile size may not be defined until
- * after the output buffer is setup in TIFFWriteBufferSetup.
- */
- return (TIFFWriteEncodedTile(tif,
- TIFFComputeTile(tif, x, y, z, s), buf, (tsize_t) -1));
-}
-
-/*
- * Encode the supplied data and write it to the
- * specified tile. There must be space for the
- * data. The function clamps individual writes
- * to a tile to the tile size, but does not (and
- * can not) check that multiple writes to the same
- * tile do not write more than tile size data.
- *
- * NB: Image length must be setup before writing; this
- * interface does not support automatically growing
- * the image on each write (as TIFFWriteScanline does).
- */
-tsize_t
-TIFFWriteEncodedTile(TIFF* tif, ttile_t tile, tdata_t data, tsize_t cc)
-{
- static const char module[] = "TIFFWriteEncodedTile";
- TIFFDirectory *td;
- tsample_t sample;
-
- if (!WRITECHECKTILES(tif, module))
- return ((tsize_t) -1);
- td = &tif->tif_dir;
- if (tile >= td->td_nstrips) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Tile %lu out of range, max %lu",
- tif->tif_name, (unsigned long) tile, (unsigned long) td->td_nstrips);
- return ((tsize_t) -1);
- }
- /*
- * Handle delayed allocation of data buffer. This
- * permits it to be sized more intelligently (using
- * directory information).
- */
- if (!BUFFERCHECK(tif))
- return ((tsize_t) -1);
- tif->tif_curtile = tile;
-
- tif->tif_rawcc = 0;
- tif->tif_rawcp = tif->tif_rawdata;
-
- if( td->td_stripbytecount[tile] > 0 )
- {
- /* Force TIFFAppendToStrip() to consider placing data at end
- of file. */
- tif->tif_curoff = 0;
- }
-
- /*
- * Compute tiles per row & per column to compute
- * current row and column
- */
- tif->tif_row = (tile % TIFFhowmany(td->td_imagelength, td->td_tilelength))
- * td->td_tilelength;
- tif->tif_col = (tile % TIFFhowmany(td->td_imagewidth, td->td_tilewidth))
- * td->td_tilewidth;
-
- if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
- if (!(*tif->tif_setupencode)(tif))
- return ((tsize_t) -1);
- tif->tif_flags |= TIFF_CODERSETUP;
- }
- tif->tif_flags &= ~TIFF_POSTENCODE;
- sample = (tsample_t)(tile/td->td_stripsperimage);
- if (!(*tif->tif_preencode)(tif, sample))
- return ((tsize_t) -1);
- /*
- * Clamp write amount to the tile size. This is mostly
- * done so that callers can pass in some large number
- * (e.g. -1) and have the tile size used instead.
- */
- if ( cc < 1 || cc > tif->tif_tilesize)
- cc = tif->tif_tilesize;
-
- /* swab if needed - note that source buffer will be altered */
- tif->tif_postdecode( tif, (tidata_t) data, cc );
-
- if (!(*tif->tif_encodetile)(tif, (tidata_t) data, cc, sample))
- return ((tsize_t) 0);
- if (!(*tif->tif_postencode)(tif))
- return ((tsize_t) -1);
- if (!isFillOrder(tif, td->td_fillorder) &&
- (tif->tif_flags & TIFF_NOBITREV) == 0)
- TIFFReverseBits((unsigned char *)tif->tif_rawdata, tif->tif_rawcc);
- if (tif->tif_rawcc > 0 && !TIFFAppendToStrip(tif, tile,
- tif->tif_rawdata, tif->tif_rawcc))
- return ((tsize_t) -1);
- tif->tif_rawcc = 0;
- tif->tif_rawcp = tif->tif_rawdata;
- return (cc);
-}
-
-/*
- * Write the supplied data to the specified strip.
- * There must be space for the data; we don't check
- * if strips overlap!
- *
- * NB: Image length must be setup before writing; this
- * interface does not support automatically growing
- * the image on each write (as TIFFWriteScanline does).
- */
-tsize_t
-TIFFWriteRawTile(TIFF* tif, ttile_t tile, tdata_t data, tsize_t cc)
-{
- static const char module[] = "TIFFWriteRawTile";
-
- if (!WRITECHECKTILES(tif, module))
- return ((tsize_t) -1);
- if (tile >= tif->tif_dir.td_nstrips) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Tile %lu out of range, max %lu",
- tif->tif_name, (unsigned long) tile,
- (unsigned long) tif->tif_dir.td_nstrips);
- return ((tsize_t) -1);
- }
- return (TIFFAppendToStrip(tif, tile, (tidata_t) data, cc) ?
- cc : (tsize_t) -1);
-}
-
-#define isUnspecified(tif, f) \
- (TIFFFieldSet(tif,f) && (tif)->tif_dir.td_imagelength == 0)
-
-int
-TIFFSetupStrips(TIFF* tif)
-{
- TIFFDirectory* td = &tif->tif_dir;
-
- if (isTiled(tif))
- td->td_stripsperimage =
- isUnspecified(tif, FIELD_TILEDIMENSIONS) ?
- td->td_samplesperpixel : TIFFNumberOfTiles(tif);
- else
- td->td_stripsperimage =
- isUnspecified(tif, FIELD_ROWSPERSTRIP) ?
- td->td_samplesperpixel : TIFFNumberOfStrips(tif);
- td->td_nstrips = td->td_stripsperimage;
- if (td->td_planarconfig == PLANARCONFIG_SEPARATE)
- td->td_stripsperimage /= td->td_samplesperpixel;
- td->td_stripoffset = (uint32 *)
- _TIFFmalloc(td->td_nstrips * sizeof (uint32));
- td->td_stripbytecount = (uint32 *)
- _TIFFmalloc(td->td_nstrips * sizeof (uint32));
- if (td->td_stripoffset == NULL || td->td_stripbytecount == NULL)
- return (0);
- /*
- * Place data at the end-of-file
- * (by setting offsets to zero).
- */
- _TIFFmemset(td->td_stripoffset, 0, td->td_nstrips*sizeof (uint32));
- _TIFFmemset(td->td_stripbytecount, 0, td->td_nstrips*sizeof (uint32));
- TIFFSetFieldBit(tif, FIELD_STRIPOFFSETS);
- TIFFSetFieldBit(tif, FIELD_STRIPBYTECOUNTS);
- return (1);
-}
-#undef isUnspecified
-
-/*
- * Verify file is writable and that the directory
- * information is setup properly. In doing the latter
- * we also "freeze" the state of the directory so
- * that important information is not changed.
- */
-int
-TIFFWriteCheck(TIFF* tif, int tiles, const char* module)
-{
- if (tif->tif_mode == O_RDONLY) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: File not open for writing",
- tif->tif_name);
- return (0);
- }
- if (tiles ^ isTiled(tif)) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name, tiles ?
- "Can not write tiles to a stripped image" :
- "Can not write scanlines to a tiled image");
- return (0);
- }
-
- /*
- * On the first write verify all the required information
- * has been setup and initialize any data structures that
- * had to wait until directory information was set.
- * Note that a lot of our work is assumed to remain valid
- * because we disallow any of the important parameters
- * from changing after we start writing (i.e. once
- * TIFF_BEENWRITING is set, TIFFSetField will only allow
- * the image's length to be changed).
- */
- if (!TIFFFieldSet(tif, FIELD_IMAGEDIMENSIONS)) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Must set \"ImageWidth\" before writing data",
- tif->tif_name);
- return (0);
- }
- if (tif->tif_dir.td_samplesperpixel == 1) {
- /*
- * Planarconfiguration is irrelevant in case of single band
- * images and need not be included. We will set it anyway,
- * because this field is used in other parts of library even
- * in the single band case.
- */
- if (!TIFFFieldSet(tif, FIELD_PLANARCONFIG))
- tif->tif_dir.td_planarconfig = PLANARCONFIG_CONTIG;
- } else {
- if (!TIFFFieldSet(tif, FIELD_PLANARCONFIG)) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Must set \"PlanarConfiguration\" before writing data",
- tif->tif_name);
- return (0);
- }
- }
- if (tif->tif_dir.td_stripoffset == NULL && !TIFFSetupStrips(tif)) {
- tif->tif_dir.td_nstrips = 0;
- TIFFErrorExt(tif->tif_clientdata, module, "%s: No space for %s arrays",
- tif->tif_name, isTiled(tif) ? "tile" : "strip");
- return (0);
- }
- tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1;
- tif->tif_scanlinesize = TIFFScanlineSize(tif);
- tif->tif_flags |= TIFF_BEENWRITING;
- return (1);
-}
-
-/*
- * Setup the raw data buffer used for encoding.
- */
-int
-TIFFWriteBufferSetup(TIFF* tif, tdata_t bp, tsize_t size)
-{
- static const char module[] = "TIFFWriteBufferSetup";
-
- if (tif->tif_rawdata) {
- if (tif->tif_flags & TIFF_MYBUFFER) {
- _TIFFfree(tif->tif_rawdata);
- tif->tif_flags &= ~TIFF_MYBUFFER;
- }
- tif->tif_rawdata = NULL;
- }
- if (size == (tsize_t) -1) {
- size = (isTiled(tif) ?
- tif->tif_tilesize : TIFFStripSize(tif));
- /*
- * Make raw data buffer at least 8K
- */
- if (size < 8*1024)
- size = 8*1024;
- bp = NULL; /* NB: force malloc */
- }
- if (bp == NULL) {
- bp = _TIFFmalloc(size);
- if (bp == NULL) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: No space for output buffer",
- tif->tif_name);
- return (0);
- }
- tif->tif_flags |= TIFF_MYBUFFER;
- } else
- tif->tif_flags &= ~TIFF_MYBUFFER;
- tif->tif_rawdata = (tidata_t) bp;
- tif->tif_rawdatasize = size;
- tif->tif_rawcc = 0;
- tif->tif_rawcp = tif->tif_rawdata;
- tif->tif_flags |= TIFF_BUFFERSETUP;
- return (1);
-}
-
-/*
- * Grow the strip data structures by delta strips.
- */
-static int
-TIFFGrowStrips(TIFF* tif, int delta, const char* module)
-{
- TIFFDirectory *td = &tif->tif_dir;
- uint32 *new_stripoffset, *new_stripbytecount;
-
- assert(td->td_planarconfig == PLANARCONFIG_CONTIG);
- new_stripoffset = (uint32*)_TIFFrealloc(td->td_stripoffset,
- (td->td_nstrips + delta) * sizeof (uint32));
- new_stripbytecount = (uint32*)_TIFFrealloc(td->td_stripbytecount,
- (td->td_nstrips + delta) * sizeof (uint32));
- if (new_stripoffset == NULL || new_stripbytecount == NULL) {
- if (new_stripoffset)
- _TIFFfree(new_stripoffset);
- if (new_stripbytecount)
- _TIFFfree(new_stripbytecount);
- td->td_nstrips = 0;
- TIFFErrorExt(tif->tif_clientdata, module, "%s: No space to expand strip arrays",
- tif->tif_name);
- return (0);
- }
- td->td_stripoffset = new_stripoffset;
- td->td_stripbytecount = new_stripbytecount;
- _TIFFmemset(td->td_stripoffset + td->td_nstrips,
- 0, delta*sizeof (uint32));
- _TIFFmemset(td->td_stripbytecount + td->td_nstrips,
- 0, delta*sizeof (uint32));
- td->td_nstrips += delta;
- return (1);
-}
-
-/*
- * Append the data to the specified strip.
- */
-static int
-TIFFAppendToStrip(TIFF* tif, tstrip_t strip, tidata_t data, tsize_t cc)
-{
- static const char module[] = "TIFFAppendToStrip";
- TIFFDirectory *td = &tif->tif_dir;
-
- if (td->td_stripoffset[strip] == 0 || tif->tif_curoff == 0) {
- assert(td->td_nstrips > 0);
-
- if( td->td_stripbytecount[strip] != 0
- && td->td_stripoffset[strip] != 0
- && td->td_stripbytecount[strip] >= cc )
- {
- /*
- * There is already tile data on disk, and the new tile
- * data we have to will fit in the same space. The only
- * aspect of this that is risky is that there could be
- * more data to append to this strip before we are done
- * depending on how we are getting called.
- */
- if (!SeekOK(tif, td->td_stripoffset[strip])) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Seek error at scanline %lu",
- (unsigned long)tif->tif_row);
- return (0);
- }
- }
- else
- {
- /*
- * Seek to end of file, and set that as our location to
- * write this strip.
- */
- td->td_stripoffset[strip] = TIFFSeekFile(tif, 0, SEEK_END);
- }
-
- tif->tif_curoff = td->td_stripoffset[strip];
-
- /*
- * We are starting a fresh strip/tile, so set the size to zero.
- */
- td->td_stripbytecount[strip] = 0;
- }
-
- if (!WriteOK(tif, data, cc)) {
- TIFFErrorExt(tif->tif_clientdata, module, "Write error at scanline %lu",
- (unsigned long) tif->tif_row);
- return (0);
- }
- tif->tif_curoff = tif->tif_curoff+cc;
- td->td_stripbytecount[strip] += cc;
- return (1);
-}
-
-/*
- * Internal version of TIFFFlushData that can be
- * called by ``encodestrip routines'' w/o concern
- * for infinite recursion.
- */
-int
-TIFFFlushData1(TIFF* tif)
-{
- if (tif->tif_rawcc > 0) {
- if (!isFillOrder(tif, tif->tif_dir.td_fillorder) &&
- (tif->tif_flags & TIFF_NOBITREV) == 0)
- TIFFReverseBits((unsigned char *)tif->tif_rawdata,
- tif->tif_rawcc);
- if (!TIFFAppendToStrip(tif,
- isTiled(tif) ? tif->tif_curtile : tif->tif_curstrip,
- tif->tif_rawdata, tif->tif_rawcc))
- return (0);
- tif->tif_rawcc = 0;
- tif->tif_rawcp = tif->tif_rawdata;
- }
- return (1);
-}
-
-/*
- * Set the current write offset. This should only be
- * used to set the offset to a known previous location
- * (very carefully), or to 0 so that the next write gets
- * appended to the end of the file.
- */
-void
-TIFFSetWriteOffset(TIFF* tif, toff_t off)
-{
- tif->tif_curoff = off;
-}
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tif_zip.c b/src/3rdparty/libtiff/libtiff/tif_zip.c
deleted file mode 100644
index 38a5773891..0000000000
--- a/src/3rdparty/libtiff/libtiff/tif_zip.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/* $Id: tif_zip.c,v 1.11.2.3 2007/11/22 21:24:51 fwarmerdam Exp $ */
-
-/*
- * Copyright (c) 1995-1997 Sam Leffler
- * Copyright (c) 1995-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#include "tiffiop.h"
-#ifdef ZIP_SUPPORT
-/*
- * TIFF Library.
- *
- * ZIP (aka Deflate) Compression Support
- *
- * This file is simply an interface to the zlib library written by
- * Jean-loup Gailly and Mark Adler. You must use version 1.0 or later
- * of the library: this code assumes the 1.0 API and also depends on
- * the ability to write the zlib header multiple times (one per strip)
- * which was not possible with versions prior to 0.95. Note also that
- * older versions of this codec avoided this bug by supressing the header
- * entirely. This means that files written with the old library cannot
- * be read; they should be converted to a different compression scheme
- * and then reconverted.
- *
- * The data format used by the zlib library is described in the files
- * zlib-3.1.doc, deflate-1.1.doc and gzip-4.1.doc, available in the
- * directory ftp://ftp.uu.net/pub/archiving/zip/doc. The library was
- * last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz.
- */
-#include "tif_predict.h"
-#include "zlib.h"
-
-#include <stdio.h>
-
-/*
- * Sigh, ZLIB_VERSION is defined as a string so there's no
- * way to do a proper check here. Instead we guess based
- * on the presence of #defines that were added between the
- * 0.95 and 1.0 distributions.
- */
-#if !defined(Z_NO_COMPRESSION) || !defined(Z_DEFLATED)
-#error "Antiquated ZLIB software; you must use version 1.0 or later"
-#endif
-
-/*
- * State block for each open TIFF
- * file using ZIP compression/decompression.
- */
-typedef struct {
- TIFFPredictorState predict;
- z_stream stream;
- int zipquality; /* compression level */
- int state; /* state flags */
-#define ZSTATE_INIT_DECODE 0x01
-#define ZSTATE_INIT_ENCODE 0x02
-
- TIFFVGetMethod vgetparent; /* super-class method */
- TIFFVSetMethod vsetparent; /* super-class method */
-} ZIPState;
-
-#define ZState(tif) ((ZIPState*) (tif)->tif_data)
-#define DecoderState(tif) ZState(tif)
-#define EncoderState(tif) ZState(tif)
-
-static int ZIPEncode(TIFF*, tidata_t, tsize_t, tsample_t);
-static int ZIPDecode(TIFF*, tidata_t, tsize_t, tsample_t);
-
-static int
-ZIPSetupDecode(TIFF* tif)
-{
- ZIPState* sp = DecoderState(tif);
- static const char module[] = "ZIPSetupDecode";
-
- assert(sp != NULL);
-
- /* if we were last encoding, terminate this mode */
- if (sp->state & ZSTATE_INIT_ENCODE) {
- deflateEnd(&sp->stream);
- sp->state = 0;
- }
-
- if (inflateInit(&sp->stream) != Z_OK) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: %s", tif->tif_name, sp->stream.msg);
- return (0);
- } else {
- sp->state |= ZSTATE_INIT_DECODE;
- return (1);
- }
-}
-
-/*
- * Setup state for decoding a strip.
- */
-static int
-ZIPPreDecode(TIFF* tif, tsample_t s)
-{
- ZIPState* sp = DecoderState(tif);
-
- (void) s;
- assert(sp != NULL);
-
- if( (sp->state & ZSTATE_INIT_DECODE) == 0 )
- tif->tif_setupdecode( tif );
-
- sp->stream.next_in = tif->tif_rawdata;
- sp->stream.avail_in = tif->tif_rawcc;
- return (inflateReset(&sp->stream) == Z_OK);
-}
-
-static int
-ZIPDecode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s)
-{
- ZIPState* sp = DecoderState(tif);
- static const char module[] = "ZIPDecode";
-
- (void) s;
- assert(sp != NULL);
- assert(sp->state == ZSTATE_INIT_DECODE);
-
- sp->stream.next_out = op;
- sp->stream.avail_out = occ;
- do {
- int state = inflate(&sp->stream, Z_PARTIAL_FLUSH);
- if (state == Z_STREAM_END)
- break;
- if (state == Z_DATA_ERROR) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Decoding error at scanline %d, %s",
- tif->tif_name, tif->tif_row, sp->stream.msg);
- if (inflateSync(&sp->stream) != Z_OK)
- return (0);
- continue;
- }
- if (state != Z_OK) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
- tif->tif_name, sp->stream.msg);
- return (0);
- }
- } while (sp->stream.avail_out > 0);
- if (sp->stream.avail_out != 0) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Not enough data at scanline %d (short %d bytes)",
- tif->tif_name, tif->tif_row, sp->stream.avail_out);
- return (0);
- }
- return (1);
-}
-
-static int
-ZIPSetupEncode(TIFF* tif)
-{
- ZIPState* sp = EncoderState(tif);
- static const char module[] = "ZIPSetupEncode";
-
- assert(sp != NULL);
- if (sp->state & ZSTATE_INIT_DECODE) {
- inflateEnd(&sp->stream);
- sp->state = 0;
- }
-
- if (deflateInit(&sp->stream, sp->zipquality) != Z_OK) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: %s", tif->tif_name, sp->stream.msg);
- return (0);
- } else {
- sp->state |= ZSTATE_INIT_ENCODE;
- return (1);
- }
-}
-
-/*
- * Reset encoding state at the start of a strip.
- */
-static int
-ZIPPreEncode(TIFF* tif, tsample_t s)
-{
- ZIPState *sp = EncoderState(tif);
-
- (void) s;
- assert(sp != NULL);
- if( sp->state != ZSTATE_INIT_ENCODE )
- tif->tif_setupencode( tif );
-
- sp->stream.next_out = tif->tif_rawdata;
- sp->stream.avail_out = tif->tif_rawdatasize;
- return (deflateReset(&sp->stream) == Z_OK);
-}
-
-/*
- * Encode a chunk of pixels.
- */
-static int
-ZIPEncode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
-{
- ZIPState *sp = EncoderState(tif);
- static const char module[] = "ZIPEncode";
-
- assert(sp != NULL);
- assert(sp->state == ZSTATE_INIT_ENCODE);
-
- (void) s;
- sp->stream.next_in = bp;
- sp->stream.avail_in = cc;
- do {
- if (deflate(&sp->stream, Z_NO_FLUSH) != Z_OK) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Encoder error: %s",
- tif->tif_name, sp->stream.msg);
- return (0);
- }
- if (sp->stream.avail_out == 0) {
- tif->tif_rawcc = tif->tif_rawdatasize;
- TIFFFlushData1(tif);
- sp->stream.next_out = tif->tif_rawdata;
- sp->stream.avail_out = tif->tif_rawdatasize;
- }
- } while (sp->stream.avail_in > 0);
- return (1);
-}
-
-/*
- * Finish off an encoded strip by flushing the last
- * string and tacking on an End Of Information code.
- */
-static int
-ZIPPostEncode(TIFF* tif)
-{
- ZIPState *sp = EncoderState(tif);
- static const char module[] = "ZIPPostEncode";
- int state;
-
- sp->stream.avail_in = 0;
- do {
- state = deflate(&sp->stream, Z_FINISH);
- switch (state) {
- case Z_STREAM_END:
- case Z_OK:
- if ((int)sp->stream.avail_out != (int)tif->tif_rawdatasize)
- {
- tif->tif_rawcc =
- tif->tif_rawdatasize - sp->stream.avail_out;
- TIFFFlushData1(tif);
- sp->stream.next_out = tif->tif_rawdata;
- sp->stream.avail_out = tif->tif_rawdatasize;
- }
- break;
- default:
- TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
- tif->tif_name, sp->stream.msg);
- return (0);
- }
- } while (state != Z_STREAM_END);
- return (1);
-}
-
-static void
-ZIPCleanup(TIFF* tif)
-{
- ZIPState* sp = ZState(tif);
-
- assert(sp != 0);
-
- (void)TIFFPredictorCleanup(tif);
-
- tif->tif_tagmethods.vgetfield = sp->vgetparent;
- tif->tif_tagmethods.vsetfield = sp->vsetparent;
-
- if (sp->state & ZSTATE_INIT_ENCODE) {
- deflateEnd(&sp->stream);
- sp->state = 0;
- } else if( sp->state & ZSTATE_INIT_DECODE) {
- inflateEnd(&sp->stream);
- sp->state = 0;
- }
- _TIFFfree(sp);
- tif->tif_data = NULL;
-
- _TIFFSetDefaultCompressionState(tif);
-}
-
-static int
-ZIPVSetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- ZIPState* sp = ZState(tif);
- static const char module[] = "ZIPVSetField";
-
- switch (tag) {
- case TIFFTAG_ZIPQUALITY:
- sp->zipquality = va_arg(ap, int);
- if ( sp->state&ZSTATE_INIT_ENCODE ) {
- if (deflateParams(&sp->stream,
- sp->zipquality, Z_DEFAULT_STRATEGY) != Z_OK) {
- TIFFErrorExt(tif->tif_clientdata, module, "%s: zlib error: %s",
- tif->tif_name, sp->stream.msg);
- return (0);
- }
- }
- return (1);
- default:
- return (*sp->vsetparent)(tif, tag, ap);
- }
- /*NOTREACHED*/
-}
-
-static int
-ZIPVGetField(TIFF* tif, ttag_t tag, va_list ap)
-{
- ZIPState* sp = ZState(tif);
-
- switch (tag) {
- case TIFFTAG_ZIPQUALITY:
- *va_arg(ap, int*) = sp->zipquality;
- break;
- default:
- return (*sp->vgetparent)(tif, tag, ap);
- }
- return (1);
-}
-
-static const TIFFFieldInfo zipFieldInfo[] = {
- { TIFFTAG_ZIPQUALITY, 0, 0, TIFF_ANY, FIELD_PSEUDO,
- TRUE, FALSE, "" },
-};
-
-int
-TIFFInitZIP(TIFF* tif, int scheme)
-{
- static const char module[] = "TIFFInitZIP";
- ZIPState* sp;
-
- assert( (scheme == COMPRESSION_DEFLATE)
- || (scheme == COMPRESSION_ADOBE_DEFLATE));
-
- /*
- * Merge codec-specific tag information.
- */
- if (!_TIFFMergeFieldInfo(tif, zipFieldInfo,
- TIFFArrayCount(zipFieldInfo))) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "Merging Deflate codec-specific tags failed");
- return 0;
- }
-
- /*
- * Allocate state block so tag methods have storage to record values.
- */
- tif->tif_data = (tidata_t) _TIFFmalloc(sizeof (ZIPState));
- if (tif->tif_data == NULL)
- goto bad;
- sp = ZState(tif);
- sp->stream.zalloc = NULL;
- sp->stream.zfree = NULL;
- sp->stream.opaque = NULL;
- sp->stream.data_type = Z_BINARY;
-
- /*
- * Override parent get/set field methods.
- */
- sp->vgetparent = tif->tif_tagmethods.vgetfield;
- tif->tif_tagmethods.vgetfield = ZIPVGetField; /* hook for codec tags */
- sp->vsetparent = tif->tif_tagmethods.vsetfield;
- tif->tif_tagmethods.vsetfield = ZIPVSetField; /* hook for codec tags */
-
- /* Default values for codec-specific fields */
- sp->zipquality = Z_DEFAULT_COMPRESSION; /* default comp. level */
- sp->state = 0;
-
- /*
- * Install codec methods.
- */
- tif->tif_setupdecode = ZIPSetupDecode;
- tif->tif_predecode = ZIPPreDecode;
- tif->tif_decoderow = ZIPDecode;
- tif->tif_decodestrip = ZIPDecode;
- tif->tif_decodetile = ZIPDecode;
- tif->tif_setupencode = ZIPSetupEncode;
- tif->tif_preencode = ZIPPreEncode;
- tif->tif_postencode = ZIPPostEncode;
- tif->tif_encoderow = ZIPEncode;
- tif->tif_encodestrip = ZIPEncode;
- tif->tif_encodetile = ZIPEncode;
- tif->tif_cleanup = ZIPCleanup;
- /*
- * Setup predictor setup.
- */
- (void) TIFFPredictorInit(tif);
- return (1);
-bad:
- TIFFErrorExt(tif->tif_clientdata, module,
- "No space for ZIP state block");
- return (0);
-}
-#endif /* ZIP_SUPORT */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tiff.h b/src/3rdparty/libtiff/libtiff/tiff.h
deleted file mode 100644
index 82116712a0..0000000000
--- a/src/3rdparty/libtiff/libtiff/tiff.h
+++ /dev/null
@@ -1,647 +0,0 @@
-/* $Id: tiff.h,v 1.43 2006-10-05 15:20:40 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _TIFF_
-#define _TIFF_
-
-#include "tiffconf.h"
-
-/*
- * Tag Image File Format (TIFF)
- *
- * Based on Rev 6.0 from:
- * Developer's Desk
- * Aldus Corporation
- * 411 First Ave. South
- * Suite 200
- * Seattle, WA 98104
- * 206-622-5500
- *
- * (http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf)
- *
- * For Big TIFF design notes see the following link
- * http://www.remotesensing.org/libtiff/bigtiffdesign.html
- */
-#define TIFF_VERSION 42
-#define TIFF_BIGTIFF_VERSION 43
-
-#define TIFF_BIGENDIAN 0x4d4d
-#define TIFF_LITTLEENDIAN 0x4949
-#define MDI_LITTLEENDIAN 0x5045
-#define MDI_BIGENDIAN 0x4550
-/*
- * Intrinsic data types required by the file format:
- *
- * 8-bit quantities int8/uint8
- * 16-bit quantities int16/uint16
- * 32-bit quantities int32/uint32
- * strings unsigned char*
- */
-
-#ifndef HAVE_INT8
-typedef signed char int8; /* NB: non-ANSI compilers may not grok */
-#endif
-typedef unsigned char uint8;
-#ifndef HAVE_INT16
-typedef short int16;
-#endif
-typedef unsigned short uint16; /* sizeof (uint16) must == 2 */
-#if SIZEOF_INT == 4
-#ifndef HAVE_INT32
-typedef int int32;
-#endif
-typedef unsigned int uint32; /* sizeof (uint32) must == 4 */
-#elif SIZEOF_LONG == 4
-#ifndef HAVE_INT32
-typedef long int32;
-#endif
-typedef unsigned long uint32; /* sizeof (uint32) must == 4 */
-#endif
-
-/* For TIFFReassignTagToIgnore */
-enum TIFFIgnoreSense /* IGNORE tag table */
-{
- TIS_STORE,
- TIS_EXTRACT,
- TIS_EMPTY
-};
-
-/*
- * TIFF header.
- */
-typedef struct {
- uint16 tiff_magic; /* magic number (defines byte order) */
-#define TIFF_MAGIC_SIZE 2
- uint16 tiff_version; /* TIFF version number */
-#define TIFF_VERSION_SIZE 2
- uint32 tiff_diroff; /* byte offset to first directory */
-#define TIFF_DIROFFSET_SIZE 4
-} TIFFHeader;
-
-
-/*
- * TIFF Image File Directories are comprised of a table of field
- * descriptors of the form shown below. The table is sorted in
- * ascending order by tag. The values associated with each entry are
- * disjoint and may appear anywhere in the file (so long as they are
- * placed on a word boundary).
- *
- * If the value is 4 bytes or less, then it is placed in the offset
- * field to save space. If the value is less than 4 bytes, it is
- * left-justified in the offset field.
- */
-typedef struct {
- uint16 tdir_tag; /* see below */
- uint16 tdir_type; /* data type; see below */
- uint32 tdir_count; /* number of items; length in spec */
- uint32 tdir_offset; /* byte offset to field data */
-} TIFFDirEntry;
-
-/*
- * NB: In the comments below,
- * - items marked with a + are obsoleted by revision 5.0,
- * - items marked with a ! are introduced in revision 6.0.
- * - items marked with a % are introduced post revision 6.0.
- * - items marked with a $ are obsoleted by revision 6.0.
- * - items marked with a & are introduced by Adobe DNG specification.
- */
-
-/*
- * Tag data type information.
- *
- * Note: RATIONALs are the ratio of two 32-bit integer values.
- */
-typedef enum {
- TIFF_NOTYPE = 0, /* placeholder */
- TIFF_BYTE = 1, /* 8-bit unsigned integer */
- TIFF_ASCII = 2, /* 8-bit bytes w/ last byte null */
- TIFF_SHORT = 3, /* 16-bit unsigned integer */
- TIFF_LONG = 4, /* 32-bit unsigned integer */
- TIFF_RATIONAL = 5, /* 64-bit unsigned fraction */
- TIFF_SBYTE = 6, /* !8-bit signed integer */
- TIFF_UNDEFINED = 7, /* !8-bit untyped data */
- TIFF_SSHORT = 8, /* !16-bit signed integer */
- TIFF_SLONG = 9, /* !32-bit signed integer */
- TIFF_SRATIONAL = 10, /* !64-bit signed fraction */
- TIFF_FLOAT = 11, /* !32-bit IEEE floating point */
- TIFF_DOUBLE = 12, /* !64-bit IEEE floating point */
- TIFF_IFD = 13 /* %32-bit unsigned integer (offset) */
-} TIFFDataType;
-
-/*
- * TIFF Tag Definitions.
- */
-#define TIFFTAG_SUBFILETYPE 254 /* subfile data descriptor */
-#define FILETYPE_REDUCEDIMAGE 0x1 /* reduced resolution version */
-#define FILETYPE_PAGE 0x2 /* one page of many */
-#define FILETYPE_MASK 0x4 /* transparency mask */
-#define TIFFTAG_OSUBFILETYPE 255 /* +kind of data in subfile */
-#define OFILETYPE_IMAGE 1 /* full resolution image data */
-#define OFILETYPE_REDUCEDIMAGE 2 /* reduced size image data */
-#define OFILETYPE_PAGE 3 /* one page of many */
-#define TIFFTAG_IMAGEWIDTH 256 /* image width in pixels */
-#define TIFFTAG_IMAGELENGTH 257 /* image height in pixels */
-#define TIFFTAG_BITSPERSAMPLE 258 /* bits per channel (sample) */
-#define TIFFTAG_COMPRESSION 259 /* data compression technique */
-#define COMPRESSION_NONE 1 /* dump mode */
-#define COMPRESSION_CCITTRLE 2 /* CCITT modified Huffman RLE */
-#define COMPRESSION_CCITTFAX3 3 /* CCITT Group 3 fax encoding */
-#define COMPRESSION_CCITT_T4 3 /* CCITT T.4 (TIFF 6 name) */
-#define COMPRESSION_CCITTFAX4 4 /* CCITT Group 4 fax encoding */
-#define COMPRESSION_CCITT_T6 4 /* CCITT T.6 (TIFF 6 name) */
-#define COMPRESSION_LZW 5 /* Lempel-Ziv & Welch */
-#define COMPRESSION_OJPEG 6 /* !6.0 JPEG */
-#define COMPRESSION_JPEG 7 /* %JPEG DCT compression */
-#define COMPRESSION_NEXT 32766 /* NeXT 2-bit RLE */
-#define COMPRESSION_CCITTRLEW 32771 /* #1 w/ word alignment */
-#define COMPRESSION_PACKBITS 32773 /* Macintosh RLE */
-#define COMPRESSION_THUNDERSCAN 32809 /* ThunderScan RLE */
-/* codes 32895-32898 are reserved for ANSI IT8 TIFF/IT <dkelly@apago.com) */
-#define COMPRESSION_IT8CTPAD 32895 /* IT8 CT w/padding */
-#define COMPRESSION_IT8LW 32896 /* IT8 Linework RLE */
-#define COMPRESSION_IT8MP 32897 /* IT8 Monochrome picture */
-#define COMPRESSION_IT8BL 32898 /* IT8 Binary line art */
-/* compression codes 32908-32911 are reserved for Pixar */
-#define COMPRESSION_PIXARFILM 32908 /* Pixar companded 10bit LZW */
-#define COMPRESSION_PIXARLOG 32909 /* Pixar companded 11bit ZIP */
-#define COMPRESSION_DEFLATE 32946 /* Deflate compression */
-#define COMPRESSION_ADOBE_DEFLATE 8 /* Deflate compression,
- as recognized by Adobe */
-/* compression code 32947 is reserved for Oceana Matrix <dev@oceana.com> */
-#define COMPRESSION_DCS 32947 /* Kodak DCS encoding */
-#define COMPRESSION_JBIG 34661 /* ISO JBIG */
-#define COMPRESSION_SGILOG 34676 /* SGI Log Luminance RLE */
-#define COMPRESSION_SGILOG24 34677 /* SGI Log 24-bit packed */
-#define COMPRESSION_JP2000 34712 /* Leadtools JPEG2000 */
-#define TIFFTAG_PHOTOMETRIC 262 /* photometric interpretation */
-#define PHOTOMETRIC_MINISWHITE 0 /* min value is white */
-#define PHOTOMETRIC_MINISBLACK 1 /* min value is black */
-#define PHOTOMETRIC_RGB 2 /* RGB color model */
-#define PHOTOMETRIC_PALETTE 3 /* color map indexed */
-#define PHOTOMETRIC_MASK 4 /* $holdout mask */
-#define PHOTOMETRIC_SEPARATED 5 /* !color separations */
-#define PHOTOMETRIC_YCBCR 6 /* !CCIR 601 */
-#define PHOTOMETRIC_CIELAB 8 /* !1976 CIE L*a*b* */
-#define PHOTOMETRIC_ICCLAB 9 /* ICC L*a*b* [Adobe TIFF Technote 4] */
-#define PHOTOMETRIC_ITULAB 10 /* ITU L*a*b* */
-#define PHOTOMETRIC_LOGL 32844 /* CIE Log2(L) */
-#define PHOTOMETRIC_LOGLUV 32845 /* CIE Log2(L) (u',v') */
-#define TIFFTAG_THRESHHOLDING 263 /* +thresholding used on data */
-#define THRESHHOLD_BILEVEL 1 /* b&w art scan */
-#define THRESHHOLD_HALFTONE 2 /* or dithered scan */
-#define THRESHHOLD_ERRORDIFFUSE 3 /* usually floyd-steinberg */
-#define TIFFTAG_CELLWIDTH 264 /* +dithering matrix width */
-#define TIFFTAG_CELLLENGTH 265 /* +dithering matrix height */
-#define TIFFTAG_FILLORDER 266 /* data order within a byte */
-#define FILLORDER_MSB2LSB 1 /* most significant -> least */
-#define FILLORDER_LSB2MSB 2 /* least significant -> most */
-#define TIFFTAG_DOCUMENTNAME 269 /* name of doc. image is from */
-#define TIFFTAG_IMAGEDESCRIPTION 270 /* info about image */
-#define TIFFTAG_MAKE 271 /* scanner manufacturer name */
-#define TIFFTAG_MODEL 272 /* scanner model name/number */
-#define TIFFTAG_STRIPOFFSETS 273 /* offsets to data strips */
-#define TIFFTAG_ORIENTATION 274 /* +image orientation */
-#define ORIENTATION_TOPLEFT 1 /* row 0 top, col 0 lhs */
-#define ORIENTATION_TOPRIGHT 2 /* row 0 top, col 0 rhs */
-#define ORIENTATION_BOTRIGHT 3 /* row 0 bottom, col 0 rhs */
-#define ORIENTATION_BOTLEFT 4 /* row 0 bottom, col 0 lhs */
-#define ORIENTATION_LEFTTOP 5 /* row 0 lhs, col 0 top */
-#define ORIENTATION_RIGHTTOP 6 /* row 0 rhs, col 0 top */
-#define ORIENTATION_RIGHTBOT 7 /* row 0 rhs, col 0 bottom */
-#define ORIENTATION_LEFTBOT 8 /* row 0 lhs, col 0 bottom */
-#define TIFFTAG_SAMPLESPERPIXEL 277 /* samples per pixel */
-#define TIFFTAG_ROWSPERSTRIP 278 /* rows per strip of data */
-#define TIFFTAG_STRIPBYTECOUNTS 279 /* bytes counts for strips */
-#define TIFFTAG_MINSAMPLEVALUE 280 /* +minimum sample value */
-#define TIFFTAG_MAXSAMPLEVALUE 281 /* +maximum sample value */
-#define TIFFTAG_XRESOLUTION 282 /* pixels/resolution in x */
-#define TIFFTAG_YRESOLUTION 283 /* pixels/resolution in y */
-#define TIFFTAG_PLANARCONFIG 284 /* storage organization */
-#define PLANARCONFIG_CONTIG 1 /* single image plane */
-#define PLANARCONFIG_SEPARATE 2 /* separate planes of data */
-#define TIFFTAG_PAGENAME 285 /* page name image is from */
-#define TIFFTAG_XPOSITION 286 /* x page offset of image lhs */
-#define TIFFTAG_YPOSITION 287 /* y page offset of image lhs */
-#define TIFFTAG_FREEOFFSETS 288 /* +byte offset to free block */
-#define TIFFTAG_FREEBYTECOUNTS 289 /* +sizes of free blocks */
-#define TIFFTAG_GRAYRESPONSEUNIT 290 /* $gray scale curve accuracy */
-#define GRAYRESPONSEUNIT_10S 1 /* tenths of a unit */
-#define GRAYRESPONSEUNIT_100S 2 /* hundredths of a unit */
-#define GRAYRESPONSEUNIT_1000S 3 /* thousandths of a unit */
-#define GRAYRESPONSEUNIT_10000S 4 /* ten-thousandths of a unit */
-#define GRAYRESPONSEUNIT_100000S 5 /* hundred-thousandths */
-#define TIFFTAG_GRAYRESPONSECURVE 291 /* $gray scale response curve */
-#define TIFFTAG_GROUP3OPTIONS 292 /* 32 flag bits */
-#define TIFFTAG_T4OPTIONS 292 /* TIFF 6.0 proper name alias */
-#define GROUP3OPT_2DENCODING 0x1 /* 2-dimensional coding */
-#define GROUP3OPT_UNCOMPRESSED 0x2 /* data not compressed */
-#define GROUP3OPT_FILLBITS 0x4 /* fill to byte boundary */
-#define TIFFTAG_GROUP4OPTIONS 293 /* 32 flag bits */
-#define TIFFTAG_T6OPTIONS 293 /* TIFF 6.0 proper name */
-#define GROUP4OPT_UNCOMPRESSED 0x2 /* data not compressed */
-#define TIFFTAG_RESOLUTIONUNIT 296 /* units of resolutions */
-#define RESUNIT_NONE 1 /* no meaningful units */
-#define RESUNIT_INCH 2 /* english */
-#define RESUNIT_CENTIMETER 3 /* metric */
-#define TIFFTAG_PAGENUMBER 297 /* page numbers of multi-page */
-#define TIFFTAG_COLORRESPONSEUNIT 300 /* $color curve accuracy */
-#define COLORRESPONSEUNIT_10S 1 /* tenths of a unit */
-#define COLORRESPONSEUNIT_100S 2 /* hundredths of a unit */
-#define COLORRESPONSEUNIT_1000S 3 /* thousandths of a unit */
-#define COLORRESPONSEUNIT_10000S 4 /* ten-thousandths of a unit */
-#define COLORRESPONSEUNIT_100000S 5 /* hundred-thousandths */
-#define TIFFTAG_TRANSFERFUNCTION 301 /* !colorimetry info */
-#define TIFFTAG_SOFTWARE 305 /* name & release */
-#define TIFFTAG_DATETIME 306 /* creation date and time */
-#define TIFFTAG_ARTIST 315 /* creator of image */
-#define TIFFTAG_HOSTCOMPUTER 316 /* machine where created */
-#define TIFFTAG_PREDICTOR 317 /* prediction scheme w/ LZW */
-#define PREDICTOR_NONE 1 /* no prediction scheme used */
-#define PREDICTOR_HORIZONTAL 2 /* horizontal differencing */
-#define PREDICTOR_FLOATINGPOINT 3 /* floating point predictor */
-#define TIFFTAG_WHITEPOINT 318 /* image white point */
-#define TIFFTAG_PRIMARYCHROMATICITIES 319 /* !primary chromaticities */
-#define TIFFTAG_COLORMAP 320 /* RGB map for pallette image */
-#define TIFFTAG_HALFTONEHINTS 321 /* !highlight+shadow info */
-#define TIFFTAG_TILEWIDTH 322 /* !tile width in pixels */
-#define TIFFTAG_TILELENGTH 323 /* !tile height in pixels */
-#define TIFFTAG_TILEOFFSETS 324 /* !offsets to data tiles */
-#define TIFFTAG_TILEBYTECOUNTS 325 /* !byte counts for tiles */
-#define TIFFTAG_BADFAXLINES 326 /* lines w/ wrong pixel count */
-#define TIFFTAG_CLEANFAXDATA 327 /* regenerated line info */
-#define CLEANFAXDATA_CLEAN 0 /* no errors detected */
-#define CLEANFAXDATA_REGENERATED 1 /* receiver regenerated lines */
-#define CLEANFAXDATA_UNCLEAN 2 /* uncorrected errors exist */
-#define TIFFTAG_CONSECUTIVEBADFAXLINES 328 /* max consecutive bad lines */
-#define TIFFTAG_SUBIFD 330 /* subimage descriptors */
-#define TIFFTAG_INKSET 332 /* !inks in separated image */
-#define INKSET_CMYK 1 /* !cyan-magenta-yellow-black color */
-#define INKSET_MULTIINK 2 /* !multi-ink or hi-fi color */
-#define TIFFTAG_INKNAMES 333 /* !ascii names of inks */
-#define TIFFTAG_NUMBEROFINKS 334 /* !number of inks */
-#define TIFFTAG_DOTRANGE 336 /* !0% and 100% dot codes */
-#define TIFFTAG_TARGETPRINTER 337 /* !separation target */
-#define TIFFTAG_EXTRASAMPLES 338 /* !info about extra samples */
-#define EXTRASAMPLE_UNSPECIFIED 0 /* !unspecified data */
-#define EXTRASAMPLE_ASSOCALPHA 1 /* !associated alpha data */
-#define EXTRASAMPLE_UNASSALPHA 2 /* !unassociated alpha data */
-#define TIFFTAG_SAMPLEFORMAT 339 /* !data sample format */
-#define SAMPLEFORMAT_UINT 1 /* !unsigned integer data */
-#define SAMPLEFORMAT_INT 2 /* !signed integer data */
-#define SAMPLEFORMAT_IEEEFP 3 /* !IEEE floating point data */
-#define SAMPLEFORMAT_VOID 4 /* !untyped data */
-#define SAMPLEFORMAT_COMPLEXINT 5 /* !complex signed int */
-#define SAMPLEFORMAT_COMPLEXIEEEFP 6 /* !complex ieee floating */
-#define TIFFTAG_SMINSAMPLEVALUE 340 /* !variable MinSampleValue */
-#define TIFFTAG_SMAXSAMPLEVALUE 341 /* !variable MaxSampleValue */
-#define TIFFTAG_CLIPPATH 343 /* %ClipPath
- [Adobe TIFF technote 2] */
-#define TIFFTAG_XCLIPPATHUNITS 344 /* %XClipPathUnits
- [Adobe TIFF technote 2] */
-#define TIFFTAG_YCLIPPATHUNITS 345 /* %YClipPathUnits
- [Adobe TIFF technote 2] */
-#define TIFFTAG_INDEXED 346 /* %Indexed
- [Adobe TIFF Technote 3] */
-#define TIFFTAG_JPEGTABLES 347 /* %JPEG table stream */
-#define TIFFTAG_OPIPROXY 351 /* %OPI Proxy [Adobe TIFF technote] */
-/*
- * Tags 512-521 are obsoleted by Technical Note #2 which specifies a
- * revised JPEG-in-TIFF scheme.
- */
-#define TIFFTAG_JPEGPROC 512 /* !JPEG processing algorithm */
-#define JPEGPROC_BASELINE 1 /* !baseline sequential */
-#define JPEGPROC_LOSSLESS 14 /* !Huffman coded lossless */
-#define TIFFTAG_JPEGIFOFFSET 513 /* !pointer to SOI marker */
-#define TIFFTAG_JPEGIFBYTECOUNT 514 /* !JFIF stream length */
-#define TIFFTAG_JPEGRESTARTINTERVAL 515 /* !restart interval length */
-#define TIFFTAG_JPEGLOSSLESSPREDICTORS 517 /* !lossless proc predictor */
-#define TIFFTAG_JPEGPOINTTRANSFORM 518 /* !lossless point transform */
-#define TIFFTAG_JPEGQTABLES 519 /* !Q matrice offsets */
-#define TIFFTAG_JPEGDCTABLES 520 /* !DCT table offsets */
-#define TIFFTAG_JPEGACTABLES 521 /* !AC coefficient offsets */
-#define TIFFTAG_YCBCRCOEFFICIENTS 529 /* !RGB -> YCbCr transform */
-#define TIFFTAG_YCBCRSUBSAMPLING 530 /* !YCbCr subsampling factors */
-#define TIFFTAG_YCBCRPOSITIONING 531 /* !subsample positioning */
-#define YCBCRPOSITION_CENTERED 1 /* !as in PostScript Level 2 */
-#define YCBCRPOSITION_COSITED 2 /* !as in CCIR 601-1 */
-#define TIFFTAG_REFERENCEBLACKWHITE 532 /* !colorimetry info */
-#define TIFFTAG_XMLPACKET 700 /* %XML packet
- [Adobe XMP Specification,
- January 2004 */
-#define TIFFTAG_OPIIMAGEID 32781 /* %OPI ImageID
- [Adobe TIFF technote] */
-/* tags 32952-32956 are private tags registered to Island Graphics */
-#define TIFFTAG_REFPTS 32953 /* image reference points */
-#define TIFFTAG_REGIONTACKPOINT 32954 /* region-xform tack point */
-#define TIFFTAG_REGIONWARPCORNERS 32955 /* warp quadrilateral */
-#define TIFFTAG_REGIONAFFINE 32956 /* affine transformation mat */
-/* tags 32995-32999 are private tags registered to SGI */
-#define TIFFTAG_MATTEING 32995 /* $use ExtraSamples */
-#define TIFFTAG_DATATYPE 32996 /* $use SampleFormat */
-#define TIFFTAG_IMAGEDEPTH 32997 /* z depth of image */
-#define TIFFTAG_TILEDEPTH 32998 /* z depth/data tile */
-/* tags 33300-33309 are private tags registered to Pixar */
-/*
- * TIFFTAG_PIXAR_IMAGEFULLWIDTH and TIFFTAG_PIXAR_IMAGEFULLLENGTH
- * are set when an image has been cropped out of a larger image.
- * They reflect the size of the original uncropped image.
- * The TIFFTAG_XPOSITION and TIFFTAG_YPOSITION can be used
- * to determine the position of the smaller image in the larger one.
- */
-#define TIFFTAG_PIXAR_IMAGEFULLWIDTH 33300 /* full image size in x */
-#define TIFFTAG_PIXAR_IMAGEFULLLENGTH 33301 /* full image size in y */
- /* Tags 33302-33306 are used to identify special image modes and data
- * used by Pixar's texture formats.
- */
-#define TIFFTAG_PIXAR_TEXTUREFORMAT 33302 /* texture map format */
-#define TIFFTAG_PIXAR_WRAPMODES 33303 /* s & t wrap modes */
-#define TIFFTAG_PIXAR_FOVCOT 33304 /* cotan(fov) for env. maps */
-#define TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN 33305
-#define TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA 33306
-/* tag 33405 is a private tag registered to Eastman Kodak */
-#define TIFFTAG_WRITERSERIALNUMBER 33405 /* device serial number */
-/* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
-#define TIFFTAG_COPYRIGHT 33432 /* copyright string */
-/* IPTC TAG from RichTIFF specifications */
-#define TIFFTAG_RICHTIFFIPTC 33723
-/* 34016-34029 are reserved for ANSI IT8 TIFF/IT <dkelly@apago.com) */
-#define TIFFTAG_IT8SITE 34016 /* site name */
-#define TIFFTAG_IT8COLORSEQUENCE 34017 /* color seq. [RGB,CMYK,etc] */
-#define TIFFTAG_IT8HEADER 34018 /* DDES Header */
-#define TIFFTAG_IT8RASTERPADDING 34019 /* raster scanline padding */
-#define TIFFTAG_IT8BITSPERRUNLENGTH 34020 /* # of bits in short run */
-#define TIFFTAG_IT8BITSPEREXTENDEDRUNLENGTH 34021/* # of bits in long run */
-#define TIFFTAG_IT8COLORTABLE 34022 /* LW colortable */
-#define TIFFTAG_IT8IMAGECOLORINDICATOR 34023 /* BP/BL image color switch */
-#define TIFFTAG_IT8BKGCOLORINDICATOR 34024 /* BP/BL bg color switch */
-#define TIFFTAG_IT8IMAGECOLORVALUE 34025 /* BP/BL image color value */
-#define TIFFTAG_IT8BKGCOLORVALUE 34026 /* BP/BL bg color value */
-#define TIFFTAG_IT8PIXELINTENSITYRANGE 34027 /* MP pixel intensity value */
-#define TIFFTAG_IT8TRANSPARENCYINDICATOR 34028 /* HC transparency switch */
-#define TIFFTAG_IT8COLORCHARACTERIZATION 34029 /* color character. table */
-#define TIFFTAG_IT8HCUSAGE 34030 /* HC usage indicator */
-#define TIFFTAG_IT8TRAPINDICATOR 34031 /* Trapping indicator
- (untrapped=0, trapped=1) */
-#define TIFFTAG_IT8CMYKEQUIVALENT 34032 /* CMYK color equivalents */
-/* tags 34232-34236 are private tags registered to Texas Instruments */
-#define TIFFTAG_FRAMECOUNT 34232 /* Sequence Frame Count */
-/* tag 34377 is private tag registered to Adobe for PhotoShop */
-#define TIFFTAG_PHOTOSHOP 34377
-/* tags 34665, 34853 and 40965 are documented in EXIF specification */
-#define TIFFTAG_EXIFIFD 34665 /* Pointer to EXIF private directory */
-/* tag 34750 is a private tag registered to Adobe? */
-#define TIFFTAG_ICCPROFILE 34675 /* ICC profile data */
-/* tag 34750 is a private tag registered to Pixel Magic */
-#define TIFFTAG_JBIGOPTIONS 34750 /* JBIG options */
-#define TIFFTAG_GPSIFD 34853 /* Pointer to GPS private directory */
-/* tags 34908-34914 are private tags registered to SGI */
-#define TIFFTAG_FAXRECVPARAMS 34908 /* encoded Class 2 ses. parms */
-#define TIFFTAG_FAXSUBADDRESS 34909 /* received SubAddr string */
-#define TIFFTAG_FAXRECVTIME 34910 /* receive time (secs) */
-#define TIFFTAG_FAXDCS 34911 /* encoded fax ses. params, Table 2/T.30 */
-/* tags 37439-37443 are registered to SGI <gregl@sgi.com> */
-#define TIFFTAG_STONITS 37439 /* Sample value to Nits */
-/* tag 34929 is a private tag registered to FedEx */
-#define TIFFTAG_FEDEX_EDR 34929 /* unknown use */
-#define TIFFTAG_INTEROPERABILITYIFD 40965 /* Pointer to Interoperability private directory */
-/* Adobe Digital Negative (DNG) format tags */
-#define TIFFTAG_DNGVERSION 50706 /* &DNG version number */
-#define TIFFTAG_DNGBACKWARDVERSION 50707 /* &DNG compatibility version */
-#define TIFFTAG_UNIQUECAMERAMODEL 50708 /* &name for the camera model */
-#define TIFFTAG_LOCALIZEDCAMERAMODEL 50709 /* &localized camera model
- name */
-#define TIFFTAG_CFAPLANECOLOR 50710 /* &CFAPattern->LinearRaw space
- mapping */
-#define TIFFTAG_CFALAYOUT 50711 /* &spatial layout of the CFA */
-#define TIFFTAG_LINEARIZATIONTABLE 50712 /* &lookup table description */
-#define TIFFTAG_BLACKLEVELREPEATDIM 50713 /* &repeat pattern size for
- the BlackLevel tag */
-#define TIFFTAG_BLACKLEVEL 50714 /* &zero light encoding level */
-#define TIFFTAG_BLACKLEVELDELTAH 50715 /* &zero light encoding level
- differences (columns) */
-#define TIFFTAG_BLACKLEVELDELTAV 50716 /* &zero light encoding level
- differences (rows) */
-#define TIFFTAG_WHITELEVEL 50717 /* &fully saturated encoding
- level */
-#define TIFFTAG_DEFAULTSCALE 50718 /* &default scale factors */
-#define TIFFTAG_DEFAULTCROPORIGIN 50719 /* &origin of the final image
- area */
-#define TIFFTAG_DEFAULTCROPSIZE 50720 /* &size of the final image
- area */
-#define TIFFTAG_COLORMATRIX1 50721 /* &XYZ->reference color space
- transformation matrix 1 */
-#define TIFFTAG_COLORMATRIX2 50722 /* &XYZ->reference color space
- transformation matrix 2 */
-#define TIFFTAG_CAMERACALIBRATION1 50723 /* &calibration matrix 1 */
-#define TIFFTAG_CAMERACALIBRATION2 50724 /* &calibration matrix 2 */
-#define TIFFTAG_REDUCTIONMATRIX1 50725 /* &dimensionality reduction
- matrix 1 */
-#define TIFFTAG_REDUCTIONMATRIX2 50726 /* &dimensionality reduction
- matrix 2 */
-#define TIFFTAG_ANALOGBALANCE 50727 /* &gain applied the stored raw
- values*/
-#define TIFFTAG_ASSHOTNEUTRAL 50728 /* &selected white balance in
- linear reference space */
-#define TIFFTAG_ASSHOTWHITEXY 50729 /* &selected white balance in
- x-y chromaticity
- coordinates */
-#define TIFFTAG_BASELINEEXPOSURE 50730 /* &how much to move the zero
- point */
-#define TIFFTAG_BASELINENOISE 50731 /* &relative noise level */
-#define TIFFTAG_BASELINESHARPNESS 50732 /* &relative amount of
- sharpening */
-#define TIFFTAG_BAYERGREENSPLIT 50733 /* &how closely the values of
- the green pixels in the
- blue/green rows track the
- values of the green pixels
- in the red/green rows */
-#define TIFFTAG_LINEARRESPONSELIMIT 50734 /* &non-linear encoding range */
-#define TIFFTAG_CAMERASERIALNUMBER 50735 /* &camera's serial number */
-#define TIFFTAG_LENSINFO 50736 /* info about the lens */
-#define TIFFTAG_CHROMABLURRADIUS 50737 /* &chroma blur radius */
-#define TIFFTAG_ANTIALIASSTRENGTH 50738 /* &relative strength of the
- camera's anti-alias filter */
-#define TIFFTAG_SHADOWSCALE 50739 /* &used by Adobe Camera Raw */
-#define TIFFTAG_DNGPRIVATEDATA 50740 /* &manufacturer's private data */
-#define TIFFTAG_MAKERNOTESAFETY 50741 /* &whether the EXIF MakerNote
- tag is safe to preserve
- along with the rest of the
- EXIF data */
-#define TIFFTAG_CALIBRATIONILLUMINANT1 50778 /* &illuminant 1 */
-#define TIFFTAG_CALIBRATIONILLUMINANT2 50779 /* &illuminant 2 */
-#define TIFFTAG_BESTQUALITYSCALE 50780 /* &best quality multiplier */
-#define TIFFTAG_RAWDATAUNIQUEID 50781 /* &unique identifier for
- the raw image data */
-#define TIFFTAG_ORIGINALRAWFILENAME 50827 /* &file name of the original
- raw file */
-#define TIFFTAG_ORIGINALRAWFILEDATA 50828 /* &contents of the original
- raw file */
-#define TIFFTAG_ACTIVEAREA 50829 /* &active (non-masked) pixels
- of the sensor */
-#define TIFFTAG_MASKEDAREAS 50830 /* &list of coordinates
- of fully masked pixels */
-#define TIFFTAG_ASSHOTICCPROFILE 50831 /* &these two tags used to */
-#define TIFFTAG_ASSHOTPREPROFILEMATRIX 50832 /* map cameras's color space
- into ICC profile space */
-#define TIFFTAG_CURRENTICCPROFILE 50833 /* & */
-#define TIFFTAG_CURRENTPREPROFILEMATRIX 50834 /* & */
-/* tag 65535 is an undefined tag used by Eastman Kodak */
-#define TIFFTAG_DCSHUESHIFTVALUES 65535 /* hue shift correction data */
-
-/*
- * The following are ``pseudo tags'' that can be used to control
- * codec-specific functionality. These tags are not written to file.
- * Note that these values start at 0xffff+1 so that they'll never
- * collide with Aldus-assigned tags.
- *
- * If you want your private pseudo tags ``registered'' (i.e. added to
- * this file), please post a bug report via the tracking system at
- * http://www.remotesensing.org/libtiff/bugs.html with the appropriate
- * C definitions to add.
- */
-#define TIFFTAG_FAXMODE 65536 /* Group 3/4 format control */
-#define FAXMODE_CLASSIC 0x0000 /* default, include RTC */
-#define FAXMODE_NORTC 0x0001 /* no RTC at end of data */
-#define FAXMODE_NOEOL 0x0002 /* no EOL code at end of row */
-#define FAXMODE_BYTEALIGN 0x0004 /* byte align row */
-#define FAXMODE_WORDALIGN 0x0008 /* word align row */
-#define FAXMODE_CLASSF FAXMODE_NORTC /* TIFF Class F */
-#define TIFFTAG_JPEGQUALITY 65537 /* Compression quality level */
-/* Note: quality level is on the IJG 0-100 scale. Default value is 75 */
-#define TIFFTAG_JPEGCOLORMODE 65538 /* Auto RGB<=>YCbCr convert? */
-#define JPEGCOLORMODE_RAW 0x0000 /* no conversion (default) */
-#define JPEGCOLORMODE_RGB 0x0001 /* do auto conversion */
-#define TIFFTAG_JPEGTABLESMODE 65539 /* What to put in JPEGTables */
-#define JPEGTABLESMODE_QUANT 0x0001 /* include quantization tbls */
-#define JPEGTABLESMODE_HUFF 0x0002 /* include Huffman tbls */
-/* Note: default is JPEGTABLESMODE_QUANT | JPEGTABLESMODE_HUFF */
-#define TIFFTAG_FAXFILLFUNC 65540 /* G3/G4 fill function */
-#define TIFFTAG_PIXARLOGDATAFMT 65549 /* PixarLogCodec I/O data sz */
-#define PIXARLOGDATAFMT_8BIT 0 /* regular u_char samples */
-#define PIXARLOGDATAFMT_8BITABGR 1 /* ABGR-order u_chars */
-#define PIXARLOGDATAFMT_11BITLOG 2 /* 11-bit log-encoded (raw) */
-#define PIXARLOGDATAFMT_12BITPICIO 3 /* as per PICIO (1.0==2048) */
-#define PIXARLOGDATAFMT_16BIT 4 /* signed short samples */
-#define PIXARLOGDATAFMT_FLOAT 5 /* IEEE float samples */
-/* 65550-65556 are allocated to Oceana Matrix <dev@oceana.com> */
-#define TIFFTAG_DCSIMAGERTYPE 65550 /* imager model & filter */
-#define DCSIMAGERMODEL_M3 0 /* M3 chip (1280 x 1024) */
-#define DCSIMAGERMODEL_M5 1 /* M5 chip (1536 x 1024) */
-#define DCSIMAGERMODEL_M6 2 /* M6 chip (3072 x 2048) */
-#define DCSIMAGERFILTER_IR 0 /* infrared filter */
-#define DCSIMAGERFILTER_MONO 1 /* monochrome filter */
-#define DCSIMAGERFILTER_CFA 2 /* color filter array */
-#define DCSIMAGERFILTER_OTHER 3 /* other filter */
-#define TIFFTAG_DCSINTERPMODE 65551 /* interpolation mode */
-#define DCSINTERPMODE_NORMAL 0x0 /* whole image, default */
-#define DCSINTERPMODE_PREVIEW 0x1 /* preview of image (384x256) */
-#define TIFFTAG_DCSBALANCEARRAY 65552 /* color balance values */
-#define TIFFTAG_DCSCORRECTMATRIX 65553 /* color correction values */
-#define TIFFTAG_DCSGAMMA 65554 /* gamma value */
-#define TIFFTAG_DCSTOESHOULDERPTS 65555 /* toe & shoulder points */
-#define TIFFTAG_DCSCALIBRATIONFD 65556 /* calibration file desc */
-/* Note: quality level is on the ZLIB 1-9 scale. Default value is -1 */
-#define TIFFTAG_ZIPQUALITY 65557 /* compression quality level */
-#define TIFFTAG_PIXARLOGQUALITY 65558 /* PixarLog uses same scale */
-/* 65559 is allocated to Oceana Matrix <dev@oceana.com> */
-#define TIFFTAG_DCSCLIPRECTANGLE 65559 /* area of image to acquire */
-#define TIFFTAG_SGILOGDATAFMT 65560 /* SGILog user data format */
-#define SGILOGDATAFMT_FLOAT 0 /* IEEE float samples */
-#define SGILOGDATAFMT_16BIT 1 /* 16-bit samples */
-#define SGILOGDATAFMT_RAW 2 /* uninterpreted data */
-#define SGILOGDATAFMT_8BIT 3 /* 8-bit RGB monitor values */
-#define TIFFTAG_SGILOGENCODE 65561 /* SGILog data encoding control*/
-#define SGILOGENCODE_NODITHER 0 /* do not dither encoded values*/
-#define SGILOGENCODE_RANDITHER 1 /* randomly dither encd values */
-
-/*
- * EXIF tags
- */
-#define EXIFTAG_EXPOSURETIME 33434 /* Exposure time */
-#define EXIFTAG_FNUMBER 33437 /* F number */
-#define EXIFTAG_EXPOSUREPROGRAM 34850 /* Exposure program */
-#define EXIFTAG_SPECTRALSENSITIVITY 34852 /* Spectral sensitivity */
-#define EXIFTAG_ISOSPEEDRATINGS 34855 /* ISO speed rating */
-#define EXIFTAG_OECF 34856 /* Optoelectric conversion
- factor */
-#define EXIFTAG_EXIFVERSION 36864 /* Exif version */
-#define EXIFTAG_DATETIMEORIGINAL 36867 /* Date and time of original
- data generation */
-#define EXIFTAG_DATETIMEDIGITIZED 36868 /* Date and time of digital
- data generation */
-#define EXIFTAG_COMPONENTSCONFIGURATION 37121 /* Meaning of each component */
-#define EXIFTAG_COMPRESSEDBITSPERPIXEL 37122 /* Image compression mode */
-#define EXIFTAG_SHUTTERSPEEDVALUE 37377 /* Shutter speed */
-#define EXIFTAG_APERTUREVALUE 37378 /* Aperture */
-#define EXIFTAG_BRIGHTNESSVALUE 37379 /* Brightness */
-#define EXIFTAG_EXPOSUREBIASVALUE 37380 /* Exposure bias */
-#define EXIFTAG_MAXAPERTUREVALUE 37381 /* Maximum lens aperture */
-#define EXIFTAG_SUBJECTDISTANCE 37382 /* Subject distance */
-#define EXIFTAG_METERINGMODE 37383 /* Metering mode */
-#define EXIFTAG_LIGHTSOURCE 37384 /* Light source */
-#define EXIFTAG_FLASH 37385 /* Flash */
-#define EXIFTAG_FOCALLENGTH 37386 /* Lens focal length */
-#define EXIFTAG_SUBJECTAREA 37396 /* Subject area */
-#define EXIFTAG_MAKERNOTE 37500 /* Manufacturer notes */
-#define EXIFTAG_USERCOMMENT 37510 /* User comments */
-#define EXIFTAG_SUBSECTIME 37520 /* DateTime subseconds */
-#define EXIFTAG_SUBSECTIMEORIGINAL 37521 /* DateTimeOriginal subseconds */
-#define EXIFTAG_SUBSECTIMEDIGITIZED 37522 /* DateTimeDigitized subseconds */
-#define EXIFTAG_FLASHPIXVERSION 40960 /* Supported Flashpix version */
-#define EXIFTAG_COLORSPACE 40961 /* Color space information */
-#define EXIFTAG_PIXELXDIMENSION 40962 /* Valid image width */
-#define EXIFTAG_PIXELYDIMENSION 40963 /* Valid image height */
-#define EXIFTAG_RELATEDSOUNDFILE 40964 /* Related audio file */
-#define EXIFTAG_FLASHENERGY 41483 /* Flash energy */
-#define EXIFTAG_SPATIALFREQUENCYRESPONSE 41484 /* Spatial frequency response */
-#define EXIFTAG_FOCALPLANEXRESOLUTION 41486 /* Focal plane X resolution */
-#define EXIFTAG_FOCALPLANEYRESOLUTION 41487 /* Focal plane Y resolution */
-#define EXIFTAG_FOCALPLANERESOLUTIONUNIT 41488 /* Focal plane resolution unit */
-#define EXIFTAG_SUBJECTLOCATION 41492 /* Subject location */
-#define EXIFTAG_EXPOSUREINDEX 41493 /* Exposure index */
-#define EXIFTAG_SENSINGMETHOD 41495 /* Sensing method */
-#define EXIFTAG_FILESOURCE 41728 /* File source */
-#define EXIFTAG_SCENETYPE 41729 /* Scene type */
-#define EXIFTAG_CFAPATTERN 41730 /* CFA pattern */
-#define EXIFTAG_CUSTOMRENDERED 41985 /* Custom image processing */
-#define EXIFTAG_EXPOSUREMODE 41986 /* Exposure mode */
-#define EXIFTAG_WHITEBALANCE 41987 /* White balance */
-#define EXIFTAG_DIGITALZOOMRATIO 41988 /* Digital zoom ratio */
-#define EXIFTAG_FOCALLENGTHIN35MMFILM 41989 /* Focal length in 35 mm film */
-#define EXIFTAG_SCENECAPTURETYPE 41990 /* Scene capture type */
-#define EXIFTAG_GAINCONTROL 41991 /* Gain control */
-#define EXIFTAG_CONTRAST 41992 /* Contrast */
-#define EXIFTAG_SATURATION 41993 /* Saturation */
-#define EXIFTAG_SHARPNESS 41994 /* Sharpness */
-#define EXIFTAG_DEVICESETTINGDESCRIPTION 41995 /* Device settings description */
-#define EXIFTAG_SUBJECTDISTANCERANGE 41996 /* Subject distance range */
-#define EXIFTAG_GAINCONTROL 41991 /* Gain control */
-#define EXIFTAG_GAINCONTROL 41991 /* Gain control */
-#define EXIFTAG_IMAGEUNIQUEID 42016 /* Unique image ID */
-
-#endif /* _TIFF_ */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tiffconf.h b/src/3rdparty/libtiff/libtiff/tiffconf.h
deleted file mode 100644
index 1a012226c6..0000000000
--- a/src/3rdparty/libtiff/libtiff/tiffconf.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- Configuration defines for Qt.
- This file maintained for backward compatibility. Do not use definitions
- from this file in your programs.
-*/
-
-#ifndef _TIFFCONF_
-#define _TIFFCONF_
-
-#include <qglobal.h>
-
-/* Define to 1 if the system has the type `int16'. */
-/* #undef HAVE_INT16 */
-
-/* Define to 1 if the system has the type `int32'. */
-/* #undef HAVE_INT32 */
-
-/* Define to 1 if the system has the type `int8'. */
-/* #undef HAVE_INT8 */
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#if (QT_POINTER_SIZE == 8) && !defined(Q_OS_WIN64)
-#define SIZEOF_LONG 8
-#else
-#define SIZEOF_LONG 4
-#endif
-
-/* Compatibility stuff. */
-
-/* Define as 0 or 1 according to the floating point format suported by the
- machine */
-#define HAVE_IEEEFP 1
-
-/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
-#define HOST_FILLORDER FILLORDER_LSB2MSB
-
-/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
- (Intel) */
-#if (Q_BYTE_ORDER == Q_BIG_ENDIAN)
-#define HOST_BIGENDIAN 1
-#else
-#define HOST_BIGENDIAN 0
-#endif
-
-/* Support CCITT Group 3 & 4 algorithms */
-#define CCITT_SUPPORT 1
-
-/* Support JPEG compression (requires IJG JPEG library) */
-/* #undef JPEG_SUPPORT */
-
-/* Support LogLuv high dynamic range encoding */
-#define LOGLUV_SUPPORT 1
-
-/* Support LZW algorithm */
-#define LZW_SUPPORT 1
-
-/* Support NeXT 2-bit RLE algorithm */
-#define NEXT_SUPPORT 1
-
-/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
- fails with unpatched IJG JPEG library) */
-/* #undef OJPEG_SUPPORT */
-
-/* Support Macintosh PackBits algorithm */
-#define PACKBITS_SUPPORT 1
-
-/* Support Pixar log-format algorithm (requires Zlib) */
-#define PIXARLOG_SUPPORT 1
-
-/* Support ThunderScan 4-bit RLE algorithm */
-#define THUNDER_SUPPORT 1
-
-/* Support Deflate compression */
-#define ZIP_SUPPORT 1
-
-/* Support strip chopping (whether or not to convert single-strip uncompressed
- images to mutiple strips of ~8Kb to reduce memory usage) */
-#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
-
-/* Enable SubIFD tag (330) support */
-#define SUBIFD_SUPPORT 1
-
-/* Treat extra sample as alpha (default enabled). The RGBA interface will
- treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
- packages produce RGBA files but don't mark the alpha properly. */
-#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
-
-/* Pick up YCbCr subsampling info from the JPEG data stream to support files
- lacking the tag (default enabled). */
-#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
-
-/* Support MS MDI magic number files as TIFF */
-#define MDI_SUPPORT 1
-
-/*
- * Feature support definitions.
- * XXX: These macros are obsoleted. Don't use them in your apps!
- * Macros stays here for backward compatibility and should be always defined.
- */
-#define COLORIMETRY_SUPPORT
-#define YCBCR_SUPPORT
-#define CMYK_SUPPORT
-#define ICC_SUPPORT
-#define PHOTOSHOP_SUPPORT
-#define IPTC_SUPPORT
-
-#endif /* _TIFFCONF_ */
diff --git a/src/3rdparty/libtiff/libtiff/tiffconf.h.in b/src/3rdparty/libtiff/libtiff/tiffconf.h.in
deleted file mode 100644
index 1a52b37ada..0000000000
--- a/src/3rdparty/libtiff/libtiff/tiffconf.h.in
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- Configuration defines for installed libtiff.
- This file maintained for backward compatibility. Do not use definitions
- from this file in your programs.
-*/
-
-#ifndef _TIFFCONF_
-#define _TIFFCONF_
-
-/* Define to 1 if the system has the type `int16'. */
-#undef HAVE_INT16
-
-/* Define to 1 if the system has the type `int32'. */
-#undef HAVE_INT32
-
-/* Define to 1 if the system has the type `int8'. */
-#undef HAVE_INT8
-
-/* The size of a `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of a `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* Compatibility stuff. */
-
-/* Define as 0 or 1 according to the floating point format suported by the
- machine */
-#undef HAVE_IEEEFP
-
-/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
-#undef HOST_FILLORDER
-
-/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
- (Intel) */
-#undef HOST_BIGENDIAN
-
-/* Support CCITT Group 3 & 4 algorithms */
-#undef CCITT_SUPPORT
-
-/* Support JPEG compression (requires IJG JPEG library) */
-#undef JPEG_SUPPORT
-
-/* Support JBIG compression (requires JBIG-KIT library) */
-#undef JBIG_SUPPORT
-
-/* Support LogLuv high dynamic range encoding */
-#undef LOGLUV_SUPPORT
-
-/* Support LZW algorithm */
-#undef LZW_SUPPORT
-
-/* Support NeXT 2-bit RLE algorithm */
-#undef NEXT_SUPPORT
-
-/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
- fails with unpatched IJG JPEG library) */
-#undef OJPEG_SUPPORT
-
-/* Support Macintosh PackBits algorithm */
-#undef PACKBITS_SUPPORT
-
-/* Support Pixar log-format algorithm (requires Zlib) */
-#undef PIXARLOG_SUPPORT
-
-/* Support ThunderScan 4-bit RLE algorithm */
-#undef THUNDER_SUPPORT
-
-/* Support Deflate compression */
-#undef ZIP_SUPPORT
-
-/* Support strip chopping (whether or not to convert single-strip uncompressed
- images to mutiple strips of ~8Kb to reduce memory usage) */
-#undef STRIPCHOP_DEFAULT
-
-/* Enable SubIFD tag (330) support */
-#undef SUBIFD_SUPPORT
-
-/* Treat extra sample as alpha (default enabled). The RGBA interface will
- treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
- packages produce RGBA files but don't mark the alpha properly. */
-#undef DEFAULT_EXTRASAMPLE_AS_ALPHA
-
-/* Pick up YCbCr subsampling info from the JPEG data stream to support files
- lacking the tag (default enabled). */
-#undef CHECK_JPEG_YCBCR_SUBSAMPLING
-
-/* Support MS MDI magic number files as TIFF */
-#undef MDI_SUPPORT
-
-/*
- * Feature support definitions.
- * XXX: These macros are obsoleted. Don't use them in your apps!
- * Macros stays here for backward compatibility and should be always defined.
- */
-#define COLORIMETRY_SUPPORT
-#define YCBCR_SUPPORT
-#define CMYK_SUPPORT
-#define ICC_SUPPORT
-#define PHOTOSHOP_SUPPORT
-#define IPTC_SUPPORT
-
-#endif /* _TIFFCONF_ */
diff --git a/src/3rdparty/libtiff/libtiff/tiffconf.vc.h b/src/3rdparty/libtiff/libtiff/tiffconf.vc.h
deleted file mode 100644
index 9a0b15205d..0000000000
--- a/src/3rdparty/libtiff/libtiff/tiffconf.vc.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- Configuration defines for installed libtiff.
- This file maintained for backward compatibility. Do not use definitions
- from this file in your programs.
-*/
-
-#ifndef _TIFFCONF_
-#define _TIFFCONF_
-
-/* Define to 1 if the system has the type `int16'. */
-/* #undef HAVE_INT16 */
-
-/* Define to 1 if the system has the type `int32'. */
-/* #undef HAVE_INT32 */
-
-/* Define to 1 if the system has the type `int8'. */
-/* #undef HAVE_INT8 */
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* Signed 64-bit type formatter */
-#define TIFF_INT64_FORMAT "%I64d"
-
-/* Signed 64-bit type */
-#define TIFF_INT64_T signed __int64
-
-/* Unsigned 64-bit type formatter */
-#define TIFF_UINT64_FORMAT "%I64u"
-
-/* Unsigned 64-bit type */
-#define TIFF_UINT64_T unsigned __int64
-
-/* Compatibility stuff. */
-
-/* Define as 0 or 1 according to the floating point format suported by the
- machine */
-#define HAVE_IEEEFP 1
-
-/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
-#define HOST_FILLORDER FILLORDER_LSB2MSB
-
-/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
- (Intel) */
-#define HOST_BIGENDIAN 0
-
-/* Support CCITT Group 3 & 4 algorithms */
-#define CCITT_SUPPORT 1
-
-/* Support JPEG compression (requires IJG JPEG library) */
-/* #undef JPEG_SUPPORT */
-
-/* Support LogLuv high dynamic range encoding */
-#define LOGLUV_SUPPORT 1
-
-/* Support LZW algorithm */
-#define LZW_SUPPORT 1
-
-/* Support NeXT 2-bit RLE algorithm */
-#define NEXT_SUPPORT 1
-
-/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
- fails with unpatched IJG JPEG library) */
-/* #undef OJPEG_SUPPORT */
-
-/* Support Macintosh PackBits algorithm */
-#define PACKBITS_SUPPORT 1
-
-/* Support Pixar log-format algorithm (requires Zlib) */
-/* #undef PIXARLOG_SUPPORT */
-
-/* Support ThunderScan 4-bit RLE algorithm */
-#define THUNDER_SUPPORT 1
-
-/* Support Deflate compression */
-/* #undef ZIP_SUPPORT */
-
-/* Support strip chopping (whether or not to convert single-strip uncompressed
- images to mutiple strips of ~8Kb to reduce memory usage) */
-#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
-
-/* Enable SubIFD tag (330) support */
-#define SUBIFD_SUPPORT 1
-
-/* Treat extra sample as alpha (default enabled). The RGBA interface will
- treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
- packages produce RGBA files but don't mark the alpha properly. */
-#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
-
-/* Pick up YCbCr subsampling info from the JPEG data stream to support files
- lacking the tag (default enabled). */
-#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
-
-/*
- * Feature support definitions.
- * XXX: These macros are obsoleted. Don't use them in your apps!
- * Macros stays here for backward compatibility and should be always defined.
- */
-#define COLORIMETRY_SUPPORT
-#define YCBCR_SUPPORT
-#define CMYK_SUPPORT
-#define ICC_SUPPORT
-#define PHOTOSHOP_SUPPORT
-#define IPTC_SUPPORT
-
-#endif /* _TIFFCONF_ */
diff --git a/src/3rdparty/libtiff/libtiff/tiffconf.wince.h b/src/3rdparty/libtiff/libtiff/tiffconf.wince.h
deleted file mode 100644
index 27fa239a92..0000000000
--- a/src/3rdparty/libtiff/libtiff/tiffconf.wince.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* $Id: tiffconf.wince.h,v 1.1.2.1 2009-01-01 17:52:51 bfriesen Exp $ */
-
-/*
- * Windows CE platform tiffconf.wince.h
- * Created by Mateusz Loskot (mateusz@loskot.net)
- *
- * NOTE: Requires WCELIBCEX library with wceex_* functions,
- * It's an extension to C library on Windows CE platform.
- * For example, HAVE_STDIO_H definition indicates there are
- * following files available:
- * stdio.h - from Windows CE / Windows Mobile SDK
- * wce_stdio.h - from WCELIBCEX library
- */
-
-
-/*
- Configuration defines for installed libtiff.
- This file maintained for backward compatibility. Do not use definitions
- from this file in your programs.
-*/
-
-#ifndef _WIN32_WCE
-# error This version of tif_config.h header is dedicated for Windows CE platform!
-#endif
-
-
-#ifndef _TIFFCONF_
-#define _TIFFCONF_
-
-/* Define to 1 if the system has the type `int16'. */
-/* #undef HAVE_INT16 */
-
-/* Define to 1 if the system has the type `int32'. */
-/* #undef HAVE_INT32 */
-
-/* Define to 1 if the system has the type `int8'. */
-/* #undef HAVE_INT8 */
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* Signed 64-bit type formatter */
-#define TIFF_INT64_FORMAT "%I64d"
-
-/* Signed 64-bit type */
-#define TIFF_INT64_T signed __int64
-
-/* Unsigned 64-bit type formatter */
-#define TIFF_UINT64_FORMAT "%I64u"
-
-/* Unsigned 64-bit type */
-#define TIFF_UINT64_T unsigned __int64
-
-/* Compatibility stuff. */
-
-/* Define as 0 or 1 according to the floating point format suported by the
- machine */
-#define HAVE_IEEEFP 1
-
-/* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
-#define HOST_FILLORDER FILLORDER_LSB2MSB
-
-/* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
- (Intel) */
-#define HOST_BIGENDIAN 0
-
-/* Support CCITT Group 3 & 4 algorithms */
-#define CCITT_SUPPORT 1
-
-/* Support JPEG compression (requires IJG JPEG library) */
-/* #undef JPEG_SUPPORT */
-
-/* Support LogLuv high dynamic range encoding */
-#define LOGLUV_SUPPORT 1
-
-/* Support LZW algorithm */
-#define LZW_SUPPORT 1
-
-/* Support NeXT 2-bit RLE algorithm */
-#define NEXT_SUPPORT 1
-
-/* Support Old JPEG compresson (read contrib/ojpeg/README first! Compilation
- fails with unpatched IJG JPEG library) */
-/* #undef OJPEG_SUPPORT */
-
-/* Support Macintosh PackBits algorithm */
-#define PACKBITS_SUPPORT 1
-
-/* Support Pixar log-format algorithm (requires Zlib) */
-/* #undef PIXARLOG_SUPPORT */
-
-/* Support ThunderScan 4-bit RLE algorithm */
-#define THUNDER_SUPPORT 1
-
-/* Support Deflate compression */
-/* #undef ZIP_SUPPORT */
-
-/* Support strip chopping (whether or not to convert single-strip uncompressed
- images to mutiple strips of ~8Kb to reduce memory usage) */
-#define STRIPCHOP_DEFAULT TIFF_STRIPCHOP
-
-/* Enable SubIFD tag (330) support */
-#define SUBIFD_SUPPORT 1
-
-/* Treat extra sample as alpha (default enabled). The RGBA interface will
- treat a fourth sample with no EXTRASAMPLE_ value as being ASSOCALPHA. Many
- packages produce RGBA files but don't mark the alpha properly. */
-#define DEFAULT_EXTRASAMPLE_AS_ALPHA 1
-
-/* Pick up YCbCr subsampling info from the JPEG data stream to support files
- lacking the tag (default enabled). */
-#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
-
-/*
- * Feature support definitions.
- * XXX: These macros are obsoleted. Don't use them in your apps!
- * Macros stays here for backward compatibility and should be always defined.
- */
-#define COLORIMETRY_SUPPORT
-#define YCBCR_SUPPORT
-#define CMYK_SUPPORT
-#define ICC_SUPPORT
-#define PHOTOSHOP_SUPPORT
-#define IPTC_SUPPORT
-
-#endif /* _TIFFCONF_ */
diff --git a/src/3rdparty/libtiff/libtiff/tiffio.h b/src/3rdparty/libtiff/libtiff/tiffio.h
deleted file mode 100644
index 0f2735f95d..0000000000
--- a/src/3rdparty/libtiff/libtiff/tiffio.h
+++ /dev/null
@@ -1,521 +0,0 @@
-/* $Id: tiffio.h,v 1.56.2.3 2009-01-01 00:10:43 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _TIFFIO_
-#define _TIFFIO_
-
-/*
- * TIFF I/O Library Definitions.
- */
-#include "tiff.h"
-#include "tiffvers.h"
-
-/*
- * TIFF is defined as an incomplete type to hide the
- * library's internal data structures from clients.
- */
-typedef struct tiff TIFF;
-
-/*
- * The following typedefs define the intrinsic size of
- * data types used in the *exported* interfaces. These
- * definitions depend on the proper definition of types
- * in tiff.h. Note also that the varargs interface used
- * to pass tag types and values uses the types defined in
- * tiff.h directly.
- *
- * NB: ttag_t is unsigned int and not unsigned short because
- * ANSI C requires that the type before the ellipsis be a
- * promoted type (i.e. one of int, unsigned int, pointer,
- * or double) and because we defined pseudo-tags that are
- * outside the range of legal Aldus-assigned tags.
- * NB: tsize_t is int32 and not uint32 because some functions
- * return -1.
- * NB: toff_t is not off_t for many reasons; TIFFs max out at
- * 32-bit file offsets being the most important, and to ensure
- * that it is unsigned, rather than signed.
- */
-typedef uint32 ttag_t; /* directory tag */
-typedef uint16 tdir_t; /* directory index */
-typedef uint16 tsample_t; /* sample number */
-typedef uint32 tstrile_t; /* strip or tile number */
-typedef tstrile_t tstrip_t; /* strip number */
-typedef tstrile_t ttile_t; /* tile number */
-typedef int32 tsize_t; /* i/o size in bytes */
-typedef void* tdata_t; /* image data ref */
-typedef uint32 toff_t; /* file offset */
-
-#if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32))
-#define __WIN32__
-#endif
-
-#include <stdlib.h>
-
-/*
- * On windows you should define USE_WIN32_FILEIO if you are using tif_win32.c
- * or AVOID_WIN32_FILEIO if you are using something else (like tif_unix.c).
- *
- * By default tif_unix.c is assumed.
- */
-
-#if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
-# if !defined(__CYGWIN) && !defined(AVOID_WIN32_FILEIO) && !defined(USE_WIN32_FILEIO)
-# define AVOID_WIN32_FILEIO
-# endif
-#endif
-
-#if defined(USE_WIN32_FILEIO)
-# define VC_EXTRALEAN
-# include <windows.h>
-# ifdef __WIN32__
-DECLARE_HANDLE(thandle_t); /* Win32 file handle */
-# else
-typedef HFILE thandle_t; /* client data handle */
-# endif /* __WIN32__ */
-#else
-typedef void* thandle_t; /* client data handle */
-#endif /* USE_WIN32_FILEIO */
-
-/*
- * Flags to pass to TIFFPrintDirectory to control
- * printing of data structures that are potentially
- * very large. Bit-or these flags to enable printing
- * multiple items.
- */
-#define TIFFPRINT_NONE 0x0 /* no extra info */
-#define TIFFPRINT_STRIPS 0x1 /* strips/tiles info */
-#define TIFFPRINT_CURVES 0x2 /* color/gray response curves */
-#define TIFFPRINT_COLORMAP 0x4 /* colormap */
-#define TIFFPRINT_JPEGQTABLES 0x100 /* JPEG Q matrices */
-#define TIFFPRINT_JPEGACTABLES 0x200 /* JPEG AC tables */
-#define TIFFPRINT_JPEGDCTABLES 0x200 /* JPEG DC tables */
-
-/*
- * Colour conversion stuff
- */
-
-/* reference white */
-#define D65_X0 (95.0470F)
-#define D65_Y0 (100.0F)
-#define D65_Z0 (108.8827F)
-
-#define D50_X0 (96.4250F)
-#define D50_Y0 (100.0F)
-#define D50_Z0 (82.4680F)
-
-/* Structure for holding information about a display device. */
-
-typedef unsigned char TIFFRGBValue; /* 8-bit samples */
-
-typedef struct {
- float d_mat[3][3]; /* XYZ -> luminance matrix */
- float d_YCR; /* Light o/p for reference white */
- float d_YCG;
- float d_YCB;
- uint32 d_Vrwr; /* Pixel values for ref. white */
- uint32 d_Vrwg;
- uint32 d_Vrwb;
- float d_Y0R; /* Residual light for black pixel */
- float d_Y0G;
- float d_Y0B;
- float d_gammaR; /* Gamma values for the three guns */
- float d_gammaG;
- float d_gammaB;
-} TIFFDisplay;
-
-typedef struct { /* YCbCr->RGB support */
- TIFFRGBValue* clamptab; /* range clamping table */
- int* Cr_r_tab;
- int* Cb_b_tab;
- int32* Cr_g_tab;
- int32* Cb_g_tab;
- int32* Y_tab;
-} TIFFYCbCrToRGB;
-
-typedef struct { /* CIE Lab 1976->RGB support */
- int range; /* Size of conversion table */
-#define CIELABTORGB_TABLE_RANGE 1500
- float rstep, gstep, bstep;
- float X0, Y0, Z0; /* Reference white point */
- TIFFDisplay display;
- float Yr2r[CIELABTORGB_TABLE_RANGE + 1]; /* Conversion of Yr to r */
- float Yg2g[CIELABTORGB_TABLE_RANGE + 1]; /* Conversion of Yg to g */
- float Yb2b[CIELABTORGB_TABLE_RANGE + 1]; /* Conversion of Yb to b */
-} TIFFCIELabToRGB;
-
-/*
- * RGBA-style image support.
- */
-typedef struct _TIFFRGBAImage TIFFRGBAImage;
-/*
- * The image reading and conversion routines invoke
- * ``put routines'' to copy/image/whatever tiles of
- * raw image data. A default set of routines are
- * provided to convert/copy raw image data to 8-bit
- * packed ABGR format rasters. Applications can supply
- * alternate routines that unpack the data into a
- * different format or, for example, unpack the data
- * and draw the unpacked raster on the display.
- */
-typedef void (*tileContigRoutine)
- (TIFFRGBAImage*, uint32*, uint32, uint32, uint32, uint32, int32, int32,
- unsigned char*);
-typedef void (*tileSeparateRoutine)
- (TIFFRGBAImage*, uint32*, uint32, uint32, uint32, uint32, int32, int32,
- unsigned char*, unsigned char*, unsigned char*, unsigned char*);
-/*
- * RGBA-reader state.
- */
-struct _TIFFRGBAImage {
- TIFF* tif; /* image handle */
- int stoponerr; /* stop on read error */
- int isContig; /* data is packed/separate */
- int alpha; /* type of alpha data present */
- uint32 width; /* image width */
- uint32 height; /* image height */
- uint16 bitspersample; /* image bits/sample */
- uint16 samplesperpixel; /* image samples/pixel */
- uint16 orientation; /* image orientation */
- uint16 req_orientation; /* requested orientation */
- uint16 photometric; /* image photometric interp */
- uint16* redcmap; /* colormap pallete */
- uint16* greencmap;
- uint16* bluecmap;
- /* get image data routine */
- int (*get)(TIFFRGBAImage*, uint32*, uint32, uint32);
- /* put decoded strip/tile */
- union {
- void (*any)(TIFFRGBAImage*);
- tileContigRoutine contig;
- tileSeparateRoutine separate;
- } put;
- TIFFRGBValue* Map; /* sample mapping array */
- uint32** BWmap; /* black&white map */
- uint32** PALmap; /* palette image map */
- TIFFYCbCrToRGB* ycbcr; /* YCbCr conversion state */
- TIFFCIELabToRGB* cielab; /* CIE L*a*b conversion state */
-
- int row_offset;
- int col_offset;
-};
-
-/*
- * Macros for extracting components from the
- * packed ABGR form returned by TIFFReadRGBAImage.
- */
-#define TIFFGetR(abgr) ((abgr) & 0xff)
-#define TIFFGetG(abgr) (((abgr) >> 8) & 0xff)
-#define TIFFGetB(abgr) (((abgr) >> 16) & 0xff)
-#define TIFFGetA(abgr) (((abgr) >> 24) & 0xff)
-
-/*
- * A CODEC is a software package that implements decoding,
- * encoding, or decoding+encoding of a compression algorithm.
- * The library provides a collection of builtin codecs.
- * More codecs may be registered through calls to the library
- * and/or the builtin implementations may be overridden.
- */
-typedef int (*TIFFInitMethod)(TIFF*, int);
-typedef struct {
- char* name;
- uint16 scheme;
- TIFFInitMethod init;
-} TIFFCodec;
-
-#include <stdio.h>
-#include <stdarg.h>
-
-/* share internal LogLuv conversion routines? */
-#ifndef LOGLUV_PUBLIC
-#define LOGLUV_PUBLIC 1
-#endif
-
-#if !defined(__GNUC__) && !defined(__attribute__)
-# define __attribute__(x) /*nothing*/
-#endif
-
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
-typedef void (*TIFFErrorHandler)(const char*, const char*, va_list);
-typedef void (*TIFFErrorHandlerExt)(thandle_t, const char*, const char*, va_list);
-typedef tsize_t (*TIFFReadWriteProc)(thandle_t, tdata_t, tsize_t);
-typedef toff_t (*TIFFSeekProc)(thandle_t, toff_t, int);
-typedef int (*TIFFCloseProc)(thandle_t);
-typedef toff_t (*TIFFSizeProc)(thandle_t);
-typedef int (*TIFFMapFileProc)(thandle_t, tdata_t*, toff_t*);
-typedef void (*TIFFUnmapFileProc)(thandle_t, tdata_t, toff_t);
-typedef void (*TIFFExtendProc)(TIFF*);
-
-extern const char* TIFFGetVersion(void);
-
-extern const TIFFCodec* TIFFFindCODEC(uint16);
-extern TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod);
-extern void TIFFUnRegisterCODEC(TIFFCodec*);
-extern int TIFFIsCODECConfigured(uint16);
-extern TIFFCodec* TIFFGetConfiguredCODECs(void);
-
-/*
- * Auxiliary functions.
- */
-
-extern tdata_t _TIFFmalloc(tsize_t);
-extern tdata_t _TIFFrealloc(tdata_t, tsize_t);
-extern void _TIFFmemset(tdata_t, int, tsize_t);
-extern void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t);
-extern int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t);
-extern void _TIFFfree(tdata_t);
-
-/*
-** Stuff, related to tag handling and creating custom tags.
-*/
-extern int TIFFGetTagListCount( TIFF * );
-extern ttag_t TIFFGetTagListEntry( TIFF *, int tag_index );
-
-#define TIFF_ANY TIFF_NOTYPE /* for field descriptor searching */
-#define TIFF_VARIABLE -1 /* marker for variable length tags */
-#define TIFF_SPP -2 /* marker for SamplesPerPixel tags */
-#define TIFF_VARIABLE2 -3 /* marker for uint32 var-length tags */
-
-#define FIELD_CUSTOM 65
-
-typedef struct {
- ttag_t field_tag; /* field's tag */
- short field_readcount; /* read count/TIFF_VARIABLE/TIFF_SPP */
- short field_writecount; /* write count/TIFF_VARIABLE */
- TIFFDataType field_type; /* type of associated data */
- unsigned short field_bit; /* bit in fieldsset bit vector */
- unsigned char field_oktochange; /* if true, can change while writing */
- unsigned char field_passcount; /* if true, pass dir count on set */
- char *field_name; /* ASCII name */
-} TIFFFieldInfo;
-
-typedef struct _TIFFTagValue {
- const TIFFFieldInfo *info;
- int count;
- void *value;
-} TIFFTagValue;
-
-extern void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int);
-extern const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType);
-extern const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *,
- TIFFDataType);
-extern const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t);
-extern const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *);
-
-typedef int (*TIFFVSetMethod)(TIFF*, ttag_t, va_list);
-typedef int (*TIFFVGetMethod)(TIFF*, ttag_t, va_list);
-typedef void (*TIFFPrintMethod)(TIFF*, FILE*, long);
-
-typedef struct {
- TIFFVSetMethod vsetfield; /* tag set routine */
- TIFFVGetMethod vgetfield; /* tag get routine */
- TIFFPrintMethod printdir; /* directory print routine */
-} TIFFTagMethods;
-
-extern TIFFTagMethods *TIFFAccessTagMethods( TIFF * );
-extern void *TIFFGetClientInfo( TIFF *, const char * );
-extern void TIFFSetClientInfo( TIFF *, void *, const char * );
-
-extern void TIFFCleanup(TIFF*);
-extern void TIFFClose(TIFF*);
-extern int TIFFFlush(TIFF*);
-extern int TIFFFlushData(TIFF*);
-extern int TIFFGetField(TIFF*, ttag_t, ...);
-extern int TIFFVGetField(TIFF*, ttag_t, va_list);
-extern int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...);
-extern int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list);
-extern int TIFFReadDirectory(TIFF*);
-extern int TIFFReadCustomDirectory(TIFF*, toff_t, const TIFFFieldInfo[],
- size_t);
-extern int TIFFReadEXIFDirectory(TIFF*, toff_t);
-extern tsize_t TIFFScanlineSize(TIFF*);
-extern tsize_t TIFFOldScanlineSize(TIFF*);
-extern tsize_t TIFFNewScanlineSize(TIFF*);
-extern tsize_t TIFFRasterScanlineSize(TIFF*);
-extern tsize_t TIFFStripSize(TIFF*);
-extern tsize_t TIFFRawStripSize(TIFF*, tstrip_t);
-extern tsize_t TIFFVStripSize(TIFF*, uint32);
-extern tsize_t TIFFTileRowSize(TIFF*);
-extern tsize_t TIFFTileSize(TIFF*);
-extern tsize_t TIFFVTileSize(TIFF*, uint32);
-extern uint32 TIFFDefaultStripSize(TIFF*, uint32);
-extern void TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
-extern int TIFFFileno(TIFF*);
-extern int TIFFSetFileno(TIFF*, int);
-extern thandle_t TIFFClientdata(TIFF*);
-extern thandle_t TIFFSetClientdata(TIFF*, thandle_t);
-extern int TIFFGetMode(TIFF*);
-extern int TIFFSetMode(TIFF*, int);
-extern int TIFFIsTiled(TIFF*);
-extern int TIFFIsByteSwapped(TIFF*);
-extern int TIFFIsUpSampled(TIFF*);
-extern int TIFFIsMSB2LSB(TIFF*);
-extern int TIFFIsBigEndian(TIFF*);
-extern TIFFReadWriteProc TIFFGetReadProc(TIFF*);
-extern TIFFReadWriteProc TIFFGetWriteProc(TIFF*);
-extern TIFFSeekProc TIFFGetSeekProc(TIFF*);
-extern TIFFCloseProc TIFFGetCloseProc(TIFF*);
-extern TIFFSizeProc TIFFGetSizeProc(TIFF*);
-extern TIFFMapFileProc TIFFGetMapFileProc(TIFF*);
-extern TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*);
-extern uint32 TIFFCurrentRow(TIFF*);
-extern tdir_t TIFFCurrentDirectory(TIFF*);
-extern tdir_t TIFFNumberOfDirectories(TIFF*);
-extern uint32 TIFFCurrentDirOffset(TIFF*);
-extern tstrip_t TIFFCurrentStrip(TIFF*);
-extern ttile_t TIFFCurrentTile(TIFF*);
-extern int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t);
-extern int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t);
-extern int TIFFSetupStrips(TIFF *);
-extern int TIFFWriteCheck(TIFF*, int, const char *);
-extern void TIFFFreeDirectory(TIFF*);
-extern int TIFFCreateDirectory(TIFF*);
-extern int TIFFLastDirectory(TIFF*);
-extern int TIFFSetDirectory(TIFF*, tdir_t);
-extern int TIFFSetSubDirectory(TIFF*, uint32);
-extern int TIFFUnlinkDirectory(TIFF*, tdir_t);
-extern int TIFFSetField(TIFF*, ttag_t, ...);
-extern int TIFFVSetField(TIFF*, ttag_t, va_list);
-extern int TIFFWriteDirectory(TIFF *);
-extern int TIFFCheckpointDirectory(TIFF *);
-extern int TIFFRewriteDirectory(TIFF *);
-extern int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int);
-
-#if defined(c_plusplus) || defined(__cplusplus)
-extern void TIFFPrintDirectory(TIFF*, FILE*, long = 0);
-extern int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0);
-extern int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0);
-extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0);
-extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*,
- int = ORIENTATION_BOTLEFT, int = 0);
-#else
-extern void TIFFPrintDirectory(TIFF*, FILE*, long);
-extern int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t);
-extern int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t);
-extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int);
-extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int);
-#endif
-
-extern int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * );
-extern int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * );
-extern int TIFFRGBAImageOK(TIFF*, char [1024]);
-extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]);
-extern int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32);
-extern void TIFFRGBAImageEnd(TIFFRGBAImage*);
-extern TIFF* TIFFOpen(const char*, const char*);
-# ifdef __WIN32__
-extern TIFF* TIFFOpenW(const wchar_t*, const char*);
-# endif /* __WIN32__ */
-extern TIFF* TIFFFdOpen(int, const char*, const char*);
-extern TIFF* TIFFClientOpen(const char*, const char*,
- thandle_t,
- TIFFReadWriteProc, TIFFReadWriteProc,
- TIFFSeekProc, TIFFCloseProc,
- TIFFSizeProc,
- TIFFMapFileProc, TIFFUnmapFileProc);
-extern const char* TIFFFileName(TIFF*);
-extern const char* TIFFSetFileName(TIFF*, const char *);
-extern void TIFFError(const char*, const char*, ...) __attribute__((format (printf,2,3)));
-extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4)));
-extern void TIFFWarning(const char*, const char*, ...) __attribute__((format (printf,2,3)));
-extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4)));
-extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler);
-extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt);
-extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler);
-extern TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt);
-extern TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc);
-extern ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t);
-extern int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t);
-extern ttile_t TIFFNumberOfTiles(TIFF*);
-extern tsize_t TIFFReadTile(TIFF*,
- tdata_t, uint32, uint32, uint32, tsample_t);
-extern tsize_t TIFFWriteTile(TIFF*,
- tdata_t, uint32, uint32, uint32, tsample_t);
-extern tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t);
-extern tstrip_t TIFFNumberOfStrips(TIFF*);
-extern tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
-extern tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
-extern tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t);
-extern tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t);
-extern tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
-extern tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
-extern tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t);
-extern tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t);
-extern int TIFFDataWidth(TIFFDataType); /* table of tag datatype widths */
-extern void TIFFSetWriteOffset(TIFF*, toff_t);
-extern void TIFFSwabShort(uint16*);
-extern void TIFFSwabLong(uint32*);
-extern void TIFFSwabDouble(double*);
-extern void TIFFSwabArrayOfShort(uint16*, unsigned long);
-extern void TIFFSwabArrayOfTriples(uint8*, unsigned long);
-extern void TIFFSwabArrayOfLong(uint32*, unsigned long);
-extern void TIFFSwabArrayOfDouble(double*, unsigned long);
-extern void TIFFReverseBits(unsigned char *, unsigned long);
-extern const unsigned char* TIFFGetBitRevTable(int);
-
-#ifdef LOGLUV_PUBLIC
-#define U_NEU 0.210526316
-#define V_NEU 0.473684211
-#define UVSCALE 410.
-extern double LogL16toY(int);
-extern double LogL10toY(int);
-extern void XYZtoRGB24(float*, uint8*);
-extern int uv_decode(double*, double*, int);
-extern void LogLuv24toXYZ(uint32, float*);
-extern void LogLuv32toXYZ(uint32, float*);
-#if defined(c_plusplus) || defined(__cplusplus)
-extern int LogL16fromY(double, int = SGILOGENCODE_NODITHER);
-extern int LogL10fromY(double, int = SGILOGENCODE_NODITHER);
-extern int uv_encode(double, double, int = SGILOGENCODE_NODITHER);
-extern uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER);
-extern uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER);
-#else
-extern int LogL16fromY(double, int);
-extern int LogL10fromY(double, int);
-extern int uv_encode(double, double, int);
-extern uint32 LogLuv24fromXYZ(float*, int);
-extern uint32 LogLuv32fromXYZ(float*, int);
-#endif
-#endif /* LOGLUV_PUBLIC */
-
-extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*);
-extern void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32,
- float *, float *, float *);
-extern void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float,
- uint32 *, uint32 *, uint32 *);
-
-extern int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*);
-extern void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32,
- uint32 *, uint32 *, uint32 *);
-
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
-
-#endif /* _TIFFIO_ */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tiffio.hxx b/src/3rdparty/libtiff/libtiff/tiffio.hxx
deleted file mode 100644
index ac7b9f2cd1..0000000000
--- a/src/3rdparty/libtiff/libtiff/tiffio.hxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $Id: tiffio.hxx,v 1.1 2004/11/21 16:12:08 dron Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _TIFFIO_HXX_
-#define _TIFFIO_HXX_
-
-/*
- * TIFF I/O library definitions which provide C++ streams API.
- */
-
-#include <iostream>
-#include "tiff.h"
-
-extern TIFF* TIFFStreamOpen(const char*, std::ostream *);
-extern TIFF* TIFFStreamOpen(const char*, std::istream *);
-
-#endif /* _TIFFIO_HXX_ */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tiffiop.h b/src/3rdparty/libtiff/libtiff/tiffiop.h
deleted file mode 100644
index 30bb19cfca..0000000000
--- a/src/3rdparty/libtiff/libtiff/tiffiop.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/* $Id: tiffiop.h,v 1.51.2.1 2009-01-06 19:08:09 bfriesen Exp $ */
-
-/*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _TIFFIOP_
-#define _TIFFIOP_
-/*
- * ``Library-private'' definitions.
- */
-
-#include "tif_config.h"
-
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#if !defined(Q_OS_WINCE)
-# include <sys/types.h>
-#else
-# include <windows.h>
-# include <types.h>
-#endif
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-
-#ifdef HAVE_ASSERT_H
-# include <assert.h>
-#else
-# define assert(x)
-#endif
-
-#ifdef HAVE_SEARCH_H
-# include <search.h>
-#else
-extern void *lfind(const void *, const void *, size_t *, size_t,
- int (*)(const void *, const void *));
-#endif
-
-/*
- Libtiff itself does not require a 64-bit type, but bundled TIFF
- utilities may use it.
-*/
-typedef TIFF_INT64_T int64;
-typedef TIFF_UINT64_T uint64;
-
-#include "tiffio.h"
-#include "tif_dir.h"
-
-#ifndef STRIP_SIZE_DEFAULT
-# define STRIP_SIZE_DEFAULT 8192
-#endif
-
-#define streq(a,b) (strcmp(a,b) == 0)
-
-#ifndef TRUE
-#define TRUE 1
-#define FALSE 0
-#endif
-
-typedef struct client_info {
- struct client_info *next;
- void *data;
- char *name;
-} TIFFClientInfoLink;
-
-/*
- * Typedefs for ``method pointers'' used internally.
- */
-typedef unsigned char tidataval_t; /* internal image data value type */
-typedef tidataval_t* tidata_t; /* reference to internal image data */
-
-typedef void (*TIFFVoidMethod)(TIFF*);
-typedef int (*TIFFBoolMethod)(TIFF*);
-typedef int (*TIFFPreMethod)(TIFF*, tsample_t);
-typedef int (*TIFFCodeMethod)(TIFF*, tidata_t, tsize_t, tsample_t);
-typedef int (*TIFFSeekMethod)(TIFF*, uint32);
-typedef void (*TIFFPostMethod)(TIFF*, tidata_t, tsize_t);
-typedef uint32 (*TIFFStripMethod)(TIFF*, uint32);
-typedef void (*TIFFTileMethod)(TIFF*, uint32*, uint32*);
-
-struct tiff {
- char* tif_name; /* name of open file */
- int tif_fd; /* open file descriptor */
- int tif_mode; /* open mode (O_*) */
- uint32 tif_flags;
-#define TIFF_FILLORDER 0x00003 /* natural bit fill order for machine */
-#define TIFF_DIRTYHEADER 0x00004 /* header must be written on close */
-#define TIFF_DIRTYDIRECT 0x00008 /* current directory must be written */
-#define TIFF_BUFFERSETUP 0x00010 /* data buffers setup */
-#define TIFF_CODERSETUP 0x00020 /* encoder/decoder setup done */
-#define TIFF_BEENWRITING 0x00040 /* written 1+ scanlines to file */
-#define TIFF_SWAB 0x00080 /* byte swap file information */
-#define TIFF_NOBITREV 0x00100 /* inhibit bit reversal logic */
-#define TIFF_MYBUFFER 0x00200 /* my raw data buffer; free on close */
-#define TIFF_ISTILED 0x00400 /* file is tile, not strip- based */
-#define TIFF_MAPPED 0x00800 /* file is mapped into memory */
-#define TIFF_POSTENCODE 0x01000 /* need call to postencode routine */
-#define TIFF_INSUBIFD 0x02000 /* currently writing a subifd */
-#define TIFF_UPSAMPLED 0x04000 /* library is doing data up-sampling */
-#define TIFF_STRIPCHOP 0x08000 /* enable strip chopping support */
-#define TIFF_HEADERONLY 0x10000 /* read header only, do not process */
- /* the first directory */
-#define TIFF_NOREADRAW 0x20000 /* skip reading of raw uncompressed */
- /* image data */
-#define TIFF_INCUSTOMIFD 0x40000 /* currently writing a custom IFD */
- toff_t tif_diroff; /* file offset of current directory */
- toff_t tif_nextdiroff; /* file offset of following directory */
- toff_t* tif_dirlist; /* list of offsets to already seen */
- /* directories to prevent IFD looping */
- tsize_t tif_dirlistsize;/* number of entires in offset list */
- uint16 tif_dirnumber; /* number of already seen directories */
- TIFFDirectory tif_dir; /* internal rep of current directory */
- TIFFDirectory tif_customdir; /* custom IFDs are separated from
- the main ones */
- TIFFHeader tif_header; /* file's header block */
- const int* tif_typeshift; /* data type shift counts */
- const long* tif_typemask; /* data type masks */
- uint32 tif_row; /* current scanline */
- tdir_t tif_curdir; /* current directory (index) */
- tstrip_t tif_curstrip; /* current strip for read/write */
- toff_t tif_curoff; /* current offset for read/write */
- toff_t tif_dataoff; /* current offset for writing dir */
-/* SubIFD support */
- uint16 tif_nsubifd; /* remaining subifds to write */
- toff_t tif_subifdoff; /* offset for patching SubIFD link */
-/* tiling support */
- uint32 tif_col; /* current column (offset by row too) */
- ttile_t tif_curtile; /* current tile for read/write */
- tsize_t tif_tilesize; /* # of bytes in a tile */
-/* compression scheme hooks */
- int tif_decodestatus;
- TIFFBoolMethod tif_setupdecode;/* called once before predecode */
- TIFFPreMethod tif_predecode; /* pre- row/strip/tile decoding */
- TIFFBoolMethod tif_setupencode;/* called once before preencode */
- int tif_encodestatus;
- TIFFPreMethod tif_preencode; /* pre- row/strip/tile encoding */
- TIFFBoolMethod tif_postencode; /* post- row/strip/tile encoding */
- TIFFCodeMethod tif_decoderow; /* scanline decoding routine */
- TIFFCodeMethod tif_encoderow; /* scanline encoding routine */
- TIFFCodeMethod tif_decodestrip;/* strip decoding routine */
- TIFFCodeMethod tif_encodestrip;/* strip encoding routine */
- TIFFCodeMethod tif_decodetile; /* tile decoding routine */
- TIFFCodeMethod tif_encodetile; /* tile encoding routine */
- TIFFVoidMethod tif_close; /* cleanup-on-close routine */
- TIFFSeekMethod tif_seek; /* position within a strip routine */
- TIFFVoidMethod tif_cleanup; /* cleanup state routine */
- TIFFStripMethod tif_defstripsize;/* calculate/constrain strip size */
- TIFFTileMethod tif_deftilesize;/* calculate/constrain tile size */
- tidata_t tif_data; /* compression scheme private data */
-/* input/output buffering */
- tsize_t tif_scanlinesize;/* # of bytes in a scanline */
- tsize_t tif_scanlineskew;/* scanline skew for reading strips */
- tidata_t tif_rawdata; /* raw data buffer */
- tsize_t tif_rawdatasize;/* # of bytes in raw data buffer */
- tidata_t tif_rawcp; /* current spot in raw buffer */
- tsize_t tif_rawcc; /* bytes unread from raw buffer */
-/* memory-mapped file support */
- tidata_t tif_base; /* base of mapped file */
- toff_t tif_size; /* size of mapped file region (bytes)
- FIXME: it should be tsize_t */
- TIFFMapFileProc tif_mapproc; /* map file method */
- TIFFUnmapFileProc tif_unmapproc;/* unmap file method */
-/* input/output callback methods */
- thandle_t tif_clientdata; /* callback parameter */
- TIFFReadWriteProc tif_readproc; /* read method */
- TIFFReadWriteProc tif_writeproc;/* write method */
- TIFFSeekProc tif_seekproc; /* lseek method */
- TIFFCloseProc tif_closeproc; /* close method */
- TIFFSizeProc tif_sizeproc; /* filesize method */
-/* post-decoding support */
- TIFFPostMethod tif_postdecode; /* post decoding routine */
-/* tag support */
- TIFFFieldInfo** tif_fieldinfo; /* sorted table of registered tags */
- size_t tif_nfields; /* # entries in registered tag table */
- const TIFFFieldInfo *tif_foundfield;/* cached pointer to already found tag */
- TIFFTagMethods tif_tagmethods; /* tag get/set/print routines */
- TIFFClientInfoLink *tif_clientinfo; /* extra client information. */
-};
-
-#define isPseudoTag(t) (t > 0xffff) /* is tag value normal or pseudo */
-
-#define isTiled(tif) (((tif)->tif_flags & TIFF_ISTILED) != 0)
-#define isMapped(tif) (((tif)->tif_flags & TIFF_MAPPED) != 0)
-#define isFillOrder(tif, o) (((tif)->tif_flags & (o)) != 0)
-#define isUpSampled(tif) (((tif)->tif_flags & TIFF_UPSAMPLED) != 0)
-#define TIFFReadFile(tif, buf, size) \
- ((*(tif)->tif_readproc)((tif)->tif_clientdata,buf,size))
-#define TIFFWriteFile(tif, buf, size) \
- ((*(tif)->tif_writeproc)((tif)->tif_clientdata,buf,size))
-#define TIFFSeekFile(tif, off, whence) \
- ((*(tif)->tif_seekproc)((tif)->tif_clientdata,(toff_t)(off),whence))
-#define TIFFCloseFile(tif) \
- ((*(tif)->tif_closeproc)((tif)->tif_clientdata))
-#define TIFFGetFileSize(tif) \
- ((*(tif)->tif_sizeproc)((tif)->tif_clientdata))
-#define TIFFMapFileContents(tif, paddr, psize) \
- ((*(tif)->tif_mapproc)((tif)->tif_clientdata,paddr,psize))
-#define TIFFUnmapFileContents(tif, addr, size) \
- ((*(tif)->tif_unmapproc)((tif)->tif_clientdata,addr,size))
-
-/*
- * Default Read/Seek/Write definitions.
- */
-#ifndef ReadOK
-#define ReadOK(tif, buf, size) \
- (TIFFReadFile(tif, (tdata_t) buf, (tsize_t)(size)) == (tsize_t)(size))
-#endif
-#ifndef SeekOK
-#define SeekOK(tif, off) \
- (TIFFSeekFile(tif, (toff_t) off, SEEK_SET) == (toff_t) off)
-#endif
-#ifndef WriteOK
-#define WriteOK(tif, buf, size) \
- (TIFFWriteFile(tif, (tdata_t) buf, (tsize_t) size) == (tsize_t) size)
-#endif
-
-/* NB: the uint32 casts are to silence certain ANSI-C compilers */
-#define TIFFhowmany(x, y) ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y)))
-#define TIFFhowmany8(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3)
-#define TIFFroundup(x, y) (TIFFhowmany(x,y)*(y))
-
-#define TIFFmax(A,B) ((A)>(B)?(A):(B))
-#define TIFFmin(A,B) ((A)<(B)?(A):(B))
-
-#define TIFFArrayCount(a) (sizeof (a) / sizeof ((a)[0]))
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-extern int _TIFFgetMode(const char*, const char*);
-extern int _TIFFNoRowEncode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern int _TIFFNoStripEncode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern int _TIFFNoTileEncode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern int _TIFFNoRowDecode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern int _TIFFNoStripDecode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern int _TIFFNoTileDecode(TIFF*, tidata_t, tsize_t, tsample_t);
-extern void _TIFFNoPostDecode(TIFF*, tidata_t, tsize_t);
-extern int _TIFFNoPreCode (TIFF*, tsample_t);
-extern int _TIFFNoSeek(TIFF*, uint32);
-extern void _TIFFSwab16BitData(TIFF*, tidata_t, tsize_t);
-extern void _TIFFSwab24BitData(TIFF*, tidata_t, tsize_t);
-extern void _TIFFSwab32BitData(TIFF*, tidata_t, tsize_t);
-extern void _TIFFSwab64BitData(TIFF*, tidata_t, tsize_t);
-extern int TIFFFlushData1(TIFF*);
-extern int TIFFDefaultDirectory(TIFF*);
-extern void _TIFFSetDefaultCompressionState(TIFF*);
-extern int TIFFSetCompressionScheme(TIFF*, int);
-extern int TIFFSetDefaultCompressionState(TIFF*);
-extern uint32 _TIFFDefaultStripSize(TIFF*, uint32);
-extern void _TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
-extern int _TIFFDataSize(TIFFDataType);
-
-extern void _TIFFsetByteArray(void**, void*, uint32);
-extern void _TIFFsetString(char**, char*);
-extern void _TIFFsetShortArray(uint16**, uint16*, uint32);
-extern void _TIFFsetLongArray(uint32**, uint32*, uint32);
-extern void _TIFFsetFloatArray(float**, float*, uint32);
-extern void _TIFFsetDoubleArray(double**, double*, uint32);
-
-extern void _TIFFprintAscii(FILE*, const char*);
-extern void _TIFFprintAsciiTag(FILE*, const char*, const char*);
-
-extern TIFFErrorHandler _TIFFwarningHandler;
-extern TIFFErrorHandler _TIFFerrorHandler;
-extern TIFFErrorHandlerExt _TIFFwarningHandlerExt;
-extern TIFFErrorHandlerExt _TIFFerrorHandlerExt;
-
-extern tdata_t _TIFFCheckMalloc(TIFF*, size_t, size_t, const char*);
-extern tdata_t _TIFFCheckRealloc(TIFF*, tdata_t, size_t, size_t, const char*);
-
-extern int TIFFInitDumpMode(TIFF*, int);
-#ifdef PACKBITS_SUPPORT
-extern int TIFFInitPackBits(TIFF*, int);
-#endif
-#ifdef CCITT_SUPPORT
-extern int TIFFInitCCITTRLE(TIFF*, int), TIFFInitCCITTRLEW(TIFF*, int);
-extern int TIFFInitCCITTFax3(TIFF*, int), TIFFInitCCITTFax4(TIFF*, int);
-#endif
-#ifdef THUNDER_SUPPORT
-extern int TIFFInitThunderScan(TIFF*, int);
-#endif
-#ifdef NEXT_SUPPORT
-extern int TIFFInitNeXT(TIFF*, int);
-#endif
-#ifdef LZW_SUPPORT
-extern int TIFFInitLZW(TIFF*, int);
-#endif
-#ifdef OJPEG_SUPPORT
-extern int TIFFInitOJPEG(TIFF*, int);
-#endif
-#ifdef JPEG_SUPPORT
-extern int TIFFInitJPEG(TIFF*, int);
-#endif
-#ifdef JBIG_SUPPORT
-extern int TIFFInitJBIG(TIFF*, int);
-#endif
-#ifdef ZIP_SUPPORT
-extern int TIFFInitZIP(TIFF*, int);
-#endif
-#ifdef PIXARLOG_SUPPORT
-extern int TIFFInitPixarLog(TIFF*, int);
-#endif
-#ifdef LOGLUV_SUPPORT
-extern int TIFFInitSGILog(TIFF*, int);
-#endif
-#ifdef VMS
-extern const TIFFCodec _TIFFBuiltinCODECS[];
-#else
-extern TIFFCodec _TIFFBuiltinCODECS[];
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* _TIFFIOP_ */
-
-/* vim: set ts=8 sts=8 sw=8 noet: */
diff --git a/src/3rdparty/libtiff/libtiff/tiffvers.h b/src/3rdparty/libtiff/libtiff/tiffvers.h
deleted file mode 100644
index 7108541bc2..0000000000
--- a/src/3rdparty/libtiff/libtiff/tiffvers.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.9.2\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
-/*
- * This define can be used in code that requires
- * compilation-related definitions specific to a
- * version or versions of the library. Runtime
- * version checking should be done based on the
- * string returned by TIFFGetVersion.
- */
-#define TIFFLIB_VERSION 20091104
diff --git a/src/3rdparty/libtiff/libtiff/uvcode.h b/src/3rdparty/libtiff/libtiff/uvcode.h
deleted file mode 100644
index 5b2d7d71fa..0000000000
--- a/src/3rdparty/libtiff/libtiff/uvcode.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Version 1.0 generated April 7, 1997 by Greg Ward Larson, SGI */
-#define UV_SQSIZ (float)0.003500
-#define UV_NDIVS 16289
-#define UV_VSTART (float)0.016940
-#define UV_NVS 163
-static struct {
- float ustart;
- short nus, ncum;
-} uv_row[UV_NVS] = {
- { (float)0.247663, 4, 0 },
- { (float)0.243779, 6, 4 },
- { (float)0.241684, 7, 10 },
- { (float)0.237874, 9, 17 },
- { (float)0.235906, 10, 26 },
- { (float)0.232153, 12, 36 },
- { (float)0.228352, 14, 48 },
- { (float)0.226259, 15, 62 },
- { (float)0.222371, 17, 77 },
- { (float)0.220410, 18, 94 },
- { (float)0.214710, 21, 112 },
- { (float)0.212714, 22, 133 },
- { (float)0.210721, 23, 155 },
- { (float)0.204976, 26, 178 },
- { (float)0.202986, 27, 204 },
- { (float)0.199245, 29, 231 },
- { (float)0.195525, 31, 260 },
- { (float)0.193560, 32, 291 },
- { (float)0.189878, 34, 323 },
- { (float)0.186216, 36, 357 },
- { (float)0.186216, 36, 393 },
- { (float)0.182592, 38, 429 },
- { (float)0.179003, 40, 467 },
- { (float)0.175466, 42, 507 },
- { (float)0.172001, 44, 549 },
- { (float)0.172001, 44, 593 },
- { (float)0.168612, 46, 637 },
- { (float)0.168612, 46, 683 },
- { (float)0.163575, 49, 729 },
- { (float)0.158642, 52, 778 },
- { (float)0.158642, 52, 830 },
- { (float)0.158642, 52, 882 },
- { (float)0.153815, 55, 934 },
- { (float)0.153815, 55, 989 },
- { (float)0.149097, 58, 1044 },
- { (float)0.149097, 58, 1102 },
- { (float)0.142746, 62, 1160 },
- { (float)0.142746, 62, 1222 },
- { (float)0.142746, 62, 1284 },
- { (float)0.138270, 65, 1346 },
- { (float)0.138270, 65, 1411 },
- { (float)0.138270, 65, 1476 },
- { (float)0.132166, 69, 1541 },
- { (float)0.132166, 69, 1610 },
- { (float)0.126204, 73, 1679 },
- { (float)0.126204, 73, 1752 },
- { (float)0.126204, 73, 1825 },
- { (float)0.120381, 77, 1898 },
- { (float)0.120381, 77, 1975 },
- { (float)0.120381, 77, 2052 },
- { (float)0.120381, 77, 2129 },
- { (float)0.112962, 82, 2206 },
- { (float)0.112962, 82, 2288 },
- { (float)0.112962, 82, 2370 },
- { (float)0.107450, 86, 2452 },
- { (float)0.107450, 86, 2538 },
- { (float)0.107450, 86, 2624 },
- { (float)0.107450, 86, 2710 },
- { (float)0.100343, 91, 2796 },
- { (float)0.100343, 91, 2887 },
- { (float)0.100343, 91, 2978 },
- { (float)0.095126, 95, 3069 },
- { (float)0.095126, 95, 3164 },
- { (float)0.095126, 95, 3259 },
- { (float)0.095126, 95, 3354 },
- { (float)0.088276, 100, 3449 },
- { (float)0.088276, 100, 3549 },
- { (float)0.088276, 100, 3649 },
- { (float)0.088276, 100, 3749 },
- { (float)0.081523, 105, 3849 },
- { (float)0.081523, 105, 3954 },
- { (float)0.081523, 105, 4059 },
- { (float)0.081523, 105, 4164 },
- { (float)0.074861, 110, 4269 },
- { (float)0.074861, 110, 4379 },
- { (float)0.074861, 110, 4489 },
- { (float)0.074861, 110, 4599 },
- { (float)0.068290, 115, 4709 },
- { (float)0.068290, 115, 4824 },
- { (float)0.068290, 115, 4939 },
- { (float)0.068290, 115, 5054 },
- { (float)0.063573, 119, 5169 },
- { (float)0.063573, 119, 5288 },
- { (float)0.063573, 119, 5407 },
- { (float)0.063573, 119, 5526 },
- { (float)0.057219, 124, 5645 },
- { (float)0.057219, 124, 5769 },
- { (float)0.057219, 124, 5893 },
- { (float)0.057219, 124, 6017 },
- { (float)0.050985, 129, 6141 },
- { (float)0.050985, 129, 6270 },
- { (float)0.050985, 129, 6399 },
- { (float)0.050985, 129, 6528 },
- { (float)0.050985, 129, 6657 },
- { (float)0.044859, 134, 6786 },
- { (float)0.044859, 134, 6920 },
- { (float)0.044859, 134, 7054 },
- { (float)0.044859, 134, 7188 },
- { (float)0.040571, 138, 7322 },
- { (float)0.040571, 138, 7460 },
- { (float)0.040571, 138, 7598 },
- { (float)0.040571, 138, 7736 },
- { (float)0.036339, 142, 7874 },
- { (float)0.036339, 142, 8016 },
- { (float)0.036339, 142, 8158 },
- { (float)0.036339, 142, 8300 },
- { (float)0.032139, 146, 8442 },
- { (float)0.032139, 146, 8588 },
- { (float)0.032139, 146, 8734 },
- { (float)0.032139, 146, 8880 },
- { (float)0.027947, 150, 9026 },
- { (float)0.027947, 150, 9176 },
- { (float)0.027947, 150, 9326 },
- { (float)0.023739, 154, 9476 },
- { (float)0.023739, 154, 9630 },
- { (float)0.023739, 154, 9784 },
- { (float)0.023739, 154, 9938 },
- { (float)0.019504, 158, 10092 },
- { (float)0.019504, 158, 10250 },
- { (float)0.019504, 158, 10408 },
- { (float)0.016976, 161, 10566 },
- { (float)0.016976, 161, 10727 },
- { (float)0.016976, 161, 10888 },
- { (float)0.016976, 161, 11049 },
- { (float)0.012639, 165, 11210 },
- { (float)0.012639, 165, 11375 },
- { (float)0.012639, 165, 11540 },
- { (float)0.009991, 168, 11705 },
- { (float)0.009991, 168, 11873 },
- { (float)0.009991, 168, 12041 },
- { (float)0.009016, 170, 12209 },
- { (float)0.009016, 170, 12379 },
- { (float)0.009016, 170, 12549 },
- { (float)0.006217, 173, 12719 },
- { (float)0.006217, 173, 12892 },
- { (float)0.005097, 175, 13065 },
- { (float)0.005097, 175, 13240 },
- { (float)0.005097, 175, 13415 },
- { (float)0.003909, 177, 13590 },
- { (float)0.003909, 177, 13767 },
- { (float)0.002340, 177, 13944 },
- { (float)0.002389, 170, 14121 },
- { (float)0.001068, 164, 14291 },
- { (float)0.001653, 157, 14455 },
- { (float)0.000717, 150, 14612 },
- { (float)0.001614, 143, 14762 },
- { (float)0.000270, 136, 14905 },
- { (float)0.000484, 129, 15041 },
- { (float)0.001103, 123, 15170 },
- { (float)0.001242, 115, 15293 },
- { (float)0.001188, 109, 15408 },
- { (float)0.001011, 103, 15517 },
- { (float)0.000709, 97, 15620 },
- { (float)0.000301, 89, 15717 },
- { (float)0.002416, 82, 15806 },
- { (float)0.003251, 76, 15888 },
- { (float)0.003246, 69, 15964 },
- { (float)0.004141, 62, 16033 },
- { (float)0.005963, 55, 16095 },
- { (float)0.008839, 47, 16150 },
- { (float)0.010490, 40, 16197 },
- { (float)0.016994, 31, 16237 },
- { (float)0.023659, 21, 16268 },
-};
diff --git a/src/3rdparty/libtiff/nmake.opt b/src/3rdparty/libtiff/nmake.opt
deleted file mode 100644
index 7e882d2d4a..0000000000
--- a/src/3rdparty/libtiff/nmake.opt
+++ /dev/null
@@ -1,218 +0,0 @@
-# $Id: nmake.opt,v 1.18 2006/06/07 16:33:45 dron Exp $
-#
-# Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
-#
-# Permission to use, copy, modify, distribute, and sell this software and
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-#
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-#
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-# OF THIS SOFTWARE.
-
-# Compile time parameters for MS Visual C++ compiler.
-# You may edit this file to specify building options.
-
-#
-###### Edit the following lines to choose a feature set you need. #######
-#
-
-#
-# Select WINMODE_CONSOLE to build a library which reports errors to stderr, or
-# WINMODE_WINDOWED to build such that errors are reported via MessageBox().
-#
-WINMODE_CONSOLE = 1
-#WINMODE_WINDOWED = 1
-
-#
-# Comment out the following lines to disable internal codecs.
-#
-# Support for CCITT Group 3 & 4 algorithms
-CCITT_SUPPORT = 1
-# Support for Macintosh PackBits algorithm
-PACKBITS_SUPPORT = 1
-# Support for LZW algorithm
-LZW_SUPPORT = 1
-# Support for ThunderScan 4-bit RLE algorithm
-THUNDER_SUPPORT = 1
-# Support for NeXT 2-bit RLE algorithm
-NEXT_SUPPORT = 1
-# Support for LogLuv high dynamic range encoding
-LOGLUV_SUPPORT = 1
-
-#
-# Uncomment and edit following lines to enable JPEG support.
-#
-#JPEG_SUPPORT = 1
-#JPEGDIR = d:/projects/jpeg-6b
-#JPEG_INCLUDE = -I$(JPEGDIR)
-#JPEG_LIB = $(JPEGDIR)/Release/jpeg.lib
-
-#
-# Uncomment and edit following lines to enable ZIP support
-# (required for Deflate compression and Pixar log-format)
-#
-#ZIP_SUPPORT = 1
-#ZLIBDIR = d:/projects/zlib-1.2.1
-#ZLIB_INCLUDE = -I$(ZLIBDIR)
-#ZLIB_LIB = $(ZLIBDIR)/zlib.lib
-
-#
-# Uncomment and edit following lines to enable ISO JBIG support
-#
-#JBIG_SUPPORT = 1
-#JBIGDIR = d:/projects/jbigkit
-#JBIG_INCLUDE = -I$(JBIGDIR)/libjbig
-#JBIG_LIB = $(JBIGDIR)/libjbig/jbig.lib
-
-#
-# Uncomment following line to enable Pixar log-format algorithm
-# (Zlib required).
-#
-#PIXARLOG_SUPPORT = 1
-
-#
-# Comment out the following lines to disable strip chopping
-# (whether or not to convert single-strip uncompressed images to mutiple
-# strips of specified size to reduce memory usage). Default strip size
-# is 8192 bytes, it can be configured via the STRIP_SIZE_DEFAULT parameter
-#
-STRIPCHOP_SUPPORT = 1
-STRIP_SIZE_DEFAULT = 8192
-
-#
-# Comment out the following lines to disable treating the fourth sample with
-# no EXTRASAMPLE_ value as being ASSOCALPHA. Many packages produce RGBA
-# files but don't mark the alpha properly.
-#
-EXTRASAMPLE_AS_ALPHA_SUPPORT = 1
-
-#
-# Comment out the following lines to disable picking up YCbCr subsampling
-# info from the JPEG data stream to support files lacking the tag.
-# See Bug 168 in Bugzilla, and JPEGFixupTestSubsampling() for details.
-#
-CHECK_JPEG_YCBCR_SUBSAMPLING = 1
-
-#
-####################### Compiler related options. #######################
-#
-
-#
-# Pick debug or optimized build flags. We default to an optimized build
-# with no debugging information.
-# NOTE: /EHsc option required if you want to build the C++ stream API
-#
-OPTFLAGS = /Ox /MD /EHsc /W3 /D_CRT_SECURE_NO_DEPRECATE
-#OPTFLAGS = /Zi
-
-#
-# Uncomment following line to enable using Windows Common RunTime Library
-# instead of Windows specific system calls. See notes on top of tif_unix.c
-# module for details.
-#
-USE_WIN_CRT_LIB = 1
-
-# Compiler specific options. You may probably want to adjust compilation
-# parameters in CFLAGS variable. Refer to your compiler documentation
-# for the option reference.
-#
-MAKE = nmake /nologo
-CC = cl /nologo
-CXX = cl /nologo
-AR = lib /nologo
-LD = link /nologo
-
-CFLAGS = $(OPTFLAGS) $(INCL) $(EXTRAFLAGS)
-CXXFLAGS = $(OPTFLAGS) $(INCL) $(EXTRAFLAGS)
-EXTRAFLAGS =
-LIBS =
-
-# Name of the output shared library
-DLLNAME = libtiff.dll
-
-#
-########### There is nothing to edit below this line normally. ###########
-#
-
-# Set the native cpu bit order
-EXTRAFLAGS = -DFILLODER_LSB2MSB $(EXTRAFLAGS)
-
-!IFDEF WINMODE_WINDOWED
-EXTRAFLAGS = -DTIF_PLATFORM_WINDOWED $(EXTRAFLAGS)
-LIBS = user32.lib $(LIBS)
-!ELSE
-EXTRAFLAGS = -DTIF_PLATFORM_CONSOLE $(EXTRAFLAGS)
-!ENDIF
-
-# Codec stuff
-!IFDEF CCITT_SUPPORT
-EXTRAFLAGS = -DCCITT_SUPPORT $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF PACKBITS_SUPPORT
-EXTRAFLAGS = -DPACKBITS_SUPPORT $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF LZW_SUPPORT
-EXTRAFLAGS = -DLZW_SUPPORT $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF THUNDER_SUPPORT
-EXTRAFLAGS = -DTHUNDER_SUPPORT $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF NEXT_SUPPORT
-EXTRAFLAGS = -DNEXT_SUPPORT $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF LOGLUV_SUPPORT
-EXTRAFLAGS = -DLOGLUV_SUPPORT $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF JPEG_SUPPORT
-LIBS = $(LIBS) $(JPEG_LIB)
-EXTRAFLAGS = -DJPEG_SUPPORT -DOJPEG_SUPPORT $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF ZIP_SUPPORT
-LIBS = $(LIBS) $(ZLIB_LIB)
-EXTRAFLAGS = -DZIP_SUPPORT $(EXTRAFLAGS)
-!IFDEF PIXARLOG_SUPPORT
-EXTRAFLAGS = -DPIXARLOG_SUPPORT $(EXTRAFLAGS)
-!ENDIF
-!ENDIF
-
-!IFDEF JBIG_SUPPORT
-LIBS = $(LIBS) $(JBIG_LIB)
-EXTRAFLAGS = -DJBIG_SUPPORT $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF STRIPCHOP_SUPPORT
-EXTRAFLAGS = -DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP -DSTRIP_SIZE_DEFAULT=$(STRIP_SIZE_DEFAULT) $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF EXTRASAMPLE_AS_ALPHA_SUPPORT
-EXTRAFLAGS = -DDEFAULT_EXTRASAMPLE_AS_ALPHA $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF CHECK_JPEG_YCBCR_SUBSAMPLING
-EXTRAFLAGS = -DCHECK_JPEG_YCBCR_SUBSAMPLING $(EXTRAFLAGS)
-!ENDIF
-
-!IFDEF USE_WIN_CRT_LIB
-EXTRAFLAGS = -DAVOID_WIN32_FILEIO $(EXTRAFLAGS)
-!ELSE
-EXTRAFLAGS = -DUSE_WIN32_FILEIO $(EXTRAFLAGS)
-!ENDIF
diff --git a/src/3rdparty/libtiff/port/dummy.c b/src/3rdparty/libtiff/port/dummy.c
deleted file mode 100644
index 1cbda6afa1..0000000000
--- a/src/3rdparty/libtiff/port/dummy.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* $Id: dummy.c,v 1.2.2.1 2007/03/21 14:53:46 dron Exp $ */
-
-/*
- * Dummy function, just to be ensure that the library always will be created.
- */
-
-void
-libport_dummy_function()
-{
- return;
-}
-
diff --git a/src/3rdparty/libtiff/port/getopt.c b/src/3rdparty/libtiff/port/getopt.c
deleted file mode 100644
index 0138c89e30..0000000000
--- a/src/3rdparty/libtiff/port/getopt.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $Id: getopt.c,v 1.2 2005/07/07 16:34:06 dron Exp $ */
-
-/*
- * Copyright (c) 1987, 1993, 1994
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if 0
-static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95";
-__RCSID("$NetBSD: getopt.c,v 1.26 2003/08/07 16:43:40 agc Exp $");
-#endif
-
-#include <stdio.h>
-#include <string.h>
-
-int opterr = 1, /* if error message should be printed */
- optind = 1, /* index into parent argv vector */
- optopt, /* character checked for validity */
- optreset; /* reset getopt */
-char *optarg; /* argument associated with option */
-
-#define BADCH (int)'?'
-#define BADARG (int)':'
-#define EMSG ""
-
-/*
- * getopt --
- * Parse argc/argv argument vector.
- */
-int
-getopt(int argc, char * const argv[], const char *optstring)
-{
- static char *place = EMSG; /* option letter processing */
- char *oli; /* option letter list index */
-
- if (optreset || *place == 0) { /* update scanning pointer */
- optreset = 0;
- place = argv[optind];
- if (optind >= argc || *place++ != '-') {
- /* Argument is absent or is not an option */
- place = EMSG;
- return (-1);
- }
- optopt = *place++;
- if (optopt == '-' && *place == 0) {
- /* "--" => end of options */
- ++optind;
- place = EMSG;
- return (-1);
- }
- if (optopt == 0) {
- /* Solitary '-', treat as a '-' option
- if the program (eg su) is looking for it. */
- place = EMSG;
- if (strchr(optstring, '-') == NULL)
- return -1;
- optopt = '-';
- }
- } else
- optopt = *place++;
-
- /* See if option letter is one the caller wanted... */
- if (optopt == ':' || (oli = strchr(optstring, optopt)) == NULL) {
- if (*place == 0)
- ++optind;
- if (opterr && *optstring != ':')
- (void)fprintf(stderr,
- "unknown option -- %c\n", optopt);
- return (BADCH);
- }
-
- /* Does this option need an argument? */
- if (oli[1] != ':') {
- /* don't need argument */
- optarg = NULL;
- if (*place == 0)
- ++optind;
- } else {
- /* Option-argument is either the rest of this argument or the
- entire next argument. */
- if (*place)
- optarg = place;
- else if (argc > ++optind)
- optarg = argv[optind];
- else {
- /* option-argument absent */
- place = EMSG;
- if (*optstring == ':')
- return (BADARG);
- if (opterr)
- (void)fprintf(stderr,
- "option requires an argument -- %c\n",
- optopt);
- return (BADCH);
- }
- place = EMSG;
- ++optind;
- }
- return (optopt); /* return option letter */
-}
diff --git a/src/3rdparty/libtiff/port/lfind.c b/src/3rdparty/libtiff/port/lfind.c
deleted file mode 100644
index 64b261ca36..0000000000
--- a/src/3rdparty/libtiff/port/lfind.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* $Id: lfind.c,v 1.4 2007/01/15 18:40:39 mloskot Exp $ */
-
-/*
- * Copyright (c) 1989, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Roger L. Snyder.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if 0
-static char sccsid[] = "@(#)lsearch.c 8.1 (Berkeley) 6/4/93";
-__RCSID("$NetBSD: lsearch.c,v 1.2 2005/07/06 15:47:15 drochner Exp $");
-#endif
-
-#ifdef _WIN32_WCE
-# include <wce_types.h>
-#else
-# include <sys/types.h>
-#endif
-
-#ifndef NULL
-# define NULL 0
-#endif
-
-void *
-lfind(const void *key, const void *base, size_t *nmemb, size_t size,
- int(*compar)(const void *, const void *))
-{
- char *element, *end;
-
- end = (char *)base + *nmemb * size;
- for (element = (char *)base; element < end; element += size)
- if (!compar(element, key)) /* key found */
- return element;
-
- return NULL;
-}
diff --git a/src/3rdparty/libtiff/port/libport.h b/src/3rdparty/libtiff/port/libport.h
deleted file mode 100644
index e3413f7af2..0000000000
--- a/src/3rdparty/libtiff/port/libport.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $Id: libport.h,v 1.2.2.2 2009-11-02 14:47:41 bfriesen Exp $ */
-
-/*
- * Copyright (c) 2009 Frank Warmerdam
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the names of
- * Sam Leffler and Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#ifndef _LIBPORT_
-#define _LIBPORT_
-
-int getopt(int argc, char * const argv[], const char *optstring);
-extern char *optarg;
-extern int opterr;
-extern int optind;
-extern int optopt;
-
-int strcasecmp(const char *s1, const char *s2);
-
-#ifndef HAVE_GETOPT
-# define HAVE_GETOPT 1
-#endif
-
-#if 0
-unsigned long strtoul(const char *nptr, char **endptr, int base);
-#endif
-
-#if 0
-void *
-lfind(const void *key, const void *base, size_t *nmemb, size_t size,
- int(*compar)(const void *, const void *));
-#endif
-
-#endif /* ndef _LIBPORT_ */
diff --git a/src/3rdparty/libtiff/port/strcasecmp.c b/src/3rdparty/libtiff/port/strcasecmp.c
deleted file mode 100644
index 2422304b12..0000000000
--- a/src/3rdparty/libtiff/port/strcasecmp.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $Id: strcasecmp.c,v 1.2 2005/07/07 16:34:06 dron Exp $ */
-
-/*
- * Copyright (c) 1987, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if 0
-static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93";
-__RCSID("$NetBSD: strcasecmp.c,v 1.16 2003/08/07 16:43:49 agc Exp $");
-#endif
-
-#include <ctype.h>
-#include <string.h>
-
-int
-strcasecmp(const char *s1, const char *s2)
-{
- const unsigned char *us1 = (const unsigned char *)s1,
- *us2 = (const unsigned char *)s2;
-
- while (tolower(*us1) == tolower(*us2++))
- if (*us1++ == '\0')
- return (0);
- return (tolower(*us1) - tolower(*--us2));
-}
diff --git a/src/3rdparty/libtiff/port/strtoul.c b/src/3rdparty/libtiff/port/strtoul.c
deleted file mode 100644
index f7a9a1a565..0000000000
--- a/src/3rdparty/libtiff/port/strtoul.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* $Id: strtoul.c,v 1.2 2005/07/07 16:34:06 dron Exp $ */
-
-/*
- * Copyright (c) 1990, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if 0
-static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93";
-__RCSID("$NetBSD: strtoul.c,v 1.16 2003/08/07 16:43:45 agc Exp $");
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
-/*
- * Convert a string to an unsigned long integer.
- *
- * Ignores `locale' stuff. Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-unsigned long
-strtoul(const char *nptr, char **endptr, int base)
-{
- const char *s;
- unsigned long acc, cutoff;
- int c;
- int neg, any, cutlim;
-
- /*
- * See strtol for comments as to the logic used.
- */
- s = nptr;
- do {
- c = (unsigned char) *s++;
- } while (isspace(c));
- if (c == '-') {
- neg = 1;
- c = *s++;
- } else {
- neg = 0;
- if (c == '+')
- c = *s++;
- }
- if ((base == 0 || base == 16) &&
- c == '0' && (*s == 'x' || *s == 'X')) {
- c = s[1];
- s += 2;
- base = 16;
- }
- if (base == 0)
- base = c == '0' ? 8 : 10;
-
- cutoff = ULONG_MAX / (unsigned long)base;
- cutlim = (int)(ULONG_MAX % (unsigned long)base);
- for (acc = 0, any = 0;; c = (unsigned char) *s++) {
- if (isdigit(c))
- c -= '0';
- else if (isalpha(c))
- c -= isupper(c) ? 'A' - 10 : 'a' - 10;
- else
- break;
- if (c >= base)
- break;
- if (any < 0)
- continue;
- if (acc > cutoff || (acc == cutoff && c > cutlim)) {
- any = -1;
- acc = ULONG_MAX;
- errno = ERANGE;
- } else {
- any = 1;
- acc *= (unsigned long)base;
- acc += c;
- }
- }
- if (neg && any > 0)
- acc = -acc;
- if (endptr != 0)
- /* LINTED interface specification */
- *endptr = (char *)(any ? s - 1 : nptr);
- return (acc);
-}
diff --git a/src/3rdparty/patches/libmng-1.0.10-endless-loop.patch b/src/3rdparty/patches/libmng-1.0.10-endless-loop.patch
deleted file mode 100644
index 31f0474e6b..0000000000
--- a/src/3rdparty/patches/libmng-1.0.10-endless-loop.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- libmng_data.h.orig 2007-04-20 10:41:58.000000000 +0200
-+++ libmng_data.h 2007-07-14 00:00:00.000000000 +0200
-@@ -658,6 +658,9 @@
- mng_int32 iFrameclipb;
-
- mng_uint32 iNextdelay; /* delay *after* next image */
-+
-+ mng_bool bForcedelay;
-+ mng_uint32 iAccumdelay;
- #endif
-
- #ifndef MNG_SKIPCHUNK_SHOW
---- libmng_display.c.orig 2007-04-20 10:41:58.000000000 +0200
-+++ libmng_display.c 2007-07-14 00:00:00.000000000 +0200
-@@ -384,8 +384,9 @@
-
- {
- #ifndef MNG_SKIPCHUNK_FRAM
-- if (pData->iFramedelay > 0) /* real delay ? */
-+ if (pData->iFramedelay > 0 || pData->bForcedelay) /* real delay ? */
- { /* let the app refresh first ? */
-+ pData->bForcedelay = MNG_FALSE;
- if ((pData->bRunning) && (!pData->bSkipping) &&
- (pData->iUpdatetop < pData->iUpdatebottom) && (pData->iUpdateleft < pData->iUpdateright))
- if (!pData->fRefresh (((mng_handle)pData),
-@@ -455,6 +456,7 @@
- pData->iFrametime = pData->iFrametime + iWaitfor;
- /* setup for next delay */
- pData->iFramedelay = pData->iNextdelay;
-+ pData->iAccumdelay += pData->iFramedelay;
- #endif
- }
-
-@@ -3340,6 +3342,9 @@
- MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_MEND, MNG_LC_START);
- #endif
-
-+ pData->bForcedelay = pData->iAccumdelay ? MNG_FALSE : MNG_TRUE;
-+ pData->iAccumdelay = 0;
-+
- #ifdef MNG_SUPPORT_DYNAMICMNG
- if (pData->bStopafterseek) /* need to stop after this ? */
- {
---- libmng_hlapi.c.orig 2007-07-06 18:23:04.000000000 +0200
-+++ libmng_hlapi.c 2007-07-14 00:00:00.000000000 +0200
-@@ -446,6 +446,9 @@
- pData->iFrameclipb = 0;
-
- pData->iNextdelay = 1;
-+
-+ pData->bForcedelay = MNG_FALSE;
-+ pData->iAccumdelay = 0;
- #endif
-
- #ifndef MNG_SKIPCHUNK_SHOW
-@@ -1737,6 +1740,9 @@
- pData->iFrameclipb = 0;
-
- pData->iNextdelay = 1;
-+
-+ pData->bForcedelay = MNG_FALSE;
-+ pData->iAccumdelay = 0;
- #endif
-
- #ifndef MNG_SKIPCHUNK_SHOW
diff --git a/src/3rdparty/pcre.pri b/src/3rdparty/pcre.pri
new file mode 100644
index 0000000000..92066e1aee
--- /dev/null
+++ b/src/3rdparty/pcre.pri
@@ -0,0 +1,38 @@
+DEFINES += PCRE_HAVE_CONFIG_H
+
+# man 3 pcrejit for a list of supported platforms;
+# as PCRE 8.30, stable JIT support is available for:
+# - ARM v5, v7, and Thumb2
+# - x86/x86-64
+# - MIPS 32bit
+equals(QT_ARCH, "i386")|equals(QT_ARCH, "x86_64")|equals(QT_ARCH, "arm")|if(equals(QT_ARCH, "mips"):!*-64) {
+ DEFINES += SUPPORT_JIT
+}
+
+win32:DEFINES += PCRE_STATIC
+
+INCLUDEPATH += $$PWD/pcre
+SOURCES += \
+ $$PWD/pcre/pcre16_byte_order.c \
+ $$PWD/pcre/pcre16_chartables.c \
+ $$PWD/pcre/pcre16_compile.c \
+ $$PWD/pcre/pcre16_config.c \
+ $$PWD/pcre/pcre16_dfa_exec.c \
+ $$PWD/pcre/pcre16_exec.c \
+ $$PWD/pcre/pcre16_fullinfo.c \
+ $$PWD/pcre/pcre16_get.c \
+ $$PWD/pcre/pcre16_globals.c \
+ $$PWD/pcre/pcre16_jit_compile.c \
+ $$PWD/pcre/pcre16_maketables.c \
+ $$PWD/pcre/pcre16_newline.c \
+ $$PWD/pcre/pcre16_ord2utf16.c \
+ $$PWD/pcre/pcre16_refcount.c \
+ $$PWD/pcre/pcre16_string_utils.c \
+ $$PWD/pcre/pcre16_study.c \
+ $$PWD/pcre/pcre16_tables.c \
+ $$PWD/pcre/pcre16_ucd.c \
+ $$PWD/pcre/pcre16_utf16_utils.c \
+ $$PWD/pcre/pcre16_valid_utf16.c \
+ $$PWD/pcre/pcre16_version.c \
+ $$PWD/pcre/pcre16_xclass.c
+
diff --git a/src/3rdparty/pcre/config.h b/src/3rdparty/pcre/config.h
new file mode 100644
index 0000000000..4fe10f41d8
--- /dev/null
+++ b/src/3rdparty/pcre/config.h
@@ -0,0 +1,15 @@
+#define HAVE_MEMMOVE 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+
+#define LINK_SIZE 2
+#define MATCH_LIMIT 10000000
+#define MATCH_LIMIT_RECURSION MATCH_LIMIT
+#define MAX_NAME_COUNT 10000
+#define MAX_NAME_SIZE 32
+#define NEWLINE 10
+
+#define POSIX_MALLOC_THRESHOLD 10
+#define SUPPORT_UCP
+#define SUPPORT_UTF16
+
diff --git a/src/3rdparty/pcre/import_from_pcre_tarball.sh b/src/3rdparty/pcre/import_from_pcre_tarball.sh
new file mode 100755
index 0000000000..914820e8d6
--- /dev/null
+++ b/src/3rdparty/pcre/import_from_pcre_tarball.sh
@@ -0,0 +1,154 @@
+#! /bin/sh
+#############################################################################
+##
+## Copyright (C) 2012 Giuseppe D'Angelo <dangelog@gmail.com>.
+## Contact: http://www.qt-project.org/
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this
+## file. Please review the following information to ensure the GNU Lesser
+## General Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights. These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU General
+## Public License version 3.0 as published by the Free Software Foundation
+## and appearing in the file LICENSE.GPL included in the packaging of this
+## file. Please review the following information to ensure the GNU General
+## Public License version 3.0 requirements will be met:
+## http://www.gnu.org/copyleft/gpl.html.
+##
+## Other Usage
+## Alternatively, this file may be used in accordance with the terms and
+## conditions contained in a signed written agreement between you and Nokia.
+##
+##
+##
+##
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This is a small script to copy the required files from a PCRE tarball
+# into 3rdparty/pcre/ , following the instructions found in the NON-UNIX-USE
+# file. Documentation, tests, demos etc. are not imported.
+# Also, a global s/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g is performed, to avoid
+# tampering QtCore compilation with a -DHAVE_CONFIG_H.
+
+if [ $# -ne 2 ]; then
+ echo "Usage: $0 pcre_tarball_dir/ \$QTDIR/src/3rdparty/pcre/"
+ exit 1
+fi
+
+PCRE_DIR=$1
+TARGET_DIR=$2
+
+if [ ! -d "$PCRE_DIR" -o ! -r "$PCRE_DIR" -o ! -d "$TARGET_DIR" -o ! -w "$TARGET_DIR" ]; then
+ echo "Either the PCRE source dir or the target dir do not exist,"
+ echo "are not directories or have the wrong permissions."
+ exit 2
+fi
+
+# with 1 argument, copies PCRE_DIR/$1 to TARGET_DIR/$1
+# with 2 arguments, copies PCRE_DIR/$1 to TARGET_DIR/$2
+# every file copied gets a s/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g
+copy_and_convert_file() {
+ if [ $# -lt 1 -o $# -gt 2 ]; then
+ echo "Wrong number of arguments to copy_and_convert_file"
+ exit 3
+ fi
+
+ SOURCE_FILE=$1
+ if [ -n "$2" ]; then
+ DEST_FILE=$2
+ else
+ DEST_FILE=$1
+ fi
+
+ mkdir -p "$TARGET_DIR/$(dirname "$SOURCE_FILE")"
+ sed 's/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g' < "$PCRE_DIR/$SOURCE_FILE" > "$TARGET_DIR/$DEST_FILE"
+}
+
+copy_and_convert_file "pcre.h.generic" "pcre.h"
+copy_and_convert_file "pcre_chartables.c.dist" "pcre_chartables.c"
+
+FILES="
+ AUTHORS
+ COPYING
+ LICENCE
+ pcre_internal.h
+ ucp.h
+ pcre_byte_order.c
+ pcre_compile.c
+ pcre_config.c
+ pcre_dfa_exec.c
+ pcre_exec.c
+ pcre_fullinfo.c
+ pcre_get.c
+ pcre_globals.c
+ pcre_jit_compile.c
+ pcre_maketables.c
+ pcre_newline.c
+ pcre_ord2utf8.c
+ pcre_refcount.c
+ pcre_string_utils.c
+ pcre_study.c
+ pcre_tables.c
+ pcre_ucd.c
+ pcre_valid_utf8.c
+ pcre_version.c
+ pcre_xclass.c
+ pcre16_byte_order.c
+ pcre16_chartables.c
+ pcre16_compile.c
+ pcre16_config.c
+ pcre16_dfa_exec.c
+ pcre16_exec.c
+ pcre16_fullinfo.c
+ pcre16_get.c
+ pcre16_globals.c
+ pcre16_jit_compile.c
+ pcre16_maketables.c
+ pcre16_newline.c
+ pcre16_ord2utf16.c
+ pcre16_refcount.c
+ pcre16_string_utils.c
+ pcre16_study.c
+ pcre16_tables.c
+ pcre16_ucd.c
+ pcre16_utf16_utils.c
+ pcre16_valid_utf16.c
+ pcre16_version.c
+ pcre16_xclass.c
+ sljit/sljitLir.c
+ sljit/sljitLir.h
+ sljit/sljitNativePPC_common.c
+ sljit/sljitNativeX86_common.c
+ sljit/sljitNativeARM_v5.c
+ sljit/sljitNativeX86_32.c
+ sljit/sljitNativeX86_64.c
+ sljit/sljitNativePPC_32.c
+ sljit/sljitNativePPC_64.c
+ sljit/sljitConfig.h
+ sljit/sljitNativeMIPS_32.c
+ sljit/sljitUtils.c
+ sljit/sljitNativeMIPS_common.c
+ sljit/sljitExecAllocator.c
+ sljit/sljitConfigInternal.h
+ sljit/sljitNativeARM_Thumb2.c
+"
+
+for i in $FILES; do
+ copy_and_convert_file "$i"
+done
diff --git a/src/3rdparty/s60/eiksoftkeyimage.h b/src/3rdparty/s60/eiksoftkeyimage.h
deleted file mode 100644
index 01a41a5b47..0000000000
--- a/src/3rdparty/s60/eiksoftkeyimage.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef EIKSOFTKEYIMAGE_H
-#define EIKSOFTKEYIMAGE_H
-
-// FORWARD DECLARATIONS
-class CEikButtonGroupContainer;
-
-// CLASS DECLARATION
-
-/**
-* Changes cba button's label to image.
-*
-* @lib EIKCOCTL
-* @since 2.0
-*/
-class EikSoftkeyImage
- {
- public:
-
- /**
- * Set image to cba button by replacing label
- * @since 2.0
- * @param aButtonGroupContainer Button container
- * @param aImage Image to button,
- * Takes Images ownership
- * @param aLeft Boolean: left or right button.
- * If true, then change left,
- * if false, change right
- */
- IMPORT_C static void SetImage(CEikButtonGroupContainer* aButtonGroupContainer, CEikImage& aImage, TBool aLeft);
-
- /**
- * Change to cba button image back to label
- * @since 2.0
- * @param aButtonGroupContainer Button container
- * @param aLeft Boolean: left or right button.
- * If true, then change left,
- * if false, change right
- */
- IMPORT_C static void SetLabel(CEikButtonGroupContainer* aButtonGroupContainer, TBool aLeft);
-
- private:
-
- /**
- * C++ default constructor.
- */
- EikSoftkeyImage() {};
-
-
- };
-
-#endif // EIKSOFTKEYIMAGE_H
-
-// End of File
-
diff --git a/src/3rdparty/sha1/sha1.cpp b/src/3rdparty/sha1/sha1.cpp
index 6270140a79..f4c8e6abe2 100644
--- a/src/3rdparty/sha1/sha1.cpp
+++ b/src/3rdparty/sha1/sha1.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
**
** This file is part of the Qt Toolkit.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri
index 042eb1373f..75dd2396f2 100644
--- a/src/3rdparty/zlib_dependency.pri
+++ b/src/3rdparty/zlib_dependency.pri
@@ -1,8 +1,7 @@
# zlib dependency satisfied by bundled 3rd party zlib or system zlib
contains(QT_CONFIG, system-zlib) {
- symbian: LIBS_PRIVATE += -llibz
- else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
- else: LIBS += zdll.lib
+ if(unix|win32-g++*):LIBS_PRIVATE += -lz
+ else: LIBS += zdll.lib
} else {
INCLUDEPATH += $$PWD/zlib
}