fc695138b4
Added option wxIMAGE_OPTION_TIFF_PHOTOMETRIC for reading and writing TIFF images. This is mostly for being able to distinguish between PHOTOMETRIC_MINISBLACK (chocolate flavour) and PHOTOMETRIC_MINISWHITE (vanilla) as currently the flavour used was fixed. It applies to greyscale as well as black and white images. Added unit tests to verify the written photometric value. Also see #13194. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
61 lines
2.0 KiB
C++
61 lines
2.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/imagtiff.h
|
|
// Purpose: wxImage TIFF handler
|
|
// Author: Robert Roebling
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_IMAGTIFF_H_
|
|
#define _WX_IMAGTIFF_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxTIFFHandler
|
|
//-----------------------------------------------------------------------------
|
|
|
|
#if wxUSE_LIBTIFF
|
|
|
|
#include "wx/image.h"
|
|
#include "wx/versioninfo.h"
|
|
|
|
// defines for wxImage::SetOption
|
|
#define wxIMAGE_OPTION_TIFF_BITSPERSAMPLE wxString(wxT("BitsPerSample"))
|
|
#define wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel"))
|
|
#define wxIMAGE_OPTION_TIFF_COMPRESSION wxString(wxT("Compression"))
|
|
#define wxIMAGE_OPTION_TIFF_PHOTOMETRIC wxString(wxT("Photometric"))
|
|
#define wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor"))
|
|
|
|
// for backwards compatibility
|
|
#define wxIMAGE_OPTION_BITSPERSAMPLE wxIMAGE_OPTION_TIFF_BITSPERSAMPLE
|
|
#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL
|
|
#define wxIMAGE_OPTION_COMPRESSION wxIMAGE_OPTION_TIFF_COMPRESSION
|
|
#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR
|
|
|
|
class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler
|
|
{
|
|
public:
|
|
wxTIFFHandler();
|
|
|
|
static wxVersionInfo GetLibraryVersionInfo();
|
|
|
|
#if wxUSE_STREAMS
|
|
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
|
|
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
|
|
|
|
protected:
|
|
virtual int DoGetImageCount( wxInputStream& stream );
|
|
virtual bool DoCanRead( wxInputStream& stream );
|
|
#endif
|
|
|
|
private:
|
|
DECLARE_DYNAMIC_CLASS(wxTIFFHandler)
|
|
};
|
|
|
|
#endif // wxUSE_LIBTIFF
|
|
|
|
#endif // _WX_IMAGTIFF_H_
|
|
|