octave-libtiff: libinterp/dldfcn/__tiff_

annotate libinterp/dldfcn/tiff.cc @ 31138:68762676dab1

Tiff writeEncodedStrip: prevent writing to a read-only file * __tiff__.cc(F__tiff_write_encoded_strip__): add a check to disallow calling the function on a file opened in read-only mode. * Tiff.m: added a test for this new failure case.

author	magedrifaat <magedrifaat@gmail.com>
date	Wed, 27 Jul 2022 00:54:48 +0200
parents	233130c0b1f6
children	3431a15b2c75

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
31138 68762676dab1 Tiff writeEncodedStrip: prevent writing to a read-only file magedrifaat <magedrifaat@gmail.com> parents: 31137 diff changeset	8 // Workaround to not have to include fcntl which doesn't exist on windows
68762676dab1 Tiff writeEncodedStrip: prevent writing to a read-only file magedrifaat <magedrifaat@gmail.com> parents: 31137 diff changeset	9 #ifndef O_RDONLY
68762676dab1 Tiff writeEncodedStrip: prevent writing to a read-only file magedrifaat <magedrifaat@gmail.com> parents: 31137 diff changeset	10 #define O_RDONLY 0
68762676dab1 Tiff writeEncodedStrip: prevent writing to a read-only file magedrifaat <magedrifaat@gmail.com> parents: 31137 diff changeset	11 #endif
68762676dab1 Tiff writeEncodedStrip: prevent writing to a read-only file magedrifaat <magedrifaat@gmail.com> parents: 31137 diff changeset	12
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	13 #include "defun-dld.h"
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	14 #include "ov.h"
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	15 #include "ovl.h"
31093 e2bed4daae82 Fix typo in module-files magedrifaat <magedrifaat@gmail.com> parents: 31092 diff changeset	16 #include "error.h"
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	17
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	18 #include "errwarn.h"
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	19
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	20 #if defined (HAVE_TIFF)
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	21 # include <tiffio.h>
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	22 #endif
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	23
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	24 namespace octve
31099 6fc4bf5e14e1 Cleaned up the interface magedrifaat <magedrifaat@gmail.com> parents: 31098 diff changeset	25 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	26 #if defined (HAVE_TIFF)
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	27
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	28 struct tiff_image_data
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	29 {
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	30 public:
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	31 uint32_t width;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	32 uint32_t height;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	33 uint16_t samples_per_pixel;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	34 uint16_t bits_per_sample;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	35 uint16_t planar_configuration;
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	36 uint16_t is_tiled;
31122 1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	37
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	38 tiff_image_data (TIFF *tif)
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_IMAGEWIDTH, &width))
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	41 error ("Failed to read image width");
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_IMAGELENGTH, &height))
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	44 error ("Failed to read image height");
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	45
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	46 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_SAMPLESPERPIXEL,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	47 &samples_per_pixel))
31122 1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	48 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	49
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	50 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	51 &bits_per_sample))
31122 1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	52 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	53
31131 7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	54 if (! TIFFGetField (tif, TIFFTAG_PLANARCONFIG,
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	55 &planar_configuration))
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	56 // LibTIFF has a bug where it incorrectly returns 0 as a default
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	57 // value for PlanarConfiguration although the default value is 1
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	58 planar_configuration = 1;
31122 1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	59
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	60 is_tiled = TIFFIsTiled(tif);
1662939a7a49 Tiff read: moved image_date initialization into a constructor magedrifaat <magedrifaat@gmail.com> parents: 31121 diff changeset	61 }
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	62 };
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	63
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	64 // 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	65 void
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	66 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	67 {
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	68 if (status != 1)
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	69 {
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	70 if (p_to_free != NULL)
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	71 _TIFFfree (p_to_free);
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	72 error ("Failed to read tag");
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	73 }
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	74 }
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	75
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	76 template <typename T>
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	77 octave_value
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	78 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	79 {
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	80 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	81
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	82 // 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	83 // 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	84 // 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	85 // 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	86 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	87 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	88 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	89 && padded_width % 8 != 0)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	90 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	91 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	92 remove_padding = 1;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	93 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	94
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	95 // 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	96 // 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	97 // 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	98 T img;
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	99 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	100 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	101 image_data->height));
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	102 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	103 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	104 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	105 else
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	106 error ("Unsupported Planar Configuration");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	107
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	108 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	109
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	110 // 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	111 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	112
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	113 // 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	114 // 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	115 // 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	116 int64_t strip_size;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	117 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	118 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	119 * 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	120 * sizeof (P);
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	121 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	122 {
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	123 // 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	124 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	125
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	126 // 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	127 if (strip_size == -1)
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	128 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	129
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	130 // 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	131 // In case of a corrupt image with more data than needed
31129 dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	132 // This is probably redundant as LibTIFF checks sizes internally
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	133 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	134 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	135
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	136 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	137 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	138 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	139 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	140
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	141 // 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	142 // 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	143 // 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	144 strip_size *= 8;
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 // 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	147 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	148 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	149
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	150 // 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	151 // 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	152 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	153 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	154 // 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	155 uint8_t bit_number = 7 - pixel % 8;
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	156 uint8_t * img_u8 = reinterpret_cast<uint8_t *> (img_fvec);
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	157 img_fvec[pixel] = (img_u8[pixel / 8] >> bit_number) & 0x01;
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	158 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	159 break;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	160 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	161 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	162 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	163 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	164 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	165
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	166 // 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	167 // 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	168 strip_size *= 2;
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 // 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	171 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	172 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	173
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	174 // 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	175 // 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	176 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	177 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	178 uint8_t shift = pixel % 2 == 0? 4: 0;
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	179 uint8_t * img_u8 = reinterpret_cast<uint8_t *> (img_fvec);
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	180 img_fvec[pixel] = (img_u8[pixel / 2] >> shift) & 0x0F;
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	181 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	182 break;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	183 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	184 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	185 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	186 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	187 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	188 error ("Unsupported bit depth");
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	189
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	190 // Advance the pointer by the amount of bytes read
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	191 img_fvec
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	192 = reinterpret_cast<P > (reinterpret_cast <uint8_t > (img_fvec)
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	193 + strip_size);
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	194 written_size += strip_size;
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	195 }
31119 dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	196
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	197 // 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	198 // 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	199 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	200 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	201 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	202 perm(0) = 2;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	203 perm(1) = 1;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	204 perm(2) = 0;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	205 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	206 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	207 {
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	208 perm(0) = 1;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	209 perm(1) = 0;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	210 perm(2) = 2;
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	211 }
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	212
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	213 img = img.permute (perm);
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	214
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	215 if (remove_padding)
dbca50246dfc Tiff read: changed logic to matrix operations instead of pointer math magedrifaat <magedrifaat@gmail.com> parents: 31118 diff changeset	216 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	217
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	218 return octave_value (img);
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	219 }
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	220
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	221 template <typename T>
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	222 octave_value
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	223 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	224 {
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	225 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	226
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	227 // 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	228 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	229 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	230 &tile_width));
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	231 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	232 &tile_height));
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	233 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	234 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	235 / tile_width;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	236 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	237 / tile_height;
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	238
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	239 T img;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	240 // 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	241 // 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	242 // 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	243 // shape expected by Octave
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	244 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	245 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	246 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	247 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	248 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	249 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	250 else
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	251 error ("Unsupported Planar Configuration");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	252
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	253 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	254
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	255 // 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	256 // 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	257 // boundary tiles
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	258 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	259 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	260 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	261
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	262 // 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	263 // 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	264 // 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	265 int64_t tile_size;
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	266 uint64_t written_size = 0;
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	267 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	268 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	269 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	270
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	271 if (tile_size == -1)
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	272 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	273
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	274 // 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	275 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	276 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	277
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	278 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	279 {
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	280 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	281 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	282
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	283 // 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	284 // 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	285 // 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	286 tile_size *= 8;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	287
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	288 // 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	289 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	290 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	291
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	292 // 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	293 // 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	294 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	295 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	296 // 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	297 uint8_t bit_number = 7 - pixel % 8;
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	298 uint8_t * img_u8 = reinterpret_cast<uint8_t *> (img_fvec);
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	299 img_fvec[pixel]= (img_u8[pixel / 8] >> bit_number) & 0x01;
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	300 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	301 break;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	302 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	303 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	304 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	305 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	306 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	307
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	308 // 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	309 // 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	310 tile_size *= 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	311
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	312 // 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	313 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	314 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	315
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	316 // 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	317 // 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	318 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	319 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	320 uint8_t shift = pixel % 2 == 0? 4: 0;
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	321 uint8_t * img_u8 = reinterpret_cast<uint8_t *> (img_fvec);
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	322 img_fvec[pixel] = (img_u8[pixel / 2] >> shift) & 0x0F;
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	323 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	324 break;
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	325 }
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	326 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	327 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	328 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	329 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	330 error ("Unsupported bit depth");
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	331
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	332 img_fvec
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	333 = reinterpret_cast<P > (reinterpret_cast<uint8_t > (img_fvec)
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	334 + tile_size);
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	335 written_size += tile_size;
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
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	338 // 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	339 // 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	340 // 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	341 // 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	342 // 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	343 // 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	344 // 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	345 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	346 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	347 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	348 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	349 perm1(0) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	350 perm1(1) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	351 perm1(2) = 3;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	352 perm1(3) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	353 perm1(4) = 4;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	354 img = img.permute (perm1);
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	355
31120 46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	356 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	357 tile_width * tiles_across,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	358 tile_height * tiles_down));
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 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	361 \|\| 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	362 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	363 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	364
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	365 perm2(0) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	366 perm2(1) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	367 perm2(2) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	368 img = img.permute (perm2);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	369 }
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	370 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	371 {
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	372 perm1(0) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	373 perm1(1) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	374 perm1(2) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	375 perm1(3) = 3;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	376 perm1(4) = 4;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	377 img = img.permute (perm1);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	378
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	379 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	380 tile_height * tiles_down,
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	381 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	382
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	383 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	384 \|\| 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	385 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	386 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	387
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	388 perm2(0) = 1;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	389 perm2(1) = 0;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	390 perm2(2) = 2;
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	391 img = img.permute (perm2);
46bb98cec195 Tiff read: implemented all cases for tiled images using matrix operations magedrifaat <magedrifaat@gmail.com> parents: 31119 diff changeset	392 }
31118 f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	393
f8be3654caef Tiff read: Support for tiled images with normal planar configuration magedrifaat <magedrifaat@gmail.com> parents: 31117 diff changeset	394 return octave_value (img);
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	395 }
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	396
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	397 template <typename T>
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	398 octave_value
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	399 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	400 {
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	401 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	402 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	403 else
a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	404 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	405 }
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	406
e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	407 // Convert tag value to double
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	408 octave_value
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	409 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	410 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	411 double retval;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	412
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	413 switch (tag_datatype)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	414 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	415 case TIFF_BYTE:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	416 case TIFF_UNDEFINED:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	417 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	418 retval = static_cast<double> ((reinterpret_cast<uint8_t > (data)));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	419 break;
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 case TIFF_SHORT:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	422 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	423 retval = static_cast<double> ((reinterpret_cast<uint16_t > (data)));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	424 break;
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 case TIFF_LONG:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	427 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	428 retval = static_cast<double> ((reinterpret_cast<uint32_t > (data)));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	429 break;
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 case TIFF_LONG8:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	432 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	433 retval = static_cast<double> ((reinterpret_cast<uint64_t > (data)));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	434 break;
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 case TIFF_RATIONAL:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	437 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	438 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	439 break;
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 case TIFF_SBYTE:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	442 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	443 retval = static_cast<double> ((reinterpret_cast<int8_t > (data)));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	444 break;
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 case TIFF_SSHORT:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	447 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	448 retval = static_cast<double> ((reinterpret_cast<int16_t > (data)));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	449 break;
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 case TIFF_SLONG:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	452 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	453 retval = static_cast<double> ((reinterpret_cast<int32_t > (data)));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	454 break;
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 case TIFF_SLONG8:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	457 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	458 retval = static_cast<double> ((reinterpret_cast<int64_t > (data)));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	459 break;
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 case TIFF_FLOAT:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	462 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	463 retval = (reinterpret_cast<float > (data));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	464 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	465 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	466 case TIFF_DOUBLE:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	467 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	468 retval = (reinterpret_cast<double > (data));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	469 break;
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 case TIFF_SRATIONAL:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	472 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	473 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	474 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	475 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	476 case TIFF_IFD:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	477 case TIFF_IFD8:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	478 error ("Unimplemented IFFD data type");
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	479 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	480 default:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	481 error ("Unsupported tag data type");
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	482 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	483
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	484 return octave_value (retval);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	485 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	486
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	487 // 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	488 // depending on tag_datatype
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	489 octave_value
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	490 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	491 {
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	492 octave_value retval;
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	493 // Apparently matlab converts scalar numerical values into double
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	494 // but doesn't do the same for arrays
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	495 if (count == 1 && tag_datatype != TIFF_ASCII)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	496 {
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	497 retval = interpret_scalar_tag_data (data, tag_datatype);
31105 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 else
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	500 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	501 dim_vector arr_dims (1, count);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	502
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	503 switch (tag_datatype)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	504 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	505 case TIFF_BYTE:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	506 case TIFF_UNDEFINED:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	507 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	508 uint8NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	509 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	510 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	511 arr(i) = (reinterpret_cast<uint8_t *> (data))[i];
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	512 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	513 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	514 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	515 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	516 case TIFF_ASCII:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	517 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	518 retval = octave_value ((reinterpret_cast<char *> (data)));
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	519 break;
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 case TIFF_SHORT:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	522 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	523 uint16NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	524 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	525 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	526 arr(i) = (reinterpret_cast<uint16_t *> (data))[i];
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	527 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	528 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	529 break;
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 case TIFF_LONG:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	532 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	533 uint32NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	534 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	535 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	536 arr(i) = (reinterpret_cast<uint32_t *> (data))[i];
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	537 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	538 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	539 break;
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 case TIFF_LONG8:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	542 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	543 uint64NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	544 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	545 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	546 arr(i) = (reinterpret_cast<uint64_t *> (data))[i];
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	547 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	548 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	549 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	550 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	551 case TIFF_RATIONAL:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	552 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	553 NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	554 for (uint32_t i = 0; i < count; i+=2)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	555 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	556 arr(i / 2) = static_cast<float> ((reinterpret_cast<uint32_t *> (data))[i])
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	557 / static_cast<float> ((reinterpret_cast<uint32_t *> (data))[i+1]);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	558 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	559 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	560 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	561 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	562 case TIFF_SBYTE:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	563 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	564 int8NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	565 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	566 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	567 arr(i) = (reinterpret_cast<int8_t *> (data))[i];
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	568 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	569 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	570 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	571 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	572 case TIFF_SSHORT:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	573 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	574 int16NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	575 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	576 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	577 arr(i) = (reinterpret_cast<int16_t *> (data))[i];
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	578 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	579 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	580 break;
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 case TIFF_SLONG:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	583 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	584 int32NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	585 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	586 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	587 arr(i) = (reinterpret_cast<int32_t *> (data))[i];
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	588 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	589 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	590 break;
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 case TIFF_SLONG8:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	593 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	594 int64NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	595 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	596 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	597 arr(i) = (reinterpret_cast<int64_t *> (data))[i];
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	598 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	599 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	600 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	601 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	602 case TIFF_FLOAT:
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	603 {
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	604 NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	605 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	606 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	607 arr(i) = (reinterpret_cast<float *> (data))[i];
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	608 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	609 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	610 break;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	611 }
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	612 case TIFF_DOUBLE:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	613 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	614 NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	615 for (uint32_t i = 0; i < count; i++)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	616 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	617 arr(i) = (reinterpret_cast<double *> (data))[i];
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	618 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	619 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	620 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	621 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	622 case TIFF_SRATIONAL:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	623 {
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	624 NDArray arr (arr_dims);
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	625 for (uint32_t i = 0; i < count; i+=2)
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	626 {
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	627 arr(i / 2) = static_cast<float> ((reinterpret_cast<int32_t *> (data))[i])
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	628 / static_cast<float> ((reinterpret_cast<int32_t *> (data))[i+1]);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	629 }
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	630 retval = octave_value (arr);
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	631 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	632 }
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	633 case TIFF_IFD:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	634 case TIFF_IFD8:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	635 // TODO(maged): implement IFD datatype?
31129 dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	636 error ("Unimplemented IFD data type");
31105 7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	637 break;
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	638 default:
7c5b8a294f60 getTag returns double for scalar values magedrifaat <magedrifaat@gmail.com> parents: 31104 diff changeset	639 error ("Unsupported tag data type");
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	640 }
f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	641 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	642
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	643 return retval;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	644 }
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	645
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	646 octave_value
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	647 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	648 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	649 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	650
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	651 // TIFFFieldReadCount returns VARIABLE for some scalar tags
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	652 // (e.g. Compression) But TIFFFieldPassCount seems consistent
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	653 // 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	654 // 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	655 if (TIFFFieldPassCount (fip))
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	656 error ("Unsupported tag");
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	657
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	658 int type_size = TIFFDataWidth (TIFFFieldDataType (fip));
31129 dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	659
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	660 void *data = _TIFFmalloc (type_size);
31131 7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	661 if (tag_id == TIFFTAG_PLANARCONFIG)
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	662 {
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	663 // Workaround for a bug in LibTIFF where it incorrectly returns
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	664 // zero as the default value for PlanaConfiguration
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	665 if (! TIFFGetField(tif, tag_id, data))
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	666 reinterpret_cast<uint16_t > (data) = 1;
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	667 }
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	668 else
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	669 validate_tiff_get_field (TIFFGetFieldDefaulted (tif, tag_id, data), data);
7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	670
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	671 octave_value tag_data_ov = interpret_tag_data (data, 1,
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	672 TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	673 _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	674
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	675 return tag_data_ov;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	676 }
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	677
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	678 octave_value
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	679 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	680 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	681 void *data;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	682 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	683
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	684 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	685 }
31097 75ab26f147a5 getTag: Implemented single array tags, only multi-array and special tags are unimplemented magedrifaat <magedrifaat@gmail.com> parents: 31096 diff changeset	686
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	687 octave_value
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	688 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	689 {
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	690 octave_value tag_data_ov;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	691 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	692
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	693 // 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	694 switch (tag_id)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	695 {
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	696 case TIFFTAG_STRIPBYTECOUNTS:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	697 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	698 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	699 TIFFNumberOfStrips (tif));
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	700 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	701 case TIFFTAG_TILEBYTECOUNTS:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	702 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	703 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	704 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	705 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	706 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	707 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	708 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	709 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	710 break;
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	711 case TIFFTAG_GRAYRESPONSECURVE:
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	712 {
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	713 uint16_t bits_per_sample;
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	714 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	715 &bits_per_sample))
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	716 error ("Failed to obtain the bit depth");
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	717
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	718 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	719 break;
f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	720 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	721 case TIFFTAG_COLORMAP:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	722 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	723 uint16_t bits_per_sample;
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	724 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	725 &bits_per_sample))
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	726 error ("Failed to obtain the bit depth");
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	727
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	728 if (bits_per_sample > 24)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	729 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	730
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	731 uint32_t count = 1 << bits_per_sample;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	732 uint16_t red, green, *blue;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	733 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	734 &red, &green, &blue));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	735
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	736 // Retrieving the data of the three channels and concatenating
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	737 // them together
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	738 OCTAVE_LOCAL_BUFFER (NDArray, array_list, 3);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	739 dim_vector col_dims(count, 1);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	740 array_list[0] = NDArray (interpret_tag_data (red,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	741 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	742 TIFFFieldDataType(fip))
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	743 .uint16_array_value ()
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	744 .reshape (col_dims));
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	745 array_list[1] = NDArray (interpret_tag_data (green,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	746 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	747 TIFFFieldDataType(fip))
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	748 .uint16_array_value ()
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	749 .reshape (col_dims));
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	750 array_list[2] = NDArray (interpret_tag_data (blue,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	751 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	752 TIFFFieldDataType(fip))
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	753 .uint16_array_value ()
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	754 .reshape (col_dims));
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	755
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	756 NDArray mat_out = NDArray::cat(1, 3, array_list);
31121 341796f9efb6 Tiff getTag: converted colormap tag data to the correct type and range magedrifaat <magedrifaat@gmail.com> parents: 31120 diff changeset	757 // 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	758 mat_out /= UINT16_MAX;
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	759
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	760 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	761 break;
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 case TIFFTAG_TRANSFERFUNCTION:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	764 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	765 uint16_t samples_per_pixel;
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	766 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_SAMPLESPERPIXEL,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	767 &samples_per_pixel))
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	768 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	769
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	770 uint16_t bits_per_sample;
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	771 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE,
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	772 &bits_per_sample))
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	773 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	774
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	775 uint32_t count = 1 << bits_per_sample;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	776 uint16_t ch1, ch2, *ch3;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	777 if (samples_per_pixel == 1)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	778 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	779 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	780 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	781 TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	782 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	783 else
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	784 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	785 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	786 &ch1, &ch2, &ch3));
9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	787
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	788 OCTAVE_LOCAL_BUFFER (uint16NDArray, array_list, 3);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	789 dim_vector col_dims(count, 1);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	790 array_list[0] = interpret_tag_data (ch1,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	791 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	792 TIFFFieldDataType (fip))
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	793 .uint16_array_value ()
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	794 .reshape (col_dims);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	795 array_list[1] = interpret_tag_data (ch2,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	796 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	797 TIFFFieldDataType (fip))
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	798 .uint16_array_value ()
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	799 .reshape (col_dims);
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	800 array_list[2] = interpret_tag_data (ch3,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	801 count,
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	802 TIFFFieldDataType (fip))
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	803 .uint16_array_value ()
8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	804 .reshape (col_dims);
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	805
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	806 tag_data_ov = octave_value (uint16NDArray::cat (1, 3, array_list));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	807 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	808 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	809 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	810 case TIFFTAG_PAGENUMBER:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	811 case TIFFTAG_HALFTONEHINTS:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	812 case TIFFTAG_DOTRANGE:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	813 case TIFFTAG_YCBCRSUBSAMPLING:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	814 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	815 uint16_t tag_part1, tag_part2;
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,
31114 9dead1249449 Tiff getTag: fixed matrix shape for ColorMap and TransferFunction magedrifaat <magedrifaat@gmail.com> parents: 31113 diff changeset	817 &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	818
31130 8475bdb70457 Tiff getTag: changed ColorMap to use Array::cat instead of memcpy magedrifaat <magedrifaat@gmail.com> parents: 31129 diff changeset	819 NDArray mat_out (dim_vector (1, 2));
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	820 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	821 = 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	822 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	823 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	824 = 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	825 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	826
530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	827 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	828 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	829 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	830 case TIFFTAG_SUBIFD:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	831 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	832 uint16_t count;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	833 uint64_t *offsets;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	834 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	835 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	836 TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	837 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	838 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	839 case TIFFTAG_EXTRASAMPLES:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	840 {
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	841 uint16_t count;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	842 uint16_t *types;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	843 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	844 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	845 TIFFFieldDataType (fip));
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	846 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	847 }
31103 76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	848 // 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	849 // will be implemented and tested later.
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	850 case TIFFTAG_XMLPACKET:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	851 case TIFFTAG_RICHTIFFIPTC:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	852 case TIFFTAG_PHOTOSHOP:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	853 case TIFFTAG_ICCPROFILE:
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	854 {
31103 76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	855 error ("Complex Tags not implemented");
76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	856 break;
76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	857 }
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	858 // 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	859 // 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	860 case TIFFTAG_ZIPQUALITY:
76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	861 case TIFFTAG_SGILOGDATAFMT:
31106 f5a88c0a61ab Support for GrayResponseCurve and GrayResponseUnit tags magedrifaat <magedrifaat@gmail.com> parents: 31105 diff changeset	862 case TIFFTAG_GRAYRESPONSEUNIT:
31103 76b21bed2920 Undocumented and unimplemented tags are explicilty mentioned and handled magedrifaat <magedrifaat@gmail.com> parents: 31102 diff changeset	863 {
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	864 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	865 break;
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	866 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	867 default:
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	868 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	869 }
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	870
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	871 return tag_data_ov;
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	872 }
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	873
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	874 void
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	875 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	876 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	877 // 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	878 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	879 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	880
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	881 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	882 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	883 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	884
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	885 template <typename T>
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	886 void
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	887 write_strip (TIFF *tif, uint32_t strip_no, T strip_data,
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	888 tiff_image_data *image_data)
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	889 {
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	890 uint32_t rows_in_strip;
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	891 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ROWSPERSTRIP, &rows_in_strip))
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	892 error ("Failed to obtain the RowsPerStrip tag");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	893
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	894 // The tag has a default value of UINT32_MAX which means the entire
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	895 // image, but we need to cap it to the height for later calculations
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	896 if (rows_in_strip > image_data->height)
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	897 rows_in_strip = image_data->height;
0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	898
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	899 uint32_t strip_count = TIFFNumberOfStrips (tif);
31137 233130c0b1f6 Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab magedrifaat <magedrifaat@gmail.com> parents: 31136 diff changeset	900 dim_vector strip_dimensions;
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	901
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	902 // Calculate the expected number of elements in the strip data array
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	903 // All strips have equal number of rows excpet strips at the bottom
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	904 // of the image can have less number of rows
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	905 if (image_data->planar_configuration == PLANARCONFIG_CONTIG)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	906 {
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	907 // All strips have equal number of rows excpet strips at the bottom
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	908 // of the image can have less number of rows
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	909 if (strip_no == strip_count)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	910 rows_in_strip = image_data->height - rows_in_strip * (strip_no - 1);
31137 233130c0b1f6 Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab magedrifaat <magedrifaat@gmail.com> parents: 31136 diff changeset	911 strip_dimensions = dim_vector (rows_in_strip, image_data->width,
233130c0b1f6 Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab magedrifaat <magedrifaat@gmail.com> parents: 31136 diff changeset	912 image_data->samples_per_pixel);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	913 }
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	914 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	915 {
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	916 // For separate planes, we should check the last strip of each channel
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	917 uint32_t strips_per_channel
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	918 = strip_count / image_data->samples_per_pixel;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	919 for (uint32_t boundary_strip = strips_per_channel;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	920 boundary_strip <= strip_count;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	921 boundary_strip += strips_per_channel)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	922 if (strip_no == boundary_strip)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	923 rows_in_strip = image_data->height - rows_in_strip
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	924 * ((strip_no - 1)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	925 % (strips_per_channel));
31137 233130c0b1f6 Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab magedrifaat <magedrifaat@gmail.com> parents: 31136 diff changeset	926 strip_dimensions = dim_vector (rows_in_strip, image_data->width, 1);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	927 }
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	928 else
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	929 error ("Planar configuration not supported");
31137 233130c0b1f6 Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab magedrifaat <magedrifaat@gmail.com> parents: 31136 diff changeset	930
233130c0b1f6 Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab magedrifaat <magedrifaat@gmail.com> parents: 31136 diff changeset	931 strip_data.resize (strip_dimensions);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	932
31137 233130c0b1f6 Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab magedrifaat <magedrifaat@gmail.com> parents: 31136 diff changeset	933 //TODO(maged): add suppot for 1-bit images
31127 0d9633ee715e Tiff: fixed a bug where the default value of some tags was ignored magedrifaat <magedrifaat@gmail.com> parents: 31126 diff changeset	934
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	935 // Permute the dimesions of the strip to match the expected memory
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	936 // arrangement of LibTIFF (channel x width x height)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	937 Array<octave_idx_type> perm (dim_vector (3, 1));
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	938 perm(0) = 2;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	939 perm(1) = 1;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	940 perm(2) = 0;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	941 strip_data = strip_data.permute (perm);
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	942
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	943 // LibTIFF uses zero-based indexing as opposed to Octave's 1-based
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	944 strip_no--;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	945 // Can't rely in LibTIFF's TIFFStripSize because boundary strips
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	946 // can be smaller in size
31137 233130c0b1f6 Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab magedrifaat <magedrifaat@gmail.com> parents: 31136 diff changeset	947 tsize_t strip_size = strip_data.numel () * image_data->bits_per_sample / 8;
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	948 if (TIFFWriteEncodedStrip (tif, strip_no,
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	949 strip_data.fortran_vec (), strip_size) == -1)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	950 error ("Failed to write strip data to image");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	951 }
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	952
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	953 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	954
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	955 DEFUN_DLD (__open_tiff__, args, ,
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	956 "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	957 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	958 #if defined (HAVE_TIFF)
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	959 int nargin = args.length ();
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	960
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	961 if (nargin == 0 \|\| nargin > 2)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	962 {
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	963 // TODO(maged): return invalid object instead??
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	964 error ("No filename supplied\n");
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	965 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	966
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	967 std::string filename = args (0).string_value ();
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	968 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	969
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	970 if (nargin == 2)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	971 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	972
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	973 // TODO(maged): look into const begin and end
31123 0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	974 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	975
0bcb35909ef4 Tiff open: removed support for rh mode and marked r+ as not yet supported magedrifaat <magedrifaat@gmail.com> parents: 31122 diff changeset	976 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	977 == supported_modes.end())
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	978 {
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	979 if (mode == "r+")
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	980 error ("Openning files in r+ mode is not yet supported");
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	981 else
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	982 error ("Invalid mode for openning Tiff file: %s", mode.c_str ());
524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	983 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	984
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	985 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	986
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	987 if (! tif)
d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	988 error ("Failed to open Tiff file\n");
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	989
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	990 // 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	991 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	992 return octave_value_list (tiff_ov);
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	993 #else
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	994 octave_unused_parameter (args);
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	995 err_disabled_feature ("Tiff", "Tiff");
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	996 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	997 }
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	998
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	999
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	1000 DEFUN_DLD (__close_tiff__, args, ,
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1001 "Close a tiff file")
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1002 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	1003 #if defined (HAVE_TIFF)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	1004 int nargin = args.length ();
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	1005
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	1006 if (nargin == 0)
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	1007 error ("No handle provided\n");
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	1008
31101 f24d7bcad2d3 Partially fixed formatting of C++ code magedrifaat <magedrifaat@gmail.com> parents: 31099 diff changeset	1009 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	1010 TIFFClose (tif);
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	1011
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1012 return octave_value_list ();
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	1013 #else
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	1014 err_disabled_feature ("close", "Tiff");
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	1015 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1016 }
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	1017
a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	1018
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	1019 DEFUN_DLD (__tiff_get_tag__, args, ,
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1020 "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	1021 {
31104 b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	1022 #if defined (HAVE_TIFF)
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1023 int nargin = args.length ();
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1024
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1025 if (nargin == 0)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1026 error ("No handle provided\n");
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 if (nargin < 2)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1029 error ("No tag name provided\n");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1030
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1031 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	1032
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1033 uint32_t tag_id;
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1034 const TIFFField *fip;
31129 dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	1035
dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	1036 if (args (1).type_name () == "string"
dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	1037 \|\| args (1).type_name () == "sq_string")
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1038 {
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1039 std::string tagName = args (1).string_value ();
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1040 fip = TIFFFieldWithName (tif, tagName.c_str ());
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1041 if (! fip)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1042 error ("Tiff tag not found");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1043
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1044 tag_id = TIFFFieldTag (fip);
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1045 }
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1046 else
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1047 {
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1048 tag_id = args (1).int_value ();
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1049 fip = TIFFFieldWithTag (tif, tag_id);
31129 dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	1050
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1051 if (! fip)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1052 error ("Tiff tag not found");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1053 }
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1054
31117 530dbd1d6b07 Tiff getTag: fixed bug for multivalued tags where only first item is returned magedrifaat <magedrifaat@gmail.com> parents: 31115 diff changeset	1055 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	1056 #else
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	1057 err_disabled_feature ("getTag", "Tiff");
b5d59c115e52 Use HAVE_TIFF flag to optionally disable Tiff magedrifaat <magedrifaat@gmail.com> parents: 31103 diff changeset	1058 #endif
31102 d6ecf0e8838b Add the new code to the octave namespace magedrifaat <magedrifaat@gmail.com> parents: 31101 diff changeset	1059 }
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1060
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1061
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	1062 DEFUN_DLD (__tiff_set_tag__, args, ,
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1063 "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	1064 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1065 #if defined (HAVE_TIFF)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1066 int nargin = args.length ();
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1067
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1068 if (nargin < 2)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1069 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	1070
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1071 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	1072
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1073 // 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	1074 // opened for reading?
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1075 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	1076 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	1077 else
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1078 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1079 const TIFFField *fip;
31129 dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	1080
dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	1081 if (args (1).type_name () == "string"
dfab9c6982bf Tiff getTag: added support for single quotes string fo the tag name magedrifaat <magedrifaat@gmail.com> parents: 31128 diff changeset	1082 \|\| args(1).type_name () == "sq_string")
31124 e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1083 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1084 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	1085 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	1086 if (! fip)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1087 error ("Tiff tag not found");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1088 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1089 else
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1090 {
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1091 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	1092 fip = TIFFFieldWithTag (tif, tag_id);
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1093 if (! fip)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1094 error ("Tiff tag not found");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1095 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1096
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1097 if (nargin < 3)
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1098 error ("Too few arguments provided");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1099
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1100 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	1101 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1102
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1103 return octave_value_list ();
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1104 #else
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1105 err_disabled_feature ("setTag", "Tiff");
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1106 #endif
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1107 }
e8d1cc309bc9 Tiff: added initial implementation of setTag function for scalar tags magedrifaat <magedrifaat@gmail.com> parents: 31123 diff changeset	1108
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1109 DEFUN_DLD (__tiff_read__, args, nargout,
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1110 "Read the image in the current IFD")
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1111 {
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1112 #if defined (HAVE_TIFF)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1113 int nargin = args.length ();
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1114
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1115 if (nargin == 0)
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1116 error ("No handle provided\n");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1117
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1118 TIFF tif = (TIFF )(args (0).uint64_value ());
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1119
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1120 // TODO(maged): nargout and ycbcr
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	1121 octave_unused_parameter (nargout);
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1122
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1123 // Obtain all necessary tags
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	1124 // 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	1125 // 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	1126 // 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	1127 // 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	1128 tiff_image_data image_data (tif);
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1129
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1130 uint16_t sample_format;
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1131 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format))
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1132 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	1133
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1134 if (sample_format == 3)
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1135 {
31135 b7ffe64e0287 Tiff.m: added test for 16- and 32-bit grayscale and RGB images. magedrifaat <magedrifaat@gmail.com> parents: 31133 diff changeset	1136 if (image_data.bits_per_sample != 32 && image_data.bits_per_sample != 64)
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1137 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	1138 }
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1139 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	1140 error ("Unsupported sample format");
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1141
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1142 octave_value_list retval;
31112 e3d8443585fe Tiff read refactored reading stripped images into a separate function magedrifaat <magedrifaat@gmail.com> parents: 31111 diff changeset	1143 switch (image_data.bits_per_sample)
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1144 {
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1145 case 1:
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1146 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	1147 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1148 case 4:
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1149 case 8:
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1150 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	1151 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1152 case 16:
31113 a74059523d74 Tiff read: use template to remove repitition in filling matrices magedrifaat <magedrifaat@gmail.com> parents: 31112 diff changeset	1153 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	1154 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1155 case 32:
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1156 if (sample_format == 3)
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1157 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	1158 else
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1159 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	1160 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1161 case 64:
31125 3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1162 if (sample_format == 3)
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1163 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	1164 else
3b775b939de4 Tiff read: Added support for floating-point images magedrifaat <magedrifaat@gmail.com> parents: 31124 diff changeset	1165 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	1166 break;
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1167 default:
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1168 error ("Unsupported bit depth");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1169 }
31110 2daeeff33980 Tiff read fixed segfault bug for compressed images magedrifaat <magedrifaat@gmail.com> parents: 31109 diff changeset	1170
31109 06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1171 return retval;
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1172 #else
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1173 err_disabled_feature ("read", "Tiff");
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1174 #endif
06814e8b5a29 add function to read an entire image magedrifaat <magedrifaat@gmail.com> parents: 31106 diff changeset	1175 }
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1176
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	1177 DEFUN_DLD (__tiff_write_encoded_strip__, args, ,
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1178 "Write an encoded strip to the image")
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1179 {
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1180 #if defined (HAVE_TIFF)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1181 int nargin = args.length ();
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1182
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1183 if (nargin < 3)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1184 error ("Too few arguments provided\n");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1185
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1186 TIFF tif = (TIFF )(args (0).uint64_value ());
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1187
31138 68762676dab1 Tiff writeEncodedStrip: prevent writing to a read-only file magedrifaat <magedrifaat@gmail.com> parents: 31137 diff changeset	1188 if (TIFFGetMode (tif) == O_RDONLY)
68762676dab1 Tiff writeEncodedStrip: prevent writing to a read-only file magedrifaat <magedrifaat@gmail.com> parents: 31137 diff changeset	1189 error ("Can't write data to a file opened in read-only mode");
68762676dab1 Tiff writeEncodedStrip: prevent writing to a read-only file magedrifaat <magedrifaat@gmail.com> parents: 31137 diff changeset	1190
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1191 // Obtain all necessary tags
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1192 tiff_image_data image_data (tif);
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1193
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1194 if (image_data.is_tiled)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1195 error ("Can't rite strips to a tiled image");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1196
31128 524cb3106432 __tiff__.cc: handled compiler warnings for unused params and old-style casts. magedrifaat <magedrifaat@gmail.com> parents: 31127 diff changeset	1197 uint32_t strip_no = args (1).uint32_scalar_value ();
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1198 if (strip_no < 1 \|\| strip_no > TIFFNumberOfStrips (tif))
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1199 error ("Strip number out of range");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1200
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1201 // SampleFormat tag is not a required field and has a default value of 1
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1202 // So we need to use TIFFGetFieldDefaulted in case it is not present in
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1203 // the file
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1204 uint16_t sample_format;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1205 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format))
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1206 error ("Failed to obtain a value for sample format");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1207
31136 be1a983981b2 Tiff writeEncodedStrip: fixed bug to disallow signed types for unsigned images magedrifaat <magedrifaat@gmail.com> parents: 31135 diff changeset	1208 // TODO(maged): add support for signed integer images
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1209 if (sample_format == 3)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1210 {
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1211 if (image_data.bits_per_sample != 32 && image_data.bits_per_sample != 64)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1212 error ("Floating point images are only supported for bit depths of 32 and 64");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1213 }
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1214 // The standard specifies that a SampleFormat of 4 should be treated
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1215 // the same as 1 (unsigned integer)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1216 else if (sample_format != 1 && sample_format != 4)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1217 error ("Unsupported sample format");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1218
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1219 switch (image_data.bits_per_sample)
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1220 {
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1221 case 1:
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1222 // We need to check for both scalar and matrix types to handle single
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1223 // element strip
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1224 if (args(2).is_bool_scalar () \|\| args(2).is_bool_matrix ())
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1225 write_strip<boolNDArray> (tif, strip_no,
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1226 args(2).bool_array_value (), &image_data);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1227 else
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1228 error ("Expected logical matrix for BiLevel image");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1229 break;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1230 case 4:
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1231 case 8:
31136 be1a983981b2 Tiff writeEncodedStrip: fixed bug to disallow signed types for unsigned images magedrifaat <magedrifaat@gmail.com> parents: 31135 diff changeset	1232 if (args(2).is_uint8_type ())
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1233 write_strip<uint8NDArray> (tif, strip_no,
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1234 args(2).uint8_array_value (),
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1235 &image_data);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1236 else
31136 be1a983981b2 Tiff writeEncodedStrip: fixed bug to disallow signed types for unsigned images magedrifaat <magedrifaat@gmail.com> parents: 31135 diff changeset	1237 error ("Only uint8 data is allowed for uint images with bit depth of 8");
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1238 break;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1239 case 16:
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1240 // TODO(maged): what is the behavior if the input matrix has
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1241 // negative numbers?
31136 be1a983981b2 Tiff writeEncodedStrip: fixed bug to disallow signed types for unsigned images magedrifaat <magedrifaat@gmail.com> parents: 31135 diff changeset	1242 if (args(2).is_uint16_type ())
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1243 write_strip<uint16NDArray> (tif, strip_no,
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1244 args(2).uint16_array_value (),
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1245 &image_data);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1246 else
31136 be1a983981b2 Tiff writeEncodedStrip: fixed bug to disallow signed types for unsigned images magedrifaat <magedrifaat@gmail.com> parents: 31135 diff changeset	1247 error ("Only uint16 data is allowed for uint images with bit depth of 16");
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1248 break;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1249 case 32:
31131 7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	1250 if (sample_format == 3)
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1251 if (args(2).is_single_type () \|\| args(2).is_double_type ())
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1252 write_strip<FloatNDArray> (tif, strip_no,
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1253 args(2).float_array_value (),
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1254 &image_data);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1255 else
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1256 error ("Only single and double data are allowed for floating-point images");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1257 else
31136 be1a983981b2 Tiff writeEncodedStrip: fixed bug to disallow signed types for unsigned images magedrifaat <magedrifaat@gmail.com> parents: 31135 diff changeset	1258 if (args(2).is_uint32_type ())
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1259 write_strip<uint32NDArray> (tif, strip_no,
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1260 args(2).uint32_array_value (),
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1261 &image_data);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1262 else
31136 be1a983981b2 Tiff writeEncodedStrip: fixed bug to disallow signed types for unsigned images magedrifaat <magedrifaat@gmail.com> parents: 31135 diff changeset	1263 error ("Only uint32 data is allowed for uint images with bit depth of 32");
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1264 break;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1265 case 64:
31131 7349994f30f8 Tiff: fixed the first test to use a single-pixel image magedrifaat <magedrifaat@gmail.com> parents: 31130 diff changeset	1266 if (sample_format == 3)
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1267 if (args(2).is_single_type () \|\| args(2).is_double_type ())
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1268 write_strip<NDArray> (tif, strip_no,
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1269 args(2).array_value (),
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1270 &image_data);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1271 else
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1272 error ("Only single and double data are allowed for floating-point images");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1273 else
31136 be1a983981b2 Tiff writeEncodedStrip: fixed bug to disallow signed types for unsigned images magedrifaat <magedrifaat@gmail.com> parents: 31135 diff changeset	1274 if (args(2).is_uint64_type ())
31133 e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1275 write_strip<uint64NDArray> (tif, strip_no,
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1276 args(2).uint64_array_value (),
e9925d528428 Tiff writeEncodedStrip: used octave_value functions instead of type_name magedrifaat <magedrifaat@gmail.com> parents: 31131 diff changeset	1277 &image_data);
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1278 else
31136 be1a983981b2 Tiff writeEncodedStrip: fixed bug to disallow signed types for unsigned images magedrifaat <magedrifaat@gmail.com> parents: 31135 diff changeset	1279 error ("Only uint64 data is allowed for uint images with bit depth of 64");
31126 7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1280 break;
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1281 default:
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1282 error ("Unsupported bit depth");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1283 }
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1284
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1285 return octave_value_list ();
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1286 #else
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1287 err_disabled_feature ("writeEncodedStrip", "Tiff");
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1288 #endif
7851c5b9c950 Tiff: implemented writeEncodedStrip function for writing a strip to an image magedrifaat <magedrifaat@gmail.com> parents: 31125 diff changeset	1289 }
31092 a736190ce738 Added the Tiff classdef files to octave magedrifaat <magedrifaat@gmail.com> parents: diff changeset	1290 }

Mercurial > octave-libtiff

annotate libinterp/dldfcn/__tiff__.cc @ 31138:68762676dab1

annotate libinterp/dldfcn/tiff.cc @ 31138:68762676dab1