octave-libtiff: libinterp/corefcn/__tiff_

annotate libinterp/corefcn/tiff.cc @ 31192:6a2bb6f4e41e

__tiff__.cc (F__tiff_imread__): fixed bug where file was not closed on errors.

author	magedrifaat <magedrifaat@gmail.com>
date	Sat, 27 Aug 2022 16:23:59 +0200
parents	8ada1e68d961
children	c142c153034c

rev	line source
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	1 #if defined (HAVE_CONFIG_H)
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2 # include "config.h"
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	3 #endif
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	4
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	5 #include <string>
31094 ab5b33e447b0 Modified getTag to account for different tag data types and multivalued tags, the current implementation is still buggy for most tags and data types magedrifaat <magedrifaat@gmail.com> parents: 31093 diff changeset	6 #include <iostream>
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	7
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	8 #include "defun.h"
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	9 #include "ov.h"
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	10 #include "ovl.h"
31093 e2bed4daae82 Fix typo in module-files magedrifaat <magedrifaat@gmail.com> parents: 31092 diff changeset	11 #include "error.h"
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	12
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	13 #include "errwarn.h"
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	14
31162 28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	15 #include "fcntl-wrappers.h"
28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	16
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	17 #if defined (HAVE_TIFF)
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	18 # include <tiffio.h>
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	19 bool handlers_set = true;
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	20 #endif
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	21
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	22 namespace octave
31099 6fc4bf5e14e1 Cleaned up the interface magedrifaat <magedrifaat@gmail.com> parents: 31098 diff changeset	23 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	24 #if defined (HAVE_TIFF)
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	25 class OCTINTERP_API octave_tiff_handle : public octave_base_value
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	26 {
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	27 public:
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	28 octave_tiff_handle (TIFF *tif)
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	29 : tiff_file (tif), closed (false)
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	30 { }
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	31
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	32 TIFF *get_file(void) { return tiff_file; }
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	33
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	34 bool is_defined (void) const { return true; }
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	35 bool is_constant (void) const { return true; }
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	36
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	37 void close(void)
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	38 {
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	39 if (! closed)
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	40 {
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	41 closed = true;
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	42 TIFFClose (tiff_file);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	43 }
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	44 }
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	45
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	46 bool is_closed (void) { return closed; }
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	47
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	48 ~octave_tiff_handle (void)
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	49 {
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	50 if (! closed)
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	51 close ();
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	52 }
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	53
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	54 static octave_tiff_handle *
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	55 get_tiff_handle (const octave_value& ov)
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	56 {
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	57 octave_base_value *rep = ov.internal_rep ();
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	58 octave_tiff_handle handle = dynamic_cast<octave_tiff_handle > (rep);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	59 if (! handle)
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	60 error ("get_tiff_handle: dynamic_cast to octave_tiff_handle failed");
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	61
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	62 return handle;
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	63 }
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	64 private:
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	65 TIFF *tiff_file;
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	66 bool closed;
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	67 };
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	68
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	69 struct tiff_image_data
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	70 {
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	71 public:
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	72 uint32_t width;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	73 uint32_t height;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	74 uint16_t samples_per_pixel;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	75 uint16_t bits_per_sample;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	76 uint16_t planar_configuration;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	77 uint16_t is_tiled;
31122 1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	78
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	79 tiff_image_data (TIFF *tif)
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	80 {
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	81 if (! TIFFGetField (tif, TIFFTAG_IMAGEWIDTH, &width))
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	82 error ("Failed to read image width");
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	83
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	84 if (! TIFFGetField (tif, TIFFTAG_IMAGELENGTH, &height))
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	85 error ("Failed to read image height");
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	86
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	87 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_SAMPLESPERPIXEL,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	88 &samples_per_pixel))
31122 1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	89 error ("Failed to read the SamplesPerPixel tag");
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	90
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	91 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	92 &bits_per_sample))
31122 1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	93 error ("Failed to read the BitsPerSample tag");
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	94
31131 7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	95 if (! TIFFGetField (tif, TIFFTAG_PLANARCONFIG,
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	96 &planar_configuration))
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	97 // LibTIFF has a bug where it incorrectly returns 0 as a default
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	98 // value for PlanarConfiguration although the default value is 1
31185 a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	99 // This doesn't completely solve the issue as LibTIFF will refuse
a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	100 // to write data to images of the tag is not set.
a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	101 // see: https://www.asmail.be/msg0054918184.html
31131 7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	102 planar_configuration = 1;
31122 1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	103
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	104 is_tiled = TIFFIsTiled(tif);
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	105 }
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	106 };
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	107
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	108 void
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	109 set_internal_handlers (void)
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	110 {
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	111 if (handlers_set)
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	112 {
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	113 TIFFSetErrorHandler (verror_with_id);
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	114 TIFFSetWarningHandler (vwarning_with_id);
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	115 }
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	116 else
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	117 {
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	118 TIFFSetErrorHandler (NULL);
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	119 TIFFSetWarningHandler (NULL);
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	120 }
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	121 }
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	122
31190 a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	123 bool
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	124 is_numeric_scalar (octave_value ov)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	125 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	126 return ov.isnumeric () && ov.isreal () && ov.is_scalar_type ();
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	127 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	128
31182 4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	129 // A map of tag names supported by matlab, there are some differences
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	130 // than LibTIFF's names (e.g. Photometric vs PhotometricInerpretation)
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	131 static const std::map<std::string, ttag_t> tag_name_map = {
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	132 {"SubFileType", 254},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	133 {"ImageWidth", 256},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	134 {"ImageLength", 257},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	135 {"BitsPerSample", 258},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	136 {"Compression", 259},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	137 {"Photometric", 262},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	138 {"Thresholding", 263},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	139 {"FillOrder", 266},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	140 {"DocumentName", 269},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	141 {"ImageDescription", 270},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	142 {"Make", 271},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	143 {"Model", 272},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	144 {"StripOffsets", 273},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	145 {"Orientation", 274},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	146 {"SamplesPerPixel", 277},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	147 {"RowsPerStrip", 278},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	148 {"StripByteCounts", 279},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	149 {"MinSampleValue", 280},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	150 {"MaxSampleValue", 281},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	151 {"XResolution", 282},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	152 {"YResolution", 283},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	153 {"PlanarConfiguration", 284},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	154 {"PageName", 285},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	155 {"XPosition", 286},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	156 {"YPosition", 287},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	157 {"GrayResponseUnit", 290},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	158 {"GrayResponseCurve", 291},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	159 {"Group3Options", 292},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	160 {"Group4Options", 293},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	161 {"ResolutionUnit", 296},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	162 {"PageNumber", 297},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	163 {"TransferFunction", 301},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	164 {"Software", 305},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	165 {"DateTime", 306},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	166 {"Artist", 315},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	167 {"HostComputer", 316},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	168 {"WhitePoint", 318},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	169 {"PrimaryChromaticities", 319},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	170 {"ColorMap", 320},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	171 {"HalfToneHints", 321},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	172 {"TileWidth", 322},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	173 {"TileLength", 323},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	174 {"TileOffsets", 324},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	175 {"TileByteCounts", 325},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	176 {"SubIFD", 330},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	177 {"InkSet", 332},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	178 {"InkNames", 333},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	179 {"NumberOfInks", 334},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	180 {"DotRange", 336},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	181 {"TargetPrinter", 337},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	182 {"ExtraSamples", 338},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	183 {"SampleFormat", 339},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	184 {"SMinSampleValue", 340},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	185 {"SMaxSampleValue", 341},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	186 {"YCbCrCoefficients", 529},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	187 {"YCbCrSubSampling", 530},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	188 {"YCbCrPositioning", 531},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	189 {"ReferenceBlackWhite", 532},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	190 {"XMP", 700},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	191 {"ImageDepth", 32997},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	192 {"Copyright", 33432},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	193 {"RichTIFFIPTC", 33723},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	194 {"Photoshop", 34377},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	195 {"ICCProfile", 34675},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	196 {"SToNits", 37439},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	197 {"JPEGQuality", 65537},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	198 {"JPEGColorMode", 65538},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	199 {"ZipQuality", 65557},
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	200 {"SGILogDataFmt", 6556}
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	201 };
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	202
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	203 const TIFFField get_fip_with_name (TIFF tif, std::string& tag_name)
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	204 {
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	205 const TIFFField *fip = NULL;
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	206 if (tag_name_map.find (tag_name) != tag_name_map.cend ())
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	207 fip = TIFFFieldWithTag (tif, tag_name_map.at (tag_name));
31182 4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	208
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	209 // If the tag name is not found, fallback to the names defined
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	210 // in LibTIFF.
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	211 if (fip == NULL)
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	212 fip = TIFFFieldWithName (tif, tag_name.c_str ());
31182 4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	213
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	214 return fip;
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	215 }
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	216
31162 28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	217 void
28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	218 check_readonly (TIFF *tif)
28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	219 {
28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	220 if (TIFFGetMode (tif) == octave_o_rdonly_wrapper ())
28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	221 error ("Can't write data to a file opened in read-only mode");
28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	222 }
28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	223
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	224 void
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	225 check_closed (octave_tiff_handle *tiff_handle)
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	226 {
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	227 if (tiff_handle->is_closed ())
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	228 error ("The image file was closed");
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	229 }
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	230
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	231 void
31181 8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	232 validate_tiff_get_field (bool status)
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	233 {
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	234 // Check if the return status of TIFFGetField is not 1
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	235 if (status != 1)
31181 8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	236 error ("Failed to read tag");
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	237 }
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	238
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	239 uint32_t get_rows_in_strip (uint32_t strip_no, uint32_t strip_count,
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	240 uint32_t rows_per_strip,
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	241 tiff_image_data *image_data)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	242 {
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	243 // Calculate the expected number of elements in the strip data array
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	244 // All strips have equal number of rows except strips at the bottom
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	245 // of the image can have less number of rows
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	246 uint32_t rows_in_strip = rows_per_strip;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	247 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	248 {
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	249 // All strips have equal number of rows excpet strips at the bottom
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	250 // of the image can have less number of rows
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	251 if (strip_no == strip_count - 1)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	252 rows_in_strip = image_data->height - rows_in_strip * strip_no;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	253 }
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	254 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	255 {
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	256 // For separate planes, we should check the last strip of each channel
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	257 uint32_t strips_per_channel
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	258 = strip_count / image_data->samples_per_pixel;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	259 for (uint32_t boundary_strip = strips_per_channel - 1;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	260 boundary_strip <= strip_count;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	261 boundary_strip += strips_per_channel)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	262 if (strip_no == boundary_strip)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	263 rows_in_strip = image_data->height
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	264 - rows_in_strip * (strip_no % strips_per_channel);
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	265 }
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	266 else
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	267 error ("Planar Configuration not supported");
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	268
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	269 return rows_in_strip;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	270 }
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	271
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	272 void
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	273 get_tile_dimensions_validated (TIFF *tif, uint32_t& tile_width,
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	274 uint32_t& tile_height)
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	275 {
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	276 if (! TIFFGetField (tif, TIFFTAG_TILELENGTH, &tile_height))
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	277 error ("Filed to read tile length");
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	278
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	279 if (! TIFFGetField (tif, TIFFTAG_TILEWIDTH, &tile_width))
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	280 error ("Filed to read tile length");
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	281
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	282 if (tile_height == 0 \|\| tile_height % 16 != 0
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	283 \|\| tile_width == 0 \|\| tile_width % 16 != 0)
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	284 error ("Tile dimesion tags are invalid");
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	285 }
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	286
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	287 template <typename T>
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	288 octave_value
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	289 read_strip (TIFF tif, uint32_t strip_no, tiff_image_data image_data)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	290 {
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	291 // ASSUMES stripped image and strip_no is a valid zero-based strip
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	292 // index for the tif image
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	293
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	294 uint32_t rows_in_strip;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	295 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ROWSPERSTRIP, &rows_in_strip))
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	296 error ("Failed to obtain a value for RowsPerStrip");
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	297
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	298 // The default for RowsPerStrip is INT_MAX so it should be capped to the
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	299 // image height
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	300 if (rows_in_strip > image_data->height)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	301 rows_in_strip = image_data->height;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	302
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	303 uint32_t strip_count = TIFFNumberOfStrips (tif);
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	304 // Get the actual number of rows in the strip
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	305 rows_in_strip = get_rows_in_strip (strip_no, strip_count,
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	306 rows_in_strip, image_data);
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	307
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	308 // Set the strip dimensions depending on the planar configuration
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	309 dim_vector strip_dims;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	310 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	311 strip_dims = dim_vector (image_data->samples_per_pixel,
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	312 image_data->width, rows_in_strip);
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	313 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	314 strip_dims = dim_vector (image_data->width, rows_in_strip, 1);
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	315 else
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	316 error ("Unsupported bit depth");
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	317
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	318 T strip_data (strip_dims);
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	319 uint8_t *strip_fvec
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	320 = reinterpret_cast<uint8_t *> (strip_data.fortran_vec ());
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	321
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	322 if (image_data->bits_per_sample == 8
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	323 \|\| image_data->bits_per_sample == 16
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	324 \|\| image_data->bits_per_sample == 32
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	325 \|\| image_data->bits_per_sample == 64)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	326 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	327 if (TIFFReadEncodedStrip (tif, strip_no, strip_fvec, -1) == -1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	328 error ("Failed to read strip data");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	329 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	330 else if (image_data->bits_per_sample == 1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	331 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	332 if (image_data->samples_per_pixel != 1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	333 error ("Bi-Level images must have one channel only");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	334
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	335 // Create a buffer to hold the packed strip data
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	336 // Unique pointers are faster than vectors for constant size buffers
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	337 std::unique_ptr<uint8_t []> strip_ptr
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	338 = std::make_unique<uint8_t []> (TIFFStripSize (tif));
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	339 uint8_t *strip_buf = strip_ptr.get ();
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	340 if (TIFFReadEncodedStrip (tif, strip_no, strip_buf, -1) == -1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	341 error ("Failed to read strip data");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	342
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	343 // According to the format specification, the row should be byte
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	344 // aligned so the number of bytes is rounded up to the nearest byte
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	345 uint32_t padded_width = (image_data->width + 7) / 8;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	346 // Packing the pixel data into bits
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	347 for (uint32_t row = 0; row < rows_in_strip; row++)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	348 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	349 for (uint32_t col = 0; col < image_data->width; col++)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	350 {
31183 6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	351 uint8_t shift = col % 8;
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	352 if (TIFFIsMSB2LSB (tif))
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	353 shift = 7 - shift;
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	354 strip_fvec[col] = (strip_buf[col / 8] >> shift) & 0x1;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	355 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	356 strip_fvec += image_data->width;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	357 strip_buf += padded_width;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	358 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	359 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	360 else
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	361 error ("Unsupported bit depth");
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	362
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	363 // Reorder the dimensions to the order expected by Octave
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	364 Array<octave_idx_type> perm (dim_vector (3, 1));
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	365 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	366 {
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	367 perm(0) = 2;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	368 perm(1) = 1;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	369 perm(2) = 0;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	370 }
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	371 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	372 {
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	373 perm(0) = 1;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	374 perm(1) = 0;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	375 perm(2) = 2;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	376 }
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	377
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	378 strip_data = strip_data.permute (perm);
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	379 return octave_value (strip_data);
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	380 }
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	381
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	382 template <typename T>
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	383 octave_value
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	384 read_tile (TIFF tif, uint32_t tile_no, tiff_image_data image_data)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	385 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	386 // ASSUMES tiled image and tile_no is a valid zero-based tile
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	387 // index for the tif image
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	388
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	389 uint32_t tile_width, tile_height;
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	390 get_tile_dimensions_validated (tif, tile_width, tile_height);
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	391
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	392 dim_vector tile_dims;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	393 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	394 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	395 tile_dims = dim_vector (image_data->samples_per_pixel, tile_width,
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	396 tile_height);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	397 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	398 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	399 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	400 tile_dims = dim_vector (tile_width, tile_height, 1);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	401 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	402 else
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	403 error ("Unsupported planar configuration");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	404
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	405 T tile_data (tile_dims);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	406 uint8_t *tile_fvec
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	407 = reinterpret_cast<uint8_t *> (tile_data.fortran_vec ());
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	408
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	409 if (image_data->bits_per_sample == 8
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	410 \|\| image_data->bits_per_sample == 16
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	411 \|\| image_data->bits_per_sample == 32
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	412 \|\| image_data->bits_per_sample == 64)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	413 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	414 if (TIFFReadEncodedTile (tif, tile_no, tile_fvec, -1) == -1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	415 error ("Failed to read tile data");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	416 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	417 else if (image_data->bits_per_sample == 1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	418 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	419 if (image_data->samples_per_pixel != 1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	420 error ("Bi-Level images must have one channel only");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	421
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	422 // Create a buffer to hold the packed tile data
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	423 // Unique pointers are faster than vectors for constant size buffers
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	424 std::unique_ptr<uint8_t []> tile_ptr
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	425 = std::make_unique<uint8_t []> (TIFFTileSize (tif));
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	426 uint8_t *tile_buf = tile_ptr.get ();
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	427 if (TIFFReadEncodedTile (tif, tile_no, tile_buf, -1) == -1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	428 error ("Failed to read tile data");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	429
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	430 // unpack tile bits into output matrix cells
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	431 for (uint32_t row = 0; row < tile_height; row++)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	432 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	433 for (uint32_t col = 0; col < tile_width; col++)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	434 {
31183 6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	435 uint8_t shift = col % 8;
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	436 if (TIFFIsMSB2LSB (tif))
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	437 shift = 7 - shift;
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	438 tile_fvec[col] = (tile_buf [col / 8] >> shift) & 0x1;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	439 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	440 tile_fvec += tile_width;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	441 tile_buf += tile_width / 8;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	442 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	443 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	444 else
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	445 error ("Unsupported bit depth");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	446
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	447 Array<octave_idx_type> perm (dim_vector (3, 1));
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	448 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	449 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	450 perm(0) = 2;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	451 perm(1) = 1;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	452 perm(2) = 0;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	453 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	454 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	455 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	456 perm(0) = 1;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	457 perm(1) = 0;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	458 perm(2) = 2;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	459 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	460
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	461 tile_data = tile_data.permute (perm);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	462
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	463 // Get the actual tile dimensions for boundary tiles
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	464 uint32_t tiles_across = (image_data->width + tile_width - 1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	465 / tile_width;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	466 uint32_t tiles_down = (image_data->height + tile_height - 1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	467 / tile_height;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	468 uint32_t corrected_width = tile_width;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	469 uint32_t corrected_height = tile_height;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	470 if (tile_no % tiles_across == tiles_across - 1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	471 corrected_width = image_data->width - tile_width * (tiles_across - 1);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	472 if ((tile_no / tiles_across) % tiles_down == tiles_down - 1)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	473 corrected_height = image_data->height - tile_height * (tiles_down - 1);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	474
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	475 dim_vector corrected_dims;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	476 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	477 corrected_dims = dim_vector (corrected_height, corrected_width,
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	478 image_data->samples_per_pixel);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	479 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	480 corrected_dims = dim_vector (corrected_height, corrected_width);
31159 e960e3a3b3f6 Tiff.m: added structs for tag value enums to the Tiff class. magedrifaat <magedrifaat@gmail.com> parents: 31158 diff changeset	481
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	482 tile_data.resize (corrected_dims);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	483
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	484 return octave_value (tile_data);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	485 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	486
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	487 template <typename T>
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	488 octave_value
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	489 read_strip_or_tile (TIFF *tif, uint32_t strip_tile_no,
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	490 tiff_image_data *image_data)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	491 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	492 if (image_data->is_tiled)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	493 return read_tile<T> (tif, strip_tile_no, image_data);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	494 else
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	495 return read_strip<T> (tif, strip_tile_no, image_data);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	496 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	497
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	498 octave_value
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	499 read_unsigned_strip_or_tile (TIFF *tif, uint32_t strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	500 tiff_image_data *image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	501 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	502 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	503 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	504 case 1:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	505 return read_strip_or_tile<boolNDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	506 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	507 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	508 case 8:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	509 return read_strip_or_tile<uint8NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	510 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	511 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	512 case 16:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	513 return read_strip_or_tile<uint16NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	514 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	515 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	516 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	517 return read_strip_or_tile<uint32NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	518 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	519 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	520 return read_strip_or_tile<uint64NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	521 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	522 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	523 error ("Unsupported bit depth");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	524 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	525 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	526
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	527 octave_value
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	528 read_signed_strip_or_tile (TIFF *tif, uint32_t strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	529 tiff_image_data *image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	530 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	531 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	532 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	533 case 8:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	534 return read_strip_or_tile<int8NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	535 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	536 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	537 case 16:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	538 return read_strip_or_tile<int16NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	539 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	540 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	541 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	542 return read_strip_or_tile<int32NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	543 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	544 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	545 return read_strip_or_tile<int64NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	546 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	547 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	548 error ("Unsupported bit depth for signed images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	549 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	550 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	551
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	552 octave_value
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	553 read_float_strip_or_tile (TIFF *tif, uint32_t strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	554 tiff_image_data *image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	555 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	556 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	557 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	558 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	559 return read_strip_or_tile<FloatNDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	560 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	561 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	562 return read_strip_or_tile<NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	563 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	564 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	565 error ("Unsupported bit depth for floating-point images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	566 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	567 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	568
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	569 octave_value
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	570 handle_read_strip_or_tile (TIFF *tif, uint32_t strip_tile_no)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	571 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	572 // Obtain all necessary tags
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	573 tiff_image_data image_data (tif);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	574
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	575 uint16_t sample_format;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	576 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format))
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	577 error ("Failed to obtain a value for sample format");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	578
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	579 switch (sample_format)
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	580 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	581 case 1:
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	582 case 4:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	583 return read_unsigned_strip_or_tile (tif, strip_tile_no, &image_data);
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	584 break;
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	585 case 2:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	586 return read_signed_strip_or_tile (tif, strip_tile_no, &image_data);
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	587 break;
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	588 case 3:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	589 return read_float_strip_or_tile (tif, strip_tile_no, &image_data);
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	590 break;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	591 default:
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	592 error ("Unsupported sample format");
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	593 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	594 }
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	595
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	596 template <typename T>
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	597 octave_value
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	598 read_stripped_image (TIFF tif, tiff_image_data image_data)
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	599 {
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	600 typedef typename T::element_type P;
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	601
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	602 // For 1-bit and 4-bit images, each row must be byte aligned and padding
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	603 // is added to the end of the row to reach the byte mark.
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	604 // To facilitate reading the data, the matrix is defined with the padded
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	605 // size and the padding is removed at the end.
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	606 uint32_t padded_width = image_data->width;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	607 uint8_t remove_padding = 0;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	608 if ((image_data->bits_per_sample == 1 \|\| image_data->bits_per_sample == 4)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	609 && padded_width % 8 != 0)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	610 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	611 padded_width += (8 - padded_width % 8) % 8;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	612 remove_padding = 1;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	613 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	614
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	615 // The matrix dimensions are defined in the order that corresponds to
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	616 // the order of strip data read from LibTIFF.
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	617 // At the end, the matrix is permutated to the order expected by Octave
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	618 T img;
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	619 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	620 img = T (dim_vector (image_data->samples_per_pixel, padded_width,
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	621 image_data->height));
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	622 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	623 img = T (dim_vector (padded_width, image_data->height,
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	624 image_data->samples_per_pixel));
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	625 else
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	626 error ("Unsupported Planar Configuration");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	627
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	628 P *img_fvec = img.fortran_vec ();
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	629
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	630 // Obtain the necessary data for handling the strips
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	631 uint32_t strip_count = TIFFNumberOfStrips (tif);
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	632
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	633 // Can't rely on StripByteCounts because in compressed images
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	634 // the byte count reflect the actual number of bytes stored
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	635 // in the file not the size of the uncompressed strip
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	636 int64_t strip_size;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	637 uint64_t written_size = 0;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	638 uint64_t image_size = padded_width * image_data->height
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	639 * image_data->samples_per_pixel
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	640 * sizeof (P);
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	641 for (uint32_t strip = 0; strip < strip_count; strip++)
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	642 {
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	643 // Read the strip data into the matrix directly
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	644 strip_size = TIFFReadEncodedStrip (tif, strip, img_fvec, -1);
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	645
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	646 // Check if the strip read failed.
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	647 if (strip_size == -1)
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	648 error ("Failed to read strip data");
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	649
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	650 // Check if the size being read exceeds the bounds of the matrix
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	651 // In case of a corrupt image with more data than needed
31129 dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	652 // This is probably redundant as LibTIFF checks sizes internally
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	653 if (written_size + strip_size > image_size)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	654 error ("Strip data is larger than the image size");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	655
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	656 if (image_data->bits_per_sample == 1)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	657 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	658 if (image_data->samples_per_pixel != 1)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	659 error ("Bi-Level images must have one channel only");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	660
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	661 // The strip size is multiplied by 8 to reflect tha actual
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	662 // number of bytes written to the matrix since each byte
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	663 // in the original strip contains 8 pixels of data
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	664 strip_size *= 8;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	665
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	666 // Checking bounds again with the new size
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	667 if (written_size + strip_size > image_size)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	668 error ("Strip data is larger than the image size");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	669
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	670 // Iterate over the memory region backwards to expand the bits
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	671 // to their respective bytes without overwriting the read data
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	672 for (int64_t pixel = strip_size - 1; pixel >= 0; pixel--)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	673 {
31183 6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	674 uint8_t bit_number = pixel % 8;
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	675 if (TIFFIsMSB2LSB (tif))
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	676 bit_number = 7 - bit_number;
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	677 uint8_t * img_u8 = reinterpret_cast<uint8_t *> (img_fvec);
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	678 img_fvec[pixel] = (img_u8[pixel / 8] >> bit_number) & 0x01;
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	679 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	680 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	681 else if (image_data->bits_per_sample == 4)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	682 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	683 if (image_data->samples_per_pixel != 1)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	684 error ("4-bit images are only supported for grayscale");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	685
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	686 // Strip size is multplied by as each byte contains 2 pixels
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	687 // and each pixel is later expanded into its own byte
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	688 strip_size *= 2;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	689
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	690 // Checking bounds again with the ne size
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	691 if (written_size + strip_size > image_size)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	692 error ("Strip data is larger than the image size");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	693
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	694 // Iterate over the memory region backwards to expand the nibbles
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	695 // to their respective bytes without overwriting the read data
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	696 for (int64_t pixel = strip_size - 1; pixel >= 0; pixel--)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	697 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	698 uint8_t shift = pixel % 2 == 0? 4: 0;
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	699 uint8_t * img_u8 = reinterpret_cast<uint8_t *> (img_fvec);
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	700 img_fvec[pixel] = (img_u8[pixel / 2] >> shift) & 0x0F;
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	701 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	702 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	703 else if (image_data->bits_per_sample != 8 &&
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	704 image_data->bits_per_sample != 16 &&
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	705 image_data->bits_per_sample != 32 &&
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	706 image_data->bits_per_sample != 64)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	707 error ("Unsupported bit depth");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	708
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	709 // Advance the pointer by the amount of bytes read
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	710 img_fvec
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	711 = reinterpret_cast<P > (reinterpret_cast <uint8_t > (img_fvec)
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	712 + strip_size);
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	713 written_size += strip_size;
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	714 }
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	715
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	716 // The matrices are permutated back to the shape expected by Octave
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	717 // which is height x width x channels
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	718 Array<octave_idx_type> perm (dim_vector (3, 1));
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	719 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	720 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	721 perm(0) = 2;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	722 perm(1) = 1;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	723 perm(2) = 0;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	724 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	725 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	726 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	727 perm(0) = 1;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	728 perm(1) = 0;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	729 perm(2) = 2;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	730 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	731
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	732 img = img.permute (perm);
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	733
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	734 if (remove_padding)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	735 img.resize (dim_vector (image_data->height, image_data->width));
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	736
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	737 return octave_value (img);
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	738 }
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	739
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	740 template <typename T>
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	741 octave_value
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	742 read_tiled_image (TIFF tif, tiff_image_data image_data)
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	743 {
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	744 typedef typename T::element_type P;
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	745
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	746 // Obtain the necessary data for handling the tiles
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	747 uint32_t tile_width, tile_height;
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	748 validate_tiff_get_field (TIFFGetField (tif, TIFFTAG_TILEWIDTH,
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	749 &tile_width));
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	750 validate_tiff_get_field (TIFFGetField (tif, TIFFTAG_TILELENGTH,
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	751 &tile_height));
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	752 uint32_t tile_count = TIFFNumberOfTiles (tif);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	753 uint32_t tiles_across = (image_data->width + tile_width - 1)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	754 / tile_width;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	755 uint32_t tiles_down = (image_data->height + tile_height - 1)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	756 / tile_height;
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	757
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	758 T img;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	759 // The matrix dimensions are defined in the order that corresponds to
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	760 // the order of the tile data read from LibTIFF.
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	761 // At the end, the matrix is permutated, reshaped and resized to be in the
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	762 // shape expected by Octave
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	763 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	764 img = T (dim_vector (image_data->samples_per_pixel, tile_width,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	765 tile_height, tiles_across, tiles_down));
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	766 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	767 img = T (dim_vector (tile_width, tile_height, tiles_across, tiles_down,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	768 image_data->samples_per_pixel));
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	769 else
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	770 error ("Unsupported Planar Configuration");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	771
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	772 P *img_fvec = img.fortran_vec ();
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	773
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	774 // image_size is calculated from the tile data and not from the
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	775 // image parameters to account for the additional padding in the
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	776 // boundary tiles
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	777 uint64_t image_size = tile_width * tile_height * tile_count * sizeof(P);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	778 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	779 image_size *= image_data->samples_per_pixel;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	780
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	781 // Can't rely on TileByteCounts because compressed images will report
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	782 // the number of bytes present in the file as opposed to the actual
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	783 // number of bytes of uncompressed data that is needed here
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	784 int64_t tile_size;
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	785 uint64_t written_size = 0;
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	786 for (uint32_t tile = 0; tile < tile_count; tile++)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	787 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	788 tile_size = TIFFReadEncodedTile(tif, tile, img_fvec, -1);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	789
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	790 if (tile_size == -1)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	791 error ("Failed to read tile data");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	792
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	793 // Checking if the read bytes would exceed the size of the matrix
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	794 if (tile_size + written_size > image_size)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	795 error ("Tile data is larger than image size");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	796
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	797 if (image_data->bits_per_sample == 1)
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	798 {
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	799 if (image_data->samples_per_pixel != 1)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	800 error ("Bi-Level images must have one channel only");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	801
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	802 // The tile size is multiplied by 8 to reflect tha actual
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	803 // number of bytes written to the matrix since each byte
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	804 // in the original tile contains 8 pixels of data
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	805 tile_size *= 8;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	806
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	807 // Checking bounds again with the new size
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	808 if (written_size + tile_size > image_size)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	809 error ("Tile data is larger than the image size");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	810
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	811 // Iterate over the memory region backwards to expand the bits
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	812 // to their respective bytes without overwriting the read data
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	813 for (int64_t pixel = tile_size - 1; pixel >= 0; pixel--)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	814 {
31183 6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	815 uint8_t bit_number = pixel % 8;
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	816 if (TIFFIsMSB2LSB (tif))
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	817 bit_number = 7 - bit_number;
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	818 uint8_t * img_u8 = reinterpret_cast<uint8_t *> (img_fvec);
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	819 img_fvec[pixel]= (img_u8[pixel / 8] >> bit_number) & 0x01;
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	820 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	821 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	822 else if (image_data->bits_per_sample == 4)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	823 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	824 if (image_data->samples_per_pixel != 1)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	825 error ("4-bit images are only supported for grayscale");
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	826
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	827 // tile size is multplied by as each byte contains 2 pixels
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	828 // and each pixel is later expanded into its own byte
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	829 tile_size *= 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	830
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	831 // Checking bounds again with the ne size
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	832 if (written_size + tile_size > image_size)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	833 error ("Tile data is larger than the image size");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	834
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	835 // Iterate over the memory region backwards to expand the nibbles
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	836 // to their respective bytes without overwriting the read data
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	837 for (int64_t pixel = tile_size - 1; pixel >= 0; pixel--)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	838 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	839 uint8_t shift = pixel % 2 == 0? 4: 0;
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	840 uint8_t * img_u8 = reinterpret_cast<uint8_t *> (img_fvec);
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	841 img_fvec[pixel] = (img_u8[pixel / 2] >> shift) & 0x0F;
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	842 }
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	843 }
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	844 else if (image_data->bits_per_sample != 8 &&
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	845 image_data->bits_per_sample != 16 &&
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	846 image_data->bits_per_sample != 32 &&
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	847 image_data->bits_per_sample != 64)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	848 error ("Unsupported bit depth");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	849
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	850 img_fvec
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	851 = reinterpret_cast<P > (reinterpret_cast<uint8_t > (img_fvec)
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	852 + tile_size);
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	853 written_size += tile_size;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	854 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	855
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	856 // The data is now in the matrix but in a different order than expected
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	857 // by Octave and with additional padding in boundary tiles.
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	858 // To get it to the right order, the dimensions are permutated to
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	859 // align tiles to their correct grid, then reshaped to remove the
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	860 // extra dimensions (tiles_across, tiles_down), then resized to
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	861 // remove any extra padding, and finally permutated to the correct
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	862 // order that is: height x width x channels
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	863 Array<octave_idx_type> perm1 (dim_vector (5, 1));
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	864 Array<octave_idx_type> perm2 (dim_vector (3, 1));
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	865 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	866 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	867 perm1(0) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	868 perm1(1) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	869 perm1(2) = 3;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	870 perm1(3) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	871 perm1(4) = 4;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	872 img = img.permute (perm1);
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	873
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	874 img = img.reshape (dim_vector (image_data->samples_per_pixel,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	875 tile_width * tiles_across,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	876 tile_height * tiles_down));
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	877
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	878 if (tile_width * tiles_across != image_data->width
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	879 \|\| tile_height * tiles_down != image_data->height)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	880 img.resize (dim_vector (image_data->samples_per_pixel,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	881 image_data->width, image_data->height));
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	882
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	883 perm2(0) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	884 perm2(1) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	885 perm2(2) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	886 img = img.permute (perm2);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	887 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	888 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	889 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	890 perm1(0) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	891 perm1(1) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	892 perm1(2) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	893 perm1(3) = 3;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	894 perm1(4) = 4;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	895 img = img.permute (perm1);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	896
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	897 img = img.reshape (dim_vector (tile_width * tiles_across,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	898 tile_height * tiles_down,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	899 image_data->samples_per_pixel));
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	900
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	901 if (tile_width * tiles_across != image_data->width
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	902 \|\| tile_height * tiles_down != image_data->height)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	903 img.resize (dim_vector (image_data->width, image_data->height,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	904 image_data->samples_per_pixel));
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	905
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	906 perm2(0) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	907 perm2(1) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	908 perm2(2) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	909 img = img.permute (perm2);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	910 }
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	911
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	912 return octave_value (img);
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	913 }
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	914
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	915 template <typename T>
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	916 octave_value
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	917 read_image (TIFF tif, tiff_image_data image_data)
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	918 {
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	919 if (image_data->is_tiled)
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	920 return read_tiled_image<T> (tif, image_data);
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	921 else
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	922 return read_stripped_image<T> (tif, image_data);
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	923 }
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	924
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	925 octave_value
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	926 read_unsigned_image (TIFF tif, tiff_image_data image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	927 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	928 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	929 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	930 case 1:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	931 return read_image<boolNDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	932 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	933 case 4:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	934 case 8:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	935 return read_image<uint8NDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	936 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	937 case 16:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	938 return read_image<uint16NDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	939 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	940 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	941 return read_image<uint32NDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	942 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	943 return read_image<uint64NDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	944 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	945 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	946 error ("Unsupported bit depth");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	947 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	948 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	949
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	950 octave_value
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	951 read_signed_image (TIFF tif, tiff_image_data image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	952 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	953 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	954 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	955 case 8:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	956 return read_image<int8NDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	957 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	958 case 16:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	959 return read_image<int16NDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	960 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	961 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	962 return read_image<int32NDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	963 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	964 return read_image<int64NDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	965 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	966 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	967 error ("Unsupported bit depth for signed images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	968 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	969 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	970
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	971 octave_value
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	972 read_float_image (TIFF tif, tiff_image_data image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	973 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	974 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	975 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	976 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	977 return read_image<FloatNDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	978 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	979 return read_image<NDArray> (tif, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	980 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	981 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	982 error ("Unsupported bit depth for floating-point images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	983 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	984 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	985
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	986 template <typename T>
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	987 octave_value
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	988 make_array (void *data, dim_vector& arr_dims)
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	989 {
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	990 typedef typename T::element_type P;
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	991
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	992 T arr (arr_dims);
31181 8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	993 for (uint32_t i = 0; i < arr_dims.numel (); i++)
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	994 {
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	995 arr(i) = (reinterpret_cast<P *> (data))[i];
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	996 }
31181 8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	997 return octave_value (arr);
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	998 }
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	999
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	1000 octave_value
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1001 interpret_tag_data (void *data, uint32_t count, TIFFDataType tag_datatype,
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1002 bool convert_to_double = false)
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1003 {
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1004 octave_value retval;dim_vector arr_dims (1, count);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1005 switch (tag_datatype)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	1006 {
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1007 case TIFF_BYTE:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1008 case TIFF_UNDEFINED:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1009 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1010 retval = make_array<uint8NDArray> (data, arr_dims);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1011 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1012 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1013 case TIFF_ASCII:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1014 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1015 retval = octave_value ((reinterpret_cast<char *> (data)));
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1016 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1017 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1018 case TIFF_SHORT:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1019 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1020 retval = make_array<uint16NDArray> (data, arr_dims);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1021 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1022 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1023 case TIFF_LONG:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1024 case TIFF_IFD:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1025 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1026 retval = make_array<uint32NDArray> (data, arr_dims);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1027 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1028 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1029 case TIFF_LONG8:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1030 case TIFF_IFD8:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1031 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1032 retval = make_array<uint64NDArray> (data, arr_dims);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1033 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1034 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1035 case TIFF_RATIONAL:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1036 case TIFF_SRATIONAL:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1037 case TIFF_FLOAT:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1038 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1039 retval = make_array<FloatNDArray> (data, arr_dims);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1040 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1041 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1042 case TIFF_SBYTE:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1043 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1044 retval = make_array<int8NDArray> (data, arr_dims);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1045 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1046 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1047 case TIFF_SSHORT:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1048 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1049 retval = make_array<int16NDArray> (data, arr_dims);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1050 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1051 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1052 case TIFF_SLONG:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1053 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1054 retval = make_array<int32NDArray> (data, arr_dims);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1055 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1056 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1057 case TIFF_SLONG8:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1058 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1059 retval = make_array<int64NDArray> (data, arr_dims);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1060 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1061 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1062 case TIFF_DOUBLE:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1063 {
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1064 retval = make_array<NDArray> (data, arr_dims);
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1065 break;
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1066 }
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1067 default:
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1068 error ("Unsupported tag data type");
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	1069 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1070
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1071 if (tag_datatype != TIFF_ASCII && convert_to_double)
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1072 retval = retval.as_double ();
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	1073 return retval;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1074 }
31094 ab5b33e447b0 Modified getTag to account for different tag data types and multivalued tags, the current implementation is still buggy for most tags and data types magedrifaat <magedrifaat@gmail.com> parents: 31093 diff changeset	1075
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	1076 octave_value
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1077 get_scalar_field_data (TIFF tif, const TIFFField fip)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1078 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1079 uint32_t tag_id = TIFFFieldTag (fip);
31097 75ab26f147a5 getTag: Implemented single array tags, only multi-array and special tags are unimplemented magedrifaat <magedrifaat@gmail.com> parents: 31096 diff changeset	1080
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1081 // TIFFFieldReadCount returns VARIABLE for some scalar tags
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1082 // (e.g. Compression) But TIFFFieldPassCount seems consistent
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1083 // Since scalar tags are the last to be handled, any tag that
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1084 // require a count to be passed is an unsupported tag.
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1085 if (TIFFFieldPassCount (fip))
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1086 error ("Unsupported tag");
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1087
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1088 int type_size = TIFFDataWidth (TIFFFieldDataType (fip));
31129 dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	1089
31181 8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	1090 std::unique_ptr<uint8_t []> data
8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	1091 = std::make_unique<uint8_t []> (type_size);
8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	1092 uint8_t *data_ptr = data.get ();
31131 7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	1093 if (tag_id == TIFFTAG_PLANARCONFIG)
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	1094 {
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	1095 // Workaround for a bug in LibTIFF where it incorrectly returns
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	1096 // zero as the default value for PlanaConfiguration
31185 a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	1097 // See: https://www.asmail.be/msg0054918184.html
31181 8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	1098 if (! TIFFGetField(tif, tag_id, data_ptr))
8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	1099 reinterpret_cast<uint16_t > (data_ptr) = 1;
31131 7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	1100 }
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	1101 else
31181 8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	1102 validate_tiff_get_field (TIFFGetFieldDefaulted (tif, tag_id, data_ptr));
31131 7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	1103
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1104 // All scalar tags are returned as double
31181 8a4ef572077d __tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr. magedrifaat <magedrifaat@gmail.com> parents: 31180 diff changeset	1105 octave_value tag_data_ov = interpret_tag_data (data_ptr, 1,
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1106 TIFFFieldDataType (fip),
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1107 true);
31094 ab5b33e447b0 Modified getTag to account for different tag data types and multivalued tags, the current implementation is still buggy for most tags and data types magedrifaat <magedrifaat@gmail.com> parents: 31093 diff changeset	1108
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	1109 return tag_data_ov;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1110 }
31094 ab5b33e447b0 Modified getTag to account for different tag data types and multivalued tags, the current implementation is still buggy for most tags and data types magedrifaat <magedrifaat@gmail.com> parents: 31093 diff changeset	1111
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	1112 octave_value
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1113 get_array_field_data (TIFF tif, const TIFFField fip, uint32_t array_size,
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1114 bool convert_to_double = false)
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1115 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1116 void *data;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1117 validate_tiff_get_field (TIFFGetField (tif, TIFFFieldTag (fip), &data));
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1118
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1119 return interpret_tag_data (data, array_size, TIFFFieldDataType (fip),
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1120 convert_to_double);
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1121 }
31097 75ab26f147a5 getTag: Implemented single array tags, only multi-array and special tags are unimplemented magedrifaat <magedrifaat@gmail.com> parents: 31096 diff changeset	1122
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1123 octave_value
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1124 get_field_data (TIFF tif, const TIFFField fip)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1125 {
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1126 octave_value tag_data_ov;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1127 uint32_t tag_id = TIFFFieldTag (fip);
31097 75ab26f147a5 getTag: Implemented single array tags, only multi-array and special tags are unimplemented magedrifaat <magedrifaat@gmail.com> parents: 31096 diff changeset	1128
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1129 switch (tag_id)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	1130 {
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1131 case TIFFTAG_STRIPBYTECOUNTS:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1132 case TIFFTAG_STRIPOFFSETS:
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1133 tag_data_ov = get_array_field_data (tif, fip,
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1134 TIFFNumberOfStrips (tif));
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1135 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1136 case TIFFTAG_TILEBYTECOUNTS:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1137 case TIFFTAG_TILEOFFSETS:
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1138 tag_data_ov
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1139 = get_array_field_data (tif, fip, TIFFNumberOfTiles (tif));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1140 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1141 case TIFFTAG_YCBCRCOEFFICIENTS:
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1142 tag_data_ov = get_array_field_data (tif, fip, 3, true);
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1143 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1144 case TIFFTAG_REFERENCEBLACKWHITE:
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1145 tag_data_ov = get_array_field_data (tif, fip, 6, true);
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1146 break;
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	1147 case TIFFTAG_GRAYRESPONSECURVE:
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	1148 {
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	1149 uint16_t bits_per_sample;
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1150 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1151 &bits_per_sample))
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	1152 error ("Failed to obtain the bit depth");
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	1153
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1154 tag_data_ov = get_array_field_data (tif, fip,
86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1155 1<<bits_per_sample, true);
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	1156 break;
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	1157 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1158 case TIFFTAG_COLORMAP:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1159 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1160 uint16_t bits_per_sample;
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1161 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1162 &bits_per_sample))
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1163 error ("Failed to obtain the bit depth");
31143 a68f2dadafee Tiff.m: added all remaining tests for implemented features. magedrifaat <magedrifaat@gmail.com> parents: 31142 diff changeset	1164
a68f2dadafee Tiff.m: added all remaining tests for implemented features. magedrifaat <magedrifaat@gmail.com> parents: 31142 diff changeset	1165 // According to the format specification, this field should
a68f2dadafee Tiff.m: added all remaining tests for implemented features. magedrifaat <magedrifaat@gmail.com> parents: 31142 diff changeset	1166 // be 8 or 16 only.
a68f2dadafee Tiff.m: added all remaining tests for implemented features. magedrifaat <magedrifaat@gmail.com> parents: 31142 diff changeset	1167 if (bits_per_sample > 16)
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1168 error ("Too high bit depth for a palette image");
31098 3cbd0d82167c getTag: Implemented all special tags, only unsupported geotiff tags not implemented magedrifaat <magedrifaat@gmail.com> parents: 31097 diff changeset	1169
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1170 uint32_t count = 1 << bits_per_sample;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1171 uint16_t red, green, *blue;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1172 validate_tiff_get_field (TIFFGetField (tif, TIFFTAG_COLORMAP,
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	1173 &red, &green, &blue));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1174
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1175 // Retrieving the data of the three channels and concatenating
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1176 // them together
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1177 OCTAVE_LOCAL_BUFFER (NDArray, array_list, 3);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1178 dim_vector col_dims(count, 1);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1179 array_list[0] = NDArray (interpret_tag_data (red,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1180 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1181 TIFFFieldDataType(fip))
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1182 .uint16_array_value ()
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1183 .reshape (col_dims));
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1184 array_list[1] = NDArray (interpret_tag_data (green,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1185 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1186 TIFFFieldDataType(fip))
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1187 .uint16_array_value ()
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1188 .reshape (col_dims));
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1189 array_list[2] = NDArray (interpret_tag_data (blue,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1190 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1191 TIFFFieldDataType(fip))
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1192 .uint16_array_value ()
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1193 .reshape (col_dims));
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	1194
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1195 NDArray mat_out = NDArray::cat(1, 3, array_list);
31121 341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	1196 // Normalize the range to be between 0 and 1
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	1197 mat_out /= UINT16_MAX;
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	1198
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1199 tag_data_ov = octave_value (mat_out);
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1200 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1201 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1202 case TIFFTAG_TRANSFERFUNCTION:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1203 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1204 uint16_t samples_per_pixel;
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1205 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_SAMPLESPERPIXEL,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1206 &samples_per_pixel))
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1207 error ("Failed to obtain the number of samples per pixel");
31098 3cbd0d82167c getTag: Implemented all special tags, only unsupported geotiff tags not implemented magedrifaat <magedrifaat@gmail.com> parents: 31097 diff changeset	1208
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1209 uint16_t bits_per_sample;
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1210 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1211 &bits_per_sample))
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1212 error ("Failed to obtain the bit depth");
31098 3cbd0d82167c getTag: Implemented all special tags, only unsupported geotiff tags not implemented magedrifaat <magedrifaat@gmail.com> parents: 31097 diff changeset	1213
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1214 uint32_t count = 1 << bits_per_sample;
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	1215 uint16_t ch1 = NULL, ch2 = NULL, *ch3 = NULL;
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	1216 // TransferFunction can have 1 or 3 channels depending on the
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	1217 // SamplesPerPixel but the library still expects three pointers
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	1218 // to be passed and sets only the needed ones
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1219 validate_tiff_get_field (TIFFGetField (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1220 &ch1, &ch2, &ch3));
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1221 if (ch2 == NULL)
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1222 tag_data_ov = interpret_tag_data (ch1, count,
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1223 TIFFFieldDataType (fip), true);
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1224 else
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	1225 {
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	1226 // Concatenate the channels into an n by 3 array
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1227 OCTAVE_LOCAL_BUFFER (NDArray, array_list, 3);
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1228 dim_vector col_dims(count, 1);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1229 array_list[0] = interpret_tag_data (ch1,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1230 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1231 TIFFFieldDataType (fip))
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1232 .array_value ()
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1233 .reshape (col_dims);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1234 array_list[1] = interpret_tag_data (ch2,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1235 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1236 TIFFFieldDataType (fip))
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1237 .array_value ()
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1238 .reshape (col_dims);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1239 array_list[2] = interpret_tag_data (ch3,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1240 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1241 TIFFFieldDataType (fip))
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1242 .array_value ()
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1243 .reshape (col_dims);
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	1244
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1245 tag_data_ov
31184 86f91ea7a642 __tiff__.cc (get_field_data): fixed return type for some tags. magedrifaat <magedrifaat@gmail.com> parents: 31183 diff changeset	1246 = octave_value (NDArray::cat (1, 3, array_list));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1247 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1248 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1249 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1250 case TIFFTAG_PAGENUMBER:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1251 case TIFFTAG_HALFTONEHINTS:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1252 case TIFFTAG_DOTRANGE:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1253 case TIFFTAG_YCBCRSUBSAMPLING:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1254 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1255 uint16_t tag_part1, tag_part2;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1256 validate_tiff_get_field (TIFFGetField (tif, tag_id,
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	1257 &tag_part1, &tag_part2));
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1258
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	1259 NDArray mat_out (dim_vector (1, 2));
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1260 mat_out(0)
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1261 = interpret_tag_data (&tag_part1, 1,
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1262 TIFFFieldDataType (fip)).double_value ();
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1263 mat_out(1)
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1264 = interpret_tag_data (&tag_part2, 1,
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1265 TIFFFieldDataType (fip)).double_value ();
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1266
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1267 tag_data_ov = octave_value (mat_out);
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1268 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1269 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1270 case TIFFTAG_SUBIFD:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1271 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1272 uint16_t count;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1273 uint64_t *offsets;
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1274 validate_tiff_get_field (TIFFGetField (tif, tag_id,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1275 &count, &offsets));
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1276 tag_data_ov = interpret_tag_data (offsets, count,
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1277 TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1278 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1279 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1280 case TIFFTAG_EXTRASAMPLES:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1281 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1282 uint16_t count;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1283 uint16_t *types;
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1284 validate_tiff_get_field (TIFFGetField (tif, tag_id,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1285 &count, &types));
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1286 tag_data_ov = interpret_tag_data (types, count,
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1287 TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1288 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1289 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1290 case TIFFTAG_XMLPACKET:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1291 case TIFFTAG_RICHTIFFIPTC:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1292 case TIFFTAG_PHOTOSHOP:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1293 case TIFFTAG_ICCPROFILE:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1294 {
31186 90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1295 uint32_t count;
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1296 uint8_t *data;
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1297 validate_tiff_get_field (TIFFGetField (tif, tag_id,
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1298 &count, &data));
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1299 tag_data_ov = interpret_tag_data (data, count, TIFF_BYTE);
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1300 // Matlab returns XMP tag as char array not byte array
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1301 if (tag_id == TIFFTAG_XMLPACKET)
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1302 tag_data_ov = octave_value (tag_data_ov.char_array_value ());
31103 76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	1303 break;
76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	1304 }
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	1305 // These tags are not mentioned in the LibTIFF documentation
31103 76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	1306 // but are handled correctly by the library
76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	1307 case TIFFTAG_ZIPQUALITY:
76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	1308 case TIFFTAG_SGILOGDATAFMT:
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	1309 case TIFFTAG_GRAYRESPONSEUNIT:
31103 76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	1310 {
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1311 tag_data_ov = get_scalar_field_data (tif, fip);
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1312 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1313 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1314 default:
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1315 tag_data_ov = get_scalar_field_data (tif, fip);
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1316 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1317
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1318 return tag_data_ov;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1319 }
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1320
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1321 void
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1322 set_scalar_field_data (TIFF tif, const TIFFField fip, octave_value tag_ov)
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1323 {
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1324 uint32_t tag_id = TIFFFieldTag (fip);
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1325
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1326 // Since scalar tags are the last to be handled, any tag that
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1327 // require a count to be passed is an unsupported tag.
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1328 if (TIFFFieldPassCount (fip))
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1329 error ("Unsupported tag");
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1330
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	1331 TIFFDataType tag_datatype = TIFFFieldDataType (fip);
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	1332
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1333 // According to matlab, the value must be a scalar double
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	1334 // except for strings
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	1335 if (tag_datatype == TIFF_ASCII)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	1336 {
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	1337 if (! tag_ov.is_string ())
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	1338 error ("Expected string for ascii tag");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	1339 }
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	1340 else if (! tag_ov.is_scalar_type () \|\| ! tag_ov.is_double_type ())
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1341 error ("Tag value must be a scalar double");
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1342
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1343 switch (tag_datatype)
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1344 {
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1345 case TIFF_BYTE:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1346 case TIFF_UNDEFINED:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1347 TIFFSetField (tif, tag_id, tag_ov.uint8_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1348 break;
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1349 case TIFF_ASCII:
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1350 TIFFSetField (tif, tag_id, tag_ov.string_value ().c_str ());
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1351 break;
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1352 case TIFF_SHORT:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1353 TIFFSetField (tif, tag_id, tag_ov.uint16_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1354 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1355 case TIFF_LONG:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1356 TIFFSetField (tif, tag_id, tag_ov.uint32_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1357 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1358 case TIFF_LONG8:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1359 TIFFSetField (tif, tag_id, tag_ov.uint64_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1360 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1361 case TIFF_RATIONAL:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1362 TIFFSetField (tif, tag_id, tag_ov.float_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1363 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1364 case TIFF_SBYTE:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1365 TIFFSetField (tif, tag_id, tag_ov.int8_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1366 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1367 case TIFF_SSHORT:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1368 TIFFSetField (tif, tag_id, tag_ov.int16_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1369 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1370 case TIFF_SLONG:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1371 TIFFSetField (tif, tag_id, tag_ov.int32_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1372 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1373 case TIFF_SLONG8:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1374 TIFFSetField (tif, tag_id, tag_ov.int64_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1375 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1376 case TIFF_FLOAT:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1377 TIFFSetField (tif, tag_id, tag_ov.float_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1378 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1379 case TIFF_DOUBLE:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1380 TIFFSetField (tif, tag_id, tag_ov.double_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1381 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1382 case TIFF_SRATIONAL:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1383 TIFFSetField (tif, tag_id, tag_ov.float_scalar_value ());
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1384 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1385 case TIFF_IFD:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1386 case TIFF_IFD8:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1387 error ("Unimplemented IFFD data type");
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1388 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1389 default:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1390 error ("Unsupported tag data type");
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1391 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1392 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1393
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1394 template <typename T>
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1395 void
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1396 set_array_field_helper (TIFF *tif, uint32_t tag_id, T data_arr)
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1397 {
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1398 const void *data_ptr = data_arr.data ();
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1399
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1400 if (! TIFFSetField (tif, tag_id, data_ptr))
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1401 error ("Failed to set tag");
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1402 }
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1403
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1404 void
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1405 set_array_field_data (TIFF tif, const TIFFField fip,
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1406 octave_value tag_ov, uint32_t count)
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1407 {
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1408 uint32_t tag_id = TIFFFieldTag (fip);
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1409 TIFFDataType tag_datatype = TIFFFieldDataType (fip);
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1410
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1411 // Array type must be double in matlab
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1412 if (! tag_ov.is_double_type ())
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1413 error ("Tag data must be double");
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1414
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1415 // Matlab checks number of elements not dimensions
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1416 if (tag_ov.array_value ().numel () != count)
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1417 error ("Expected an array with %u elements", count);
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1418
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1419 switch (tag_datatype)
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1420 {
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1421 case TIFF_BYTE:
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1422 case TIFF_UNDEFINED:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1423 set_array_field_helper<uint8NDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1424 tag_ov.uint8_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1425 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1426 case TIFF_SHORT:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1427 set_array_field_helper<uint16NDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1428 tag_ov.uint16_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1429 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1430 case TIFF_LONG:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1431 set_array_field_helper<uint32NDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1432 tag_ov.uint32_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1433 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1434 case TIFF_LONG8:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1435 set_array_field_helper<uint64NDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1436 tag_ov.uint64_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1437 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1438 case TIFF_RATIONAL:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1439 set_array_field_helper<FloatNDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1440 tag_ov.float_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1441 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1442 case TIFF_SBYTE:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1443 set_array_field_helper<int8NDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1444 tag_ov.int8_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1445 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1446 case TIFF_SSHORT:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1447 set_array_field_helper<int16NDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1448 tag_ov.int16_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1449 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1450 case TIFF_SLONG:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1451 set_array_field_helper<int32NDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1452 tag_ov.int32_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1453 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1454 case TIFF_SLONG8:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1455 set_array_field_helper<int64NDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1456 tag_ov.int64_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1457 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1458 case TIFF_FLOAT:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1459 set_array_field_helper<FloatNDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1460 tag_ov.float_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1461 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1462 case TIFF_DOUBLE:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1463 set_array_field_helper<NDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1464 tag_ov.array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1465 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1466 case TIFF_SRATIONAL:
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1467 set_array_field_helper<FloatNDArray> (tif, tag_id,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1468 tag_ov.float_array_value ());
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1469 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1470 case TIFF_IFD:
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1471 case TIFF_IFD8:
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1472 error ("Unimplemented IFFD data type");
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1473 break;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1474 default:
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1475 error ("Unsupported tag data type");
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1476 }
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1477 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1478
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1479 void
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1480 set_field_data (TIFF tif, const TIFFField fip, octave_value tag_ov)
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1481 {
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1482 uint32_t tag_id = TIFFFieldTag (fip);
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1483
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1484 switch (tag_id)
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1485 {
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1486 case TIFFTAG_YCBCRCOEFFICIENTS:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1487 set_array_field_data (tif, fip, tag_ov, 3);
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1488 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1489 case TIFFTAG_REFERENCEBLACKWHITE:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1490 set_array_field_data (tif, fip, tag_ov, 6);
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1491 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1492 case TIFFTAG_GRAYRESPONSECURVE:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1493 {
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1494 uint16_t bits_per_sample;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1495 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1496 &bits_per_sample))
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1497 error ("Failed to obtain the bit depth");
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1498
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1499 set_array_field_data (tif, fip, tag_ov, 1<<bits_per_sample);
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1500 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1501 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1502 case TIFFTAG_COLORMAP:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1503 {
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1504 uint16_t bits_per_sample;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1505 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1506 &bits_per_sample))
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1507 error ("Failed to obtain the bit depth");
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1508
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1509 if (! tag_ov.is_double_type ())
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1510 error ("Tag data must be double");
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1511
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1512 // According to the format specification, this field should
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1513 // be 8 or 16 only.
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1514 if (bits_per_sample > 16)
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1515 error ("Too high bit depth for a palette image");
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1516
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1517 uint32_t count = 1 << bits_per_sample;
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1518
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1519 if (tag_ov.is_scalar_type ()
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1520 \|\| tag_ov.array_value ().dim1 () != count
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1521 \|\| tag_ov.array_value ().dim2 () != 3)
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1522 error ("Expected matrix with %u rows and 3 columns", count);
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1523
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1524 NDArray array_data = tag_ov.array_value ();
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1525 array_data *= UINT16_MAX;
b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1526 uint16NDArray u16_array = uint16NDArray (array_data);
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1527 const uint16_t *data_ptr
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1528 = reinterpret_cast<const uint16_t *> (u16_array.data ());
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1529 if (! TIFFSetField (tif, tag_id, data_ptr, data_ptr + count,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1530 data_ptr + 2 * count))
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1531 error ("Failed to set tag");
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1532 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1533 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1534 case TIFFTAG_TRANSFERFUNCTION:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1535 {
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1536 uint16_t samples_per_pixel;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1537 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_SAMPLESPERPIXEL,
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1538 &samples_per_pixel))
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1539 error ("Failed to obtain the number of samples per pixel");
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1540
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1541 uint16_t bits_per_sample;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1542 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1543 &bits_per_sample))
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1544 error ("Failed to obtain the bit depth");
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1545
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1546 uint32_t count = 1 << bits_per_sample;
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1547
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1548 // An intermediate variable is required for storing the return of
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1549 // uint16_array_value so that the object remains in scope and the
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1550 // pointer returned from data () is not a dangling pointer
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1551 uint16NDArray data_arr = tag_ov.uint16_array_value ();
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1552
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1553 if (data_arr.numel () != count)
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1554 error ("Tag data should be and array of %u elements", count);
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1555
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1556 const uint16_t *data_ptr
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1557 = reinterpret_cast<const uint16_t *> (data_arr.data ());
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1558 if (samples_per_pixel == 1)
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1559 {
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1560 if (! TIFFSetField (tif, tag_id, data_ptr))
f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1561 error ("Failed to set field");
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1562 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1563 else
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1564 {
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1565 if (! TIFFSetField (tif, tag_id, data_ptr, data_ptr + count,
f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1566 data_ptr + 2 * count))
f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1567 error ("Failed to set field");
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1568 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1569 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1570 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1571 case TIFFTAG_PAGENUMBER:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1572 case TIFFTAG_HALFTONEHINTS:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1573 case TIFFTAG_DOTRANGE:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1574 case TIFFTAG_YCBCRSUBSAMPLING:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1575 {
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1576 uint16NDArray array_data = tag_ov.uint16_array_value ();
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1577 if (array_data.numel () != 2)
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1578 error ("Tag data should be an array with 2 elements");
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1579
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1580 if (! TIFFSetField (tif, tag_id, array_data (0), array_data (1)))
f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1581 error ("Failed to set field");
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1582 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1583 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1584 case TIFFTAG_SUBIFD:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1585 {
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	1586 // Setting the SubIFD invloves setting their count only
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	1587 // and the library will set the offsets correctly in
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	1588 // the next calls to writeDirectory, but an array of offsets
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	1589 // is still required so an array of zeroes is passed
31175 ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	1590 uint16_t subifd_count = tag_ov.uint16_scalar_value ();
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	1591 std::unique_ptr<uint64_t []> subifd_offsets
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	1592 = std::make_unique<uint64_t []> (subifd_count);
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	1593 uint64_t *offfsets_ptr = subifd_offsets.get ();
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	1594 if (! TIFFSetField (tif, tag_id, subifd_count, offfsets_ptr))
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	1595 error ("Failed to set tag");
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1596 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1597 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1598 case TIFFTAG_EXTRASAMPLES:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1599 {
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1600 uint16_t samples_per_pixel;
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1601 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_SAMPLESPERPIXEL,
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1602 &samples_per_pixel))
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1603 error ("Failed to obtain the number of samples per pixel");
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1604
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1605 uint16NDArray data_array = tag_ov.uint16_array_value ();
31190 a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	1606 // FIXME: this only works for RGB images. Need to handle grayscale,
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	1607 // palette, cmyk and ycbcr
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1608 if (data_array.numel () > samples_per_pixel - 3)
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1609 error ("Failed to set field, too many values");
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1610
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1611 if (! TIFFSetField (tif, tag_id,
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1612 static_cast<uint16_t> (data_array.numel ()),
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1613 data_array.data ()))
31167 f91cd5ceaae6 Tiff setTag: added support for special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31166 diff changeset	1614 error ("Failed to set field");
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1615 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1616 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1617 case TIFFTAG_XMLPACKET:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1618 case TIFFTAG_RICHTIFFIPTC:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1619 case TIFFTAG_PHOTOSHOP:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1620 case TIFFTAG_ICCPROFILE:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1621 {
31186 90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1622 uint8NDArray data_array = tag_ov.uint8_array_value ();
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1623 uint32_t count = data_array.numel ();
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1624 if (! TIFFSetField (tif, tag_id, count, data_array.data ()))
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	1625 error ("Failed to set field");
31165 48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1626 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1627 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1628 // These tags are not mentioned in the LibTIFF documentation
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1629 // but are handled correctly by the library
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1630 case TIFFTAG_ZIPQUALITY:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1631 case TIFFTAG_SGILOGDATAFMT:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1632 case TIFFTAG_GRAYRESPONSEUNIT:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1633 {
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1634 set_scalar_field_data (tif, fip, tag_ov);
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1635 break;
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1636 }
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1637 default:
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1638 set_scalar_field_data (tif, fip, tag_ov);
48d46f7a640b Tiff setTag: handled scalar tags with the correct data type. magedrifaat <magedrifaat@gmail.com> parents: 31164 diff changeset	1639 }
31166 b8b6cc05c8ea Tiff setTag: added support for tags with array values. magedrifaat <magedrifaat@gmail.com> parents: 31165 diff changeset	1640
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1641 }
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1642
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1643 template <typename T>
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1644 void
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1645 write_strip (TIFF *tif, uint32_t strip_no, T strip_data,
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1646 tiff_image_data *image_data)
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1647 {
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1648 uint32_t rows_in_strip;
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1649 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ROWSPERSTRIP, &rows_in_strip))
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1650 error ("Failed to obtain the RowsPerStrip tag");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1651
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1652 // The tag has a default value of UINT32_MAX which means the entire
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1653 // image, but we need to cap it to the height for later calculations
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1654 if (rows_in_strip > image_data->height)
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1655 rows_in_strip = image_data->height;
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	1656
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1657 // LibTIFF uses zero-based indexing as opposed to Octave's 1-based
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1658 strip_no--;
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1659
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1660 uint32_t strip_count = TIFFNumberOfStrips (tif);
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1661 rows_in_strip = get_rows_in_strip (strip_no, strip_count,
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1662 rows_in_strip, image_data);
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1663
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1664 dim_vector strip_dimensions;
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1665 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1666 strip_dimensions = dim_vector (rows_in_strip, image_data->width,
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1667 image_data->samples_per_pixel);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1668 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	1669 strip_dimensions = dim_vector (rows_in_strip, image_data->width, 1);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1670 else
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1671 error ("Planar configuration not supported");
31145 2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1672
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1673 if (strip_data.dim1 () > rows_in_strip)
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1674 warning ("The strip is composed of %u rows but the input has %ld rows.",
31145 2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1675 rows_in_strip,
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1676 strip_data.dim1 ());
31137 233130c0b1f6 Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab magedrifaat <magedrifaat@gmail.com> parents: 31136 diff changeset	1677
31145 2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1678 if (strip_data.dim2 () > image_data->width)
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1679 warning ("The image width is %u but the input has %ld columns.",
31145 2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1680 image_data->width,
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1681 strip_data.dim2 ());
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1682
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1683 if (strip_data.ndims () > 2)
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1684 {
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1685 if (image_data->planar_configuration == PLANARCONFIG_CONTIG
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1686 && strip_data.dim3 () > image_data->samples_per_pixel)
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1687 warning ("The strip is composed of %u channels but the input has %ld channels.",
31145 2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1688 image_data->samples_per_pixel,
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1689 strip_data.dim3 ());
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1690 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1691 && strip_data.dim3 () > 1)
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1692 warning ("The strip is composed of %u channel but the input has %ld channels.",
31145 2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1693 1, strip_data.dim3 ());
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1694 }
2e11f9cb30b8 Tiff writeEncodedStrip: added warning for input data larger than the size of the strip. magedrifaat <magedrifaat@gmail.com> parents: 31144 diff changeset	1695
31137 233130c0b1f6 Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab magedrifaat <magedrifaat@gmail.com> parents: 31136 diff changeset	1696 strip_data.resize (strip_dimensions);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1697
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1698 // Permute the dimesions of the strip to match the expected memory
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1699 // arrangement of LibTIFF (channel x width x height)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1700 Array<octave_idx_type> perm (dim_vector (3, 1));
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1701 perm(0) = 2;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1702 perm(1) = 1;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1703 perm(2) = 0;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1704 strip_data = strip_data.permute (perm);
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1705
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1706 uint8_t *data_u8
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1707 = reinterpret_cast<uint8_t *> (strip_data.fortran_vec ());
31144 8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1708 if (image_data->bits_per_sample == 8
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1709 \|\| image_data->bits_per_sample == 16
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1710 \|\| image_data->bits_per_sample == 32
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1711 \|\| image_data->bits_per_sample == 64)
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1712 {
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1713 // Can't rely on LibTIFF's TIFFStripSize because boundary strips
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1714 // can be smaller in size
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1715 tsize_t strip_size = strip_data.numel ()
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1716 * image_data->bits_per_sample / 8;
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1717 if (TIFFWriteEncodedStrip (tif, strip_no, data_u8, strip_size) == -1)
31144 8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1718 error ("Failed to write strip data to image");
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1719
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1720 }
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1721 else if (image_data->bits_per_sample == 1)
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1722 {
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1723 if (image_data->samples_per_pixel != 1)
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1724 error ("Bi-Level images must have one channel only");
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1725
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1726 // Create a buffer to hold the packed strip data
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1727 // Unique pointers are faster than vectors for constant size buffers
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1728 std::unique_ptr<uint8_t []> strip_ptr
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1729 = std::make_unique<uint8_t []> (TIFFStripSize (tif));
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1730 uint8_t *strip_buf = strip_ptr.get ();
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1731 // According to the format specification, the row should be byte
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1732 // aligned so the number of bytes is rounded up to the nearest byte
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1733 uint32_t padded_width = (image_data->width + 7) / 8;
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1734 // Packing the pixel data into bits
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1735 for (uint32_t row = 0; row < rows_in_strip; row++)
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1736 {
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1737 for (uint32_t col = 0; col < image_data->width; col++)
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1738 {
31183 6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	1739 uint8_t shift = col % 8;
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	1740 if (TIFFIsMSB2LSB (tif))
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	1741 shift = 7 - shift;
31144 8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1742 strip_buf[row * padded_width + col / 8] \|= data_u8[col] << shift;
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1743 }
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1744 data_u8 += image_data->width;
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1745 }
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1746 tsize_t strip_size = padded_width * rows_in_strip;
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1747 if (TIFFWriteEncodedStrip (tif, strip_no, strip_buf, strip_size) == -1)
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1748 error ("Failed to write strip data to image");
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1749 }
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1750 else
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1751 {
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1752 error ("Unsupported bit depth");
8ba9f2326ee9 Tiff writeEncodedStrip: added support for BiLevel images magedrifaat <magedrifaat@gmail.com> parents: 31143 diff changeset	1753 }
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1754 }
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1755
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1756 template <typename T>
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1757 void
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1758 write_tile (TIFF *tif, uint32_t tile_no, T tile_data,
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1759 tiff_image_data *image_data)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1760 {
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1761 uint32_t tile_width, tile_height;
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	1762 get_tile_dimensions_validated (tif, tile_width, tile_height);
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1763
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1764 if (tile_no < 1 \|\| tile_no > TIFFNumberOfTiles (tif))
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1765 error ("Tile number out of bounds");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1766
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1767 if (tile_data.dim1 () > tile_height)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1768 warning ("The tile is composed of %u rows but input has %ld rows",
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1769 tile_height, tile_data.dim1 ());
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1770 if (tile_data.dim2 () > tile_width)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1771 warning ("The tile is composed of %u columns but input has %ld columns",
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1772 tile_width, tile_data.dim2 ());
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1773 if (tile_data.ndims () > 2)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1774 {
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1775 if (image_data->planar_configuration == PLANARCONFIG_CONTIG
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1776 && tile_data.dim3 () > image_data->samples_per_pixel)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1777 warning ("The tile is composed of %u channels but input has %ld channels",
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1778 image_data->samples_per_pixel, tile_data.dim3 ());
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1779 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1780 && tile_data.dim3 () > 1)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1781 warning ("The tile is composed of %u channels but input has %ld channels",
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1782 1, tile_data.dim3 ());
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1783 }
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1784
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1785 dim_vector tile_dimensions;
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1786 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1787 tile_dimensions = dim_vector (tile_height, tile_width,
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1788 image_data->samples_per_pixel);
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1789 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1790 tile_dimensions = dim_vector (tile_height, tile_width, 1);
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1791 else
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1792 error ("Planar configuration not supported");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1793
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1794 tile_data.resize (tile_dimensions);
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1795 Array<octave_idx_type> perm (dim_vector (3, 1));
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1796 perm(0) = 2;
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1797 perm(1) = 1;
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1798 perm(2) = 0;
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1799 tile_data = tile_data.permute (perm);
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1800
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1801 // Octave indexing is 1-based while LibTIFF is zero-based
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1802 tile_no--;
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1803 uint8_t data_u8 = reinterpret_cast<uint8_t > (tile_data.fortran_vec ());
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1804 if (image_data->bits_per_sample == 8
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1805 \|\| image_data->bits_per_sample == 16
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1806 \|\| image_data->bits_per_sample == 32
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1807 \|\| image_data->bits_per_sample == 64)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1808 {
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	1809 if (TIFFWriteEncodedTile (tif, tile_no, data_u8,
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1810 TIFFTileSize (tif)) == -1)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1811 error ("Failed to write tile data to image");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1812
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1813 }
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1814 else if (image_data->bits_per_sample == 1)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1815 {
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1816 if (image_data->samples_per_pixel != 1)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1817 error ("Bi-Level images must have one channel only");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1818
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1819 // Create a buffer to hold the packed tile data
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1820 // Unique pointers are faster than vectors for constant size buffers
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1821 std::unique_ptr<uint8_t []> tile_ptr
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1822 = std::make_unique<uint8_t []> (TIFFTileSize (tif));
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1823 uint8_t *tile_buf = tile_ptr.get ();
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1824 // Packing the pixel data into bits
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1825 for (uint32_t row = 0; row < tile_height; row++)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1826 {
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1827 for (uint32_t col = 0; col < tile_width; col++)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1828 {
31183 6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	1829 uint8_t shift = col % 8;
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	1830 if (TIFFIsMSB2LSB (tif))
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	1831 shift = 7 - shift;
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1832 tile_buf[row * tile_width/8 + col/8] \|= data_u8[col] << shift;
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1833 }
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1834 data_u8 += tile_width;
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1835 }
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1836 if (TIFFWriteEncodedTile (tif, tile_no, tile_buf,
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1837 TIFFTileSize (tif)) == -1)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1838 error ("Failed to write tile data to image");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1839 }
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1840 else
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1841 {
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1842 error ("Unsupported bit depth");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1843 }
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1844 }
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1845
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1846 template <typename T>
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1847 void
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1848 write_strip_or_tile (TIFF *tif, uint32_t strip_tile_no, T strip_data,
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1849 tiff_image_data *image_data)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1850 {
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1851 if (image_data->is_tiled)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1852 write_tile<T> (tif, strip_tile_no, strip_data, image_data);
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1853 else
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1854 write_strip<T> (tif, strip_tile_no, strip_data, image_data);
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1855 }
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1856
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1857 void
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1858 write_unsigned_strip_or_tile (TIFF *tif, uint32_t strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1859 octave_value data_ov,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1860 tiff_image_data *image_data)
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1861 {
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1862 switch (image_data->bits_per_sample)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1863 {
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1864 case 1:
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1865 // We need to check for both scalar and matrix types to handle single
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1866 // element strip
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1867 if (data_ov.is_bool_scalar () \|\| data_ov.is_bool_matrix ())
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1868 write_strip_or_tile<boolNDArray> (tif, strip_tile_no,
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1869 data_ov.bool_array_value (),
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1870 image_data);
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1871 else
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1872 error ("Expected logical matrix for BiLevel image");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1873 break;
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1874 case 8:
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1875 if (data_ov.is_uint8_type ())
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1876 write_strip_or_tile<uint8NDArray> (tif, strip_tile_no,
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1877 data_ov.uint8_array_value (),
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1878 image_data);
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1879 else
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1880 error ("Only uint8 data is allowed for uint images with bit depth of 8");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1881 break;
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1882 case 16:
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1883 if (data_ov.is_uint16_type ())
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1884 write_strip_or_tile<uint16NDArray> (tif, strip_tile_no,
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1885 data_ov.uint16_array_value (),
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1886 image_data);
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1887 else
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1888 error ("Only uint16 data is allowed for uint images with bit depth of 16");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1889 break;
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1890 case 32:
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1891 if (data_ov.is_uint32_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1892 write_strip_or_tile<uint32NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1893 data_ov.uint32_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1894 image_data);
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1895 else
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1896 error ("Only uint32 data is allowed for uint images with bit depth of 32");
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1897 break;
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1898 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1899 if (data_ov.is_uint64_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1900 write_strip_or_tile<uint64NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1901 data_ov.uint64_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1902 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1903 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1904 error ("Only uint64 data is allowed for uint images with bit depth of 64");
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1905 break;
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1906 default:
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1907 error ("Unsupported bit depth");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1908 }
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	1909 }
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1910
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1911 void
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1912 write_signed_strip_or_tile (TIFF *tif, uint32_t strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1913 octave_value data_ov,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1914 tiff_image_data *image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1915 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1916 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1917 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1918 case 8:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1919 if (data_ov.is_int8_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1920 write_strip_or_tile<int8NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1921 data_ov.int8_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1922 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1923 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1924 error ("Only int8 data is allowed for int images with bit depth of 8");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1925 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1926 case 16:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1927 if (data_ov.is_int16_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1928 write_strip_or_tile<int16NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1929 data_ov.int16_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1930 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1931 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1932 error ("Only int16 data is allowed for int images with bit depth of 16");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1933 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1934 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1935 if (data_ov.is_int32_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1936 write_strip_or_tile<int32NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1937 data_ov.int32_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1938 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1939 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1940 error ("Only int32 data is allowed for int images with bit depth of 32");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1941 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1942 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1943 if (data_ov.is_int64_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1944 write_strip_or_tile<int64NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1945 data_ov.int64_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1946 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1947 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1948 error ("Only int64 data is allowed for int images with bit depth of 64");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1949 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1950 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1951 error ("Unsupported bit depth for signed images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1952 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1953 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1954
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1955 void
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1956 write_float_strip_or_tile (TIFF *tif, uint32_t strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1957 octave_value data_ov,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1958 tiff_image_data *image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1959 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1960 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1961 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1962 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1963 if (data_ov.is_single_type () \|\| data_ov.is_double_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1964 write_strip_or_tile<FloatNDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1965 data_ov.float_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1966 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1967 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1968 error ("Only single and double data are allowed for floating-point images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1969 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1970 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1971 if (data_ov.is_single_type () \|\| data_ov.is_double_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1972 write_strip_or_tile<NDArray> (tif, strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1973 data_ov.array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1974 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1975 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1976 error ("Only single and double data are allowed for floating-point images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1977 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1978 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1979 error ("Unsupported bit depth for floating-point images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1980 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1981 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1982
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1983 void
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1984 handle_write_strip_or_tile (TIFF *tif, uint32_t strip_tile_no,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1985 octave_value data_ov,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1986 tiff_image_data *image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1987 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1988
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1989 // SampleFormat tag is not a required field and has a default value of 1
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1990 // So we need to use TIFFGetFieldDefaulted in case it is not present in
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1991 // the file
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1992 uint16_t sample_format;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1993 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format))
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1994 error ("Failed to obtain a value for sample format");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1995
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1996 switch (sample_format)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1997 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1998 case 1:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	1999 case 4:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2000 write_unsigned_strip_or_tile (tif, strip_tile_no, data_ov,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2001 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2002 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2003 case 2:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2004 write_signed_strip_or_tile (tif, strip_tile_no, data_ov, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2005 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2006 case 3:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2007 write_float_strip_or_tile (tif, strip_tile_no, data_ov, image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2008 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2009 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2010 error ("Unsupported sample format");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2011 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2012 }
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	2013
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2014 template <typename T>
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2015 void
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2016 write_stripped_image (TIFF tif, T pixel_data, tiff_image_data image_data)
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2017 {
31164 3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2018 // ASSUMES pixel data dimensions are already validated
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2019
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2020 typedef typename T::element_type P;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2021
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2022 // Permute pixel data to be aligned in memory to the way LibTIFF
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2023 // expects the data to be (i.e. channel x width x height for chunky
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2024 // and width x height x channel for separate planes)
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2025 Array<octave_idx_type> perm (dim_vector (3, 1));
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2026 if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2027 {
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2028 perm(0) = 1;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2029 perm(1) = 0;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2030 perm(2) = 2;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2031 }
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2032 else
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2033 {
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2034 perm(0) = 2;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2035 perm(1) = 1;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2036 perm(2) = 0;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2037 }
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2038 pixel_data = pixel_data.permute (perm);
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2039
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2040 uint32_t row_per_strip;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2041 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ROWSPERSTRIP, &row_per_strip))
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2042 error ("Failed to obtain the RowPerStrip tag");
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2043
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2044 // The default value is INT_MAX so we need to cap it to the image height
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2045 if (row_per_strip > image_data->height)
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2046 row_per_strip = image_data->height;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2047
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2048 uint8_t *pixel_fvec
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2049 = reinterpret_cast<uint8_t *> (pixel_data.fortran_vec ());
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2050 uint32_t strip_count = TIFFNumberOfStrips (tif);
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2051 tsize_t strip_size;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2052 uint32_t rows_in_strip;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2053 for (uint32_t strip = 0; strip < strip_count; strip++)
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2054 {
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2055 rows_in_strip = get_rows_in_strip (strip, strip_count,
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2056 row_per_strip, image_data);
31154 828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2057 if (image_data->bits_per_sample == 8
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2058 \|\| image_data->bits_per_sample == 16
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2059 \|\| image_data->bits_per_sample == 32
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2060 \|\| image_data->bits_per_sample == 64)
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2061 {
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2062 strip_size = rows_in_strip * image_data->width * sizeof (P);
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2063 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2064 strip_size *= image_data->samples_per_pixel;
31186 90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	2065 if (TIFFWriteEncodedStrip (tif, strip, pixel_fvec, strip_size) == -1)
90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	2066 error ("Failed to write strip data");
31154 828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2067 pixel_fvec += strip_size;
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2068 }
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2069 else if (image_data->bits_per_sample == 1)
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2070 {
31156 1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2071 if (image_data->samples_per_pixel != 1)
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2072 error ("Bi-Level images must have one channel only");
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2073
31154 828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2074 // Create a buffer to hold the packed strip data
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2075 // Unique pointers are faster than vectors for constant size buffers
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2076 std::unique_ptr<uint8_t []> strip_ptr
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2077 = std::make_unique<uint8_t []> (TIFFStripSize (tif));
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2078 uint8_t *strip_buf = strip_ptr.get ();
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2079 // According to the format specification, the row should be byte
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2080 // aligned so the number of bytes is rounded up to the nearest byte
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2081 uint32_t padded_width = (image_data->width + 7) / 8;
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2082 // Packing the pixel data into bits
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2083 for (uint32_t row = 0; row < rows_in_strip; row++)
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2084 {
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2085 for (uint32_t col = 0; col < image_data->width; col++)
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2086 {
31183 6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	2087 uint8_t shift = col % 8;
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	2088 if (TIFFIsMSB2LSB (tif))
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	2089 shift = 7 - shift;
31154 828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2090 strip_buf[row * padded_width + col / 8]
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2091 \|= pixel_fvec[col] << shift;
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2092 }
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2093 pixel_fvec += image_data->width;
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2094 }
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2095 strip_size = padded_width * rows_in_strip;
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2096 if (TIFFWriteEncodedStrip (tif, strip, strip_buf, strip_size) == -1)
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2097 error ("Failed to write strip data to image");
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2098 }
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2099 else
828b7cc9aa36 Tiff write: added support for BiLevel stripped images and added unit tests magedrifaat <magedrifaat@gmail.com> parents: 31153 diff changeset	2100 error ("Unsupported bit depth");
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2101 }
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2102 }
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2103
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2104 template <typename T>
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2105 void
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2106 write_tiled_image (TIFF tif, T pixel_data, tiff_image_data image_data)
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2107 {
31164 3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2108 // ASSUMES pixel data dimensions are already validated
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2109
31155 a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2110 uint32_t tile_width, tile_height;
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2111 get_tile_dimensions_validated (tif, tile_width, tile_height);
31155 a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2112
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2113 uint32_t tiles_across = (image_data->width + tile_width - 1)
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2114 / tile_width;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2115 uint32_t tiles_down = (image_data->height + tile_height - 1)
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2116 / tile_height;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2117
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2118 // Resize the image data to add tile padding
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2119 dim_vector padded_dims (tiles_down * tile_height,
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2120 tiles_across * tile_width,
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2121 image_data->samples_per_pixel);
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2122 pixel_data.resize (padded_dims);
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2123
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2124 // Reshape the image to separate tiles into their own dimension
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2125 // so we can permute them to the right order
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2126 dim_vector tiled_dims (tile_height, tiles_down, tile_width, tiles_across,
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2127 image_data->samples_per_pixel);
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2128 pixel_data = pixel_data.reshape (tiled_dims);
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2129
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2130 // Permute the dimesnions to get the memory alignment to match LibTIFF
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2131 Array<octave_idx_type> perm (dim_vector (5, 1));
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2132 if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2133 {
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2134 // For separate planes, the data coming from libtiff will have all
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2135 // tiles of the first sample then all tiles of the second sample
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2136 // and so on. Tiles of each sample will be ordered from left to right
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2137 // and from top to bottom. And data inside each tile is organised as
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2138 // rows and each row contains columns.
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2139 // So the order for LibTIFF is:
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2140 // samples x tiles_down x tiles_across x tile_height x tile_width
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2141 // But memory orientation of Octave arrays is reversed so we set it to
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2142 // tile_width x tile_height x tiles_across x tiles_down x samples
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2143 perm(0) = 2;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2144 perm(1) = 0;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2145 perm(2) = 3;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2146 perm(3) = 1;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2147 perm(4) = 4;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2148 }
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2149 else
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2150 {
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2151 // For chunky planes, the data coming from libtiff will be ordered
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2152 // from left to right and from top to bottom. And data inside each
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2153 // tile is organised as rows and each row contains columns and each
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2154 // column contains samples.
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2155 // So the order for LibTIFF is:
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2156 // tiles_down x tiles_across x tile_height x tile_width x samples
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2157 // But memory orientation of Octave arrays is reversed so we set it to
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2158 // samples x tile_width x tile_height x tiles_across x tiles_down
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2159 perm(0) = 4;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2160 perm(1) = 2;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2161 perm(2) = 0;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2162 perm(3) = 3;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2163 perm(4) = 1;
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2164 }
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2165 pixel_data = pixel_data.permute (perm);
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2166
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2167 uint8_t *pixel_fvec
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2168 = reinterpret_cast<uint8_t *> (pixel_data.fortran_vec ());
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2169 uint32_t tile_count = TIFFNumberOfTiles (tif);
31156 1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2170 tsize_t tile_size = TIFFTileSize (tif);
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2171
31155 a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2172 for (uint32_t tile = 0; tile <tile_count; tile++)
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2173 {
31156 1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2174 if (image_data->bits_per_sample == 8
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2175 \|\| image_data->bits_per_sample == 16
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2176 \|\| image_data->bits_per_sample == 32
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2177 \|\| image_data->bits_per_sample == 64)
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2178 {
31186 90eccc78d958 __tiff__.cc (get_field_data, set_field_data): added support for complex tags. magedrifaat <magedrifaat@gmail.com> parents: 31185 diff changeset	2179 if (TIFFWriteEncodedTile (tif, tile, pixel_fvec, tile_size) == -1)
31156 1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2180 error ("Failed to write tile data");
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2181 pixel_fvec += tile_size;
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2182 }
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2183 else if (image_data->bits_per_sample == 1)
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2184 {
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2185 if (image_data->samples_per_pixel != 1)
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2186 error ("Bi-Level images must have one channel only");
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2187
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2188 // Create a buffer to hold the packed tile data
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2189 // Unique pointers are faster than vectors for
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2190 // constant size buffers
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2191 std::unique_ptr<uint8_t []> tile_ptr
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2192 = std::make_unique<uint8_t []> (tile_size);
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2193 uint8_t *tile_buf = tile_ptr.get ();
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2194 // Packing the pixel data into bits
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2195 for (uint32_t row = 0; row < tile_height; row++)
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2196 {
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2197 for (uint32_t col = 0; col < tile_width; col++)
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2198 {
31183 6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	2199 uint8_t shift = col % 8;
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	2200 if (TIFFIsMSB2LSB (tif))
6ab628dfe2a0 __tif__.cc: added support for BiLevel Images with reversed bit ordering. magedrifaat <magedrifaat@gmail.com> parents: 31182 diff changeset	2201 shift = 7 - shift;
31156 1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2202 tile_buf[row * tile_width / 8 + col / 8]
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2203 \|= pixel_fvec[col] << shift;
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2204 }
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2205 pixel_fvec += tile_width;
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2206 }
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2207 if (TIFFWriteEncodedTile (tif, tile, tile_buf,
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2208 TIFFTileSize (tif)) == -1)
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2209 error ("Failed to write tile data to image");
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2210 }
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2211 else
1e633a093faa Tiff write: added support for logical tile images and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31155 diff changeset	2212 error ("Unsupported bit depth");
31155 a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2213 }
a30b144bc10b Tiff write: added support for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31154 diff changeset	2214
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2215 }
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2216
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2217 template <typename T>
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2218 void
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2219 write_image (TIFF tif, T pixel_data, tiff_image_data image_data)
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2220 {
31168 27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2221 // This dimensions checking is intentially done in this non-homogeneous
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2222 // way for matlab compatibility.
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2223 // In Matlab R2022a, If the width or height of the input matrix is less
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2224 // than needed, the data is silently padded with zeroes to fit.
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2225 // If the width is larger than needed, a warning is issued and the excess
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2226 // data is truncated. If the height is larger than needed, no warning is
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2227 // issued and the image data is wrong. If the number of channels is less
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2228 // or more than needed an error is produced.
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2229 // We chose to deviate from matlab in the larger height case to avoid
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2230 // errors resulting from silently corrupting image data, a warning is
27ed758c1688 Tiff setTag: fixed bug for rational tags and special-case tags. magedrifaat <magedrifaat@gmail.com> parents: 31167 diff changeset	2231 // produced instead.
31164 3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2232 if ((image_data->samples_per_pixel > 1 && pixel_data.ndims () < 3)
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2233 \|\| (pixel_data.ndims () > 2
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2234 && image_data->samples_per_pixel != pixel_data.dim3 ()))
31164 3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2235 error ("Incorrect number of channels, expected %u",
3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2236 image_data->samples_per_pixel);
3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2237
3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2238 if (pixel_data.dim1 () > image_data->height)
3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2239 warning ("Input has more rows than the image length, data will be truncated");
3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2240 if (pixel_data.dim2 () > image_data->width)
3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2241 warning ("Input has more columns than the image width, data will be truncated");
3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2242
3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2243 pixel_data.resize (dim_vector (image_data->height, image_data->width,
3155aa74c62e Tiff write: modified handling incorrect dimensions to match matlab. magedrifaat <magedrifaat@gmail.com> parents: 31163 diff changeset	2244 image_data->samples_per_pixel));
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2245
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2246 if (image_data->is_tiled)
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2247 write_tiled_image<T> (tif, pixel_data, image_data);
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2248 else
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2249 write_stripped_image<T> (tif, pixel_data, image_data);
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2250
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2251 }
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2252
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2253 void
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2254 write_unsigned_image (TIFF *tif, octave_value image_ov,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2255 tiff_image_data *image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2256 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2257 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2258 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2259 case 1:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2260 // We need to check for both scalar and matrix types to handle single
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2261 // pixel image
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2262 if (image_ov.is_bool_scalar () \|\| image_ov.is_bool_matrix ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2263 write_image<boolNDArray> (tif, image_ov.bool_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2264 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2265 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2266 error ("Expected logical matrix for BiLevel image");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2267 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2268 case 8:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2269 if (image_ov.is_uint8_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2270 write_image<uint8NDArray> (tif, image_ov.uint8_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2271 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2272 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2273 error ("Only uint8 data is allowed for uint images with bit depth of 8");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2274 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2275 case 16:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2276 if (image_ov.is_uint16_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2277 write_image<uint16NDArray> (tif, image_ov.uint16_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2278 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2279 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2280 error ("Only uint16 data is allowed for uint images with bit depth of 16");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2281 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2282 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2283 if (image_ov.is_uint32_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2284 write_image<uint32NDArray> (tif, image_ov.uint32_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2285 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2286 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2287 error ("Only uint32 data is allowed for uint images with bit depth of 32");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2288 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2289 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2290 if (image_ov.is_uint64_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2291 write_image<uint64NDArray> (tif, image_ov.uint64_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2292 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2293 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2294 error ("Only uint64 data is allowed for uint images with bit depth of 64");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2295 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2296 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2297 error ("Unsupported bit depth");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2298 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2299 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2300
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2301 void
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2302 write_signed_image (TIFF *tif, octave_value image_ov,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2303 tiff_image_data *image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2304 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2305 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2306 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2307 case 8:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2308 if (image_ov.is_int8_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2309 write_image<int8NDArray> (tif, image_ov.int8_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2310 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2311 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2312 error ("Only int8 data is allowed for int images with bit depth of 8");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2313 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2314 case 16:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2315 if (image_ov.is_int16_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2316 write_image<int16NDArray> (tif, image_ov.int16_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2317 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2318 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2319 error ("Only int16 data is allowed for int images with bit depth of 16");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2320 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2321 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2322 if (image_ov.is_int32_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2323 write_image<int32NDArray> (tif, image_ov.int32_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2324 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2325 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2326 error ("Only int32 data is allowed for int images with bit depth of 32");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2327 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2328 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2329 if (image_ov.is_int64_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2330 write_image<int64NDArray> (tif, image_ov.int64_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2331 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2332 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2333 error ("Only int64 data is allowed for int images with bit depth of 64");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2334 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2335 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2336 error ("Unsupported bit depth for signed images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2337 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2338 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2339
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2340 void
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2341 write_float_image (TIFF *tif, octave_value image_ov,
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2342 tiff_image_data *image_data)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2343 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2344 switch (image_data->bits_per_sample)
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2345 {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2346 case 32:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2347 if (image_ov.is_single_type () \|\| image_ov.is_double_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2348 write_image<FloatNDArray> (tif, image_ov.float_array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2349 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2350 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2351 error ("Only single or double data are allowed for float images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2352 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2353 case 64:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2354 if (image_ov.is_single_type () \|\| image_ov.is_double_type ())
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2355 write_image<NDArray> (tif, image_ov.array_value (),
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2356 image_data);
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2357 else
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2358 error ("Only single or double data are allowed for float images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2359 break;
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2360 default:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2361 error ("Unsupported bit depth for floating-point images");
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2362 }
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2363 }
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2364
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2365 octave_value_list
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2366 slice_rgba (uint8NDArray rgba_data)
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2367 {
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2368 Array<idx_vector> idx (dim_vector (3, 1));
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2369 idx(0) = idx_vector (':');
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2370 idx(1) = idx_vector (':');
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2371 idx(2) = idx_vector (0, 3);
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2372 uint8NDArray rgb = uint8NDArray (rgba_data.index (idx));
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2373 idx(2) = idx_vector (3);
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2374 uint8NDArray alpha = uint8NDArray (rgba_data.index (idx));
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2375
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2376 octave_value_list retval (2);
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2377 retval(0) = octave_value (rgb);
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2378 retval(1) = octave_value (alpha);
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2379 return retval;
ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2380 }
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2381 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2382
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	2383 DEFUN (__open_tiff__, args, ,
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2384 "Open a Tiff file and return its handle")
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2385 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2386 #if defined (HAVE_TIFF)
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2387 int nargin = args.length ();
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2388
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2389 if (nargin == 0 \|\| nargin > 2)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	2390 {
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2391 error ("No filename supplied\n");
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	2392 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2393
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	2394 std::string filename = args(0).string_value ();
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2395 std::string mode = "r";
31094 ab5b33e447b0 Modified getTag to account for different tag data types and multivalued tags, the current implementation is still buggy for most tags and data types magedrifaat <magedrifaat@gmail.com> parents: 31093 diff changeset	2396
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2397 if (nargin == 2)
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	2398 mode = args(1).string_value ();
31123 0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	2399
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2400 const std::vector<std::string> supported_modes {
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2401 "r", "w", "w8", "a", "r+"
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2402 };
31123 0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	2403
31142 97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2404 if (std::find (supported_modes.cbegin (), supported_modes.cend (), mode)
97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2405 == supported_modes.cend ())
31176 c07461ca34d6 Tiff: add support for oppening tiff files in r+ mode magedrifaat <magedrifaat@gmail.com> parents: 31175 diff changeset	2406 error ("Invalid mode for openning Tiff file: %s", mode.c_str ());
c07461ca34d6 Tiff: add support for oppening tiff files in r+ mode magedrifaat <magedrifaat@gmail.com> parents: 31175 diff changeset	2407
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	2408 // LibTIFF doesn't support r+ mode but it appears that the difference
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	2409 // between "a" and "r+" in the context of LibTIFF is that in "a" mode
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	2410 // the directory is not set while in r+ the directory is set to the
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	2411 // first directory in the file
31176 c07461ca34d6 Tiff: add support for oppening tiff files in r+ mode magedrifaat <magedrifaat@gmail.com> parents: 31175 diff changeset	2412 bool is_rplus = false;
c07461ca34d6 Tiff: add support for oppening tiff files in r+ mode magedrifaat <magedrifaat@gmail.com> parents: 31175 diff changeset	2413 if (mode == "r+")
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	2414 {
31176 c07461ca34d6 Tiff: add support for oppening tiff files in r+ mode magedrifaat <magedrifaat@gmail.com> parents: 31175 diff changeset	2415 is_rplus = true;
c07461ca34d6 Tiff: add support for oppening tiff files in r+ mode magedrifaat <magedrifaat@gmail.com> parents: 31175 diff changeset	2416 mode = "a";
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	2417 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2418
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2419 // LibTIFF does Strip chopping by default, which makes the organization of
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2420 // data exposed to the user different from the actual file, so we need to
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2421 // force disable this behavior by adding 'c' flag to the mode
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2422 mode = mode + 'c';
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2423
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2424 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2425
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2426 TIFF *tif = TIFFOpen (filename.c_str (), mode.c_str ());
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2427
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2428 if (! tif)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2429 error ("Failed to open Tiff file\n");
31176 c07461ca34d6 Tiff: add support for oppening tiff files in r+ mode magedrifaat <magedrifaat@gmail.com> parents: 31175 diff changeset	2430
c07461ca34d6 Tiff: add support for oppening tiff files in r+ mode magedrifaat <magedrifaat@gmail.com> parents: 31175 diff changeset	2431 if (is_rplus && ! TIFFSetDirectory (tif, 0))
c07461ca34d6 Tiff: add support for oppening tiff files in r+ mode magedrifaat <magedrifaat@gmail.com> parents: 31175 diff changeset	2432 error ("Failed to open Tiff file\n");
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	2433
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2434 octave_value tiff_ov = octave_value (new octave_tiff_handle (tif));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2435 return octave_value_list (tiff_ov);
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2436 #else
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	2437 octave_unused_parameter (args);
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2438 err_disabled_feature ("Tiff", "Tiff");
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2439 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2440 }
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	2441
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	2442
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	2443 DEFUN (__close_tiff__, args, ,
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2444 "Close a tiff file")
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2445 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2446 #if defined (HAVE_TIFF)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	2447 int nargin = args.length ();
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	2448
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	2449 if (nargin == 0)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	2450 error ("No handle provided\n");
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	2451
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2452 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2453 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2454
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2455 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2456
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2457 tiff_handle->close ();
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	2458
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2459 return octave_value_list ();
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2460 #else
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2461 err_disabled_feature ("close", "Tiff");
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2462 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2463 }
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	2464
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	2465
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	2466 DEFUN (__tiff_get_tag__, args, ,
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2467 "Get the value of a tag from a tiff image")
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2468 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2469 #if defined (HAVE_TIFF)
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2470 int nargin = args.length ();
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2471
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2472 if (nargin == 0)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2473 error ("No handle provided\n");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2474
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2475 if (nargin < 2)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2476 error ("No tag name provided\n");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2477
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2478 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2479 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2480
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2481 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2482
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2483 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2484
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2485 TIFF *tif = tiff_handle->get_file ();
31094 ab5b33e447b0 Modified getTag to account for different tag data types and multivalued tags, the current implementation is still buggy for most tags and data types magedrifaat <magedrifaat@gmail.com> parents: 31093 diff changeset	2486
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2487 const TIFFField *fip;
31129 dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	2488
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	2489 if (args(1).is_string ())
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2490 {
31182 4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	2491 std::string tag_name = args(1).string_value ();
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	2492 fip = get_fip_with_name (tif, tag_name);
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2493 if (! fip)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2494 error ("Tiff tag not found");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2495 }
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2496 else
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2497 {
31182 4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	2498 ttag_t tag_id = args(1).int_value ();
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2499 fip = TIFFFieldWithTag (tif, tag_id);
31129 dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	2500
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2501 if (! fip)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2502 error ("Tiff tag not found");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2503 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2504
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	2505 return octave_value_list (get_field_data (tif, fip));
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2506 #else
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2507 err_disabled_feature ("getTag", "Tiff");
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	2508 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	2509 }
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2510
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2511
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	2512 DEFUN (__tiff_set_tag__, args, ,
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2513 "Set the value of a tag in a tiff image")
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2514 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2515 #if defined (HAVE_TIFF)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2516 int nargin = args.length ();
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2517
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2518 if (nargin < 2)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2519 error ("Too few arguments provided\n");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2520
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2521 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2522 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2523 check_closed (tiff_handle);
31162 28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	2524
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2525 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2526
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2527 TIFF *tif = tiff_handle->get_file ();
31162 28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	2528 check_readonly (tif);
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2529
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	2530 if (args(1).isstruct ())
31140 5f70efad6e2c Tiff setTag: added support for setting multiple tags at once using structs magedrifaat <magedrifaat@gmail.com> parents: 31139 diff changeset	2531 {
31152 2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	2532 octave_scalar_map tags = args(1).xscalar_map_value ("__tiff_set_tag__: struct argument must be a scalar structure");
31142 97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2533 string_vector keys = tags.fieldnames ();
97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2534 // Using iterators instead of this loop method seems to process
97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2535 // the elements of the struct in a different order than they were
97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2536 // assigned which makes the behavior here incompatible with matlab
97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2537 // in case of errors.
97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2538 for (octave_idx_type i = 0; i < keys.numel (); i++)
31140 5f70efad6e2c Tiff setTag: added support for setting multiple tags at once using structs magedrifaat <magedrifaat@gmail.com> parents: 31139 diff changeset	2539 {
31142 97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2540 std::string key = keys[i];
31182 4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	2541 const TIFFField *fip = get_fip_with_name (tif, key);
31142 97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2542 if (! fip)
31140 5f70efad6e2c Tiff setTag: added support for setting multiple tags at once using structs magedrifaat <magedrifaat@gmail.com> parents: 31139 diff changeset	2543 error ("Tag %s not found", key.c_str ());
31142 97e7ee3b27b7 Tiff setTag: modify the behavior with structs to be compatible with matlab magedrifaat <magedrifaat@gmail.com> parents: 31140 diff changeset	2544 set_field_data (tif, fip, tags.contents (key));
31140 5f70efad6e2c Tiff setTag: added support for setting multiple tags at once using structs magedrifaat <magedrifaat@gmail.com> parents: 31139 diff changeset	2545 }
5f70efad6e2c Tiff setTag: added support for setting multiple tags at once using structs magedrifaat <magedrifaat@gmail.com> parents: 31139 diff changeset	2546 }
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2547 else
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2548 {
31140 5f70efad6e2c Tiff setTag: added support for setting multiple tags at once using structs magedrifaat <magedrifaat@gmail.com> parents: 31139 diff changeset	2549 if (nargin < 3)
5f70efad6e2c Tiff setTag: added support for setting multiple tags at once using structs magedrifaat <magedrifaat@gmail.com> parents: 31139 diff changeset	2550 error ("Too few arguments provided");
5f70efad6e2c Tiff setTag: added support for setting multiple tags at once using structs magedrifaat <magedrifaat@gmail.com> parents: 31139 diff changeset	2551
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2552 const TIFFField *fip;
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	2553 if (args(1).is_string ())
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2554 {
31182 4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	2555 std::string tag_name = args(1).string_value ();
4c8b8c400a3b __tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well. magedrifaat <magedrifaat@gmail.com> parents: 31181 diff changeset	2556 fip = get_fip_with_name (tif, tag_name);
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2557 if (! fip)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2558 error ("Tiff tag not found");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2559 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2560 else
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2561 {
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	2562 uint32_t tag_id = args(1).int_value ();
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2563 fip = TIFFFieldWithTag (tif, tag_id);
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2564 if (! fip)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2565 error ("Tiff tag not found");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2566 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2567
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	2568 set_field_data (tif, fip, args(2));
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2569 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2570
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2571 return octave_value_list ();
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2572 #else
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2573 err_disabled_feature ("setTag", "Tiff");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2574 #endif
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2575 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	2576
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	2577 DEFUN (__tiff_read__, args, nargout,
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2578 "Read the image in the current IFD")
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2579 {
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2580 #if defined (HAVE_TIFF)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2581 int nargin = args.length ();
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2582
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2583 if (nargin == 0)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2584 error ("No handle provided\n");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2585
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2586 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2587 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2588 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2589
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2590 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2591
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2592 TIFF *tif = tiff_handle->get_file ();
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2593
31187 2bff8446484c imformats: added logic to use Tiff interface for image functions magedrifaat <magedrifaat@gmail.com> parents: 31186 diff changeset	2594 // FIXME: add support for reading in YCbCr mode
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	2595 octave_unused_parameter (nargout);
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2596
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2597 // Obtain all necessary tags
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	2598 // The main purpose of this struct is to hold all the necessary tags that
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	2599 // will be common among all the different cases of handling the the image
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	2600 // data to avoid repeating the same calls to TIFFGetField in the different
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	2601 // functions as each call is a possible point of failure
31122 1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	2602 tiff_image_data image_data (tif);
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	2603
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	2604 uint16_t sample_format;
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	2605 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format))
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	2606 error ("Failed to obtain a value for sample format");
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	2607
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2608 octave_value_list retval;
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2609 switch (sample_format)
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2610 {
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2611 case 1:
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2612 case 4:
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2613 retval (0) = read_unsigned_image (tif, &image_data);
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	2614 break;
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2615 case 2:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2616 retval (0) = read_signed_image (tif, &image_data);
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	2617 break;
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2618 case 3:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2619 retval (0) = read_float_image (tif, &image_data);
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	2620 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2621 default:
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2622 error ("Unsupported sample format");
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2623 }
31110 2daeeff33980 Tiff read fixed segfault bug for compressed images magedrifaat <magedrifaat@gmail.com> parents: 31109 diff changeset	2624
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2625 return retval;
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2626 #else
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2627 err_disabled_feature ("read", "Tiff");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2628 #endif
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	2629 }
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	2630
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	2631 DEFUN (__tiff_read_encoded_strip__, args, nargout,
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2632 "Read a strip from the image in the current IFD")
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2633 {
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2634 #if defined (HAVE_TIFF)
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2635 int nargin = args.length ();
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2636
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2637 if (nargin != 2)
31170 72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2638 error ("Wrong number of arguments");
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2639
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2640 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2641 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2642 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2643
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2644 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2645
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2646 TIFF *tif = tiff_handle->get_file ();
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2647
31187 2bff8446484c imformats: added logic to use Tiff interface for image functions magedrifaat <magedrifaat@gmail.com> parents: 31186 diff changeset	2648 // FIXME: add support for reading in YCbCr mode
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2649 octave_unused_parameter (nargout);
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2650
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2651 if (TIFFIsTiled (tif))
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2652 error ("The image is tiled not stripped");
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2653
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2654 uint32_t strip_no;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2655 if (args(1).is_scalar_type ())
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2656 strip_no = args(1).uint32_scalar_value ();
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2657 else
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2658 error ("Expected scalar for strip number");
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2659
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2660 if (strip_no < 1 \|\| strip_no > TIFFNumberOfStrips (tif))
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2661 error ("Strip number out of bounds");
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2662
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2663 // Convert from Octave's 1-based indexing to zero-based indexing
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2664 strip_no--;
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2665
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2666 return octave_value_list (handle_read_strip_or_tile (tif, strip_no));
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2667 #else
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2668 err_disabled_feature ("readEncodedStrip", "Tiff");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2669 #endif
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2670 }
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2671
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	2672 DEFUN (__tiff_read_encoded_tile__, args, nargout,
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2673 "Read a tile from the image in the current IFD")
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2674 {
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2675 #if defined (HAVE_TIFF)
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2676 int nargin = args.length ();
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2677
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2678 if (nargin != 2)
31170 72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2679 error ("Wrong number of arguments");
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2680
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2681 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2682 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2683 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2684
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2685 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2686
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2687 TIFF *tif = tiff_handle->get_file ();
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2688
31187 2bff8446484c imformats: added logic to use Tiff interface for image functions magedrifaat <magedrifaat@gmail.com> parents: 31186 diff changeset	2689 // FIXME: add support for reading in YCbCr mode
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2690 octave_unused_parameter (nargout);
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2691
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2692 if (! TIFFIsTiled (tif))
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2693 error ("The image is stripped not tiled");
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2694
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2695 uint32_t tile_no;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2696 if (args(1).is_scalar_type ())
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2697 tile_no = args(1).uint32_scalar_value ();
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2698 else
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2699 error ("Expected scalar for tile number");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2700
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2701 if (tile_no < 1 \|\| tile_no > TIFFNumberOfTiles (tif))
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2702 error ("Tile number out of bounds");
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2703
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2704 // Convert from Octave's 1-based indexing to zero-based indexing
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2705 tile_no--;
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2706
f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	2707 return octave_value_list (handle_read_strip_or_tile (tif, tile_no));
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2708 #else
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	2709 err_disabled_feature ("readEncodedTile", "Tiff");
31157 dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2710 #endif
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2711 }
dc3d2744916d Tiff: added readEncodedStrip method and corresponding unit tests magedrifaat <magedrifaat@gmail.com> parents: 31156 diff changeset	2712
31170 72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2713 DEFUN (__tiff_read_rgba_image__, args, ,
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2714 "Read the image data in rgba mode")
31170 72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2715 {
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2716 #if defined (HAVE_TIFF)
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2717 int nargin = args.length ();
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2718
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2719 if (nargin != 1)
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2720 error ("Wrong number of arguments");
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2721
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2722 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2723 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2724 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2725
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2726 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2727
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2728 TIFF *tif = tiff_handle->get_file ();
31170 72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2729
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2730 tiff_image_data image_data (tif);
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2731
31173 0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2732 uint16_t orientation;
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2733 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ORIENTATION, &orientation))
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2734 orientation = ORIENTATION_LEFTTOP;
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2735
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2736 // Start with reversed dimensions to be aligned with LibTIFF and
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2737 // permute to the correct order later
31170 72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2738 dim_vector img_dims (4, image_data.width, image_data.height);
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2739 uint8NDArray img (img_dims);
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2740 uint32_t img_ptr = reinterpret_cast <uint32_t > (img.fortran_vec ());
31173 0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2741
31179 f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	2742 // The TIFFRGBAImageGet interface is used instead of TIFFReadRGBAImage
f294b800f002 Tiff.m: added tests for signed images and sub-directories. magedrifaat <magedrifaat@gmail.com> parents: 31178 diff changeset	2743 // to have control on the requested orientation of the image
31173 0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2744 TIFFRGBAImage img_config;
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2745 char emsg[1024];
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2746 if (! TIFFRGBAImageOK (tif, emsg)
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2747 \|\| ! TIFFRGBAImageBegin (&img_config, tif, 0, emsg))
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2748 error ("Failed to read image");
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2749
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2750 img_config.orientation = ORIENTATION_TOPLEFT;
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2751 img_config.req_orientation = orientation;
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2752
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2753 bool success = TIFFRGBAImageGet (&img_config, img_ptr, img_config.width,
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2754 img_config.height);
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2755
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2756 TIFFRGBAImageEnd (&img_config);
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2757 if (!success)
31170 72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2758 error ("Failed to read image");
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2759
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2760 // Permute to the correct Octave dimension order
31170 72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2761 Array<octave_idx_type> perm (dim_vector (3, 1));
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2762 perm(0) = 2;
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2763 perm(1) = 1;
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2764 perm(2) = 0;
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2765 img = img.permute (perm);
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2766
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2767 // Slice the data into RGB and alpha
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2768 return slice_rgba (img);
31170 72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2769 #else
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2770 err_disabled_feature ("readRGBAImage", "Tiff");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2771 #endif
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2772 }
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2773
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2774 DEFUN (__tiff_read_rgba_strip__, args, ,
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2775 "Read the strip data containing the given row in rgba mode")
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2776 {
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2777 #if defined (HAVE_TIFF)
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2778 int nargin = args.length ();
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2779
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2780 if (nargin != 2)
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2781 error ("Wrong number of arguments");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2782
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2783 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2784 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2785 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2786
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2787 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2788
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2789 TIFF *tif = tiff_handle->get_file ();
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2790
31173 0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2791 // Matlab (R2022a) requires row to be double
0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2792 if (! args(1).is_double_type ())
31175 ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	2793 error ("row should be of type double");
31173 0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	2794
31175 ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	2795 uint32_t row = args(1).uint32_scalar_value ();
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2796
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2797 tiff_image_data image_data (tif);
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2798 if (image_data.is_tiled)
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2799 error ("The image is tiled not stripped");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2800
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2801 if (row < 1 \|\| row > image_data.height)
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2802 error ("Row out of bounds of the image");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2803
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2804 // Convert from 1-based indexing to zero-based
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2805 row--;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2806
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2807 uint32_t rows_in_strip;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2808 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ROWSPERSTRIP, &rows_in_strip))
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2809 error ("Failed to obtain a value for RowsPerStrip");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2810
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2811 if (rows_in_strip > image_data.height)
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2812 rows_in_strip = image_data.height;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2813
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2814 // LibTIFF requires the row to be the first row in the strip
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2815 // so this removes any offset to reach the first row
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2816 row -= row % rows_in_strip;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2817
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2818 // The exact number of rows in the strip is needed for boundary strips
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2819 uint32_t strip_no = TIFFComputeStrip (tif, row, 0);
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2820 rows_in_strip = get_rows_in_strip (strip_no, TIFFNumberOfStrips (tif),
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2821 rows_in_strip, &image_data);
31174 1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2822
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2823 uint16_t orientation;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2824 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ORIENTATION, &orientation))
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2825 orientation = ORIENTATION_LEFTTOP;
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2826
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2827 // Start with reversed dimensions to be aligned with LibTIFF and
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2828 // permute to the correct order later
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2829 dim_vector strip_dims (4, image_data.width, rows_in_strip);
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2830 uint8NDArray strip_data (strip_dims);
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2831 uint32_t *strip_ptr
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2832 = reinterpret_cast <uint32_t *> (strip_data.fortran_vec ());
31174 1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2833
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2834 TIFFRGBAImage img_config;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2835 char emsg[1024];
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2836 if (! TIFFRGBAImageOK (tif, emsg)
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2837 \|\| ! TIFFRGBAImageBegin (&img_config, tif, 0, emsg))
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2838 error ("Failed to read strip");
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2839
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2840 img_config.orientation = ORIENTATION_TOPLEFT;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2841 img_config.req_orientation = orientation;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2842 img_config.row_offset = row;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2843 img_config.col_offset = 0;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2844
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2845 bool success = TIFFRGBAImageGet (&img_config, strip_ptr, img_config.width,
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2846 rows_in_strip);
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2847
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2848 TIFFRGBAImageEnd (&img_config);
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2849 if (!success)
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2850 error ("Failed to read strip");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2851
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2852 // Permute to the correct order of dimensions for Octave
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2853 Array<octave_idx_type> perm (dim_vector (3, 1));
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2854 perm(0) = 2;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2855 perm(1) = 1;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2856 perm(2) = 0;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2857 strip_data = strip_data.permute (perm);
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2858
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2859 // Slice the data into RGB and alpha
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2860 return slice_rgba (strip_data);
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2861 #else
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2862 err_disabled_feature ("readRGBAStrip", "Tiff");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2863 #endif
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2864 }
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2865
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2866 DEFUN (__tiff_read_rgba_tile__, args, ,
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2867 "Read the stile data containing the given row and column in rgba mode")
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2868 {
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2869 #if defined (HAVE_TIFF)
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2870 int nargin = args.length ();
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2871
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2872 if (nargin != 3)
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2873 error ("Wrong number of arguments");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2874
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2875 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2876 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2877 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2878
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2879 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2880
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2881 TIFF *tif = tiff_handle->get_file ();
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2882
31175 ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	2883 if (! args(1).is_double_type ())
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	2884 error ("row should be of type double");
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	2885 if (! args(2).is_double_type ())
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	2886 error ("col should be of type double");
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	2887
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	2888 uint32_t row = args(1).uint32_scalar_value ();
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	2889 uint32_t col = args(2).uint32_scalar_value ();
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2890
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2891 tiff_image_data image_data (tif);
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2892 if (! image_data.is_tiled)
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2893 error ("The image is stripped not tiled");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2894
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2895 if (row < 1 \|\| row > image_data.height)
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2896 error ("Row out of bounds of the image");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2897 if (col < 1 \|\| col > image_data.width)
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2898 error ("Column out of bounds of the image");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2899
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2900 // Convert from 1-based indexing to zero-based
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2901 row--;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2902 col--;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2903
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2904 uint32_t tile_width, tile_height;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2905 if (! TIFFGetField (tif, TIFFTAG_TILELENGTH, &tile_height))
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2906 error ("Failed to obtain a value for TileLength");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2907 if (! TIFFGetField (tif, TIFFTAG_TILEWIDTH, &tile_width))
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2908 error ("Failed to obtain a value for TileWidth");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2909
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2910 // LibTIFF requires the row and columns to be the top-left corner of the
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2911 // tile, so this removes any offset to reach the top-left row and column
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2912 // of the tile
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2913 row -= row % tile_height;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2914 col -= col % tile_width;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2915
31174 1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2916 uint16_t orientation;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2917 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ORIENTATION, &orientation))
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2918 orientation = ORIENTATION_LEFTTOP;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2919
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2920 // Calculate the correct dimensions for boundary tiles
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2921 uint32_t corrected_height = tile_height;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2922 uint32_t corrected_width = tile_width;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2923 if (row + tile_height > image_data.height)
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2924 corrected_height = image_data.height - row;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2925 if (col + tile_width > image_data.width)
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2926 corrected_width = image_data.width - col;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2927
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2928 // Start with reversed dimensions to be aligned with LibTIFF and
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2929 // permute to the correct order later
31174 1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2930 dim_vector tile_dims (4, corrected_width, corrected_height);
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2931 uint8NDArray tile_data (tile_dims);
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2932 uint32_t *tile_ptr
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2933 = reinterpret_cast <uint32_t *> (tile_data.fortran_vec ());
31174 1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2934
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2935 TIFFRGBAImage img_config;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2936 char emsg[1024];
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2937 if (! TIFFRGBAImageOK (tif, emsg)
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2938 \|\| ! TIFFRGBAImageBegin (&img_config, tif, 0, emsg))
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2939 error ("Failed to read tile");
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2940
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2941 img_config.orientation = ORIENTATION_TOPLEFT;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2942 img_config.req_orientation = orientation;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2943 img_config.row_offset = row;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2944 img_config.col_offset = col;
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2945
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2946 bool success = TIFFRGBAImageGet (&img_config, tile_ptr, corrected_width,
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2947 corrected_height);
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2948
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2949 TIFFRGBAImageEnd (&img_config);
1f19e9a06f2d Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag magedrifaat <magedrifaat@gmail.com> parents: 31173 diff changeset	2950 if (!success)
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2951 error ("Failed to read tile");
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2952
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2953 // Permute to the correct order of dimensions for Octave
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2954 Array<octave_idx_type> perm (dim_vector (3, 1));
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2955 perm(0) = 2;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2956 perm(1) = 1;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2957 perm(2) = 0;
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2958 tile_data = tile_data.permute (perm);
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2959
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2960 // Slice the data into RGB and alpha
31180 ae78937e24d2 __tiff__.cc: refactored repititive code into functions. magedrifaat <magedrifaat@gmail.com> parents: 31179 diff changeset	2961 return slice_rgba (tile_data);
31171 8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2962 #else
8bf3fa6b6977 Tiff: added readRGBAStrip and readRGBATile methods magedrifaat <magedrifaat@gmail.com> parents: 31170 diff changeset	2963 err_disabled_feature ("readRGBATile", "Tiff");
31170 72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2964 #endif
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2965 }
72a159bc5a4c Tiff: added readRGBAImage method to read image using the RGBA interface magedrifaat <magedrifaat@gmail.com> parents: 31168 diff changeset	2966
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	2967 DEFUN (__tiff_write__, args, ,
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2968 "Write the image data to the current IFD")
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2969 {
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2970 #if defined (HAVE_TIFF)
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2971 int nargin = args.length ();
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2972
31187 2bff8446484c imformats: added logic to use Tiff interface for image functions magedrifaat <magedrifaat@gmail.com> parents: 31186 diff changeset	2973 // FIXME: add support for writing in YCbCr mode
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2974 if (nargin < 2)
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2975 error ("Wrong number of arguments\n");
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2976
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2977 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2978 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2979 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2980
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2981 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	2982
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	2983 TIFF *tif = tiff_handle->get_file ();
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2984
31162 28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	2985 check_readonly (tif);
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2986
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2987 // Obtain all necessary tags
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2988 tiff_image_data image_data (tif);
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2989
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2990 uint16_t sample_format;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2991 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format))
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2992 error ("Failed to obtain a value for sample format");
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2993
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2994 switch (sample_format)
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2995 {
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2996 case 1:
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2997 case 4:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	2998 write_unsigned_image (tif, args(1), &image_data);
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	2999 break;
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	3000 case 2:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	3001 write_signed_image (tif, args(1), &image_data);
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3002 break;
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	3003 case 3:
14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	3004 write_float_image (tif, args(1), &image_data);
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3005 break;
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3006 default:
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	3007 error ("Unsupported sample format");
31153 c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3008 }
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3009
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3010 return octave_value_list ();
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3011 #else
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3012 err_disabled_feature ("write", "Tiff");
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3013 #endif
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3014 }
c66d6c7f025e Tiff: implemented write method for stripped images magedrifaat <magedrifaat@gmail.com> parents: 31152 diff changeset	3015
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	3016 DEFUN (__tiff_write_encoded_strip__, args, ,
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3017 "Write an encoded strip to the image")
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3018 {
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3019 #if defined (HAVE_TIFF)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3020 int nargin = args.length ();
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3021
31187 2bff8446484c imformats: added logic to use Tiff interface for image functions magedrifaat <magedrifaat@gmail.com> parents: 31186 diff changeset	3022 // FIXME: add support for writing in YCbCr mode
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3023 if (nargin < 3)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3024 error ("Too few arguments provided\n");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3025
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3026 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3027 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3028 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3029
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3030 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3031
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3032 TIFF *tif = tiff_handle->get_file ();
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3033
31162 28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	3034 check_readonly (tif);
31138 68762676dab1 Tiff writeEncodedStrip: prevent writing to a read-only file magedrifaat <magedrifaat@gmail.com> parents: 31137 diff changeset	3035
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3036 // Obtain all necessary tags
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3037 tiff_image_data image_data (tif);
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3038
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3039 if (image_data.is_tiled)
31143 a68f2dadafee Tiff.m: added all remaining tests for implemented features. magedrifaat <magedrifaat@gmail.com> parents: 31142 diff changeset	3040 error ("Can't write strips to a tiled image");
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3041
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3042 uint32_t strip_no = args(1).uint32_scalar_value ();
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3043 if (strip_no < 1 \|\| strip_no > TIFFNumberOfStrips (tif))
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3044 error ("Strip number out of range");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3045
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	3046 handle_write_strip_or_tile (tif, strip_no, args(2), &image_data);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3047
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3048 return octave_value_list ();
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3049 #else
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3050 err_disabled_feature ("writeEncodedStrip", "Tiff");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3051 #endif
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	3052 }
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3053
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	3054 DEFUN (__tiff_write_encoded_tile__, args, ,
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3055 "Write an encoded tile to the image")
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3056 {
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3057 #if defined (HAVE_TIFF)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3058 int nargin = args.length ();
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3059
31187 2bff8446484c imformats: added logic to use Tiff interface for image functions magedrifaat <magedrifaat@gmail.com> parents: 31186 diff changeset	3060 // FIXME: add support for writing in YCbCr mode
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3061 if (nargin < 3)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3062 error ("Too few arguments provided\n");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3063
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3064 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3065 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3066 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3067
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3068 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3069
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3070 TIFF *tif = tiff_handle->get_file ();
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3071
31162 28817158ca86 Tiff: changed write functions to use fcntl wrappers. magedrifaat <magedrifaat@gmail.com> parents: 31161 diff changeset	3072 check_readonly (tif);
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3073
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3074 // Obtain all necessary tags
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3075 tiff_image_data image_data (tif);
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3076
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3077 if (! image_data.is_tiled)
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3078 error ("Can't write tiles to a stripped image");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3079
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3080 uint32_t tile_no = args(1).uint32_scalar_value ();
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3081 if (tile_no < 1 \|\| tile_no > TIFFNumberOfTiles (tif))
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3082 error ("Tile number out of range");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3083
31158 f2ae7763739a Tiff: added writeEncodedTile method to read tiles from image magedrifaat <magedrifaat@gmail.com> parents: 31157 diff changeset	3084 handle_write_strip_or_tile (tif, tile_no, args(2), &image_data);
31146 50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3085
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3086 return octave_value_list ();
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3087 #else
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3088 err_disabled_feature ("writeEncodedTile", "Tiff");
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3089 #endif
50402b8dfb4a Tiff: added writeEncodedTile function for writing tiled images magedrifaat <magedrifaat@gmail.com> parents: 31145 diff changeset	3090 }
31148 4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3091
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	3092 DEFUN (__tiff_is_tiled__, args, ,
31148 4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3093 "Get whether the image is tiled")
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3094 {
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3095 #if defined (HAVE_TIFF)
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3096 int nargin = args.length ();
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3097
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3098 if (nargin == 0)
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3099 error ("No handle provided\n");
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3100
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3101 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3102 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3103 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3104
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3105 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3106
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3107 TIFF *tif = tiff_handle->get_file ();
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3108
31148 4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3109 bool is_tiled = static_cast<bool> (TIFFIsTiled (tif));
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3110 return octave_value_list (octave_value (is_tiled));
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3111 #else
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3112 err_disabled_feature ("isTiled", "Tiff");
31148 4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3113 #endif
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3114 }
4bc9a1938f9a Tiff: added isTiled method to check if the image is tiled or stripped magedrifaat <magedrifaat@gmail.com> parents: 31147 diff changeset	3115
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	3116 DEFUN (__tiff_number_of_strips__, args, ,
31149 d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3117 "Get the number of strips in the image")
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3118 {
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3119 #if defined (HAVE_TIFF)
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3120 int nargin = args.length ();
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3121
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3122 if (nargin == 0)
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3123 error ("No handle provided\n");
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3124
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3125 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3126 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3127 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3128
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3129 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3130
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3131 TIFF *tif = tiff_handle->get_file ();
31152 2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3132
31149 d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3133 if (TIFFIsTiled (tif))
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3134 error ("The image is tiled not stripped");
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3135
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3136 double strip_count = static_cast<double> (TIFFNumberOfStrips (tif));
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3137 return octave_value_list (octave_value (strip_count));
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3138 #else
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3139 err_disabled_feature ("numberOfStrips", "Tiff");
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3140 #endif
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3141 }
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3142
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	3143 DEFUN (__tiff_number_of_tiles__, args, ,
31151 6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3144 "Get the number of tiles in the image")
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3145 {
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3146 #if defined (HAVE_TIFF)
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3147 int nargin = args.length ();
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3148
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3149 if (nargin == 0)
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3150 error ("No handle provided\n");
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3151
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3152 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3153 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3154 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3155
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3156 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3157
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3158 TIFF *tif = tiff_handle->get_file ();
31152 2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3159
31151 6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3160 if (! TIFFIsTiled (tif))
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3161 error ("The image is stripped not tiled");
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3162
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3163 double tile_count = static_cast<double> (TIFFNumberOfTiles (tif));
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3164 return octave_value_list (octave_value (tile_count));
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3165 #else
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3166 err_disabled_feature ("numberOfTiles", "Tiff");
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3167 #endif
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3168 }
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3169
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	3170 DEFUN (__tiff_compute_strip__, args, ,
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3171 "Get the strip index containing the given row")
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3172 {
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3173 #if defined (HAVE_TIFF)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3174 int nargin = args.length ();
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3175
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3176 if (nargin < 2 \|\| nargin > 3)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3177 error ("Wrong number of arguments\n");
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3178
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3179 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3180 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3181 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3182
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3183 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3184
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3185 TIFF *tif = tiff_handle->get_file ();
31152 2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3186
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3187 if (TIFFIsTiled (tif))
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3188 error ("The image is tiled not stripped");
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3189
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3190 tiff_image_data image_data (tif);
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3191
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3192 uint32_t row = args(1).uint32_scalar_value ();
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3193 if (row > image_data.height)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3194 row = image_data.height;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3195
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3196 // Convert from 1-based to zero-based indexing but avoid underflow
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3197 if (row > 0)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3198 row--;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3199
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3200 uint16_t plane;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3201 if (nargin > 2)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3202 {
31152 2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3203 if (image_data.planar_configuration == PLANARCONFIG_CONTIG)
2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3204 error ("Can't use plane argument for images with chunky PlanarConfiguration");
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3205 plane = args(2).uint16_scalar_value ();
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3206 if (plane > image_data.samples_per_pixel)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3207 plane = image_data.samples_per_pixel;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3208 if (plane > 0)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3209 plane--;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3210 }
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3211 else
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3212 {
31152 2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3213 if (image_data.planar_configuration == PLANARCONFIG_SEPARATE)
2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3214 error ("The plane argument is required for images with separate PlanarConfiguration");
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3215 plane = 0;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3216 }
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3217
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3218 double strip_number = TIFFComputeStrip (tif, row, plane) + 1;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3219 if (strip_number > TIFFNumberOfStrips (tif))
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3220 strip_number = TIFFNumberOfStrips (tif);
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3221 return octave_value_list (octave_value (strip_number));
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3222 #else
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3223 err_disabled_feature ("computeStrip", "Tiff");
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3224 #endif
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3225 }
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3226
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	3227 DEFUN (__tiff_compute_tile__, args, ,
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3228 "Get the tile index containing the given row and column")
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3229 {
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3230 #if defined (HAVE_TIFF)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3231 int nargin = args.length ();
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3232
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3233 if (nargin < 2 \|\| nargin > 3)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3234 error ("Wrong number of arguments\n");
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3235
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3236 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3237 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3238 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3239
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3240 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3241
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3242 TIFF *tif = tiff_handle->get_file ();
31152 2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3243
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3244 if (! TIFFIsTiled (tif))
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3245 error ("The image is stripped not tiled");
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3246
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3247 uint32NDArray coords = args(1).uint32_array_value ();
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3248 if (coords.dim2() < 2)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3249 error ("Coordinates must be in the shape [row, col]");
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3250 uint32_t row = coords(0, 0);
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3251 uint32_t col = coords(0, 1);
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3252
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3253 tiff_image_data image_data (tif);
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3254
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3255 if (col > image_data.width)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3256 col = image_data.width;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3257 if (row > image_data.height)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3258 row = image_data.height;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3259
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3260 // Convert from 1-based to zero-based indexing but avoid underflow
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3261 if (row > 0)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3262 row--;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3263 if (col > 0)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3264 col--;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3265
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3266 uint16_t plane;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3267 if (nargin > 2)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3268 {
31152 2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3269 if (image_data.planar_configuration == PLANARCONFIG_CONTIG)
2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3270 error ("Can't use plane argument for images with chunky PlanarConfiguration");
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3271 plane = args(2).uint16_scalar_value ();
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3272 if (plane > image_data.samples_per_pixel)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3273 plane = image_data.samples_per_pixel;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3274 if (plane > 0)
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3275 plane--;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3276 }
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3277 else
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3278 {
31152 2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3279 if (image_data.planar_configuration == PLANARCONFIG_SEPARATE)
2244617f4da5 Tiff computeStrip: fixed inconsistency in checking plane argument. magedrifaat <magedrifaat@gmail.com> parents: 31151 diff changeset	3280 error ("The plane argument is required for images with separate PlanarConfiguration");
31150 6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3281 plane = 0;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3282 }
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3283
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3284 double tile_number = TIFFComputeTile (tif, col, row, 0, plane) + 1;
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3285 if (tile_number > TIFFNumberOfTiles (tif))
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3286 tile_number = TIFFNumberOfTiles (tif);
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3287 return octave_value_list (octave_value (tile_number));
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3288 #else
6bede2d6f273 Tiff: added computeStrip and computeTile methods magedrifaat <magedrifaat@gmail.com> parents: 31149 diff changeset	3289 err_disabled_feature ("computeTile", "Tiff");
31149 d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3290 #endif
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3291 }
d4dbc69f301e Tiff: implemented numberOfStrips method magedrifaat <magedrifaat@gmail.com> parents: 31148 diff changeset	3292
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3293 DEFUN (__tiff_current_directory__, args, ,
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3294 "Get the index of the current directory")
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3295 {
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3296 #if defined (HAVE_TIFF)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3297 int nargin = args.length ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3298
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3299 if (nargin != 1)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3300 error ("Wrong number of arguments\n");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3301
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3302 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3303 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3304 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3305
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3306 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3307
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3308 TIFF *tif = tiff_handle->get_file ();
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3309
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3310 uint16_t dir = TIFFCurrentDirectory (tif);
31175 ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3311 dir++;
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3312
31175 ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3313 return octave_value_list (octave_value (static_cast<double> (dir)));
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3314 #else
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3315 err_disabled_feature ("currentDirectory", "Tiff");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3316 #endif
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3317 }
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3318
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3319 DEFUN (__tiff_last_directory__, args, ,
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3320 "Get the whether the current directory is the last")
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3321 {
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3322 #if defined (HAVE_TIFF)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3323 int nargin = args.length ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3324
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3325 if (nargin != 1)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3326 error ("Wrong number of arguments\n");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3327
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3328 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3329 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3330 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3331
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3332 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3333
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3334 TIFF *tif = tiff_handle->get_file ();
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3335
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3336 bool is_last = TIFFLastDirectory (tif);
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3337
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3338 return octave_value_list (octave_value (is_last));
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3339 #else
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3340 err_disabled_feature ("lastDirectory", "Tiff");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3341 #endif
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3342 }
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3343
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3344 DEFUN (__tiff_next_directory__, args, ,
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3345 "Set the next IFD as the current IFD")
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3346 {
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3347 #if defined (HAVE_TIFF)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3348 int nargin = args.length ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3349
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3350 if (nargin != 1)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3351 error ("Wrong number of arguments\n");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3352
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3353 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3354 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3355 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3356
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3357 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3358
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3359 TIFF *tif = tiff_handle->get_file ();
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3360
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3361 bool is_last = TIFFLastDirectory (tif);
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3362 if (is_last)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3363 error ("Current directory is the last directory");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3364
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3365 if (! TIFFReadDirectory (tif))
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3366 error ("Failed to read the next directory");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3367
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3368 return octave_value_list ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3369 #else
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3370 err_disabled_feature ("nextDirectory", "Tiff");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3371 #endif
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3372 }
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3373
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3374 DEFUN (__tiff_set_directory__, args, ,
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3375 "Set the current IFD using the given index")
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3376 {
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3377 #if defined (HAVE_TIFF)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3378 int nargin = args.length ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3379
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3380 if (nargin != 2)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3381 error ("Wrong number of arguments\n");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3382
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3383 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3384 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3385 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3386
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3387 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3388
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3389 TIFF *tif = tiff_handle->get_file ();
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3390
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3391 uint16_t dir = args(1).uint16_scalar_value ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3392 if (dir < 1 \|\| dir > TIFFNumberOfDirectories (tif))
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3393 error ("Directory index out of bounds");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3394
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3395 dir--;
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3396
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3397 if (! TIFFSetDirectory(tif, dir))
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3398 error ("Failed to read directory");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3399
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3400 return octave_value_list ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3401 #else
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3402 err_disabled_feature ("setDirectory", "Tiff");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3403 #endif
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3404 }
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3405
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3406 DEFUN (__tiff_write_directory__, args, ,
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3407 "Write the current IFD to file and create a new one")
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3408 {
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3409 #if defined (HAVE_TIFF)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3410 int nargin = args.length ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3411
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3412 if (nargin != 1)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3413 error ("Wrong number of arguments\n");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3414
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3415 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3416 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3417 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3418
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3419 TIFF *tif = tiff_handle->get_file ();
31175 ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3420
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3421 if (! TIFFWriteDirectory(tif))
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3422 error ("Failed to write directory");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3423
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3424 return octave_value_list ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3425 #else
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3426 err_disabled_feature ("writeDirectory", "Tiff");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3427 #endif
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3428 }
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3429
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3430 DEFUN (__tiff_rewrite_directory__, args, ,
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3431 "Rewrite modifications to the current IFD")
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3432 {
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3433 #if defined (HAVE_TIFF)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3434 int nargin = args.length ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3435
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3436 if (nargin != 1)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3437 error ("Wrong number of arguments\n");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3438
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3439 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3440 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3441 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3442
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3443 set_internal_handlers ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3444
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3445 TIFF *tif = tiff_handle->get_file ();
31173 0abc9779f751 Tiff: modified readRGBAImage to use the orientation tag correctly magedrifaat <magedrifaat@gmail.com> parents: 31172 diff changeset	3446
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3447 if (! TIFFRewriteDirectory(tif))
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3448 error ("Failed to rewrite directory");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3449
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3450 return octave_value_list ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3451 #else
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3452 err_disabled_feature ("rewriteDirectory", "Tiff");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3453 #endif
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3454 }
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3455
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3456 DEFUN (__tiff_set_sub_directory__, args, ,
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3457 "Set the given offset directory as the current IFD")
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3458 {
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3459 #if defined (HAVE_TIFF)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3460 int nargin = args.length ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3461
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3462 if (nargin != 2)
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3463 error ("Wrong number of arguments\n");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3464
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3465 octave_tiff_handle *tiff_handle
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3466 = octave_tiff_handle::get_tiff_handle (args(0));
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3467 check_closed (tiff_handle);
c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3468
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3469 set_internal_handlers ();
31190 a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3470
31177 c7c79973007f Tiff: added octave_tiff_handle class to wrap the Tiff file pointer magedrifaat <magedrifaat@gmail.com> parents: 31176 diff changeset	3471 TIFF *tif = tiff_handle->get_file ();
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3472
31175 ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3473 if (! args(1).is_double_type () && ! args(1).is_uint32_type ()
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3474 && ! args(1).is_uint64_type ())
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3475 error ("Expected offset of type double, uint32 or uint64");
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3476
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3477 uint16_t count;
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3478 uint64_t *offsets;
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3479 if (! TIFFGetField (tif, TIFFTAG_SUBIFD, &count, &offsets))
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3480 error ("The current directory doesn't have sub directories");
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3481
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3482 uint64_t offset = args(1).uint64_scalar_value ();
31175 ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3483
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3484 int found = 0;
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3485 for (uint16_t i = 0; i < count; i++)
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3486 if (offset == offsets[i])
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3487 {
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3488 found = 1;
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3489 break;
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3490 }
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3491
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3492 if (! found)
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3493 error ("No Sub directory with the given offset");
ed329571ec88 Tiff: added support for creating and reading sub-directories magedrifaat <magedrifaat@gmail.com> parents: 31174 diff changeset	3494
31172 3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3495 if (! TIFFSetSubDirectory (tif, offset))
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3496 error ("Failed to switch to the sub directory");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3497
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3498 return octave_value_list ();
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3499 #else
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3500 err_disabled_feature ("setSubDirectory", "Tiff");
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3501 #endif
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3502 }
3f5f1404af8a Tiff: added directory methods (currentDirectory, nextDirectory, ...) magedrifaat <magedrifaat@gmail.com> parents: 31171 diff changeset	3503
31160 5f0c3da75926 Tiff: moved internal functions to corefcn. magedrifaat <magedrifaat@gmail.com> parents: 31159 diff changeset	3504 DEFUN (__tiff_version__, , ,
31151 6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3505 "Get the version stamp of LibTIFF")
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3506 {
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3507 #if defined (HAVE_TIFF)
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3508 std::string version = std::string (TIFFGetVersion ());
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3509 return octave_value_list (octave_value (version));
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3510 #else
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3511 err_disabled_feature ("getVersion", "Tiff");
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3512 #endif
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3513 }
6fb54834aa93 Tiff: added numberOfTiles and getVersion methods magedrifaat <magedrifaat@gmail.com> parents: 31150 diff changeset	3514
31161 b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3515 DEFUN (__tiff_set_errors_enabled__, args, ,
b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3516 "Enables or Disables error output from LibTIFF")
b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3517 {
b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3518 #if defined (HAVE_TIFF)
31163 d701c6a4cda1 Tiff: improved handling LibTIFF error output silencing. magedrifaat <magedrifaat@gmail.com> parents: 31162 diff changeset	3519 if (args.length () == 0)
d701c6a4cda1 Tiff: improved handling LibTIFF error output silencing. magedrifaat <magedrifaat@gmail.com> parents: 31162 diff changeset	3520 error ("No state argument provided");
d701c6a4cda1 Tiff: improved handling LibTIFF error output silencing. magedrifaat <magedrifaat@gmail.com> parents: 31162 diff changeset	3521
d701c6a4cda1 Tiff: improved handling LibTIFF error output silencing. magedrifaat <magedrifaat@gmail.com> parents: 31162 diff changeset	3522 if (! args(0).is_bool_scalar ())
d701c6a4cda1 Tiff: improved handling LibTIFF error output silencing. magedrifaat <magedrifaat@gmail.com> parents: 31162 diff changeset	3523 error ("Expected logical value as argument");
d701c6a4cda1 Tiff: improved handling LibTIFF error output silencing. magedrifaat <magedrifaat@gmail.com> parents: 31162 diff changeset	3524
31178 14edd6b09efe Tiff: added support for reading and writing signed images magedrifaat <magedrifaat@gmail.com> parents: 31177 diff changeset	3525 // Set the error and warning handlers according to the bool parameter
31189 6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3526 handlers_set = args(0).bool_value ();
6a9d985e7474 Tiff: fixed bug graphicsmagick error handler colliding with our handler magedrifaat <magedrifaat@gmail.com> parents: 31187 diff changeset	3527 set_internal_handlers ();
31161 b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3528
b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3529 return octave_value_list ();
b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3530 #else
b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3531 err_disabled_feature ("setErrorEnabled", "Tiff");
b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3532 #endif
b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3533 }
b731c8f6db95 Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors magedrifaat <magedrifaat@gmail.com> parents: 31160 diff changeset	3534
31185 a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	3535 DEFUN (__tiff_make_tagid__, , ,
a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	3536 "Create the TagID structure from the internal map")
a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	3537 {
31187 2bff8446484c imformats: added logic to use Tiff interface for image functions magedrifaat <magedrifaat@gmail.com> parents: 31186 diff changeset	3538 #if defined (HAVE_TIFF)
31185 a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	3539 std::map<std::string, octave_value> tag_ov_map;
a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	3540 for (auto it = tag_name_map.cbegin (); it != tag_name_map.cend (); it++)
a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	3541 tag_ov_map[it->first] = octave_value (it->second);
a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	3542 return octave_value_list(octave_scalar_map (tag_ov_map));
31187 2bff8446484c imformats: added logic to use Tiff interface for image functions magedrifaat <magedrifaat@gmail.com> parents: 31186 diff changeset	3543 #else
2bff8446484c imformats: added logic to use Tiff interface for image functions magedrifaat <magedrifaat@gmail.com> parents: 31186 diff changeset	3544 err_disabled_feature ("F__tiff_make_tagid__", "Tiff");
2bff8446484c imformats: added logic to use Tiff interface for image functions magedrifaat <magedrifaat@gmail.com> parents: 31186 diff changeset	3545 #endif
31185 a1145ac2ce9b Tiff: populated TagID from the C++ map to avoid having two copies magedrifaat <magedrifaat@gmail.com> parents: 31184 diff changeset	3546 }
31190 a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3547
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3548 DEFUN (__tiff_imread__, args, nargout,
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3549 "Handler for imread that uses Tiff interface")
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3550 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3551 #if defined (HAVE_TIFF)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3552 int nargin = args.length ();
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3553
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3554 if (nargin == 0 \|\| ! args(0).is_string ())
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3555 error ("No filename provided\n");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3556
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3557 uint16_t offset = 1;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3558
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3559 TIFF *tif = TIFFOpen (args(0).string_value ().c_str (), "r");
31192 6a2bb6f4e41e __tiff__.cc (F__tiff_imread__): fixed bug where file was not closed on errors. magedrifaat <magedrifaat@gmail.com> parents: 31191 diff changeset	3560 if (! tif)
6a2bb6f4e41e __tiff__.cc (F__tiff_imread__): fixed bug where file was not closed on errors. magedrifaat <magedrifaat@gmail.com> parents: 31191 diff changeset	3561 error ("Failed to open file %s", args(0).string_value ().c_str ());
6a2bb6f4e41e __tiff__.cc (F__tiff_imread__): fixed bug where file was not closed on errors. magedrifaat <magedrifaat@gmail.com> parents: 31191 diff changeset	3562
6a2bb6f4e41e __tiff__.cc (F__tiff_imread__): fixed bug where file was not closed on errors. magedrifaat <magedrifaat@gmail.com> parents: 31191 diff changeset	3563 // A simple way to make sure the file will be closed when the function
6a2bb6f4e41e __tiff__.cc (F__tiff_imread__): fixed bug where file was not closed on errors. magedrifaat <magedrifaat@gmail.com> parents: 31191 diff changeset	3564 // returns or when an error occurs as the destructor will always be called
6a2bb6f4e41e __tiff__.cc (F__tiff_imread__): fixed bug where file was not closed on errors. magedrifaat <magedrifaat@gmail.com> parents: 31191 diff changeset	3565 octave_tiff_handle tiff_handle (tif);
6a2bb6f4e41e __tiff__.cc (F__tiff_imread__): fixed bug where file was not closed on errors. magedrifaat <magedrifaat@gmail.com> parents: 31191 diff changeset	3566
31190 a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3567 uint16_t dir_count = TIFFNumberOfDirectories (tif);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3568 uint16_t page = 1;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3569
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3570 // Handle unpaired index parameter
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3571 if (nargin > 1 && ! args(1).is_string ())
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3572 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3573 if (is_numeric_scalar (args(1)))
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3574 page = args(1).uint16_scalar_value ();
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3575 else
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3576 error ("imread: index must be a numeric scalar");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3577 offset++;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3578 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3579
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3580 if ((nargin - offset) % 2 != 0)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3581 error ("imread: PARAM/VALUE arguments must occur in pairs");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3582
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3583 // Handle all index/frames params
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3584 bool found_index = false;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3585 for (uint16_t arg_idx = offset; arg_idx < nargin; arg_idx+=2)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3586 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3587 if (! args(arg_idx).is_string ())
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3588 error ("imread: PARAM in PARAM/VALUE pair must be string");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3589
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3590 const char *param_cstr = args(arg_idx).string_value ().c_str ();
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3591 if (strcasecmp (param_cstr, "index") == 0
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3592 \|\| strcasecmp (param_cstr, "frames") == 0)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3593 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3594 if (found_index)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3595 error ("imread: Index or Frames may only be specified once");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3596
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3597 found_index = true;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3598 octave_value val = args(arg_idx + 1);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3599 if (is_numeric_scalar (val))
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3600 page = val.uint16_scalar_value ();
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3601 else
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3602 error ("imread: %s must be a scalar", param_cstr);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3603 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3604 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3605
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3606 // validate frame numbers
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3607 if (page < 1 \|\| page > dir_count)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3608 error ("imread: index/frames specified are outside the number of images");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3609
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3610 // Convert to zero-based indexing
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3611 page = page - 1;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3612
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3613 // Go to the first page
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3614 if (! TIFFSetDirectory (tif, page))
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3615 error ("imread: failed to read page %d", page);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3616
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3617 // Obtain image info
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3618 tiff_image_data image_data (tif);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3619
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3620 // Set the default region
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3621 uint32NDArray row_region (dim_vector (1, 3));
31192 6a2bb6f4e41e __tiff__.cc (F__tiff_imread__): fixed bug where file was not closed on errors. magedrifaat <magedrifaat@gmail.com> parents: 31191 diff changeset	3622 row_region(0) = 1;
31190 a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3623 row_region(1) = 1;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3624 row_region(2) = image_data.height;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3625 uint32NDArray col_region (dim_vector (1, 3));
31192 6a2bb6f4e41e __tiff__.cc (F__tiff_imread__): fixed bug where file was not closed on errors. magedrifaat <magedrifaat@gmail.com> parents: 31191 diff changeset	3626 col_region(0) = 1;
31190 a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3627 col_region(1) = 1;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3628 col_region(2) = image_data.width;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3629
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3630 // Obtain and validate other params (pixelregion, info)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3631 for (uint16_t arg_idx = offset; arg_idx < nargin; arg_idx+=2)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3632 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3633 if (! args(arg_idx).is_string ())
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3634 error ("imread: PARAM in PARAM/VALUE pair must be string");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3635
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3636 const char *param_cstr = args(arg_idx).string_value ().c_str ();
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3637 if (strcasecmp (param_cstr, "index") == 0
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3638 \|\| strcasecmp (param_cstr, "frames") == 0)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3639 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3640 // Already handled
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3641 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3642 else if (strcasecmp (param_cstr, "pixelregion") == 0)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3643 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3644 octave_value region_ov = args(arg_idx + 1);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3645
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3646 if (! region_ov.iscell () \|\| region_ov.numel () != 2)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3647 error ("imread: %s must be a 2-element cell array", param_cstr);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3648
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3649 Cell region_cell = region_ov.cell_value ();
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3650 row_region = region_cell(0).floor ().uint32_array_value ();
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3651 col_region = region_cell(1).floor ().uint32_array_value ();
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3652
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3653 if (row_region.numel () < 2 \|\| row_region.numel () > 3
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3654 \|\| col_region.numel () < 2 \|\| col_region.numel () > 3)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3655 error ("imread: range for %s must be a 2 or 3 element vector",
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3656 param_cstr);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3657
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3658 if (row_region.numel () == 2)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3659 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3660 row_region(2) = row_region(1);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3661 row_region(1) = 1;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3662 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3663 if (col_region.numel () == 2)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3664 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3665 col_region(2) = col_region(1);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3666 col_region(1) = 1;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3667 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3668
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3669 if (static_cast<uint32_t> (row_region(2)) > image_data.height)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3670 error ("imread: end ROWS for PixelRegions option is larger than image height");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3671 if (static_cast<uint32_t> (col_region(2)) > image_data.width)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3672 error ("imread: end COLS for PixelRegions option is larger than image width");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3673 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3674 else if (strcasecmp (param_cstr, "info") == 0)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3675 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3676 // FIXME: is this useful for our use case?
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3677 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3678 else
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3679 error ("imread: invalid PARAMETER '%s'", param_cstr);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3680 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3681
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3682 // Read image according to params
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3683 // FIXME: this should convert YCbCr images to RGB
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3684 uint16_t sample_format;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3685 TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3686
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3687 octave_value_list retval (3, Matrix ());
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3688 switch (sample_format)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3689 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3690 case 1:
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3691 case 4:
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3692 retval (0) = read_unsigned_image (tif, &image_data);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3693 break;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3694 case 2:
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3695 retval (0) = read_signed_image (tif, &image_data);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3696 break;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3697 case 3:
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3698 retval (0) = read_float_image (tif, &image_data);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3699 break;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3700 default:
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3701 // FIXME: should this fallback to magick instead?
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3702 error ("Unsupported sample format");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3703 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3704
31191 8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3705 // Use octave_value methods to slice the data without knowledge of
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3706 // the underlying data type to avoid code duplication
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3707 // FIXME: this approach is slow when the needed region is much smaller
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3708 // than the image size because the entire image will be read first
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3709 octave_value_list idx (3);
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3710 // Need to use range because normal idx_vector constuctor handles steps
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3711 // in a wrong way (FIXME?)
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3712 idx(0) = idx_vector (range<double> (row_region (0), row_region (1),
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3713 row_region(2)));
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3714 idx(1) = idx_vector (range<double> (col_region (0), col_region (1),
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3715 col_region(2)));
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3716 idx(2) = idx_vector (':');
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3717 retval(0) = retval(0).index_op (idx);
8ada1e68d961 __tiff__.cc (F__tiff_imread__): added support for PixelRegion option. magedrifaat <magedrifaat@gmail.com> parents: 31190 diff changeset	3718
31190 a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3719 if (nargout > 1)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3720 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3721 // Also return the color map if available
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3722 uint16_t photometric;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3723 if (TIFFGetField (tif, TIFFTAG_PHOTOMETRIC, &photometric)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3724 && photometric == PHOTOMETRIC_PALETTE)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3725 {
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3726 const TIFFField *fip
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3727 = TIFFFieldWithTag (tif, TIFFTAG_COLORMAP);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3728 if (fip)
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3729 retval(1) = get_field_data (tif, fip);
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3730 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3731 }
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3732 // FIXME: matlab returns all channels in the first argout
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3733 // and doesnt separate the alpha
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3734 return retval;
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3735 #else
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3736 err_disabled_feature ("imread", "Tiff");
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3737 #endif
a91f2f79e58c Tiff: added internal handler for imread using the Tiff interface magedrifaat <magedrifaat@gmail.com> parents: 31189 diff changeset	3738 }
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	3739 }

Mercurial > octave-libtiff

annotate libinterp/corefcn/__tiff__.cc @ 31192:6a2bb6f4e41e

annotate libinterp/corefcn/tiff.cc @ 31192:6a2bb6f4e41e