octave-libtiff: libinterp/dldfcn/__tiff_

annotate libinterp/dldfcn/tiff.cc @ 31125:3b775b939de4

Tiff read: Added support for floating-point images * __tif__.cc(F__tiff_read__): handled the SampleFormat tag to support reading floating-point images.

author	magedrifaat <magedrifaat@gmail.com>
date	Fri, 22 Jul 2022 05:07:00 +0200
parents	e8d1cc309bc9
children	7851c5b9c950

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
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	8 #include "defun-dld.h"
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
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	15 #if defined (HAVE_TIFF)
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	16 # include <tiffio.h>
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	17 #endif
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	18
31115 5b3465a9c340 Tiff read: support for reading image arranged in planes (RRRGGGBBB) magedrifaat <magedrifaat@gmail.com> parents: 31114 diff changeset	19 // TODO(maged): Fix warnings
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	20
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	21 namespace octve
31099 6fc4bf5e14e1 Cleaned up the interface magedrifaat <magedrifaat@gmail.com> parents: 31098 diff changeset	22 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	23 #if defined (HAVE_TIFF)
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	24
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	25 struct tiff_image_data
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	26 {
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	27 public:
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	28 uint32_t width;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	29 uint32_t height;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	30 uint16_t samples_per_pixel;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	31 uint16_t bits_per_sample;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	32 uint16_t planar_configuration;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	33 uint16_t is_tiled;
31122 1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	34
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	35 tiff_image_data (TIFF *tif)
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	36 {
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	37 if (! TIFFGetField (tif, TIFFTAG_IMAGEWIDTH, &width))
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	38 error ("Failed to read image width");
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	39
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	40 if (! TIFFGetField (tif, TIFFTAG_IMAGELENGTH, &height))
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	41 error ("Failed to read image height");
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	42
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	43 if (! TIFFGetField (tif, TIFFTAG_SAMPLESPERPIXEL, &samples_per_pixel))
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	44 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	45
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	46 if (! TIFFGetField (tif, TIFFTAG_BITSPERSAMPLE, &bits_per_sample))
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	47 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	48
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	49 if (! TIFFGetField (tif, TIFFTAG_PLANARCONFIG, &planar_configuration))
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	50 error ("Failed to read the PlanarConfiguration tag");
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	51
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	52 is_tiled = TIFFIsTiled(tif);
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	53 }
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	54 };
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	55
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	56 // Error if status is not 1 (success status for TIFFGetField)
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	57 void
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	58 validate_tiff_get_field (bool status, void *p_to_free=NULL)
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	59 {
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	60 if (status != 1)
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	61 {
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	62 if (p_to_free != NULL)
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	63 _TIFFfree (p_to_free);
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	64 error ("Failed to read tag");
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	65 }
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	66 }
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	67
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	68 template <typename T>
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	69 octave_value
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	70 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	71 {
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	72 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	73
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	74 // 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	75 // 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	76 // 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	77 // 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	78 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	79 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	80 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	81 && padded_width % 8 != 0)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	82 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	83 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	84 remove_padding = 1;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	85 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	86
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	87 // 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	88 // 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	89 // 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	90 T img;
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	91 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	92 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	93 image_data->height));
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	94 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	95 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	96 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	97 else
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	98 error ("Unsupported Planar Configuration");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	99
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	100 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	101
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	102 // 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	103 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	104
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	105 // 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	106 // 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	107 // 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	108 int64_t strip_size;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	109 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	110 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	111 * 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	112 * sizeof (P);
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	113 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	114 {
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	115 // 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	116 // TODO(maged): Are incorrect sized strips checked internally?
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	117 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	118
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	119 // 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	120 if (strip_size == -1)
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	121 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	122
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	123 // 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	124 // In case of a corrupt image with more data than needed
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	125 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	126 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	127
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	128 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	129 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	130 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	131 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	132
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	133 // 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	134 // 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	135 // 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	136 strip_size *= 8;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	137
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	138 // 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	139 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	140 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	141
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	142 // 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	143 // 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	144 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	145 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	146 // TODO(maged): is it necessary to check FillOrder?
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	147 uint8_t bit_number = 7 - pixel % 8;
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	148 img_fvec[pixel]
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	149 = (((uint8_t *)img_fvec)[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	150 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	151 break;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	152 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	153 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	154 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	155 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	156 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	157
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	158 // 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	159 // 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	160 strip_size *= 2;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	161
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	162 // 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	163 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	164 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	165
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	166 // 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	167 // 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	168 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	169 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	170 uint8_t shift = pixel % 2 == 0? 4: 0;
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	171 img_fvec[pixel]
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	172 = (((uint8_t *)img_fvec)[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	173 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	174 break;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	175 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	176 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	177 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	178 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	179 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	180 error ("Unsupported bit depth");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	181
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	182 // Advance the pointer by the amount of bytes read
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	183 img_fvec = (P)((uint8_t )img_fvec + strip_size);
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	184 written_size += strip_size;
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	185 }
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	186
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	187 // 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	188 // 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	189 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	190 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	191 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	192 perm(0) = 2;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	193 perm(1) = 1;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	194 perm(2) = 0;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	195 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	196 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	197 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	198 perm(0) = 1;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	199 perm(1) = 0;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	200 perm(2) = 2;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	201 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	202
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	203 img = img.permute (perm);
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	204
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	205 if (remove_padding)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	206 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	207
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	208 return octave_value (img);
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	209 }
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	210
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	211 template <typename T>
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	212 octave_value
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	213 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	214 {
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	215 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	216
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	217 // 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	218 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	219 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	220 &tile_width));
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	221 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	222 &tile_height));
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	223 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	224 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	225 / tile_width;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	226 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	227 / tile_height;
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	228
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	229 T img;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	230 // 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	231 // 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	232 // 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	233 // shape expected by Octave
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	234 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	235 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	236 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	237 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	238 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	239 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	240 else
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	241 error ("Unsupported Planar Configuration");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	242
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	243 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	244
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	245 // 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	246 // 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	247 // boundary tiles
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	248 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	249 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	250 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	251
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	252 // 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	253 // 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	254 // 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	255 int64_t tile_size;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	256 uint32_t written_size = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	257 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	258 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	259 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	260
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	261 if (tile_size == -1)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	262 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	263
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	264 // 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	265 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	266 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	267
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	268 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	269 {
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	270 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	271 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	272
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	273 // 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	274 // 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	275 // 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	276 tile_size *= 8;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	277
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	278 // 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	279 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	280 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	281
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	282 // 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	283 // 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	284 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	285 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	286 // TODO(maged): is it necessary to check FillOrder?
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	287 uint8_t bit_number = 7 - pixel % 8;
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	288 img_fvec[pixel]
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	289 = (((uint8_t *)img_fvec)[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	290 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	291 break;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	292 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	293 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	294 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	295 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	296 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	297
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	298 // 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	299 // 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	300 tile_size *= 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	301
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	302 // 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	303 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	304 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	305
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	306 // 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	307 // 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	308 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	309 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	310 uint8_t shift = pixel % 2 == 0? 4: 0;
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	311 img_fvec[pixel]
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	312 = (((uint8_t *)img_fvec)[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	313 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	314 break;
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	315 }
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	316 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	317 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	318 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	319 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	320 error ("Unsupported bit depth");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	321
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	322 img_fvec = (P)((uint8_t )img_fvec + tile_size);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	323 written_size += tile_size;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	324 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	325
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	326 // 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	327 // 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	328 // 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	329 // 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	330 // 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	331 // 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	332 // 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	333 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	334 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	335 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	336 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	337 perm1(0) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	338 perm1(1) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	339 perm1(2) = 3;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	340 perm1(3) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	341 perm1(4) = 4;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	342 img = img.permute (perm1);
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	343
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	344 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	345 tile_width * tiles_across,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	346 tile_height * tiles_down));
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	347
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	348 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	349 \|\| 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	350 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	351 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	352
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	353 perm2(0) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	354 perm2(1) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	355 perm2(2) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	356 img = img.permute (perm2);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	357 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	358 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	359 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	360 perm1(0) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	361 perm1(1) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	362 perm1(2) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	363 perm1(3) = 3;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	364 perm1(4) = 4;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	365 img = img.permute (perm1);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	366
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	367 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	368 tile_height * tiles_down,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	369 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	370
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	371 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	372 \|\| 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	373 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	374 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	375
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	376 perm2(0) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	377 perm2(1) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	378 perm2(2) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	379 img = img.permute (perm2);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	380 }
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	381
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	382 return octave_value (img);
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	383 }
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	384
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	385 template <typename T>
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	386 octave_value
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	387 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	388 {
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	389 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	390 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	391 else
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	392 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	393 }
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	394
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	395 // Convert tag value to double
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	396 octave_value
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	397 interpret_scalar_tag_data (void *data, TIFFDataType tag_datatype)
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	398 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	399 double retval;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	400
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	401 switch (tag_datatype)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	402 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	403 case TIFF_BYTE:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	404 case TIFF_UNDEFINED:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	405 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	406 retval = (double)(((uint8_t )data));
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	407 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	408 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	409 case TIFF_SHORT:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	410 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	411 retval = (double)(((uint16_t )data));
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	412 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	413 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	414 case TIFF_LONG:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	415 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	416 retval = (double)(((uint32_t )data));
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	417 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	418 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	419 case TIFF_LONG8:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	420 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	421 retval = (double)(((uint64_t )data));
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	422 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	423 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	424 case TIFF_RATIONAL:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	425 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	426 error ("TIFF_RATIONAL should have at least 2 elements but got only 1");
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	427 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	428 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	429 case TIFF_SBYTE:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	430 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	431 retval = (double)(((int8_t )data));
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	432 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	433 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	434 case TIFF_SSHORT:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	435 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	436 retval = (double)(((int16_t )data));
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	437 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	438 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	439 case TIFF_SLONG:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	440 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	441 retval = (double)(((int32_t )data));
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	442 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	443 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	444 case TIFF_SLONG8:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	445 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	446 retval = (double)(((int64_t )data));
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	447 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	448 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	449 case TIFF_FLOAT:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	450 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	451 retval = ((float )data);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	452 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	453 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	454 case TIFF_DOUBLE:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	455 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	456 retval = ((double )data);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	457 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	458 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	459 case TIFF_SRATIONAL:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	460 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	461 error ("TIFF_SRATIONAL should have at least 2 elements but got only 1");
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	462 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	463 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	464 case TIFF_IFD:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	465 case TIFF_IFD8:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	466 error ("Unimplemented IFFD data type");
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	467 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	468 default:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	469 error ("Unsupported tag data type");
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	470 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	471
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	472 return octave_value (retval);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	473 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	474
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	475 // Convert memory buffer into a suitable octave value
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	476 // depending on tag_datatype
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	477 octave_value
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	478 interpret_tag_data (void *data, uint32_t count, TIFFDataType tag_datatype)
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	479 {
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	480 octave_value retval;
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	481 // Apparently matlab converts scalar numerical values into double
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	482 // but doesn't do the same for arrays
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	483 if (count == 1 && tag_datatype != TIFF_ASCII)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	484 {
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	485 retval = interpret_scalar_tag_data (data, tag_datatype);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	486 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	487 else
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	488 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	489 dim_vector arr_dims (1, count);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	490
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	491 switch (tag_datatype)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	492 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	493 case TIFF_BYTE:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	494 case TIFF_UNDEFINED:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	495 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	496 uint8NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	497 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	498 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	499 arr(i) = ((uint8_t *)data)[i];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	500 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	501 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	502 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	503 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	504 case TIFF_ASCII:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	505 {
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	506 retval = octave_value ((char *)data);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	507 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	508 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	509 case TIFF_SHORT:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	510 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	511 uint16NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	512 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	513 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	514 arr(i) = ((uint16_t *)data)[i];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	515 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	516 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	517 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	518 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	519 case TIFF_LONG:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	520 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	521 uint32NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	522 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	523 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	524 arr(i) = ((uint32_t *)data)[i];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	525 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	526 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	527 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	528 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	529 case TIFF_LONG8:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	530 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	531 uint64NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	532 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	533 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	534 arr(i) = ((uint64_t *)data)[i];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	535 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	536 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	537 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	538 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	539 case TIFF_RATIONAL:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	540 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	541 NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	542 for (uint32_t i = 0; i < count; i+=2)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	543 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	544 arr(i / 2) = (float)((uint32_t *)data)[i]
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	545 / (float)((uint32_t *)data)[i+1];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	546 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	547 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	548 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	549 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	550 case TIFF_SBYTE:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	551 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	552 int8NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	553 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	554 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	555 arr(i) = ((int8_t *)data)[i];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	556 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	557 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	558 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	559 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	560 case TIFF_SSHORT:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	561 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	562 int16NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	563 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	564 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	565 arr(i) = ((int16_t *)data)[i];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	566 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	567 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	568 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	569 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	570 case TIFF_SLONG:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	571 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	572 int32NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	573 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	574 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	575 arr(i) = ((int32_t *)data)[i];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	576 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	577 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	578 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	579 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	580 case TIFF_SLONG8:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	581 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	582 int64NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	583 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	584 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	585 arr(i) = ((int64_t *)data)[i];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	586 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	587 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	588 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	589 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	590 case TIFF_FLOAT:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	591 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	592 NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	593 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	594 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	595 arr(i) = ((float *)data)[i];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	596 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	597 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	598 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	599 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	600 case TIFF_DOUBLE:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	601 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	602 NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	603 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	604 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	605 arr(i) = ((double *)data)[i];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	606 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	607 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	608 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	609 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	610 case TIFF_SRATIONAL:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	611 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	612 NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	613 for (uint32_t i = 0; i < count; i+=2)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	614 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	615 arr(i / 2) = (float)((int32_t *)data)[i]
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	616 / (float)((int32_t *)data)[i+1];
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	617 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	618 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	619 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	620 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	621 case TIFF_IFD:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	622 case TIFF_IFD8:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	623 // TODO(maged): implement IFD datatype?
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	624 error ("Unimplemented IFFD data type");
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	625 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	626 default:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	627 error ("Unsupported tag data type");
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	628 }
f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	629 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	630
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	631 return retval;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	632 }
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	633
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	634 octave_value
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	635 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	636 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	637 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	638
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	639 // TIFFFieldReadCount returns VARIABLE for some scalar tags
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	640 // (e.g. Compression) But TIFFFieldPassCount seems consistent
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	641 // 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	642 // 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	643 if (TIFFFieldPassCount (fip))
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	644 error ("Unsupported tag");
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	645
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	646 // TODO(maged): test this function vs actual data type size
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	647 int type_size = TIFFDataWidth (TIFFFieldDataType (fip));
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	648 // TODO(maged): use shared pointer instead of malloc
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	649 void *data = _TIFFmalloc (type_size);
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	650 validate_tiff_get_field (TIFFGetField (tif, tag_id, data), data);
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	651 octave_value tag_data_ov = interpret_tag_data (data, 1,
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	652 TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	653 _TIFFfree (data);
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	654
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	655 return tag_data_ov;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	656 }
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	657
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	658 octave_value
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	659 get_array_field_data (TIFF tif, const TIFFField fip, uint32_t array_size)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	660 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	661 void *data;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	662 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	663
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	664 return interpret_tag_data (data, array_size, TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	665 }
31097 75ab26f147a5 getTag: Implemented single array tags, only multi-array and special tags are unimplemented magedrifaat <magedrifaat@gmail.com> parents: 31096 diff changeset	666
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	667 octave_value
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	668 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	669 {
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	670 octave_value tag_data_ov;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	671 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	672
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	673 // TODO(maged): find/create images to test the special tags
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	674 switch (tag_id)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	675 {
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	676 case TIFFTAG_STRIPBYTECOUNTS:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	677 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	678 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	679 TIFFNumberOfStrips (tif));
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	680 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	681 case TIFFTAG_TILEBYTECOUNTS:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	682 case TIFFTAG_TILEOFFSETS:
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	683 tag_data_ov = 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	684 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	685 case TIFFTAG_YCBCRCOEFFICIENTS:
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	686 tag_data_ov = get_array_field_data (tif, fip, 3);
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	687 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	688 case TIFFTAG_REFERENCEBLACKWHITE:
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	689 tag_data_ov = get_array_field_data (tif, fip, 6);
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	690 break;
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	691 case TIFFTAG_GRAYRESPONSECURVE:
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	692 {
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	693 uint16_t bits_per_sample;
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	694 if (! TIFFGetField (tif, TIFFTAG_BITSPERSAMPLE, &bits_per_sample))
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	695 error ("Failed to obtain the bit depth");
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	696
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	697 tag_data_ov = get_array_field_data (tif, fip, 1<<bits_per_sample);
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	698 break;
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	699 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	700 case TIFFTAG_COLORMAP:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	701 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	702 uint16_t bits_per_sample;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	703 if (! TIFFGetField (tif, TIFFTAG_BITSPERSAMPLE, &bits_per_sample))
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	704 error ("Failed to obtain the bit depth");
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	705
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	706 if (bits_per_sample > 24)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	707 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	708
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	709 uint32_t count = 1 << bits_per_sample;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	710 uint16_t red, green, *blue;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	711 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	712 &red, &green, &blue));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	713
31123 0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	714 // TODO(maged): use Array<T>::cat
31121 341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	715 Matrix mat_out (count, 3);
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	716
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	717 Matrix red_array (interpret_tag_data (red,
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	718 count,
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	719 TIFFFieldDataType (fip))
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	720 .uint16_array_value ());
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	721 Matrix green_array (interpret_tag_data (green,
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	722 count,
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	723 TIFFFieldDataType (fip))
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	724 .uint16_array_value ());
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	725 Matrix blue_array (interpret_tag_data (blue,
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	726 count,
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	727 TIFFFieldDataType (fip))
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	728 .uint16_array_value ());
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	729
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	730 double *out_ptr = mat_out.fortran_vec ();
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	731 memcpy (out_ptr, red_array.fortran_vec (), sizeof(double)*count);
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	732 out_ptr += count;
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	733 memcpy (out_ptr, green_array.fortran_vec (), sizeof(double)*count);
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	734 out_ptr += count;
341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	735 memcpy (out_ptr, blue_array.fortran_vec (), sizeof(double)*count);
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	736
31121 341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	737 // 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	738 mat_out /= UINT16_MAX;
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	739
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	740 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	741 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	742 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	743 case TIFFTAG_TRANSFERFUNCTION:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	744 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	745 uint16_t samples_per_pixel;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	746 if (! TIFFGetField (tif, TIFFTAG_SAMPLESPERPIXEL, &samples_per_pixel))
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	747 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	748
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	749 uint16_t bits_per_sample;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	750 if (! TIFFGetField (tif, TIFFTAG_BITSPERSAMPLE, &bits_per_sample))
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	751 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	752
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	753 uint32_t count = 1 << bits_per_sample;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	754 uint16_t ch1, ch2, *ch3;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	755 if (samples_per_pixel == 1)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	756 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	757 validate_tiff_get_field (TIFFGetField (tif, TIFFTAG_COLORMAP, &ch1));
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	758 tag_data_ov = interpret_tag_data (ch1, count,
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	759 TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	760 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	761 else
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	762 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	763 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	764 &ch1, &ch2, &ch3));
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	765
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	766 uint16NDArray mat_out (dim_vector (count, 3));
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	767
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	768 uint16NDArray ch1_array
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	769 = interpret_tag_data (ch1,
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	770 count,
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	771 TIFFFieldDataType (fip)).uint16_array_value ();
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	772 uint16NDArray ch2_array
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	773 = interpret_tag_data (ch2,
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	774 count,
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	775 TIFFFieldDataType (fip)).uint16_array_value ();
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	776 uint16NDArray ch3_array
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	777 = interpret_tag_data (ch3,
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	778 count,
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	779 TIFFFieldDataType (fip)).uint16_array_value ();
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	780
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	781 octave_uint16 *out_ptr = mat_out.fortran_vec ();
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	782 memcpy (out_ptr, ch1_array.fortran_vec (), sizeof(uint16_t) * count);
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	783 out_ptr += count;
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	784 memcpy (out_ptr, ch2_array.fortran_vec (), sizeof(uint16_t) * count);
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	785 out_ptr += count;
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	786 memcpy (out_ptr, ch3_array.fortran_vec (), sizeof(uint16_t) * count);
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	787
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	788 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	789 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	790 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	791 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	792 case TIFFTAG_PAGENUMBER:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	793 case TIFFTAG_HALFTONEHINTS:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	794 case TIFFTAG_DOTRANGE:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	795 case TIFFTAG_YCBCRSUBSAMPLING:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	796 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	797 uint16_t tag_part1, tag_part2;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	798 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	799 &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	800
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	801 Matrix mat_out (1, 2);
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	802 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	803 = 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	804 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	805 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	806 = 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	807 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	808
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	809 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	810 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	811 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	812 case TIFFTAG_SUBIFD:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	813 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	814 uint16_t count;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	815 uint64_t *offsets;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	816 validate_tiff_get_field (TIFFGetField (tif, tag_id, &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	817 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	818 TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	819 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	820 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	821 case TIFFTAG_EXTRASAMPLES:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	822 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	823 uint16_t count;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	824 uint16_t *types;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	825 validate_tiff_get_field (TIFFGetField (tif, tag_id, &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	826 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	827 TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	828 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	829 }
31103 76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	830 // TODO(maged): These tags are more complex to implement
76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	831 // will be implemented and tested later.
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	832 case TIFFTAG_XMLPACKET:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	833 case TIFFTAG_RICHTIFFIPTC:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	834 case TIFFTAG_PHOTOSHOP:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	835 case TIFFTAG_ICCPROFILE:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	836 {
31103 76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	837 error ("Complex Tags not implemented");
76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	838 break;
76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	839 }
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	840 // 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	841 // 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	842 case TIFFTAG_ZIPQUALITY:
76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	843 case TIFFTAG_SGILOGDATAFMT:
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	844 case TIFFTAG_GRAYRESPONSEUNIT:
31103 76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	845 {
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	846 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	847 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	848 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	849 default:
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	850 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	851 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	852
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	853 return tag_data_ov;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	854 }
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	855
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	856 void
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	857 set_field_data (TIFF tif, const TIFFField fip, octave_value tag_ov)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	858 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	859 // TODO(maged): complete the implementation of this function
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	860 uint32_t tag_id = TIFFFieldTag (fip);
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	861 uint32_t tag_data = tag_ov.double_value ();
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	862
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	863 if (! TIFFSetField(tif, tag_id, tag_data))
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	864 error ("Failed to set tag value");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	865 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	866
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	867 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	868
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	869 DEFUN_DLD (__open_tiff__, args, nargout,
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	870 "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	871 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	872 #if defined (HAVE_TIFF)
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	873 int nargin = args.length ();
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	874
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	875 if (nargin == 0 \|\| nargin > 2)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	876 {
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	877 // TODO(maged): return invalid object instead??
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	878 error ("No filename supplied\n");
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	879 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	880
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	881 std::string filename = args (0).string_value ();
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	882 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	883
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	884 // TODO(maged): check valid mode
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	885 if (nargin == 2)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	886 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	887
0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	888 std::vector<std::string> supported_modes {"r", "w", "w8", "a"};
0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	889
0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	890 if (std::find(supported_modes.begin(), supported_modes.end(), mode)
0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	891 == supported_modes.end())
0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	892 if (mode == "r+")
0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	893 error ("Openning files in r+ mode is not yet supported");
0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	894 else
0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	895 error ("Invalid mode for openning Tiff file: %s", mode.c_str ());
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	896
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	897 // TODO(maged): Look into unwind action
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	898 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	899
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	900 if (! tif)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	901 error ("Failed to open Tiff file\n");
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	902
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	903 // TODO(maged): use inheritance of octave_base_value instead
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	904 octave_value tiff_ov = octave_value ((uint64_t)tif);
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	905 return octave_value_list (tiff_ov);
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	906 #else
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	907 err_disabled_feature ("Tiff", "Tiff");
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	908 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	909 }
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	910
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	911
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	912 DEFUN_DLD (__close_tiff__, args, nargout,
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	913 "Close a tiff file")
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	914 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	915 #if defined (HAVE_TIFF)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	916 int nargin = args.length ();
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	917
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	918 if (nargin == 0)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	919 error ("No handle provided\n");
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	920
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	921 TIFF tif = (TIFF )(args (0).uint64_value ());
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	922 TIFFClose (tif);
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	923
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	924 return octave_value_list ();
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	925 #else
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	926 err_disabled_feature ("close", "Tiff");
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	927 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	928 }
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	929
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	930
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	931 DEFUN_DLD (__tiff_get_tag__, args, nargout,
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	932 "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	933 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	934 #if defined (HAVE_TIFF)
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	935 int nargin = args.length ();
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	936
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	937 if (nargin == 0)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	938 error ("No handle provided\n");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	939
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	940 if (nargin < 2)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	941 error ("No tag name provided\n");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	942
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	943 TIFF tif = (TIFF )(args (0).uint64_value ());
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	944
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	945 uint32_t tag_id;
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	946 const TIFFField *fip;
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	947 if (args (1).type_name () == "string")
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	948 {
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	949 std::string tagName = args (1).string_value ();
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	950 fip = TIFFFieldWithName (tif, tagName.c_str ());
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	951 if (! fip)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	952 error ("Tiff tag not found");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	953
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	954 tag_id = TIFFFieldTag (fip);
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	955 }
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	956 else
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	957 {
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	958 tag_id = args (1).int_value ();
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	959 fip = TIFFFieldWithTag (tif, tag_id);
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	960 // TODO(maged): Handle other types of errors (e.g. unsupported tags)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	961 if (! fip)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	962 error ("Tiff tag not found");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	963 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	964
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	965 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	966 #else
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	967 err_disabled_feature ("getTag", "Tiff");
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	968 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	969 }
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	970
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	971
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	972 DEFUN_DLD (__tiff_set_tag__, args, nargout,
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	973 "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	974 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	975 #if defined (HAVE_TIFF)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	976 int nargin = args.length ();
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	977
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	978 if (nargin < 2)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	979 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	980
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	981 TIFF tif = (TIFF )(args (0).uint64_value ());
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	982
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	983 // TODO(maged): does matlab allow calling this function for images
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	984 // opened for reading?
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	985 if (args (1).type_name () == "struct")
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	986 error ("setTag with struct is not yet supported");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	987 else
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	988 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	989 const TIFFField *fip;
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	990 if (args (1).type_name () == "string")
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	991 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	992 std::string tagName = args (1).string_value ();
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	993 fip = TIFFFieldWithName (tif, tagName.c_str ());
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	994 if (! fip)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	995 error ("Tiff tag not found");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	996 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	997 else
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	998 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	999 uint32_t tag_id = args (1).int_value ();
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1000 fip = TIFFFieldWithTag (tif, tag_id);
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1001 if (! fip)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1002 error ("Tiff tag not found");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1003 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1004
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1005 if (nargin < 3)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1006 error ("Too few arguments provided");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1007
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1008 set_field_data (tif, fip, args (2));
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1009 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1010
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1011 return octave_value_list ();
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1012 #else
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1013 err_disabled_feature ("setTag", "Tiff");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1014 #endif
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1015 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1016
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1017 DEFUN_DLD (__tiff_read__, args, nargout,
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1018 "Read the image in the current IFD")
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1019 {
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1020 #if defined (HAVE_TIFF)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1021 int nargin = args.length ();
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1022
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1023 if (nargin == 0)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1024 error ("No handle provided\n");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1025
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1026 TIFF tif = (TIFF )(args (0).uint64_value ());
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1027
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1028 // Check: Strips vs Tiles
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1029 // Planar Configuration
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1030 // SamplesPerPixel and bits_per_smaple
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1031 // nargout and ycbcr
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	1032 // SampleFormat? ExtendedSamples? TransferFunction? GrayResponse? ColorMap?
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1033 // What about floating point images?
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1034
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1035 // Obtain all necessary tags
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	1036 // 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	1037 // 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	1038 // 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	1039 // 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	1040 tiff_image_data image_data (tif);
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1041
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1042 uint16_t sample_format;
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1043 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format))
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1044 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	1045
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1046 if (sample_format == 3)
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1047 {
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1048 if (false && image_data.bits_per_sample != 32 && image_data.bits_per_sample != 64)
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1049 error ("Floating point images are only supported for bit depths of 32 and 64");
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1050 }
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1051 else if (sample_format != 1 && sample_format != 4)
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1052 error ("Unsupported sample format");
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1053
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1054 octave_value_list retval;
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	1055 switch (image_data.bits_per_sample)
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1056 {
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1057 case 1:
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1058 retval(0) = read_image<boolNDArray> (tif, &image_data);
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1059 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1060 case 4:
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1061 case 8:
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1062 retval(0) = read_image<uint8NDArray> (tif, &image_data);
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1063 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1064 case 16:
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1065 retval(0) = read_image<uint16NDArray> (tif, &image_data);
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1066 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1067 case 32:
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1068 // TODO(maged): do we need to check for Min and MaxSampleValue
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1069 if (sample_format == 3)
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1070 retval(0) = read_image<FloatNDArray> (tif, &image_data);
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1071 else
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1072 retval(0) = read_image<uint32NDArray> (tif, &image_data);
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1073 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1074 case 64:
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1075 if (sample_format == 3)
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1076 retval(0) = read_image<NDArray> (tif, &image_data);
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1077 else
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1078 retval(0) = read_image<uint64NDArray> (tif, &image_data);
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1079 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1080 default:
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1081 error ("Unsupported bit depth");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1082 }
31110 2daeeff33980 Tiff read fixed segfault bug for compressed images magedrifaat <magedrifaat@gmail.com> parents: 31109 diff changeset	1083
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1084 return retval;
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1085 #else
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1086 err_disabled_feature ("read", "Tiff");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1087 #endif
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1088 }
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	1089 }

Mercurial > octave-libtiff

annotate libinterp/dldfcn/__tiff__.cc @ 31125:3b775b939de4

annotate libinterp/dldfcn/tiff.cc @ 31125:3b775b939de4