github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

plugin/tif: warning removed (thanks Klugier), Core: Cerr improved

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6380 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-09-26 17:28:54 +00:00
parent d0b23c27c4
commit e8e90a33e7
3 changed files with 101 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

9
uppsrc/Core/Stream.cpp
View file

@ -1267,6 +1267,15 @@ class CerrStream : public Stream {
putc(w, stderr);
#endif
}
virtual void _Put(const void *data, dword size) {
#ifdef PLATFORM_WIN32
static HANDLE h = GetStdHandle(STD_ERROR_HANDLE);
dword dummy;
WriteFile(h, data, size, &dummy, NULL);
#else
fwrite(data, 1, size, stderr);
#endif
}
virtual bool IsOpen() const { return true; }
};

182
uppsrc/plugin/tif/tif.upp
View file

@ -1,91 +1,91 @@
description "TIFF image file format\3770,128,128";
uses
plugin\jpg;
options
-DSTDC,
-DCHECK_JPEG_YCBCR_SUBSAMPLING,
-DDEFAULT_EXTRASAMPLE_AS_ALPHA,
-DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP,
-DPIXARLOG_SUPPORT,
-DZIP_SUPPORT,
-DOJPEG_SUPPORT,
-DJPEG_SUPPORT,
-DLOGLUV_SUPPORT,
-DNEXT_SUPPORT,
-DTHUNDER_SUPPORT,
-DLZW_SUPPORT,
-DPACKBITS_SUPPORT,
-DCCITT_SUPPORT;
file
tif.h,
tifupp.cpp,
tifreg.icpp,
lib readonly separator,
lib\Copyright,
lib\jerror.h,
lib\jpeg.patch1,
lib\jpeg.patch2,
lib\jpeglib.h,
lib\libtiff.def,
lib\Makefile.am,
lib\Makefile.in,
lib\Makefile.lcc,
lib\Makefile.vc,
lib\ojpeg.patch,
lib\t4.h,
lib\tif_aux.c,
lib\tif_close.c,
lib\tif_codec.c,
lib\tif_color.c,
lib\tif_compress.c,
lib\tif_config.h,
lib\tif_config.h.in,
lib\tif_config.h.vc,
lib\tif_dir.c,
lib\tif_dir.h,
lib\tif_dirinfo.c,
lib\tif_dirread.c,
lib\tif_dirwrite.c,
lib\tif_dumpmode.c,
lib\tif_error.c,
lib\tif_extension.c,
lib\tif_fax3.c,
lib\tif_fax3.h,
lib\tif_fax3sm.c,
lib\tif_flush.c,
lib\tif_getimage.c,
lib\tif_jpeg.c,
lib\tif_luv.c,
lib\tif_lzw.c,
lib\tif_next.c,
lib\tif_ojpeg.c,
lib\tif_open.c,
lib\tif_packbits.c,
lib\tif_pixarlog.c,
lib\tif_predict.c,
lib\tif_predict.h,
lib\tif_print.c,
lib\tif_read.c,
lib\tif_strip.c,
lib\tif_swab.c,
lib\tif_thunder.c,
lib\tif_tile.c,
lib\tif_version.c,
lib\tif_warning.c,
lib\tif_write.c,
lib\tif_zip.c,
lib\tiff.h,
lib\tiffcomp.h,
lib\tiffconf.h,
lib\tiffconf.h.in,
lib\tiffconf.h.vc,
lib\tiffio.h,
lib\tiffio.hxx,
lib\tiffiop.h,
lib\tiffvers.h,
lib\uvcode.h,
end readonly separator;
description "TIFF image file format\3770,128,128";
uses
plugin\jpg;
options
-DSTDC,
-DCHECK_JPEG_YCBCR_SUBSAMPLING,
-DDEFAULT_EXTRASAMPLE_AS_ALPHA,
-DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP,
-DPIXARLOG_SUPPORT,
-DZIP_SUPPORT,
-DOJPEG_SUPPORT,
-DJPEG_SUPPORT,
-DLOGLUV_SUPPORT,
-DNEXT_SUPPORT,
-DTHUNDER_SUPPORT,
-DLZW_SUPPORT,
-DPACKBITS_SUPPORT,
-DCCITT_SUPPORT;
file
tif.h,
tifupp.cpp,
tifreg.icpp,
lib readonly separator,
lib\Copyright,
lib\jerror.h,
lib\jpeg.patch1,
lib\jpeg.patch2,
lib\jpeglib.h,
lib\libtiff.def,
lib\Makefile.am,
lib\Makefile.in,
lib\Makefile.lcc,
lib\Makefile.vc,
lib\ojpeg.patch,
lib\t4.h,
lib\tif_aux.c,
lib\tif_close.c,
lib\tif_codec.c,
lib\tif_color.c,
lib\tif_compress.c,
lib\tif_config.h,
lib\tif_config.h.in,
lib\tif_config.h.vc,
lib\tif_dir.c,
lib\tif_dir.h,
lib\tif_dirinfo.c,
lib\tif_dirread.c,
lib\tif_dirwrite.c,
lib\tif_dumpmode.c,
lib\tif_error.c,
lib\tif_extension.c,
lib\tif_fax3.c,
lib\tif_fax3.h,
lib\tif_fax3sm.c,
lib\tif_flush.c,
lib\tif_getimage.c,
lib\tif_jpeg.c,
lib\tif_luv.c,
lib\tif_lzw.c,
lib\tif_next.c,
lib\tif_ojpeg.c,
lib\tif_open.c,
lib\tif_packbits.c,
lib\tif_pixarlog.c,
lib\tif_predict.c,
lib\tif_predict.h,
lib\tif_print.c,
lib\tif_read.c,
lib\tif_strip.c,
lib\tif_swab.c,
lib\tif_thunder.c,
lib\tif_tile.c,
lib\tif_version.c,
lib\tif_warning.c,
lib\tif_write.c,
lib\tif_zip.c,
lib\tiff.h,
lib\tiffcomp.h,
lib\tiffconf.h,
lib\tiffconf.h.in,
lib\tiffconf.h.vc,
lib\tiffio.h,
lib\tiffio.hxx,
lib\tiffiop.h,
lib\tiffvers.h,
lib\uvcode.h,
end readonly separator;

2
uppsrc/plugin/tif/tifupp.cpp
View file

@ -906,7 +906,7 @@ bool TIFRaster::Data::SeekPage(int pgx)
char emsg[1024];
if(!TIFFRGBAImageBegin(this, tiff, 0, emsg)) {
TIFFError(TIFFFileName(tiff), emsg);
TIFFError(TIFFFileName(tiff), "%s", emsg);
page_error = true;
return false;
}