Mercurial > octave-libtiff
annotate libinterp/corefcn/__tiff__.cc @ 31185:a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
* __tiff__.cc (F__tiff_make_tagid__): implemented internal function as
initializer for TagID.
* Tiff.m: changed the initialization for TagID to use the internal function.
author | magedrifaat <magedrifaat@gmail.com> |
---|---|
date | Thu, 18 Aug 2022 17:23:43 +0200 |
parents | 86f91ea7a642 |
children | 90eccc78d958 |
rev | line source |
---|---|
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
1 #if defined (HAVE_CONFIG_H) |
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2 # include "config.h" |
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
3 #endif |
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
4 |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
5 #include <string> |
31094
ab5b33e447b0
Modified getTag to account for different tag data types and multivalued tags, the current implementation is still buggy for most tags and data types
magedrifaat <magedrifaat@gmail.com>
parents:
31093
diff
changeset
|
6 #include <iostream> |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
7 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
8 #include "defun.h" |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
9 #include "ov.h" |
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
10 #include "ovl.h" |
31093
e2bed4daae82
Fix typo in module-files
magedrifaat <magedrifaat@gmail.com>
parents:
31092
diff
changeset
|
11 #include "error.h" |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
12 |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
13 #include "errwarn.h" |
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
14 |
31162
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
15 #include "fcntl-wrappers.h" |
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
16 |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
17 #if defined (HAVE_TIFF) |
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
18 # include <tiffio.h> |
31163
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
19 TIFFErrorHandler tiff_default_error_handler = NULL; |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
20 TIFFErrorHandler tiff_default_warning_handler = NULL; |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
21 #endif |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
22 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
23 namespace octave |
31099
6fc4bf5e14e1
Cleaned up the interface
magedrifaat <magedrifaat@gmail.com>
parents:
31098
diff
changeset
|
24 { |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
25 #if defined (HAVE_TIFF) |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
26 class OCTINTERP_API octave_tiff_handle : public octave_base_value |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
27 { |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
28 public: |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
29 octave_tiff_handle (TIFF *tif) |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
30 : tiff_file (tif), closed (false) |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
31 { } |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
32 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
33 TIFF *get_file(void) { return tiff_file; } |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
34 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
35 bool is_defined (void) const { return true; } |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
36 bool is_constant (void) const { return true; } |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
37 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
38 void close(void) |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
39 { |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
40 if (! closed) |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
41 { |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
42 closed = true; |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
43 TIFFClose (tiff_file); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
44 } |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
45 } |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
46 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
47 bool is_closed (void) { return closed; } |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
48 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
49 ~octave_tiff_handle (void) |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
50 { |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
51 if (! closed) |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
52 close (); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
53 } |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
54 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
55 static octave_tiff_handle * |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
56 get_tiff_handle (const octave_value& ov) |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
57 { |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
58 octave_base_value *rep = ov.internal_rep (); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
59 octave_tiff_handle *handle = dynamic_cast<octave_tiff_handle *> (rep); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
60 if (! handle) |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
61 error ("get_tiff_handle: dynamic_cast to octave_tiff_handle failed"); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
62 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
63 return handle; |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
64 } |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
65 private: |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
66 TIFF *tiff_file; |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
67 bool closed; |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
68 }; |
31112
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
69 |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
70 struct tiff_image_data |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
71 { |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
72 public: |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
73 uint32_t width; |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
74 uint32_t height; |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
75 uint16_t samples_per_pixel; |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
76 uint16_t bits_per_sample; |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
77 uint16_t planar_configuration; |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
78 uint16_t is_tiled; |
31122
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
79 |
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
80 tiff_image_data (TIFF *tif) |
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
81 { |
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
82 if (! TIFFGetField (tif, TIFFTAG_IMAGEWIDTH, &width)) |
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
83 error ("Failed to read image width"); |
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
84 |
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
85 if (! TIFFGetField (tif, TIFFTAG_IMAGELENGTH, &height)) |
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
86 error ("Failed to read image height"); |
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
87 |
31127
0d9633ee715e
Tiff: fixed a bug where the default value of some tags was ignored
magedrifaat <magedrifaat@gmail.com>
parents:
31126
diff
changeset
|
88 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
|
89 &samples_per_pixel)) |
31122
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
90 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
|
91 |
31127
0d9633ee715e
Tiff: fixed a bug where the default value of some tags was ignored
magedrifaat <magedrifaat@gmail.com>
parents:
31126
diff
changeset
|
92 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
|
93 &bits_per_sample)) |
31122
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
94 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
|
95 |
31131
7349994f30f8
Tiff: fixed the first test to use a single-pixel image
magedrifaat <magedrifaat@gmail.com>
parents:
31130
diff
changeset
|
96 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
|
97 &planar_configuration)) |
7349994f30f8
Tiff: fixed the first test to use a single-pixel image
magedrifaat <magedrifaat@gmail.com>
parents:
31130
diff
changeset
|
98 // 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
|
99 // value for PlanarConfiguration although the default value is 1 |
31185
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
100 // This doesn't completely solve the issue as LibTIFF will refuse |
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
101 // to write data to images of the tag is not set. |
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
102 // see: https://www.asmail.be/msg0054918184.html |
31131
7349994f30f8
Tiff: fixed the first test to use a single-pixel image
magedrifaat <magedrifaat@gmail.com>
parents:
31130
diff
changeset
|
103 planar_configuration = 1; |
31122
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
104 |
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
105 is_tiled = TIFFIsTiled(tif); |
1662939a7a49
Tiff read: moved image_date initialization into a constructor
magedrifaat <magedrifaat@gmail.com>
parents:
31121
diff
changeset
|
106 } |
31112
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
107 }; |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
108 |
31182
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
109 // A map of tag names supported by matlab, there are some differences |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
110 // than LibTIFF's names (e.g. Photometric vs PhotometricInerpretation) |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
111 static const std::map<std::string, ttag_t> tag_name_map = { |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
112 {"SubFileType", 254}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
113 {"ImageWidth", 256}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
114 {"ImageLength", 257}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
115 {"BitsPerSample", 258}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
116 {"Compression", 259}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
117 {"Photometric", 262}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
118 {"Thresholding", 263}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
119 {"FillOrder", 266}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
120 {"DocumentName", 269}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
121 {"ImageDescription", 270}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
122 {"Make", 271}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
123 {"Model", 272}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
124 {"StripOffsets", 273}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
125 {"Orientation", 274}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
126 {"SamplesPerPixel", 277}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
127 {"RowsPerStrip", 278}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
128 {"StripByteCounts", 279}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
129 {"MinSampleValue", 280}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
130 {"MaxSampleValue", 281}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
131 {"XResolution", 282}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
132 {"YResolution", 283}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
133 {"PlanarConfiguration", 284}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
134 {"PageName", 285}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
135 {"XPosition", 286}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
136 {"YPosition", 287}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
137 {"GrayResponseUnit", 290}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
138 {"GrayResponseCurve", 291}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
139 {"Group3Options", 292}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
140 {"Group4Options", 293}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
141 {"ResolutionUnit", 296}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
142 {"PageNumber", 297}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
143 {"TransferFunction", 301}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
144 {"Software", 305}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
145 {"DateTime", 306}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
146 {"Artist", 315}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
147 {"HostComputer", 316}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
148 {"WhitePoint", 318}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
149 {"PrimaryChromaticities", 319}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
150 {"ColorMap", 320}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
151 {"HalfToneHints", 321}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
152 {"TileWidth", 322}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
153 {"TileLength", 323}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
154 {"TileOffsets", 324}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
155 {"TileByteCounts", 325}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
156 {"SubIFD", 330}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
157 {"InkSet", 332}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
158 {"InkNames", 333}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
159 {"NumberOfInks", 334}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
160 {"DotRange", 336}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
161 {"TargetPrinter", 337}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
162 {"ExtraSamples", 338}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
163 {"SampleFormat", 339}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
164 {"SMinSampleValue", 340}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
165 {"SMaxSampleValue", 341}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
166 {"YCbCrCoefficients", 529}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
167 {"YCbCrSubSampling", 530}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
168 {"YCbCrPositioning", 531}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
169 {"ReferenceBlackWhite", 532}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
170 {"XMP", 700}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
171 {"ImageDepth", 32997}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
172 {"Copyright", 33432}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
173 {"RichTIFFIPTC", 33723}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
174 {"Photoshop", 34377}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
175 {"ICCProfile", 34675}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
176 {"SToNits", 37439}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
177 {"JPEGQuality", 65537}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
178 {"JPEGColorMode", 65538}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
179 {"ZipQuality", 65557}, |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
180 {"SGILogDataFmt", 6556} |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
181 }; |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
182 |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
183 const TIFFField *get_fip_with_name (TIFF *tif, std::string& tag_name) |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
184 { |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
185 const TIFFField *fip = TIFFFieldWithName (tif, tag_name.c_str ()); |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
186 |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
187 // If the tag name is not found, fallback to the names defined |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
188 // in our name map. |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
189 if (! fip && tag_name_map.find (tag_name) != tag_name_map.cend ()) |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
190 fip = TIFFFieldWithTag (tif, tag_name_map.at (tag_name)); |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
191 |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
192 return fip; |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
193 } |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
194 |
31162
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
195 void |
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
196 check_readonly (TIFF *tif) |
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
197 { |
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
198 if (TIFFGetMode (tif) == octave_o_rdonly_wrapper ()) |
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
199 error ("Can't write data to a file opened in read-only mode"); |
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
200 } |
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
201 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
202 void |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
203 check_closed (octave_tiff_handle *tiff_handle) |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
204 { |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
205 if (tiff_handle->is_closed ()) |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
206 error ("The image file was closed"); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
207 } |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
208 |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
209 |
31118
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
210 void |
31181
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
211 validate_tiff_get_field (bool status) |
31118
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
212 { |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
213 // Check if the return status of TIFFGetField is not 1 |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
214 if (status != 1) |
31181
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
215 error ("Failed to read tag"); |
31118
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
216 } |
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
217 |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
218 uint32_t get_rows_in_strip (uint32_t strip_no, uint32_t strip_count, |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
219 uint32_t rows_per_strip, |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
220 tiff_image_data *image_data) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
221 { |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
222 // Calculate the expected number of elements in the strip data array |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
223 // All strips have equal number of rows except strips at the bottom |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
224 // of the image can have less number of rows |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
225 uint32_t rows_in_strip = rows_per_strip; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
226 if (image_data->planar_configuration == PLANARCONFIG_CONTIG) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
227 { |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
228 // All strips have equal number of rows excpet strips at the bottom |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
229 // of the image can have less number of rows |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
230 if (strip_no == strip_count - 1) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
231 rows_in_strip = image_data->height - rows_in_strip * strip_no; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
232 } |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
233 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
234 { |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
235 // For separate planes, we should check the last strip of each channel |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
236 uint32_t strips_per_channel |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
237 = strip_count / image_data->samples_per_pixel; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
238 for (uint32_t boundary_strip = strips_per_channel - 1; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
239 boundary_strip <= strip_count; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
240 boundary_strip += strips_per_channel) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
241 if (strip_no == boundary_strip) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
242 rows_in_strip = image_data->height |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
243 - rows_in_strip * (strip_no % strips_per_channel); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
244 } |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
245 else |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
246 error ("Planar Configuration not supported"); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
247 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
248 return rows_in_strip; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
249 } |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
250 |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
251 void |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
252 get_tile_dimensions_validated (TIFF *tif, uint32_t& tile_width, |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
253 uint32_t& tile_height) |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
254 { |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
255 if (! TIFFGetField (tif, TIFFTAG_TILELENGTH, &tile_height)) |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
256 error ("Filed to read tile length"); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
257 |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
258 if (! TIFFGetField (tif, TIFFTAG_TILEWIDTH, &tile_width)) |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
259 error ("Filed to read tile length"); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
260 |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
261 if (tile_height == 0 || tile_height % 16 != 0 |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
262 || tile_width == 0 || tile_width % 16 != 0) |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
263 error ("Tile dimesion tags are invalid"); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
264 } |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
265 |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
266 template <typename T> |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
267 octave_value |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
268 read_strip (TIFF *tif, uint32_t strip_no, tiff_image_data * image_data) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
269 { |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
270 // ASSUMES stripped image and strip_no is a valid zero-based strip |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
271 // index for the tif image |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
272 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
273 uint32_t rows_in_strip; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
274 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ROWSPERSTRIP, &rows_in_strip)) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
275 error ("Failed to obtain a value for RowsPerStrip"); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
276 |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
277 // The default for RowsPerStrip is INT_MAX so it should be capped to the |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
278 // image height |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
279 if (rows_in_strip > image_data->height) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
280 rows_in_strip = image_data->height; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
281 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
282 uint32_t strip_count = TIFFNumberOfStrips (tif); |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
283 // Get the actual number of rows in the strip |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
284 rows_in_strip = get_rows_in_strip (strip_no, strip_count, |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
285 rows_in_strip, image_data); |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
286 |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
287 // Set the strip dimensions depending on the planar configuration |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
288 dim_vector strip_dims; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
289 if (image_data->planar_configuration == PLANARCONFIG_CONTIG) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
290 strip_dims = dim_vector (image_data->samples_per_pixel, |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
291 image_data->width, rows_in_strip); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
292 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
293 strip_dims = dim_vector (image_data->width, rows_in_strip, 1); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
294 else |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
295 error ("Unsupported bit depth"); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
296 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
297 T strip_data (strip_dims); |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
298 uint8_t *strip_fvec |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
299 = reinterpret_cast<uint8_t *> (strip_data.fortran_vec ()); |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
300 |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
301 if (image_data->bits_per_sample == 8 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
302 || image_data->bits_per_sample == 16 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
303 || image_data->bits_per_sample == 32 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
304 || image_data->bits_per_sample == 64) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
305 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
306 if (TIFFReadEncodedStrip (tif, strip_no, strip_fvec, -1) == -1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
307 error ("Failed to read strip data"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
308 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
309 else if (image_data->bits_per_sample == 1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
310 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
311 if (image_data->samples_per_pixel != 1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
312 error ("Bi-Level images must have one channel only"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
313 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
314 // Create a buffer to hold the packed strip data |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
315 // Unique pointers are faster than vectors for constant size buffers |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
316 std::unique_ptr<uint8_t []> strip_ptr |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
317 = std::make_unique<uint8_t []> (TIFFStripSize (tif)); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
318 uint8_t *strip_buf = strip_ptr.get (); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
319 if (TIFFReadEncodedStrip (tif, strip_no, strip_buf, -1) == -1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
320 error ("Failed to read strip data"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
321 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
322 // According to the format specification, the row should be byte |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
323 // aligned so the number of bytes is rounded up to the nearest byte |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
324 uint32_t padded_width = (image_data->width + 7) / 8; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
325 // Packing the pixel data into bits |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
326 for (uint32_t row = 0; row < rows_in_strip; row++) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
327 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
328 for (uint32_t col = 0; col < image_data->width; col++) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
329 { |
31183
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
330 uint8_t shift = col % 8; |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
331 if (TIFFIsMSB2LSB (tif)) |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
332 shift = 7 - shift; |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
333 strip_fvec[col] = (strip_buf[col / 8] >> shift) & 0x1; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
334 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
335 strip_fvec += image_data->width; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
336 strip_buf += padded_width; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
337 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
338 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
339 else |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
340 error ("Unsupported bit depth"); |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
341 |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
342 // Reorder the dimensions to the order expected by Octave |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
343 Array<octave_idx_type> perm (dim_vector (3, 1)); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
344 if (image_data->planar_configuration == PLANARCONFIG_CONTIG) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
345 { |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
346 perm(0) = 2; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
347 perm(1) = 1; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
348 perm(2) = 0; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
349 } |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
350 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
351 { |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
352 perm(0) = 1; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
353 perm(1) = 0; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
354 perm(2) = 2; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
355 } |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
356 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
357 strip_data = strip_data.permute (perm); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
358 return octave_value (strip_data); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
359 } |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
360 |
31113
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
361 template <typename T> |
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
362 octave_value |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
363 read_tile (TIFF *tif, uint32_t tile_no, tiff_image_data *image_data) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
364 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
365 // ASSUMES tiled image and tile_no is a valid zero-based tile |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
366 // index for the tif image |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
367 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
368 uint32_t tile_width, tile_height; |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
369 get_tile_dimensions_validated (tif, tile_width, tile_height); |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
370 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
371 dim_vector tile_dims; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
372 if (image_data->planar_configuration == PLANARCONFIG_CONTIG) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
373 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
374 tile_dims = dim_vector (image_data->samples_per_pixel, tile_width, |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
375 tile_height); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
376 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
377 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
378 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
379 tile_dims = dim_vector (tile_width, tile_height, 1); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
380 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
381 else |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
382 error ("Unsupported planar configuration"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
383 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
384 T tile_data (tile_dims); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
385 uint8_t *tile_fvec |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
386 = reinterpret_cast<uint8_t *> (tile_data.fortran_vec ()); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
387 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
388 if (image_data->bits_per_sample == 8 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
389 || image_data->bits_per_sample == 16 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
390 || image_data->bits_per_sample == 32 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
391 || image_data->bits_per_sample == 64) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
392 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
393 if (TIFFReadEncodedTile (tif, tile_no, tile_fvec, -1) == -1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
394 error ("Failed to read tile data"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
395 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
396 else if (image_data->bits_per_sample == 1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
397 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
398 if (image_data->samples_per_pixel != 1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
399 error ("Bi-Level images must have one channel only"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
400 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
401 // Create a buffer to hold the packed tile data |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
402 // Unique pointers are faster than vectors for constant size buffers |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
403 std::unique_ptr<uint8_t []> tile_ptr |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
404 = std::make_unique<uint8_t []> (TIFFTileSize (tif)); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
405 uint8_t *tile_buf = tile_ptr.get (); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
406 if (TIFFReadEncodedTile (tif, tile_no, tile_buf, -1) == -1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
407 error ("Failed to read tile data"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
408 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
409 // unpack tile bits into output matrix cells |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
410 for (uint32_t row = 0; row < tile_height; row++) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
411 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
412 for (uint32_t col = 0; col < tile_width; col++) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
413 { |
31183
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
414 uint8_t shift = col % 8; |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
415 if (TIFFIsMSB2LSB (tif)) |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
416 shift = 7 - shift; |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
417 tile_fvec[col] = (tile_buf [col / 8] >> shift) & 0x1; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
418 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
419 tile_fvec += tile_width; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
420 tile_buf += tile_width / 8; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
421 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
422 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
423 else |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
424 error ("Unsupported bit depth"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
425 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
426 Array<octave_idx_type> perm (dim_vector (3, 1)); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
427 if (image_data->planar_configuration == PLANARCONFIG_CONTIG) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
428 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
429 perm(0) = 2; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
430 perm(1) = 1; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
431 perm(2) = 0; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
432 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
433 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
434 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
435 perm(0) = 1; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
436 perm(1) = 0; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
437 perm(2) = 2; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
438 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
439 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
440 tile_data = tile_data.permute (perm); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
441 |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
442 // Get the actual tile dimensions for boundary tiles |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
443 uint32_t tiles_across = (image_data->width + tile_width - 1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
444 / tile_width; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
445 uint32_t tiles_down = (image_data->height + tile_height - 1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
446 / tile_height; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
447 uint32_t corrected_width = tile_width; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
448 uint32_t corrected_height = tile_height; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
449 if (tile_no % tiles_across == tiles_across - 1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
450 corrected_width = image_data->width - tile_width * (tiles_across - 1); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
451 if ((tile_no / tiles_across) % tiles_down == tiles_down - 1) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
452 corrected_height = image_data->height - tile_height * (tiles_down - 1); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
453 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
454 dim_vector corrected_dims; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
455 if (image_data->planar_configuration == PLANARCONFIG_CONTIG) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
456 corrected_dims = dim_vector (corrected_height, corrected_width, |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
457 image_data->samples_per_pixel); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
458 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
459 corrected_dims = dim_vector (corrected_height, corrected_width); |
31159
e960e3a3b3f6
Tiff.m: added structs for tag value enums to the Tiff class.
magedrifaat <magedrifaat@gmail.com>
parents:
31158
diff
changeset
|
460 |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
461 tile_data.resize (corrected_dims); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
462 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
463 return octave_value (tile_data); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
464 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
465 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
466 template <typename T> |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
467 octave_value |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
468 read_strip_or_tile (TIFF *tif, uint32_t strip_tile_no, |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
469 tiff_image_data *image_data) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
470 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
471 if (image_data->is_tiled) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
472 return read_tile<T> (tif, strip_tile_no, image_data); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
473 else |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
474 return read_strip<T> (tif, strip_tile_no, image_data); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
475 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
476 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
477 octave_value |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
478 read_unsigned_strip_or_tile (TIFF *tif, uint32_t strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
479 tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
480 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
481 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
482 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
483 case 1: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
484 return read_strip_or_tile<boolNDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
485 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
486 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
487 case 8: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
488 return read_strip_or_tile<uint8NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
489 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
490 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
491 case 16: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
492 return read_strip_or_tile<uint16NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
493 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
494 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
495 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
496 return read_strip_or_tile<uint32NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
497 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
498 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
499 return read_strip_or_tile<uint64NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
500 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
501 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
502 error ("Unsupported bit depth"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
503 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
504 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
505 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
506 octave_value |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
507 read_signed_strip_or_tile (TIFF *tif, uint32_t strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
508 tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
509 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
510 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
511 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
512 case 8: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
513 return read_strip_or_tile<int8NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
514 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
515 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
516 case 16: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
517 return read_strip_or_tile<int16NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
518 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
519 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
520 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
521 return read_strip_or_tile<int32NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
522 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
523 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
524 return read_strip_or_tile<int64NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
525 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
526 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
527 error ("Unsupported bit depth for signed images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
528 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
529 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
530 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
531 octave_value |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
532 read_float_strip_or_tile (TIFF *tif, uint32_t strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
533 tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
534 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
535 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
536 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
537 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
538 return read_strip_or_tile<FloatNDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
539 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
540 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
541 return read_strip_or_tile<NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
542 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
543 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
544 error ("Unsupported bit depth for floating-point images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
545 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
546 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
547 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
548 octave_value |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
549 handle_read_strip_or_tile (TIFF *tif, uint32_t strip_tile_no) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
550 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
551 // Obtain all necessary tags |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
552 tiff_image_data image_data (tif); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
553 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
554 uint16_t sample_format; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
555 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format)) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
556 error ("Failed to obtain a value for sample format"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
557 |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
558 switch (sample_format) |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
559 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
560 case 1: |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
561 case 4: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
562 return read_unsigned_strip_or_tile (tif, strip_tile_no, &image_data); |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
563 break; |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
564 case 2: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
565 return read_signed_strip_or_tile (tif, strip_tile_no, &image_data); |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
566 break; |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
567 case 3: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
568 return read_float_strip_or_tile (tif, strip_tile_no, &image_data); |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
569 break; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
570 default: |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
571 error ("Unsupported sample format"); |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
572 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
573 } |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
574 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
575 template <typename T> |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
576 octave_value |
31113
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
577 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
|
578 { |
31113
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
579 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
|
580 |
31119
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
581 // 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
|
582 // 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
|
583 // 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
|
584 // 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
|
585 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
|
586 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
|
587 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
|
588 && padded_width % 8 != 0) |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
589 { |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
590 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
|
591 remove_padding = 1; |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
592 } |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
593 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
594 // 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
|
595 // 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
|
596 // 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
|
597 T img; |
31119
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
598 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
|
599 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
|
600 image_data->height)); |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
601 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
|
602 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
|
603 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
|
604 else |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
605 error ("Unsupported Planar Configuration"); |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
606 |
31113
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
607 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
|
608 |
31112
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
609 // 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
|
610 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
|
611 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
612 // 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
|
613 // 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
|
614 // 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
|
615 int64_t strip_size; |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
616 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
|
617 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
|
618 * 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
|
619 * sizeof (P); |
31112
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
620 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
|
621 { |
31119
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
622 // 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
|
623 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
|
624 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
625 // 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
|
626 if (strip_size == -1) |
31112
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
627 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
|
628 |
31119
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
629 // 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
|
630 // 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
|
631 // 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
|
632 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
|
633 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
|
634 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
635 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
|
636 { |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
637 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
|
638 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
|
639 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
640 // 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
|
641 // 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
|
642 // 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
|
643 strip_size *= 8; |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
644 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
645 // 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
|
646 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
|
647 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
|
648 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
649 // 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
|
650 // 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
|
651 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
|
652 { |
31183
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
653 uint8_t bit_number = pixel % 8; |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
654 if (TIFFIsMSB2LSB (tif)) |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
655 bit_number = 7 - bit_number; |
31128
524cb3106432
__tiff__.cc: handled compiler warnings for unused params and old-style casts.
magedrifaat <magedrifaat@gmail.com>
parents:
31127
diff
changeset
|
656 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
|
657 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
|
658 } |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
659 } |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
660 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
|
661 { |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
662 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
|
663 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
|
664 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
665 // 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
|
666 // 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
|
667 strip_size *= 2; |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
668 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
669 // 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
|
670 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
|
671 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
|
672 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
673 // 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
|
674 // 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
|
675 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
|
676 { |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
677 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
|
678 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
|
679 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
|
680 } |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
681 } |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
682 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
|
683 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
|
684 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
|
685 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
|
686 error ("Unsupported bit depth"); |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
687 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
688 // 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
|
689 img_fvec |
524cb3106432
__tiff__.cc: handled compiler warnings for unused params and old-style casts.
magedrifaat <magedrifaat@gmail.com>
parents:
31127
diff
changeset
|
690 = 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
|
691 + strip_size); |
31119
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
692 written_size += strip_size; |
31112
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
693 } |
31119
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
694 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
695 // 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
|
696 // 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
|
697 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
|
698 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
|
699 { |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
700 perm(0) = 2; |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
701 perm(1) = 1; |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
702 perm(2) = 0; |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
703 } |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
704 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
|
705 { |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
706 perm(0) = 1; |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
707 perm(1) = 0; |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
708 perm(2) = 2; |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
709 } |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
710 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
711 img = img.permute (perm); |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
712 |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
713 if (remove_padding) |
dbca50246dfc
Tiff read: changed logic to matrix operations instead of pointer math
magedrifaat <magedrifaat@gmail.com>
parents:
31118
diff
changeset
|
714 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
|
715 |
31118
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
716 return octave_value (img); |
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
717 } |
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
718 |
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
719 template <typename T> |
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
720 octave_value |
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
721 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
|
722 { |
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
723 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
|
724 |
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
725 // 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
|
726 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
|
727 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
|
728 &tile_width)); |
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
729 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
|
730 &tile_height)); |
31120
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
731 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
|
732 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
|
733 / tile_width; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
734 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
|
735 / tile_height; |
31118
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
736 |
31120
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
737 T img; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
738 // 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
|
739 // 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
|
740 // 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
|
741 // shape expected by Octave |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
742 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
|
743 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
|
744 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
|
745 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
|
746 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
|
747 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
|
748 else |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
749 error ("Unsupported Planar Configuration"); |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
750 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
751 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
|
752 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
753 // 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
|
754 // 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
|
755 // boundary tiles |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
756 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
|
757 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
|
758 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
|
759 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
760 // 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
|
761 // 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
|
762 // 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
|
763 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
|
764 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
|
765 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
|
766 { |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
767 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
|
768 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
769 if (tile_size == -1) |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
770 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
|
771 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
772 // 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
|
773 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
|
774 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
|
775 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
776 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
|
777 { |
31120
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
778 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
|
779 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
|
780 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
781 // 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
|
782 // 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
|
783 // 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
|
784 tile_size *= 8; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
785 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
786 // 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
|
787 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
|
788 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
|
789 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
790 // 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
|
791 // 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
|
792 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
|
793 { |
31183
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
794 uint8_t bit_number = pixel % 8; |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
795 if (TIFFIsMSB2LSB (tif)) |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
796 bit_number = 7 - bit_number; |
31128
524cb3106432
__tiff__.cc: handled compiler warnings for unused params and old-style casts.
magedrifaat <magedrifaat@gmail.com>
parents:
31127
diff
changeset
|
797 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
|
798 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
|
799 } |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
800 } |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
801 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
|
802 { |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
803 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
|
804 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
|
805 |
31120
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
806 // 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
|
807 // 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
|
808 tile_size *= 2; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
809 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
810 // 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
|
811 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
|
812 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
|
813 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
814 // 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
|
815 // 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
|
816 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
|
817 { |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
818 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
|
819 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
|
820 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
|
821 } |
31118
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
822 } |
31120
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
823 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
|
824 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
|
825 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
|
826 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
|
827 error ("Unsupported bit depth"); |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
828 |
31128
524cb3106432
__tiff__.cc: handled compiler warnings for unused params and old-style casts.
magedrifaat <magedrifaat@gmail.com>
parents:
31127
diff
changeset
|
829 img_fvec |
524cb3106432
__tiff__.cc: handled compiler warnings for unused params and old-style casts.
magedrifaat <magedrifaat@gmail.com>
parents:
31127
diff
changeset
|
830 = 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
|
831 + tile_size); |
31120
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
832 written_size += tile_size; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
833 } |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
834 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
835 // 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
|
836 // 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
|
837 // 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
|
838 // 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
|
839 // 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
|
840 // 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
|
841 // 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
|
842 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
|
843 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
|
844 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
|
845 { |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
846 perm1(0) = 0; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
847 perm1(1) = 1; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
848 perm1(2) = 3; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
849 perm1(3) = 2; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
850 perm1(4) = 4; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
851 img = img.permute (perm1); |
31118
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
852 |
31120
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
853 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
|
854 tile_width * tiles_across, |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
855 tile_height * tiles_down)); |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
856 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
857 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
|
858 || 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
|
859 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
|
860 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
|
861 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
862 perm2(0) = 2; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
863 perm2(1) = 1; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
864 perm2(2) = 0; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
865 img = img.permute (perm2); |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
866 } |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
867 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
|
868 { |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
869 perm1(0) = 0; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
870 perm1(1) = 2; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
871 perm1(2) = 1; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
872 perm1(3) = 3; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
873 perm1(4) = 4; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
874 img = img.permute (perm1); |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
875 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
876 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
|
877 tile_height * tiles_down, |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
878 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
|
879 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
880 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
|
881 || 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
|
882 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
|
883 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
|
884 |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
885 perm2(0) = 1; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
886 perm2(1) = 0; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
887 perm2(2) = 2; |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
888 img = img.permute (perm2); |
46bb98cec195
Tiff read: implemented all cases for tiled images using matrix operations
magedrifaat <magedrifaat@gmail.com>
parents:
31119
diff
changeset
|
889 } |
31118
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
890 |
f8be3654caef
Tiff read: Support for tiled images with normal planar configuration
magedrifaat <magedrifaat@gmail.com>
parents:
31117
diff
changeset
|
891 return octave_value (img); |
31113
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
892 } |
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
893 |
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
894 template <typename T> |
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
895 octave_value |
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
896 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
|
897 { |
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
898 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
|
899 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
|
900 else |
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
901 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
|
902 } |
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
903 |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
904 octave_value |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
905 read_unsigned_image (TIFF *tif, tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
906 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
907 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
908 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
909 case 1: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
910 return read_image<boolNDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
911 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
912 case 4: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
913 case 8: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
914 return read_image<uint8NDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
915 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
916 case 16: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
917 return read_image<uint16NDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
918 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
919 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
920 return read_image<uint32NDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
921 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
922 return read_image<uint64NDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
923 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
924 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
925 error ("Unsupported bit depth"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
926 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
927 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
928 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
929 octave_value |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
930 read_signed_image (TIFF *tif, tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
931 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
932 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
933 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
934 case 8: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
935 return read_image<int8NDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
936 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
937 case 16: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
938 return read_image<int16NDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
939 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
940 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
941 return read_image<int32NDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
942 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
943 return read_image<int64NDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
944 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
945 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
946 error ("Unsupported bit depth for signed images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
947 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
948 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
949 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
950 octave_value |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
951 read_float_image (TIFF *tif, tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
952 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
953 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
954 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
955 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
956 return read_image<FloatNDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
957 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
958 return read_image<NDArray> (tif, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
959 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
960 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
961 error ("Unsupported bit depth for floating-point images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
962 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
963 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
964 |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
965 template <typename T> |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
966 octave_value |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
967 make_array (void *data, dim_vector& arr_dims) |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
968 { |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
969 typedef typename T::element_type P; |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
970 |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
971 T arr (arr_dims); |
31181
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
972 for (uint32_t i = 0; i < arr_dims.numel (); i++) |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
973 { |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
974 arr(i) = (reinterpret_cast<P *> (data))[i]; |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
975 } |
31181
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
976 return octave_value (arr); |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
977 } |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
978 |
31114
9dead1249449
Tiff getTag: fixed matrix shape for ColorMap and TransferFunction
magedrifaat <magedrifaat@gmail.com>
parents:
31113
diff
changeset
|
979 octave_value |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
980 interpret_tag_data (void *data, uint32_t count, TIFFDataType tag_datatype, |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
981 bool convert_to_double = false) |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
982 { |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
983 octave_value retval;dim_vector arr_dims (1, count); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
984 switch (tag_datatype) |
31101
f24d7bcad2d3
Partially fixed formatting of C++ code
magedrifaat <magedrifaat@gmail.com>
parents:
31099
diff
changeset
|
985 { |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
986 case TIFF_BYTE: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
987 case TIFF_UNDEFINED: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
988 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
989 retval = make_array<uint8NDArray> (data, arr_dims); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
990 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
991 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
992 case TIFF_ASCII: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
993 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
994 retval = octave_value (*(reinterpret_cast<char **> (data))); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
995 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
996 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
997 case TIFF_SHORT: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
998 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
999 retval = make_array<uint16NDArray> (data, arr_dims); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1000 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1001 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1002 case TIFF_LONG: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1003 case TIFF_IFD: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1004 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1005 retval = make_array<uint32NDArray> (data, arr_dims); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1006 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1007 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1008 case TIFF_LONG8: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1009 case TIFF_IFD8: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1010 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1011 retval = make_array<uint64NDArray> (data, arr_dims); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1012 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1013 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1014 case TIFF_RATIONAL: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1015 case TIFF_SRATIONAL: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1016 case TIFF_FLOAT: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1017 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1018 retval = make_array<FloatNDArray> (data, arr_dims); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1019 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1020 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1021 case TIFF_SBYTE: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1022 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1023 retval = make_array<int8NDArray> (data, arr_dims); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1024 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1025 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1026 case TIFF_SSHORT: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1027 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1028 retval = make_array<int16NDArray> (data, arr_dims); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1029 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1030 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1031 case TIFF_SLONG: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1032 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1033 retval = make_array<int32NDArray> (data, arr_dims); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1034 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1035 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1036 case TIFF_SLONG8: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1037 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1038 retval = make_array<int64NDArray> (data, arr_dims); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1039 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1040 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1041 case TIFF_DOUBLE: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1042 { |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1043 retval = make_array<NDArray> (data, arr_dims); |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1044 break; |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1045 } |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1046 default: |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1047 error ("Unsupported tag data type"); |
31101
f24d7bcad2d3
Partially fixed formatting of C++ code
magedrifaat <magedrifaat@gmail.com>
parents:
31099
diff
changeset
|
1048 } |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1049 |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1050 if (tag_datatype != TIFF_ASCII && convert_to_double) |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1051 retval = retval.as_double (); |
31114
9dead1249449
Tiff getTag: fixed matrix shape for ColorMap and TransferFunction
magedrifaat <magedrifaat@gmail.com>
parents:
31113
diff
changeset
|
1052 return retval; |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1053 } |
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
|
1054 |
31114
9dead1249449
Tiff getTag: fixed matrix shape for ColorMap and TransferFunction
magedrifaat <magedrifaat@gmail.com>
parents:
31113
diff
changeset
|
1055 octave_value |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1056 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
|
1057 { |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1058 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
|
1059 |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1060 // TIFFFieldReadCount returns VARIABLE for some scalar tags |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1061 // (e.g. Compression) But TIFFFieldPassCount seems consistent |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1062 // 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
|
1063 // 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
|
1064 if (TIFFFieldPassCount (fip)) |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1065 error ("Unsupported tag"); |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1066 |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1067 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
|
1068 |
31181
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
1069 std::unique_ptr<uint8_t []> data |
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
1070 = std::make_unique<uint8_t []> (type_size); |
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
1071 uint8_t *data_ptr = data.get (); |
31131
7349994f30f8
Tiff: fixed the first test to use a single-pixel image
magedrifaat <magedrifaat@gmail.com>
parents:
31130
diff
changeset
|
1072 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
|
1073 { |
7349994f30f8
Tiff: fixed the first test to use a single-pixel image
magedrifaat <magedrifaat@gmail.com>
parents:
31130
diff
changeset
|
1074 // 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
|
1075 // zero as the default value for PlanaConfiguration |
31185
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
1076 // See: https://www.asmail.be/msg0054918184.html |
31181
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
1077 if (! TIFFGetField(tif, tag_id, data_ptr)) |
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
1078 *reinterpret_cast<uint16_t *> (data_ptr) = 1; |
31131
7349994f30f8
Tiff: fixed the first test to use a single-pixel image
magedrifaat <magedrifaat@gmail.com>
parents:
31130
diff
changeset
|
1079 } |
7349994f30f8
Tiff: fixed the first test to use a single-pixel image
magedrifaat <magedrifaat@gmail.com>
parents:
31130
diff
changeset
|
1080 else |
31181
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
1081 validate_tiff_get_field (TIFFGetFieldDefaulted (tif, tag_id, data_ptr)); |
31131
7349994f30f8
Tiff: fixed the first test to use a single-pixel image
magedrifaat <magedrifaat@gmail.com>
parents:
31130
diff
changeset
|
1082 |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1083 // All scalar tags are returned as double |
31181
8a4ef572077d
__tiff__.cc (get_scalar_field_data): replaced _TIFFMalloc with unique_ptr.
magedrifaat <magedrifaat@gmail.com>
parents:
31180
diff
changeset
|
1084 octave_value tag_data_ov = interpret_tag_data (data_ptr, 1, |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1085 TIFFFieldDataType (fip), |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1086 true); |
31094
ab5b33e447b0
Modified getTag to account for different tag data types and multivalued tags, the current implementation is still buggy for most tags and data types
magedrifaat <magedrifaat@gmail.com>
parents:
31093
diff
changeset
|
1087 |
31114
9dead1249449
Tiff getTag: fixed matrix shape for ColorMap and TransferFunction
magedrifaat <magedrifaat@gmail.com>
parents:
31113
diff
changeset
|
1088 return tag_data_ov; |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1089 } |
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
|
1090 |
31114
9dead1249449
Tiff getTag: fixed matrix shape for ColorMap and TransferFunction
magedrifaat <magedrifaat@gmail.com>
parents:
31113
diff
changeset
|
1091 octave_value |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1092 get_array_field_data (TIFF *tif, const TIFFField *fip, uint32_t array_size, |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1093 bool convert_to_double = false) |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1094 { |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1095 void *data; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1096 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
|
1097 |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1098 return interpret_tag_data (data, array_size, TIFFFieldDataType (fip), |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1099 convert_to_double); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1100 } |
31097
75ab26f147a5
getTag: Implemented single array tags, only multi-array and special tags are unimplemented
magedrifaat <magedrifaat@gmail.com>
parents:
31096
diff
changeset
|
1101 |
31117
530dbd1d6b07
Tiff getTag: fixed bug for multivalued tags where only first item is returned
magedrifaat <magedrifaat@gmail.com>
parents:
31115
diff
changeset
|
1102 octave_value |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1103 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
|
1104 { |
31117
530dbd1d6b07
Tiff getTag: fixed bug for multivalued tags where only first item is returned
magedrifaat <magedrifaat@gmail.com>
parents:
31115
diff
changeset
|
1105 octave_value tag_data_ov; |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1106 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
|
1107 |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1108 // 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
|
1109 switch (tag_id) |
31101
f24d7bcad2d3
Partially fixed formatting of C++ code
magedrifaat <magedrifaat@gmail.com>
parents:
31099
diff
changeset
|
1110 { |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1111 case TIFFTAG_STRIPBYTECOUNTS: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1112 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
|
1113 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
|
1114 TIFFNumberOfStrips (tif)); |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1115 break; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1116 case TIFFTAG_TILEBYTECOUNTS: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1117 case TIFFTAG_TILEOFFSETS: |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1118 tag_data_ov |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1119 = 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
|
1120 break; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1121 case TIFFTAG_YCBCRCOEFFICIENTS: |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1122 tag_data_ov = get_array_field_data (tif, fip, 3, true); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1123 break; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1124 case TIFFTAG_REFERENCEBLACKWHITE: |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1125 tag_data_ov = get_array_field_data (tif, fip, 6, true); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1126 break; |
31106
f5a88c0a61ab
Support for GrayResponseCurve and GrayResponseUnit tags
magedrifaat <magedrifaat@gmail.com>
parents:
31105
diff
changeset
|
1127 case TIFFTAG_GRAYRESPONSECURVE: |
f5a88c0a61ab
Support for GrayResponseCurve and GrayResponseUnit tags
magedrifaat <magedrifaat@gmail.com>
parents:
31105
diff
changeset
|
1128 { |
f5a88c0a61ab
Support for GrayResponseCurve and GrayResponseUnit tags
magedrifaat <magedrifaat@gmail.com>
parents:
31105
diff
changeset
|
1129 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
|
1130 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
|
1131 &bits_per_sample)) |
31106
f5a88c0a61ab
Support for GrayResponseCurve and GrayResponseUnit tags
magedrifaat <magedrifaat@gmail.com>
parents:
31105
diff
changeset
|
1132 error ("Failed to obtain the bit depth"); |
f5a88c0a61ab
Support for GrayResponseCurve and GrayResponseUnit tags
magedrifaat <magedrifaat@gmail.com>
parents:
31105
diff
changeset
|
1133 |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1134 tag_data_ov = get_array_field_data (tif, fip, |
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1135 1<<bits_per_sample, true); |
31106
f5a88c0a61ab
Support for GrayResponseCurve and GrayResponseUnit tags
magedrifaat <magedrifaat@gmail.com>
parents:
31105
diff
changeset
|
1136 break; |
f5a88c0a61ab
Support for GrayResponseCurve and GrayResponseUnit tags
magedrifaat <magedrifaat@gmail.com>
parents:
31105
diff
changeset
|
1137 } |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1138 case TIFFTAG_COLORMAP: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1139 { |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1140 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
|
1141 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
|
1142 &bits_per_sample)) |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1143 error ("Failed to obtain the bit depth"); |
31143
a68f2dadafee
Tiff.m: added all remaining tests for implemented features.
magedrifaat <magedrifaat@gmail.com>
parents:
31142
diff
changeset
|
1144 |
a68f2dadafee
Tiff.m: added all remaining tests for implemented features.
magedrifaat <magedrifaat@gmail.com>
parents:
31142
diff
changeset
|
1145 // According to the format specification, this field should |
a68f2dadafee
Tiff.m: added all remaining tests for implemented features.
magedrifaat <magedrifaat@gmail.com>
parents:
31142
diff
changeset
|
1146 // be 8 or 16 only. |
a68f2dadafee
Tiff.m: added all remaining tests for implemented features.
magedrifaat <magedrifaat@gmail.com>
parents:
31142
diff
changeset
|
1147 if (bits_per_sample > 16) |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1148 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
|
1149 |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1150 uint32_t count = 1 << bits_per_sample; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1151 uint16_t *red, *green, *blue; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1152 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
|
1153 &red, &green, &blue)); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1154 |
31130
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1155 // 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
|
1156 // them together |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1157 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
|
1158 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
|
1159 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
|
1160 count, |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1161 TIFFFieldDataType(fip)) |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1162 .uint16_array_value () |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1163 .reshape (col_dims)); |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1164 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
|
1165 count, |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1166 TIFFFieldDataType(fip)) |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1167 .uint16_array_value () |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1168 .reshape (col_dims)); |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1169 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
|
1170 count, |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1171 TIFFFieldDataType(fip)) |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1172 .uint16_array_value () |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1173 .reshape (col_dims)); |
31114
9dead1249449
Tiff getTag: fixed matrix shape for ColorMap and TransferFunction
magedrifaat <magedrifaat@gmail.com>
parents:
31113
diff
changeset
|
1174 |
31130
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1175 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
|
1176 // 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
|
1177 mat_out /= UINT16_MAX; |
31114
9dead1249449
Tiff getTag: fixed matrix shape for ColorMap and TransferFunction
magedrifaat <magedrifaat@gmail.com>
parents:
31113
diff
changeset
|
1178 |
31117
530dbd1d6b07
Tiff getTag: fixed bug for multivalued tags where only first item is returned
magedrifaat <magedrifaat@gmail.com>
parents:
31115
diff
changeset
|
1179 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
|
1180 break; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1181 } |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1182 case TIFFTAG_TRANSFERFUNCTION: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1183 { |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1184 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
|
1185 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
|
1186 &samples_per_pixel)) |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1187 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
|
1188 |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1189 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
|
1190 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
|
1191 &bits_per_sample)) |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1192 error ("Failed to obtain the bit depth"); |
31098
3cbd0d82167c
getTag: Implemented all special tags, only unsupported geotiff tags not implemented
magedrifaat <magedrifaat@gmail.com>
parents:
31097
diff
changeset
|
1193 |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1194 uint32_t count = 1 << bits_per_sample; |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
1195 uint16_t *ch1 = NULL, *ch2 = NULL, *ch3 = NULL; |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
1196 // TransferFunction can have 1 or 3 channels depending on the |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
1197 // SamplesPerPixel but the library still expects three pointers |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
1198 // to be passed and sets only the needed ones |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1199 validate_tiff_get_field (TIFFGetField (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1200 &ch1, &ch2, &ch3)); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1201 if (ch2 == NULL) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1202 tag_data_ov = interpret_tag_data (ch1, count, |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1203 TIFFFieldDataType (fip), true); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1204 else |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
1205 { |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
1206 // Concatenate the channels into an n by 3 array |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1207 OCTAVE_LOCAL_BUFFER (NDArray, array_list, 3); |
31130
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1208 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
|
1209 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
|
1210 count, |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1211 TIFFFieldDataType (fip)) |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1212 .array_value () |
31130
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1213 .reshape (col_dims); |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1214 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
|
1215 count, |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1216 TIFFFieldDataType (fip)) |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1217 .array_value () |
31130
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1218 .reshape (col_dims); |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1219 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
|
1220 count, |
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1221 TIFFFieldDataType (fip)) |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1222 .array_value () |
31130
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1223 .reshape (col_dims); |
31114
9dead1249449
Tiff getTag: fixed matrix shape for ColorMap and TransferFunction
magedrifaat <magedrifaat@gmail.com>
parents:
31113
diff
changeset
|
1224 |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1225 tag_data_ov |
31184
86f91ea7a642
__tiff__.cc (get_field_data): fixed return type for some tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31183
diff
changeset
|
1226 = octave_value (NDArray::cat (1, 3, array_list)); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1227 } |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1228 break; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1229 } |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1230 case TIFFTAG_PAGENUMBER: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1231 case TIFFTAG_HALFTONEHINTS: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1232 case TIFFTAG_DOTRANGE: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1233 case TIFFTAG_YCBCRSUBSAMPLING: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1234 { |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1235 uint16_t tag_part1, tag_part2; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1236 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
|
1237 &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
|
1238 |
31130
8475bdb70457
Tiff getTag: changed ColorMap to use Array::cat instead of memcpy
magedrifaat <magedrifaat@gmail.com>
parents:
31129
diff
changeset
|
1239 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
|
1240 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
|
1241 = 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
|
1242 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
|
1243 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
|
1244 = 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
|
1245 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
|
1246 |
530dbd1d6b07
Tiff getTag: fixed bug for multivalued tags where only first item is returned
magedrifaat <magedrifaat@gmail.com>
parents:
31115
diff
changeset
|
1247 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
|
1248 break; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1249 } |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1250 case TIFFTAG_SUBIFD: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1251 { |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1252 uint16_t count; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1253 uint64_t *offsets; |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1254 validate_tiff_get_field (TIFFGetField (tif, tag_id, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1255 &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
|
1256 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
|
1257 TIFFFieldDataType (fip)); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1258 break; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1259 } |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1260 case TIFFTAG_EXTRASAMPLES: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1261 { |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1262 uint16_t count; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1263 uint16_t *types; |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1264 validate_tiff_get_field (TIFFGetField (tif, tag_id, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1265 &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
|
1266 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
|
1267 TIFFFieldDataType (fip)); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1268 break; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1269 } |
31103
76b21bed2920
Undocumented and unimplemented tags are explicilty mentioned and handled
magedrifaat <magedrifaat@gmail.com>
parents:
31102
diff
changeset
|
1270 // 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
|
1271 // will be implemented and tested later. |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1272 case TIFFTAG_XMLPACKET: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1273 case TIFFTAG_RICHTIFFIPTC: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1274 case TIFFTAG_PHOTOSHOP: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1275 case TIFFTAG_ICCPROFILE: |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1276 { |
31103
76b21bed2920
Undocumented and unimplemented tags are explicilty mentioned and handled
magedrifaat <magedrifaat@gmail.com>
parents:
31102
diff
changeset
|
1277 error ("Complex Tags not implemented"); |
76b21bed2920
Undocumented and unimplemented tags are explicilty mentioned and handled
magedrifaat <magedrifaat@gmail.com>
parents:
31102
diff
changeset
|
1278 break; |
76b21bed2920
Undocumented and unimplemented tags are explicilty mentioned and handled
magedrifaat <magedrifaat@gmail.com>
parents:
31102
diff
changeset
|
1279 } |
31106
f5a88c0a61ab
Support for GrayResponseCurve and GrayResponseUnit tags
magedrifaat <magedrifaat@gmail.com>
parents:
31105
diff
changeset
|
1280 // 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
|
1281 // 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
|
1282 case TIFFTAG_ZIPQUALITY: |
76b21bed2920
Undocumented and unimplemented tags are explicilty mentioned and handled
magedrifaat <magedrifaat@gmail.com>
parents:
31102
diff
changeset
|
1283 case TIFFTAG_SGILOGDATAFMT: |
31106
f5a88c0a61ab
Support for GrayResponseCurve and GrayResponseUnit tags
magedrifaat <magedrifaat@gmail.com>
parents:
31105
diff
changeset
|
1284 case TIFFTAG_GRAYRESPONSEUNIT: |
31103
76b21bed2920
Undocumented and unimplemented tags are explicilty mentioned and handled
magedrifaat <magedrifaat@gmail.com>
parents:
31102
diff
changeset
|
1285 { |
31117
530dbd1d6b07
Tiff getTag: fixed bug for multivalued tags where only first item is returned
magedrifaat <magedrifaat@gmail.com>
parents:
31115
diff
changeset
|
1286 tag_data_ov = get_scalar_field_data (tif, fip); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1287 break; |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1288 } |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1289 default: |
31117
530dbd1d6b07
Tiff getTag: fixed bug for multivalued tags where only first item is returned
magedrifaat <magedrifaat@gmail.com>
parents:
31115
diff
changeset
|
1290 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
|
1291 } |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1292 |
31117
530dbd1d6b07
Tiff getTag: fixed bug for multivalued tags where only first item is returned
magedrifaat <magedrifaat@gmail.com>
parents:
31115
diff
changeset
|
1293 return tag_data_ov; |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
1294 } |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
1295 |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
1296 void |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1297 set_scalar_field_data (TIFF *tif, const TIFFField *fip, octave_value tag_ov) |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1298 { |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1299 uint32_t tag_id = TIFFFieldTag (fip); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1300 |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1301 // Since scalar tags are the last to be handled, any tag that |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1302 // require a count to be passed is an unsupported tag. |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1303 if (TIFFFieldPassCount (fip)) |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1304 error ("Unsupported tag"); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1305 |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
1306 TIFFDataType tag_datatype = TIFFFieldDataType (fip); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
1307 |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1308 // According to matlab, the value must be a scalar double |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
1309 // except for strings |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
1310 if (tag_datatype == TIFF_ASCII) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
1311 { |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
1312 if (! tag_ov.is_string ()) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
1313 error ("Expected string for ascii tag"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
1314 } |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
1315 else if (! tag_ov.is_scalar_type () || ! tag_ov.is_double_type ()) |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1316 error ("Tag value must be a scalar double"); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1317 |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1318 switch (tag_datatype) |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1319 { |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1320 case TIFF_BYTE: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1321 case TIFF_UNDEFINED: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1322 TIFFSetField (tif, tag_id, tag_ov.uint8_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1323 break; |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1324 case TIFF_ASCII: |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1325 TIFFSetField (tif, tag_id, tag_ov.string_value ().c_str ()); |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1326 break; |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1327 case TIFF_SHORT: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1328 TIFFSetField (tif, tag_id, tag_ov.uint16_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1329 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1330 case TIFF_LONG: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1331 TIFFSetField (tif, tag_id, tag_ov.uint32_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1332 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1333 case TIFF_LONG8: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1334 TIFFSetField (tif, tag_id, tag_ov.uint64_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1335 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1336 case TIFF_RATIONAL: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1337 TIFFSetField (tif, tag_id, tag_ov.float_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1338 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1339 case TIFF_SBYTE: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1340 TIFFSetField (tif, tag_id, tag_ov.int8_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1341 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1342 case TIFF_SSHORT: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1343 TIFFSetField (tif, tag_id, tag_ov.int16_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1344 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1345 case TIFF_SLONG: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1346 TIFFSetField (tif, tag_id, tag_ov.int32_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1347 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1348 case TIFF_SLONG8: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1349 TIFFSetField (tif, tag_id, tag_ov.int64_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1350 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1351 case TIFF_FLOAT: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1352 TIFFSetField (tif, tag_id, tag_ov.float_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1353 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1354 case TIFF_DOUBLE: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1355 TIFFSetField (tif, tag_id, tag_ov.double_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1356 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1357 case TIFF_SRATIONAL: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1358 TIFFSetField (tif, tag_id, tag_ov.float_scalar_value ()); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1359 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1360 case TIFF_IFD: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1361 case TIFF_IFD8: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1362 error ("Unimplemented IFFD data type"); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1363 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1364 default: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1365 error ("Unsupported tag data type"); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1366 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1367 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1368 |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1369 template <typename T> |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1370 void |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1371 set_array_field_helper (TIFF *tif, uint32_t tag_id, T data_arr) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1372 { |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1373 const void *data_ptr = data_arr.data (); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1374 |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1375 if (! TIFFSetField (tif, tag_id, data_ptr)) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1376 error ("Failed to set tag"); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1377 } |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1378 |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1379 void |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1380 set_array_field_data (TIFF *tif, const TIFFField *fip, |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1381 octave_value tag_ov, uint32_t count) |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1382 { |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1383 uint32_t tag_id = TIFFFieldTag (fip); |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1384 TIFFDataType tag_datatype = TIFFFieldDataType (fip); |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1385 |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1386 // Array type must be double in matlab |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1387 if (! tag_ov.is_double_type ()) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1388 error ("Tag data must be double"); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1389 |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1390 // Matlab checks number of elements not dimensions |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1391 if (tag_ov.array_value ().numel () != count) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1392 error ("Expected an array with %u elements", count); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1393 |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1394 switch (tag_datatype) |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1395 { |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1396 case TIFF_BYTE: |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1397 case TIFF_UNDEFINED: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1398 set_array_field_helper<uint8NDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1399 tag_ov.uint8_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1400 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1401 case TIFF_SHORT: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1402 set_array_field_helper<uint16NDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1403 tag_ov.uint16_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1404 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1405 case TIFF_LONG: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1406 set_array_field_helper<uint32NDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1407 tag_ov.uint32_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1408 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1409 case TIFF_LONG8: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1410 set_array_field_helper<uint64NDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1411 tag_ov.uint64_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1412 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1413 case TIFF_RATIONAL: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1414 set_array_field_helper<FloatNDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1415 tag_ov.float_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1416 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1417 case TIFF_SBYTE: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1418 set_array_field_helper<int8NDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1419 tag_ov.int8_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1420 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1421 case TIFF_SSHORT: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1422 set_array_field_helper<int16NDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1423 tag_ov.int16_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1424 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1425 case TIFF_SLONG: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1426 set_array_field_helper<int32NDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1427 tag_ov.int32_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1428 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1429 case TIFF_SLONG8: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1430 set_array_field_helper<int64NDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1431 tag_ov.int64_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1432 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1433 case TIFF_FLOAT: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1434 set_array_field_helper<FloatNDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1435 tag_ov.float_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1436 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1437 case TIFF_DOUBLE: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1438 set_array_field_helper<NDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1439 tag_ov.array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1440 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1441 case TIFF_SRATIONAL: |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1442 set_array_field_helper<FloatNDArray> (tif, tag_id, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1443 tag_ov.float_array_value ()); |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1444 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1445 case TIFF_IFD: |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1446 case TIFF_IFD8: |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1447 error ("Unimplemented IFFD data type"); |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1448 break; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1449 default: |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1450 error ("Unsupported tag data type"); |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1451 } |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1452 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1453 |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1454 void |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
1455 set_field_data (TIFF *tif, const TIFFField *fip, octave_value tag_ov) |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1456 { |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
1457 uint32_t tag_id = TIFFFieldTag (fip); |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1458 |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1459 // TODO(maged): find/create images to test the special tags |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1460 switch (tag_id) |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1461 { |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1462 case TIFFTAG_YCBCRCOEFFICIENTS: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1463 set_array_field_data (tif, fip, tag_ov, 3); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1464 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1465 case TIFFTAG_REFERENCEBLACKWHITE: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1466 set_array_field_data (tif, fip, tag_ov, 6); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1467 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1468 case TIFFTAG_GRAYRESPONSECURVE: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1469 { |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1470 uint16_t bits_per_sample; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1471 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE, |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1472 &bits_per_sample)) |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1473 error ("Failed to obtain the bit depth"); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1474 |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1475 set_array_field_data (tif, fip, tag_ov, 1<<bits_per_sample); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1476 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1477 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1478 case TIFFTAG_COLORMAP: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1479 { |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1480 uint16_t bits_per_sample; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1481 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE, |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1482 &bits_per_sample)) |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1483 error ("Failed to obtain the bit depth"); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1484 |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1485 if (! tag_ov.is_double_type ()) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1486 error ("Tag data must be double"); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1487 |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1488 // According to the format specification, this field should |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1489 // be 8 or 16 only. |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1490 if (bits_per_sample > 16) |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1491 error ("Too high bit depth for a palette image"); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1492 |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1493 uint32_t count = 1 << bits_per_sample; |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1494 |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1495 if (tag_ov.is_scalar_type () |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1496 || tag_ov.array_value ().dim1 () != count |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1497 || tag_ov.array_value ().dim2 () != 3) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1498 error ("Expected matrix with %u rows and 3 columns", count); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1499 |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1500 NDArray array_data = tag_ov.array_value (); |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1501 array_data *= UINT16_MAX; |
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1502 uint16NDArray u16_array = uint16NDArray (array_data); |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1503 const uint16_t *data_ptr |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1504 = reinterpret_cast<const uint16_t *> (u16_array.data ()); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1505 if (! TIFFSetField (tif, tag_id, data_ptr, data_ptr + count, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1506 data_ptr + 2 * count)) |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1507 error ("Failed to set tag"); |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1508 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1509 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1510 case TIFFTAG_TRANSFERFUNCTION: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1511 { |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1512 uint16_t samples_per_pixel; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1513 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_SAMPLESPERPIXEL, |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1514 &samples_per_pixel)) |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1515 error ("Failed to obtain the number of samples per pixel"); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1516 |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1517 uint16_t bits_per_sample; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1518 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE, |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1519 &bits_per_sample)) |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1520 error ("Failed to obtain the bit depth"); |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1521 |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1522 uint32_t count = 1 << bits_per_sample; |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1523 |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1524 // An intermediate variable is required for storing the return of |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1525 // uint16_array_value so that the object remains in scope and the |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1526 // pointer returned from data () is not a dangling pointer |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1527 uint16NDArray data_arr = tag_ov.uint16_array_value (); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1528 |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1529 if (data_arr.numel () != count) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1530 error ("Tag data should be and array of %u elements", count); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1531 |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1532 const uint16_t *data_ptr |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1533 = reinterpret_cast<const uint16_t *> (data_arr.data ()); |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1534 if (samples_per_pixel == 1) |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1535 { |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1536 if (! TIFFSetField (tif, tag_id, data_ptr)) |
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1537 error ("Failed to set field"); |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1538 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1539 else |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1540 { |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1541 if (! TIFFSetField (tif, tag_id, data_ptr, data_ptr + count, |
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1542 data_ptr + 2 * count)) |
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1543 error ("Failed to set field"); |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1544 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1545 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1546 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1547 case TIFFTAG_PAGENUMBER: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1548 case TIFFTAG_HALFTONEHINTS: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1549 case TIFFTAG_DOTRANGE: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1550 case TIFFTAG_YCBCRSUBSAMPLING: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1551 { |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1552 uint16NDArray array_data = tag_ov.uint16_array_value (); |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1553 if (array_data.numel () != 2) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1554 error ("Tag data should be an array with 2 elements"); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1555 |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1556 if (! TIFFSetField (tif, tag_id, array_data (0), array_data (1))) |
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1557 error ("Failed to set field"); |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1558 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1559 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1560 case TIFFTAG_SUBIFD: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1561 { |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
1562 // Setting the SubIFD invloves setting their count only |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
1563 // and the library will set the offsets correctly in |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
1564 // the next calls to writeDirectory, but an array of offsets |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
1565 // is still required so an array of zeroes is passed |
31175
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
1566 uint16_t subifd_count = tag_ov.uint16_scalar_value (); |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
1567 std::unique_ptr<uint64_t []> subifd_offsets |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
1568 = std::make_unique<uint64_t []> (subifd_count); |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
1569 uint64_t *offfsets_ptr = subifd_offsets.get (); |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
1570 if (! TIFFSetField (tif, tag_id, subifd_count, offfsets_ptr)) |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
1571 error ("Failed to set tag"); |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1572 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1573 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1574 case TIFFTAG_EXTRASAMPLES: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1575 { |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1576 uint16_t samples_per_pixel; |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1577 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_SAMPLESPERPIXEL, |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1578 &samples_per_pixel)) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1579 error ("Failed to obtain the number of samples per pixel"); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1580 |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1581 uint16NDArray data_array = tag_ov.uint16_array_value (); |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1582 if (data_array.numel () > samples_per_pixel - 3) |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1583 error ("Failed to set field, too many values"); |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1584 |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1585 if (! TIFFSetField (tif, tag_id, |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1586 static_cast<uint16_t> (data_array.numel ()), |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1587 data_array.data ())) |
31167
f91cd5ceaae6
Tiff setTag: added support for special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31166
diff
changeset
|
1588 error ("Failed to set field"); |
31165
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1589 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1590 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1591 // TODO(maged): These tags are more complex to implement |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1592 // will be implemented and tested later. |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1593 case TIFFTAG_XMLPACKET: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1594 case TIFFTAG_RICHTIFFIPTC: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1595 case TIFFTAG_PHOTOSHOP: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1596 case TIFFTAG_ICCPROFILE: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1597 { |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1598 error ("Complex Tags not implemented"); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1599 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1600 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1601 // These tags are not mentioned in the LibTIFF documentation |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1602 // but are handled correctly by the library |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1603 case TIFFTAG_ZIPQUALITY: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1604 case TIFFTAG_SGILOGDATAFMT: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1605 case TIFFTAG_GRAYRESPONSEUNIT: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1606 { |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1607 set_scalar_field_data (tif, fip, tag_ov); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1608 break; |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1609 } |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1610 default: |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1611 set_scalar_field_data (tif, fip, tag_ov); |
48d46f7a640b
Tiff setTag: handled scalar tags with the correct data type.
magedrifaat <magedrifaat@gmail.com>
parents:
31164
diff
changeset
|
1612 } |
31166
b8b6cc05c8ea
Tiff setTag: added support for tags with array values.
magedrifaat <magedrifaat@gmail.com>
parents:
31165
diff
changeset
|
1613 |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
1614 } |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1615 |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1616 template <typename T> |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1617 void |
31133
e9925d528428
Tiff writeEncodedStrip: used octave_value functions instead of type_name
magedrifaat <magedrifaat@gmail.com>
parents:
31131
diff
changeset
|
1618 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
|
1619 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
|
1620 { |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1621 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
|
1622 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
|
1623 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
|
1624 |
31127
0d9633ee715e
Tiff: fixed a bug where the default value of some tags was ignored
magedrifaat <magedrifaat@gmail.com>
parents:
31126
diff
changeset
|
1625 // 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
|
1626 // 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
|
1627 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
|
1628 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
|
1629 |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1630 // LibTIFF uses zero-based indexing as opposed to Octave's 1-based |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1631 strip_no--; |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1632 |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1633 uint32_t strip_count = TIFFNumberOfStrips (tif); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1634 rows_in_strip = get_rows_in_strip (strip_no, strip_count, |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1635 rows_in_strip, image_data); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1636 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1637 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
|
1638 if (image_data->planar_configuration == PLANARCONFIG_CONTIG) |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1639 strip_dimensions = dim_vector (rows_in_strip, image_data->width, |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1640 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
|
1641 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE) |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1642 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
|
1643 else |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1644 error ("Planar configuration not supported"); |
31145
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1645 |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1646 if (strip_data.dim1 () > rows_in_strip) |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1647 warning ("The strip is composed of %u rows but the input has %ld rows.", |
31145
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1648 rows_in_strip, |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1649 strip_data.dim1 ()); |
31137
233130c0b1f6
Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31136
diff
changeset
|
1650 |
31145
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1651 if (strip_data.dim2 () > image_data->width) |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1652 warning ("The image width is %u but the input has %ld columns.", |
31145
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1653 image_data->width, |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1654 strip_data.dim2 ()); |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1655 |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1656 if (strip_data.ndims () > 2) |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1657 { |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1658 if (image_data->planar_configuration == PLANARCONFIG_CONTIG |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1659 && strip_data.dim3 () > image_data->samples_per_pixel) |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1660 warning ("The strip is composed of %u channels but the input has %ld channels.", |
31145
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1661 image_data->samples_per_pixel, |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1662 strip_data.dim3 ()); |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1663 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1664 && strip_data.dim3 () > 1) |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1665 warning ("The strip is composed of %u channel but the input has %ld channels.", |
31145
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1666 1, strip_data.dim3 ()); |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1667 } |
2e11f9cb30b8
Tiff writeEncodedStrip: added warning for input data larger than the size of the strip.
magedrifaat <magedrifaat@gmail.com>
parents:
31144
diff
changeset
|
1668 |
31137
233130c0b1f6
Tiff writeEncodedStrip: changed strip dimension check behavior to mimic matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31136
diff
changeset
|
1669 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
|
1670 |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1671 // 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
|
1672 // 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
|
1673 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
|
1674 perm(0) = 2; |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1675 perm(1) = 1; |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1676 perm(2) = 0; |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1677 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
|
1678 |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1679 uint8_t *data_u8 |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1680 = reinterpret_cast<uint8_t *> (strip_data.fortran_vec ()); |
31144
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1681 if (image_data->bits_per_sample == 8 |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1682 || image_data->bits_per_sample == 16 |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1683 || image_data->bits_per_sample == 32 |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1684 || image_data->bits_per_sample == 64) |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1685 { |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1686 // Can't rely on LibTIFF's TIFFStripSize because boundary strips |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1687 // can be smaller in size |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1688 tsize_t strip_size = strip_data.numel () |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1689 * image_data->bits_per_sample / 8; |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1690 if (TIFFWriteEncodedStrip (tif, strip_no, data_u8, strip_size) == -1) |
31144
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1691 error ("Failed to write strip data to image"); |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1692 |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1693 } |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1694 else if (image_data->bits_per_sample == 1) |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1695 { |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1696 if (image_data->samples_per_pixel != 1) |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1697 error ("Bi-Level images must have one channel only"); |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1698 |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1699 // Create a buffer to hold the packed strip data |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1700 // Unique pointers are faster than vectors for constant size buffers |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1701 std::unique_ptr<uint8_t []> strip_ptr |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1702 = std::make_unique<uint8_t []> (TIFFStripSize (tif)); |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1703 uint8_t *strip_buf = strip_ptr.get (); |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1704 // According to the format specification, the row should be byte |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1705 // aligned so the number of bytes is rounded up to the nearest byte |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1706 uint32_t padded_width = (image_data->width + 7) / 8; |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1707 // Packing the pixel data into bits |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1708 for (uint32_t row = 0; row < rows_in_strip; row++) |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1709 { |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1710 for (uint32_t col = 0; col < image_data->width; col++) |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1711 { |
31183
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
1712 uint8_t shift = col % 8; |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
1713 if (TIFFIsMSB2LSB (tif)) |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
1714 shift = 7 - shift; |
31144
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1715 strip_buf[row * padded_width + col / 8] |= data_u8[col] << shift; |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1716 } |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1717 data_u8 += image_data->width; |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1718 } |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1719 tsize_t strip_size = padded_width * rows_in_strip; |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1720 if (TIFFWriteEncodedStrip (tif, strip_no, strip_buf, strip_size) == -1) |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1721 error ("Failed to write strip data to image"); |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1722 } |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1723 else |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1724 { |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1725 error ("Unsupported bit depth"); |
8ba9f2326ee9
Tiff writeEncodedStrip: added support for BiLevel images
magedrifaat <magedrifaat@gmail.com>
parents:
31143
diff
changeset
|
1726 } |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1727 } |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
1728 |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1729 template <typename T> |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1730 void |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1731 write_tile (TIFF *tif, uint32_t tile_no, T tile_data, |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1732 tiff_image_data *image_data) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1733 { |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1734 uint32_t tile_width, tile_height; |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
1735 get_tile_dimensions_validated (tif, tile_width, tile_height); |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1736 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1737 if (tile_no < 1 || tile_no > TIFFNumberOfTiles (tif)) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1738 error ("Tile number out of bounds"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1739 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1740 if (tile_data.dim1 () > tile_height) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1741 warning ("The tile is composed of %u rows but input has %ld rows", |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1742 tile_height, tile_data.dim1 ()); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1743 if (tile_data.dim2 () > tile_width) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1744 warning ("The tile is composed of %u columns but input has %ld columns", |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1745 tile_width, tile_data.dim2 ()); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1746 if (tile_data.ndims () > 2) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1747 { |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1748 if (image_data->planar_configuration == PLANARCONFIG_CONTIG |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1749 && tile_data.dim3 () > image_data->samples_per_pixel) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1750 warning ("The tile is composed of %u channels but input has %ld channels", |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1751 image_data->samples_per_pixel, tile_data.dim3 ()); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1752 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1753 && tile_data.dim3 () > 1) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1754 warning ("The tile is composed of %u channels but input has %ld channels", |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1755 1, tile_data.dim3 ()); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1756 } |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1757 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1758 dim_vector tile_dimensions; |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1759 if (image_data->planar_configuration == PLANARCONFIG_CONTIG) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1760 tile_dimensions = dim_vector (tile_height, tile_width, |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1761 image_data->samples_per_pixel); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1762 else if (image_data->planar_configuration == PLANARCONFIG_SEPARATE) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1763 tile_dimensions = dim_vector (tile_height, tile_width, 1); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1764 else |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1765 error ("Planar configuration not supported"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1766 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1767 tile_data.resize (tile_dimensions); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1768 Array<octave_idx_type> perm (dim_vector (3, 1)); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1769 perm(0) = 2; |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1770 perm(1) = 1; |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1771 perm(2) = 0; |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1772 tile_data = tile_data.permute (perm); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1773 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1774 // Octave indexing is 1-based while LibTIFF is zero-based |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1775 tile_no--; |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1776 uint8_t *data_u8 = reinterpret_cast<uint8_t *> (tile_data.fortran_vec ()); |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1777 if (image_data->bits_per_sample == 8 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1778 || image_data->bits_per_sample == 16 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1779 || image_data->bits_per_sample == 32 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1780 || image_data->bits_per_sample == 64) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1781 { |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
1782 if (TIFFWriteEncodedTile (tif, tile_no, data_u8, |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1783 TIFFTileSize (tif)) == -1) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1784 error ("Failed to write tile data to image"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1785 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1786 } |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1787 else if (image_data->bits_per_sample == 1) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1788 { |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1789 if (image_data->samples_per_pixel != 1) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1790 error ("Bi-Level images must have one channel only"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1791 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1792 // Create a buffer to hold the packed tile data |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1793 // Unique pointers are faster than vectors for constant size buffers |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1794 std::unique_ptr<uint8_t []> tile_ptr |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1795 = std::make_unique<uint8_t []> (TIFFTileSize (tif)); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1796 uint8_t *tile_buf = tile_ptr.get (); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1797 // Packing the pixel data into bits |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1798 for (uint32_t row = 0; row < tile_height; row++) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1799 { |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1800 for (uint32_t col = 0; col < tile_width; col++) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1801 { |
31183
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
1802 uint8_t shift = col % 8; |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
1803 if (TIFFIsMSB2LSB (tif)) |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
1804 shift = 7 - shift; |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1805 tile_buf[row * tile_width/8 + col/8] |= data_u8[col] << shift; |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1806 } |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1807 data_u8 += tile_width; |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1808 } |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1809 if (TIFFWriteEncodedTile (tif, tile_no, tile_buf, |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1810 TIFFTileSize (tif)) == -1) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1811 error ("Failed to write tile data to image"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1812 } |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1813 else |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1814 { |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1815 error ("Unsupported bit depth"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1816 } |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1817 } |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1818 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1819 template <typename T> |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1820 void |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1821 write_strip_or_tile (TIFF *tif, uint32_t strip_tile_no, T strip_data, |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1822 tiff_image_data *image_data) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1823 { |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1824 if (image_data->is_tiled) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1825 write_tile<T> (tif, strip_tile_no, strip_data, image_data); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1826 else |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1827 write_strip<T> (tif, strip_tile_no, strip_data, image_data); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1828 } |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1829 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1830 void |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1831 write_unsigned_strip_or_tile (TIFF *tif, uint32_t strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1832 octave_value data_ov, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1833 tiff_image_data *image_data) |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1834 { |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1835 switch (image_data->bits_per_sample) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1836 { |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1837 case 1: |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1838 // We need to check for both scalar and matrix types to handle single |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1839 // element strip |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1840 if (data_ov.is_bool_scalar () || data_ov.is_bool_matrix ()) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1841 write_strip_or_tile<boolNDArray> (tif, strip_tile_no, |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1842 data_ov.bool_array_value (), |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1843 image_data); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1844 else |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1845 error ("Expected logical matrix for BiLevel image"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1846 break; |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1847 case 8: |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1848 if (data_ov.is_uint8_type ()) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1849 write_strip_or_tile<uint8NDArray> (tif, strip_tile_no, |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1850 data_ov.uint8_array_value (), |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1851 image_data); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1852 else |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1853 error ("Only uint8 data is allowed for uint images with bit depth of 8"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1854 break; |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1855 case 16: |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1856 if (data_ov.is_uint16_type ()) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1857 write_strip_or_tile<uint16NDArray> (tif, strip_tile_no, |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1858 data_ov.uint16_array_value (), |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1859 image_data); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1860 else |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1861 error ("Only uint16 data is allowed for uint images with bit depth of 16"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1862 break; |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1863 case 32: |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1864 if (data_ov.is_uint32_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1865 write_strip_or_tile<uint32NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1866 data_ov.uint32_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1867 image_data); |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1868 else |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1869 error ("Only uint32 data is allowed for uint images with bit depth of 32"); |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1870 break; |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1871 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1872 if (data_ov.is_uint64_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1873 write_strip_or_tile<uint64NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1874 data_ov.uint64_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1875 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1876 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1877 error ("Only uint64 data is allowed for uint images with bit depth of 64"); |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1878 break; |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1879 default: |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1880 error ("Unsupported bit depth"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1881 } |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1882 } |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1883 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1884 void |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1885 write_signed_strip_or_tile (TIFF *tif, uint32_t strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1886 octave_value data_ov, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1887 tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1888 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1889 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1890 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1891 case 8: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1892 if (data_ov.is_int8_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1893 write_strip_or_tile<int8NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1894 data_ov.int8_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1895 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1896 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1897 error ("Only int8 data is allowed for int images with bit depth of 8"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1898 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1899 case 16: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1900 if (data_ov.is_int16_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1901 write_strip_or_tile<int16NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1902 data_ov.int16_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1903 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1904 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1905 error ("Only int16 data is allowed for int images with bit depth of 16"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1906 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1907 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1908 if (data_ov.is_int32_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1909 write_strip_or_tile<int32NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1910 data_ov.int32_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1911 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1912 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1913 error ("Only int32 data is allowed for int images with bit depth of 32"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1914 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1915 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1916 if (data_ov.is_int64_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1917 write_strip_or_tile<int64NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1918 data_ov.int64_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1919 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1920 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1921 error ("Only int64 data is allowed for int images with bit depth of 64"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1922 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1923 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1924 error ("Unsupported bit depth for signed images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1925 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1926 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1927 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1928 void |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1929 write_float_strip_or_tile (TIFF *tif, uint32_t strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1930 octave_value data_ov, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1931 tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1932 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1933 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1934 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1935 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1936 if (data_ov.is_single_type () || data_ov.is_double_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1937 write_strip_or_tile<FloatNDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1938 data_ov.float_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1939 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1940 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1941 error ("Only single and double data are allowed for floating-point images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1942 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1943 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1944 if (data_ov.is_single_type () || data_ov.is_double_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1945 write_strip_or_tile<NDArray> (tif, strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1946 data_ov.array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1947 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1948 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1949 error ("Only single and double data are allowed for floating-point images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1950 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1951 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1952 error ("Unsupported bit depth for floating-point images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1953 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1954 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1955 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1956 void |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1957 handle_write_strip_or_tile (TIFF *tif, uint32_t strip_tile_no, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1958 octave_value data_ov, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1959 tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1960 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1961 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1962 // SampleFormat tag is not a required field and has a default value of 1 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1963 // So we need to use TIFFGetFieldDefaulted in case it is not present in |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1964 // the file |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1965 uint16_t sample_format; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1966 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format)) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1967 error ("Failed to obtain a value for sample format"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1968 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1969 switch (sample_format) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1970 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1971 case 1: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1972 case 4: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1973 write_unsigned_strip_or_tile (tif, strip_tile_no, data_ov, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1974 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1975 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1976 case 2: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1977 write_signed_strip_or_tile (tif, strip_tile_no, data_ov, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1978 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1979 case 3: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1980 write_float_strip_or_tile (tif, strip_tile_no, data_ov, image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1981 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1982 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1983 error ("Unsupported sample format"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1984 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
1985 } |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
1986 |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1987 template <typename T> |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1988 void |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1989 write_stripped_image (TIFF *tif, T pixel_data, tiff_image_data *image_data) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1990 { |
31164
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
1991 // ASSUMES pixel data dimensions are already validated |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1992 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1993 typedef typename T::element_type P; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1994 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1995 // Permute pixel data to be aligned in memory to the way LibTIFF |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1996 // expects the data to be (i.e. channel x width x height for chunky |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1997 // and width x height x channel for separate planes) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1998 Array<octave_idx_type> perm (dim_vector (3, 1)); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
1999 if (image_data->planar_configuration == PLANARCONFIG_SEPARATE) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2000 { |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2001 perm(0) = 1; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2002 perm(1) = 0; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2003 perm(2) = 2; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2004 } |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2005 else |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2006 { |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2007 perm(0) = 2; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2008 perm(1) = 1; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2009 perm(2) = 0; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2010 } |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2011 pixel_data = pixel_data.permute (perm); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2012 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2013 uint32_t row_per_strip; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2014 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ROWSPERSTRIP, &row_per_strip)) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2015 error ("Failed to obtain the RowPerStrip tag"); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2016 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2017 // The default value is INT_MAX so we need to cap it to the image height |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2018 if (row_per_strip > image_data->height) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2019 row_per_strip = image_data->height; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2020 |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2021 uint8_t *pixel_fvec |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2022 = reinterpret_cast<uint8_t *> (pixel_data.fortran_vec ()); |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2023 uint32_t strip_count = TIFFNumberOfStrips (tif); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2024 tsize_t strip_size; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2025 uint32_t rows_in_strip; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2026 for (uint32_t strip = 0; strip < strip_count; strip++) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2027 { |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2028 rows_in_strip = get_rows_in_strip (strip, strip_count, |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2029 row_per_strip, image_data); |
31154
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2030 if (image_data->bits_per_sample == 8 |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2031 || image_data->bits_per_sample == 16 |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2032 || image_data->bits_per_sample == 32 |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2033 || image_data->bits_per_sample == 64) |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2034 { |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2035 strip_size = rows_in_strip * image_data->width * sizeof (P); |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2036 if (image_data->planar_configuration == PLANARCONFIG_CONTIG) |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2037 strip_size *= image_data->samples_per_pixel; |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2038 if (! TIFFWriteEncodedStrip (tif, strip, pixel_fvec, strip_size)) |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2039 error ("Failed to rite strip data"); |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2040 pixel_fvec += strip_size; |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2041 } |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2042 else if (image_data->bits_per_sample == 1) |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2043 { |
31156
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2044 if (image_data->samples_per_pixel != 1) |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2045 error ("Bi-Level images must have one channel only"); |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2046 |
31154
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2047 // Create a buffer to hold the packed strip data |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2048 // Unique pointers are faster than vectors for constant size buffers |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2049 std::unique_ptr<uint8_t []> strip_ptr |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2050 = std::make_unique<uint8_t []> (TIFFStripSize (tif)); |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2051 uint8_t *strip_buf = strip_ptr.get (); |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2052 // According to the format specification, the row should be byte |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2053 // aligned so the number of bytes is rounded up to the nearest byte |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2054 uint32_t padded_width = (image_data->width + 7) / 8; |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2055 // Packing the pixel data into bits |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2056 for (uint32_t row = 0; row < rows_in_strip; row++) |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2057 { |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2058 for (uint32_t col = 0; col < image_data->width; col++) |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2059 { |
31183
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
2060 uint8_t shift = col % 8; |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
2061 if (TIFFIsMSB2LSB (tif)) |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
2062 shift = 7 - shift; |
31154
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2063 strip_buf[row * padded_width + col / 8] |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2064 |= pixel_fvec[col] << shift; |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2065 } |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2066 pixel_fvec += image_data->width; |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2067 } |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2068 strip_size = padded_width * rows_in_strip; |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2069 if (TIFFWriteEncodedStrip (tif, strip, strip_buf, strip_size) == -1) |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2070 error ("Failed to write strip data to image"); |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2071 } |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2072 else |
828b7cc9aa36
Tiff write: added support for BiLevel stripped images and added unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31153
diff
changeset
|
2073 error ("Unsupported bit depth"); |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2074 } |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2075 } |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2076 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2077 template <typename T> |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2078 void |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2079 write_tiled_image (TIFF *tif, T pixel_data, tiff_image_data *image_data) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2080 { |
31164
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2081 // ASSUMES pixel data dimensions are already validated |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2082 |
31155
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2083 uint32_t tile_width, tile_height; |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2084 get_tile_dimensions_validated (tif, tile_width, tile_height); |
31155
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2085 |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2086 uint32_t tiles_across = (image_data->width + tile_width - 1) |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2087 / tile_width; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2088 uint32_t tiles_down = (image_data->height + tile_height - 1) |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2089 / tile_height; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2090 |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2091 // Resize the image data to add tile padding |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2092 dim_vector padded_dims (tiles_down * tile_height, |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2093 tiles_across * tile_width, |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2094 image_data->samples_per_pixel); |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2095 pixel_data.resize (padded_dims); |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2096 |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2097 // Reshape the image to separate tiles into their own dimension |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2098 // so we can permute them to the right order |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2099 dim_vector tiled_dims (tile_height, tiles_down, tile_width, tiles_across, |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2100 image_data->samples_per_pixel); |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2101 pixel_data = pixel_data.reshape (tiled_dims); |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2102 |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2103 // Permute the dimesnions to get the memory alignment to match LibTIFF |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2104 Array<octave_idx_type> perm (dim_vector (5, 1)); |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2105 if (image_data->planar_configuration == PLANARCONFIG_SEPARATE) |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2106 { |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2107 // For separate planes, the data coming from libtiff will have all |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2108 // tiles of the first sample then all tiles of the second sample |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2109 // and so on. Tiles of each sample will be ordered from left to right |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2110 // and from top to bottom. And data inside each tile is organised as |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2111 // rows and each row contains columns. |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2112 // So the order for LibTIFF is: |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2113 // samples x tiles_down x tiles_across x tile_height x tile_width |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2114 // But memory orientation of Octave arrays is reversed so we set it to |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2115 // tile_width x tile_height x tiles_across x tiles_down x samples |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2116 perm(0) = 2; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2117 perm(1) = 0; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2118 perm(2) = 3; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2119 perm(3) = 1; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2120 perm(4) = 4; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2121 } |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2122 else |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2123 { |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2124 // For chunky planes, the data coming from libtiff will be ordered |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2125 // from left to right and from top to bottom. And data inside each |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2126 // tile is organised as rows and each row contains columns and each |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2127 // column contains samples. |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2128 // So the order for LibTIFF is: |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2129 // tiles_down x tiles_across x tile_height x tile_width x samples |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2130 // But memory orientation of Octave arrays is reversed so we set it to |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2131 // samples x tile_width x tile_height x tiles_across x tiles_down |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2132 perm(0) = 4; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2133 perm(1) = 2; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2134 perm(2) = 0; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2135 perm(3) = 3; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2136 perm(4) = 1; |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2137 } |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2138 pixel_data = pixel_data.permute (perm); |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2139 |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2140 uint8_t *pixel_fvec |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2141 = reinterpret_cast<uint8_t *> (pixel_data.fortran_vec ()); |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2142 uint32_t tile_count = TIFFNumberOfTiles (tif); |
31156
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2143 tsize_t tile_size = TIFFTileSize (tif); |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2144 |
31155
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2145 for (uint32_t tile = 0; tile <tile_count; tile++) |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2146 { |
31156
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2147 if (image_data->bits_per_sample == 8 |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2148 || image_data->bits_per_sample == 16 |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2149 || image_data->bits_per_sample == 32 |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2150 || image_data->bits_per_sample == 64) |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2151 { |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2152 if (! TIFFWriteEncodedTile (tif, tile, pixel_fvec, tile_size)) |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2153 error ("Failed to write tile data"); |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2154 pixel_fvec += tile_size; |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2155 } |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2156 else if (image_data->bits_per_sample == 1) |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2157 { |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2158 if (image_data->samples_per_pixel != 1) |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2159 error ("Bi-Level images must have one channel only"); |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2160 |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2161 // Create a buffer to hold the packed tile data |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2162 // Unique pointers are faster than vectors for |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2163 // constant size buffers |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2164 std::unique_ptr<uint8_t []> tile_ptr |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2165 = std::make_unique<uint8_t []> (tile_size); |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2166 uint8_t *tile_buf = tile_ptr.get (); |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2167 // Packing the pixel data into bits |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2168 for (uint32_t row = 0; row < tile_height; row++) |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2169 { |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2170 for (uint32_t col = 0; col < tile_width; col++) |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2171 { |
31183
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
2172 uint8_t shift = col % 8; |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
2173 if (TIFFIsMSB2LSB (tif)) |
6ab628dfe2a0
__tif__.cc: added support for BiLevel Images with reversed bit ordering.
magedrifaat <magedrifaat@gmail.com>
parents:
31182
diff
changeset
|
2174 shift = 7 - shift; |
31156
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2175 tile_buf[row * tile_width / 8 + col / 8] |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2176 |= pixel_fvec[col] << shift; |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2177 } |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2178 pixel_fvec += tile_width; |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2179 } |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2180 if (TIFFWriteEncodedTile (tif, tile, tile_buf, |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2181 TIFFTileSize (tif)) == -1) |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2182 error ("Failed to write tile data to image"); |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2183 } |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2184 else |
1e633a093faa
Tiff write: added support for logical tile images and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31155
diff
changeset
|
2185 error ("Unsupported bit depth"); |
31155
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2186 } |
a30b144bc10b
Tiff write: added support for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31154
diff
changeset
|
2187 |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2188 } |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2189 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2190 template <typename T> |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2191 void |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2192 write_image (TIFF *tif, T pixel_data, tiff_image_data *image_data) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2193 { |
31168
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2194 // This dimensions checking is intentially done in this non-homogeneous |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2195 // way for matlab compatibility. |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2196 // In Matlab R2022a, If the width or height of the input matrix is less |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2197 // than needed, the data is silently padded with zeroes to fit. |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2198 // If the width is larger than needed, a warning is issued and the excess |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2199 // data is truncated. If the height is larger than needed, no warning is |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2200 // issued and the image data is wrong. If the number of channels is less |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2201 // or more than needed an error is produced. |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2202 // We chose to deviate from matlab in the larger height case to avoid |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2203 // errors resulting from silently corrupting image data, a warning is |
27ed758c1688
Tiff setTag: fixed bug for rational tags and special-case tags.
magedrifaat <magedrifaat@gmail.com>
parents:
31167
diff
changeset
|
2204 // produced instead. |
31164
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2205 if ((image_data->samples_per_pixel > 1 && pixel_data.ndims () < 3) |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2206 || (pixel_data.ndims () > 2 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2207 && image_data->samples_per_pixel != pixel_data.dim3 ())) |
31164
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2208 error ("Incorrect number of channels, expected %u", |
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2209 image_data->samples_per_pixel); |
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2210 |
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2211 if (pixel_data.dim1 () > image_data->height) |
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2212 warning ("Input has more rows than the image length, data will be truncated"); |
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2213 if (pixel_data.dim2 () > image_data->width) |
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2214 warning ("Input has more columns than the image width, data will be truncated"); |
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2215 |
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2216 pixel_data.resize (dim_vector (image_data->height, image_data->width, |
3155aa74c62e
Tiff write: modified handling incorrect dimensions to match matlab.
magedrifaat <magedrifaat@gmail.com>
parents:
31163
diff
changeset
|
2217 image_data->samples_per_pixel)); |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2218 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2219 if (image_data->is_tiled) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2220 write_tiled_image<T> (tif, pixel_data, image_data); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2221 else |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2222 write_stripped_image<T> (tif, pixel_data, image_data); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2223 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2224 } |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2225 |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2226 void |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2227 write_unsigned_image (TIFF *tif, octave_value image_ov, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2228 tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2229 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2230 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2231 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2232 case 1: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2233 // We need to check for both scalar and matrix types to handle single |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2234 // pixel image |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2235 if (image_ov.is_bool_scalar () || image_ov.is_bool_matrix ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2236 write_image<boolNDArray> (tif, image_ov.bool_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2237 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2238 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2239 error ("Expected logical matrix for BiLevel image"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2240 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2241 case 8: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2242 if (image_ov.is_uint8_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2243 write_image<uint8NDArray> (tif, image_ov.uint8_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2244 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2245 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2246 error ("Only uint8 data is allowed for uint images with bit depth of 8"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2247 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2248 case 16: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2249 if (image_ov.is_uint16_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2250 write_image<uint16NDArray> (tif, image_ov.uint16_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2251 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2252 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2253 error ("Only uint16 data is allowed for uint images with bit depth of 16"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2254 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2255 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2256 if (image_ov.is_uint32_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2257 write_image<uint32NDArray> (tif, image_ov.uint32_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2258 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2259 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2260 error ("Only uint32 data is allowed for uint images with bit depth of 32"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2261 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2262 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2263 if (image_ov.is_uint64_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2264 write_image<uint64NDArray> (tif, image_ov.uint64_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2265 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2266 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2267 error ("Only uint64 data is allowed for uint images with bit depth of 64"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2268 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2269 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2270 error ("Unsupported bit depth"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2271 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2272 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2273 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2274 void |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2275 write_signed_image (TIFF *tif, octave_value image_ov, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2276 tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2277 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2278 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2279 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2280 case 8: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2281 if (image_ov.is_int8_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2282 write_image<int8NDArray> (tif, image_ov.int8_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2283 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2284 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2285 error ("Only int8 data is allowed for int images with bit depth of 8"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2286 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2287 case 16: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2288 if (image_ov.is_int16_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2289 write_image<int16NDArray> (tif, image_ov.int16_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2290 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2291 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2292 error ("Only int16 data is allowed for int images with bit depth of 16"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2293 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2294 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2295 if (image_ov.is_int32_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2296 write_image<int32NDArray> (tif, image_ov.int32_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2297 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2298 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2299 error ("Only int32 data is allowed for int images with bit depth of 32"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2300 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2301 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2302 if (image_ov.is_int64_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2303 write_image<int64NDArray> (tif, image_ov.int64_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2304 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2305 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2306 error ("Only int64 data is allowed for int images with bit depth of 64"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2307 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2308 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2309 error ("Unsupported bit depth for signed images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2310 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2311 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2312 |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2313 void |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2314 write_float_image (TIFF *tif, octave_value image_ov, |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2315 tiff_image_data *image_data) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2316 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2317 switch (image_data->bits_per_sample) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2318 { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2319 case 32: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2320 if (image_ov.is_single_type () || image_ov.is_double_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2321 write_image<FloatNDArray> (tif, image_ov.float_array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2322 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2323 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2324 error ("Only single or double data are allowed for float images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2325 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2326 case 64: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2327 if (image_ov.is_single_type () || image_ov.is_double_type ()) |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2328 write_image<NDArray> (tif, image_ov.array_value (), |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2329 image_data); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2330 else |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2331 error ("Only single or double data are allowed for float images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2332 break; |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2333 default: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2334 error ("Unsupported bit depth for floating-point images"); |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2335 } |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2336 } |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2337 |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2338 octave_value_list |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2339 slice_rgba (uint8NDArray rgba_data) |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2340 { |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2341 Array<idx_vector> idx (dim_vector (3, 1)); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2342 idx(0) = idx_vector (':'); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2343 idx(1) = idx_vector (':'); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2344 idx(2) = idx_vector (0, 3); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2345 uint8NDArray rgb = uint8NDArray (rgba_data.index (idx)); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2346 idx(2) = idx_vector (3); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2347 uint8NDArray alpha = uint8NDArray (rgba_data.index (idx)); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2348 |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2349 octave_value_list retval (2); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2350 retval(0) = octave_value (rgb); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2351 retval(1) = octave_value (alpha); |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2352 return retval; |
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2353 } |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2354 #endif |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2355 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
2356 DEFUN (__open_tiff__, args, , |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2357 "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
|
2358 { |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2359 #if defined (HAVE_TIFF) |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2360 int nargin = args.length (); |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2361 |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2362 if (nargin == 0 || nargin > 2) |
31101
f24d7bcad2d3
Partially fixed formatting of C++ code
magedrifaat <magedrifaat@gmail.com>
parents:
31099
diff
changeset
|
2363 { |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2364 error ("No filename supplied\n"); |
31101
f24d7bcad2d3
Partially fixed formatting of C++ code
magedrifaat <magedrifaat@gmail.com>
parents:
31099
diff
changeset
|
2365 } |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2366 |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
2367 std::string filename = args(0).string_value (); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2368 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
|
2369 |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2370 if (nargin == 2) |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
2371 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
|
2372 |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2373 const std::vector<std::string> supported_modes { |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2374 "r", "w", "w8", "a", "r+" |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2375 }; |
31123
0bcb35909ef4
Tiff open: removed support for rh mode and marked r+ as not yet supported
magedrifaat <magedrifaat@gmail.com>
parents:
31122
diff
changeset
|
2376 |
31142
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2377 if (std::find (supported_modes.cbegin (), supported_modes.cend (), mode) |
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2378 == supported_modes.cend ()) |
31176
c07461ca34d6
Tiff: add support for oppening tiff files in r+ mode
magedrifaat <magedrifaat@gmail.com>
parents:
31175
diff
changeset
|
2379 error ("Invalid mode for openning Tiff file: %s", mode.c_str ()); |
c07461ca34d6
Tiff: add support for oppening tiff files in r+ mode
magedrifaat <magedrifaat@gmail.com>
parents:
31175
diff
changeset
|
2380 |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
2381 // LibTIFF doesn't support r+ mode but it appears that the difference |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
2382 // between "a" and "r+" in the context of LibTIFF is that in "a" mode |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
2383 // the directory is not set while in r+ the directory is set to the |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
2384 // first directory in the file |
31176
c07461ca34d6
Tiff: add support for oppening tiff files in r+ mode
magedrifaat <magedrifaat@gmail.com>
parents:
31175
diff
changeset
|
2385 bool is_rplus = false; |
c07461ca34d6
Tiff: add support for oppening tiff files in r+ mode
magedrifaat <magedrifaat@gmail.com>
parents:
31175
diff
changeset
|
2386 if (mode == "r+") |
31128
524cb3106432
__tiff__.cc: handled compiler warnings for unused params and old-style casts.
magedrifaat <magedrifaat@gmail.com>
parents:
31127
diff
changeset
|
2387 { |
31176
c07461ca34d6
Tiff: add support for oppening tiff files in r+ mode
magedrifaat <magedrifaat@gmail.com>
parents:
31175
diff
changeset
|
2388 is_rplus = true; |
c07461ca34d6
Tiff: add support for oppening tiff files in r+ mode
magedrifaat <magedrifaat@gmail.com>
parents:
31175
diff
changeset
|
2389 mode = "a"; |
31128
524cb3106432
__tiff__.cc: handled compiler warnings for unused params and old-style casts.
magedrifaat <magedrifaat@gmail.com>
parents:
31127
diff
changeset
|
2390 } |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2391 |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2392 // LibTIFF does Strip chopping by default, which makes the organization of |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2393 // data exposed to the user different from the actual file, so we need to |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2394 // force disable this behavior by adding 'c' flag to the mode |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2395 mode = mode + 'c'; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2396 |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2397 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
|
2398 |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2399 if (! tif) |
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2400 error ("Failed to open Tiff file\n"); |
31176
c07461ca34d6
Tiff: add support for oppening tiff files in r+ mode
magedrifaat <magedrifaat@gmail.com>
parents:
31175
diff
changeset
|
2401 |
c07461ca34d6
Tiff: add support for oppening tiff files in r+ mode
magedrifaat <magedrifaat@gmail.com>
parents:
31175
diff
changeset
|
2402 // TODO(maged): check of there is more to be done for r+ |
c07461ca34d6
Tiff: add support for oppening tiff files in r+ mode
magedrifaat <magedrifaat@gmail.com>
parents:
31175
diff
changeset
|
2403 if (is_rplus && ! TIFFSetDirectory (tif, 0)) |
c07461ca34d6
Tiff: add support for oppening tiff files in r+ mode
magedrifaat <magedrifaat@gmail.com>
parents:
31175
diff
changeset
|
2404 error ("Failed to open Tiff file\n"); |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
2405 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2406 octave_value tiff_ov = octave_value (new octave_tiff_handle (tif)); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2407 return octave_value_list (tiff_ov); |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2408 #else |
31128
524cb3106432
__tiff__.cc: handled compiler warnings for unused params and old-style casts.
magedrifaat <magedrifaat@gmail.com>
parents:
31127
diff
changeset
|
2409 octave_unused_parameter (args); |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2410 err_disabled_feature ("Tiff", "Tiff"); |
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2411 #endif |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2412 } |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
2413 |
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
2414 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
2415 DEFUN (__close_tiff__, args, , |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2416 "Close a tiff file") |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2417 { |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2418 #if defined (HAVE_TIFF) |
31101
f24d7bcad2d3
Partially fixed formatting of C++ code
magedrifaat <magedrifaat@gmail.com>
parents:
31099
diff
changeset
|
2419 int nargin = args.length (); |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
2420 |
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
2421 if (nargin == 0) |
31101
f24d7bcad2d3
Partially fixed formatting of C++ code
magedrifaat <magedrifaat@gmail.com>
parents:
31099
diff
changeset
|
2422 error ("No handle provided\n"); |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
2423 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2424 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2425 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2426 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2427 tiff_handle->close (); |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
2428 |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2429 return octave_value_list (); |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2430 #else |
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2431 err_disabled_feature ("close", "Tiff"); |
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2432 #endif |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2433 } |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
2434 |
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
2435 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
2436 DEFUN (__tiff_get_tag__, args, , |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2437 "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
|
2438 { |
31104
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2439 #if defined (HAVE_TIFF) |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2440 int nargin = args.length (); |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2441 |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2442 if (nargin == 0) |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2443 error ("No handle provided\n"); |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2444 |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2445 if (nargin < 2) |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2446 error ("No tag name provided\n"); |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2447 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2448 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2449 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2450 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2451 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2452 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2453 TIFF *tif = tiff_handle->get_file (); |
31094
ab5b33e447b0
Modified getTag to account for different tag data types and multivalued tags, the current implementation is still buggy for most tags and data types
magedrifaat <magedrifaat@gmail.com>
parents:
31093
diff
changeset
|
2454 |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2455 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
|
2456 |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
2457 if (args(1).is_string ()) |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2458 { |
31182
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
2459 std::string tag_name = args(1).string_value (); |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
2460 fip = get_fip_with_name (tif, tag_name); |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2461 if (! fip) |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2462 error ("Tiff tag not found"); |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2463 } |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2464 else |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2465 { |
31182
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
2466 ttag_t tag_id = args(1).int_value (); |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2467 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
|
2468 |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2469 if (! fip) |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2470 error ("Tiff tag not found"); |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2471 } |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2472 |
31117
530dbd1d6b07
Tiff getTag: fixed bug for multivalued tags where only first item is returned
magedrifaat <magedrifaat@gmail.com>
parents:
31115
diff
changeset
|
2473 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
|
2474 #else |
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2475 err_disabled_feature ("getTag", "Tiff"); |
b5d59c115e52
Use HAVE_TIFF flag to optionally disable Tiff
magedrifaat <magedrifaat@gmail.com>
parents:
31103
diff
changeset
|
2476 #endif |
31102
d6ecf0e8838b
Add the new code to the octave namespace
magedrifaat <magedrifaat@gmail.com>
parents:
31101
diff
changeset
|
2477 } |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2478 |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2479 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
2480 DEFUN (__tiff_set_tag__, args, , |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2481 "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
|
2482 { |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2483 #if defined (HAVE_TIFF) |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2484 int nargin = args.length (); |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2485 |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2486 if (nargin < 2) |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2487 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
|
2488 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2489 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2490 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2491 check_closed (tiff_handle); |
31162
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
2492 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2493 TIFF *tif = tiff_handle->get_file (); |
31162
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
2494 check_readonly (tif); |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2495 |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
2496 if (args(1).isstruct ()) |
31140
5f70efad6e2c
Tiff setTag: added support for setting multiple tags at once using structs
magedrifaat <magedrifaat@gmail.com>
parents:
31139
diff
changeset
|
2497 { |
31152
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
2498 octave_scalar_map tags = args(1).xscalar_map_value ("__tiff_set_tag__: struct argument must be a scalar structure"); |
31142
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2499 string_vector keys = tags.fieldnames (); |
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2500 // Using iterators instead of this loop method seems to process |
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2501 // the elements of the struct in a different order than they were |
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2502 // assigned which makes the behavior here incompatible with matlab |
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2503 // in case of errors. |
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2504 for (octave_idx_type i = 0; i < keys.numel (); i++) |
31140
5f70efad6e2c
Tiff setTag: added support for setting multiple tags at once using structs
magedrifaat <magedrifaat@gmail.com>
parents:
31139
diff
changeset
|
2505 { |
31142
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2506 std::string key = keys[i]; |
31182
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
2507 const TIFFField *fip = get_fip_with_name (tif, key); |
31142
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2508 if (! fip) |
31140
5f70efad6e2c
Tiff setTag: added support for setting multiple tags at once using structs
magedrifaat <magedrifaat@gmail.com>
parents:
31139
diff
changeset
|
2509 error ("Tag %s not found", key.c_str ()); |
31142
97e7ee3b27b7
Tiff setTag: modify the behavior with structs to be compatible with matlab
magedrifaat <magedrifaat@gmail.com>
parents:
31140
diff
changeset
|
2510 set_field_data (tif, fip, tags.contents (key)); |
31140
5f70efad6e2c
Tiff setTag: added support for setting multiple tags at once using structs
magedrifaat <magedrifaat@gmail.com>
parents:
31139
diff
changeset
|
2511 } |
5f70efad6e2c
Tiff setTag: added support for setting multiple tags at once using structs
magedrifaat <magedrifaat@gmail.com>
parents:
31139
diff
changeset
|
2512 } |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2513 else |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2514 { |
31140
5f70efad6e2c
Tiff setTag: added support for setting multiple tags at once using structs
magedrifaat <magedrifaat@gmail.com>
parents:
31139
diff
changeset
|
2515 if (nargin < 3) |
5f70efad6e2c
Tiff setTag: added support for setting multiple tags at once using structs
magedrifaat <magedrifaat@gmail.com>
parents:
31139
diff
changeset
|
2516 error ("Too few arguments provided"); |
5f70efad6e2c
Tiff setTag: added support for setting multiple tags at once using structs
magedrifaat <magedrifaat@gmail.com>
parents:
31139
diff
changeset
|
2517 |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2518 const TIFFField *fip; |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
2519 if (args(1).is_string ()) |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2520 { |
31182
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
2521 std::string tag_name = args(1).string_value (); |
4c8b8c400a3b
__tiff__.cc (F__set_tag__, F__get_tag__): check for TagID names as well.
magedrifaat <magedrifaat@gmail.com>
parents:
31181
diff
changeset
|
2522 fip = get_fip_with_name (tif, tag_name); |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2523 if (! fip) |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2524 error ("Tiff tag not found"); |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2525 } |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2526 else |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2527 { |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
2528 uint32_t tag_id = args(1).int_value (); |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2529 fip = TIFFFieldWithTag (tif, tag_id); |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2530 if (! fip) |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2531 error ("Tiff tag not found"); |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2532 } |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2533 |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
2534 set_field_data (tif, fip, args(2)); |
31124
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2535 } |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2536 |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2537 return octave_value_list (); |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2538 #else |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2539 err_disabled_feature ("setTag", "Tiff"); |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2540 #endif |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2541 } |
e8d1cc309bc9
Tiff: added initial implementation of setTag function for scalar tags
magedrifaat <magedrifaat@gmail.com>
parents:
31123
diff
changeset
|
2542 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
2543 DEFUN (__tiff_read__, args, nargout, |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2544 "Read the image in the current IFD") |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2545 { |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2546 #if defined (HAVE_TIFF) |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2547 int nargin = args.length (); |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2548 |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2549 if (nargin == 0) |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2550 error ("No handle provided\n"); |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2551 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2552 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2553 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2554 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2555 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2556 TIFF *tif = tiff_handle->get_file (); |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2557 |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2558 // 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
|
2559 octave_unused_parameter (nargout); |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2560 |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2561 // Obtain all necessary tags |
31112
e3d8443585fe
Tiff read refactored reading stripped images into a separate function
magedrifaat <magedrifaat@gmail.com>
parents:
31111
diff
changeset
|
2562 // 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
|
2563 // 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
|
2564 // 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
|
2565 // 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
|
2566 tiff_image_data image_data (tif); |
31125
3b775b939de4
Tiff read: Added support for floating-point images
magedrifaat <magedrifaat@gmail.com>
parents:
31124
diff
changeset
|
2567 |
3b775b939de4
Tiff read: Added support for floating-point images
magedrifaat <magedrifaat@gmail.com>
parents:
31124
diff
changeset
|
2568 uint16_t sample_format; |
3b775b939de4
Tiff read: Added support for floating-point images
magedrifaat <magedrifaat@gmail.com>
parents:
31124
diff
changeset
|
2569 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format)) |
3b775b939de4
Tiff read: Added support for floating-point images
magedrifaat <magedrifaat@gmail.com>
parents:
31124
diff
changeset
|
2570 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
|
2571 |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2572 octave_value_list retval; |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2573 switch (sample_format) |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2574 { |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2575 case 1: |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2576 case 4: |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2577 retval (0) = read_unsigned_image (tif, &image_data); |
31113
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
2578 break; |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2579 case 2: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2580 retval (0) = read_signed_image (tif, &image_data); |
31113
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
2581 break; |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2582 case 3: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2583 retval (0) = read_float_image (tif, &image_data); |
31113
a74059523d74
Tiff read: use template to remove repitition in filling matrices
magedrifaat <magedrifaat@gmail.com>
parents:
31112
diff
changeset
|
2584 break; |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2585 default: |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2586 error ("Unsupported sample format"); |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2587 } |
31110
2daeeff33980
Tiff read fixed segfault bug for compressed images
magedrifaat <magedrifaat@gmail.com>
parents:
31109
diff
changeset
|
2588 |
31109
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2589 return retval; |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2590 #else |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2591 err_disabled_feature ("read", "Tiff"); |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2592 #endif |
06814e8b5a29
add function to read an entire image
magedrifaat <magedrifaat@gmail.com>
parents:
31106
diff
changeset
|
2593 } |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2594 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
2595 DEFUN (__tiff_read_encoded_strip__, args, nargout, |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2596 "Read a strip from the image in the current IFD") |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2597 { |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2598 #if defined (HAVE_TIFF) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2599 int nargin = args.length (); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2600 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2601 if (nargin != 2) |
31170
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2602 error ("Wrong number of arguments"); |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2603 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2604 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2605 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2606 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2607 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2608 TIFF *tif = tiff_handle->get_file (); |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2609 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2610 // TODO(maged): nargout and ycbcr |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2611 octave_unused_parameter (nargout); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2612 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2613 if (TIFFIsTiled (tif)) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2614 error ("The image is tiled not stripped"); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2615 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2616 uint32_t strip_no; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2617 if (args(1).is_scalar_type ()) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2618 strip_no = args(1).uint32_scalar_value (); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2619 else |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2620 error ("Expected scalar for strip number"); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2621 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2622 if (strip_no < 1 || strip_no > TIFFNumberOfStrips (tif)) |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2623 error ("Strip number out of bounds"); |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2624 |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2625 // Convert from Octave's 1-based indexing to zero-based indexing |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2626 strip_no--; |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2627 |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2628 return octave_value_list (handle_read_strip_or_tile (tif, strip_no)); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2629 #else |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2630 err_disabled_feature ("readEncodedStrip", "Tiff"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2631 #endif |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2632 } |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2633 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
2634 DEFUN (__tiff_read_encoded_tile__, args, nargout, |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2635 "Read a tile from the image in the current IFD") |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2636 { |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2637 #if defined (HAVE_TIFF) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2638 int nargin = args.length (); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2639 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2640 if (nargin != 2) |
31170
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2641 error ("Wrong number of arguments"); |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2642 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2643 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2644 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2645 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2646 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2647 TIFF *tif = tiff_handle->get_file (); |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2648 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2649 // TODO(maged): nargout and ycbcr |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2650 octave_unused_parameter (nargout); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2651 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2652 if (! TIFFIsTiled (tif)) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2653 error ("The image is stripped not tiled"); |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2654 |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2655 uint32_t tile_no; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2656 if (args(1).is_scalar_type ()) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2657 tile_no = args(1).uint32_scalar_value (); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2658 else |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2659 error ("Expected scalar for tile number"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2660 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2661 if (tile_no < 1 || tile_no > TIFFNumberOfTiles (tif)) |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2662 error ("Tile number out of bounds"); |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2663 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2664 // Convert from Octave's 1-based indexing to zero-based indexing |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2665 tile_no--; |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2666 |
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2667 return octave_value_list (handle_read_strip_or_tile (tif, tile_no)); |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2668 #else |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
2669 err_disabled_feature ("readEncodedTile", "Tiff"); |
31157
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2670 #endif |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2671 } |
dc3d2744916d
Tiff: added readEncodedStrip method and corresponding unit tests
magedrifaat <magedrifaat@gmail.com>
parents:
31156
diff
changeset
|
2672 |
31170
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2673 DEFUN (__tiff_read_rgba_image__, args, , |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2674 "Read the image data in rgba mode") |
31170
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2675 { |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2676 #if defined (HAVE_TIFF) |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2677 int nargin = args.length (); |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2678 |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2679 if (nargin != 1) |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2680 error ("Wrong number of arguments"); |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2681 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2682 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2683 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2684 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2685 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2686 TIFF *tif = tiff_handle->get_file (); |
31170
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2687 |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2688 tiff_image_data image_data (tif); |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2689 |
31173
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2690 uint16_t orientation; |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2691 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ORIENTATION, &orientation)) |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2692 orientation = ORIENTATION_LEFTTOP; |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2693 |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2694 // Start with reversed dimensions to be aligned with LibTIFF and |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2695 // permute to the correct order later |
31170
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2696 dim_vector img_dims (4, image_data.width, image_data.height); |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2697 uint8NDArray img (img_dims); |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2698 uint32_t *img_ptr = reinterpret_cast <uint32_t *> (img.fortran_vec ()); |
31173
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2699 |
31179
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
2700 // The TIFFRGBAImageGet interface is used instead of TIFFReadRGBAImage |
f294b800f002
Tiff.m: added tests for signed images and sub-directories.
magedrifaat <magedrifaat@gmail.com>
parents:
31178
diff
changeset
|
2701 // to have control on the requested orientation of the image |
31173
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2702 TIFFRGBAImage img_config; |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2703 char emsg[1024]; |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2704 if (! TIFFRGBAImageOK (tif, emsg) |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2705 || ! TIFFRGBAImageBegin (&img_config, tif, 0, emsg)) |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2706 error ("Failed to read image"); |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2707 |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2708 img_config.orientation = ORIENTATION_TOPLEFT; |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2709 img_config.req_orientation = orientation; |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2710 |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2711 bool success = TIFFRGBAImageGet (&img_config, img_ptr, img_config.width, |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2712 img_config.height); |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2713 |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2714 TIFFRGBAImageEnd (&img_config); |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2715 if (!success) |
31170
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2716 error ("Failed to read image"); |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2717 |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2718 // Permute to the correct Octave dimension order |
31170
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2719 Array<octave_idx_type> perm (dim_vector (3, 1)); |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2720 perm(0) = 2; |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2721 perm(1) = 1; |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2722 perm(2) = 0; |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2723 img = img.permute (perm); |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2724 |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2725 // Slice the data into RGB and alpha |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2726 return slice_rgba (img); |
31170
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2727 #else |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2728 err_disabled_feature ("readRGBAImage", "Tiff"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2729 #endif |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2730 } |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2731 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2732 DEFUN (__tiff_read_rgba_strip__, args, , |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2733 "Read the strip data containing the given row in rgba mode") |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2734 { |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2735 #if defined (HAVE_TIFF) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2736 int nargin = args.length (); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2737 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2738 if (nargin != 2) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2739 error ("Wrong number of arguments"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2740 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2741 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2742 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2743 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2744 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2745 TIFF *tif = tiff_handle->get_file (); |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2746 |
31173
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2747 // Matlab (R2022a) requires row to be double |
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2748 if (! args(1).is_double_type ()) |
31175
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
2749 error ("row should be of type double"); |
31173
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
2750 |
31175
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
2751 uint32_t row = args(1).uint32_scalar_value (); |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2752 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2753 tiff_image_data image_data (tif); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2754 if (image_data.is_tiled) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2755 error ("The image is tiled not stripped"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2756 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2757 if (row < 1 || row > image_data.height) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2758 error ("Row out of bounds of the image"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2759 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2760 // Convert from 1-based indexing to zero-based |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2761 row--; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2762 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2763 uint32_t rows_in_strip; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2764 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ROWSPERSTRIP, &rows_in_strip)) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2765 error ("Failed to obtain a value for RowsPerStrip"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2766 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2767 if (rows_in_strip > image_data.height) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2768 rows_in_strip = image_data.height; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2769 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2770 // LibTIFF requires the row to be the first row in the strip |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2771 // so this removes any offset to reach the first row |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2772 row -= row % rows_in_strip; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2773 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2774 // The exact number of rows in the strip is needed for boundary strips |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2775 uint32_t strip_no = TIFFComputeStrip (tif, row, 0); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2776 rows_in_strip = get_rows_in_strip (strip_no, TIFFNumberOfStrips (tif), |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2777 rows_in_strip, &image_data); |
31174
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2778 |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2779 uint16_t orientation; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2780 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ORIENTATION, &orientation)) |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2781 orientation = ORIENTATION_LEFTTOP; |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2782 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2783 // Start with reversed dimensions to be aligned with LibTIFF and |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2784 // permute to the correct order later |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2785 dim_vector strip_dims (4, image_data.width, rows_in_strip); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2786 uint8NDArray strip_data (strip_dims); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2787 uint32_t *strip_ptr |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2788 = reinterpret_cast <uint32_t *> (strip_data.fortran_vec ()); |
31174
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2789 |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2790 TIFFRGBAImage img_config; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2791 char emsg[1024]; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2792 if (! TIFFRGBAImageOK (tif, emsg) |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2793 || ! TIFFRGBAImageBegin (&img_config, tif, 0, emsg)) |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2794 error ("Failed to read strip"); |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2795 |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2796 img_config.orientation = ORIENTATION_TOPLEFT; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2797 img_config.req_orientation = orientation; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2798 img_config.row_offset = row; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2799 img_config.col_offset = 0; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2800 |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2801 bool success = TIFFRGBAImageGet (&img_config, strip_ptr, img_config.width, |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2802 rows_in_strip); |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2803 |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2804 TIFFRGBAImageEnd (&img_config); |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2805 if (!success) |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2806 error ("Failed to read strip"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2807 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2808 // Permute to the correct order of dimensions for Octave |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2809 Array<octave_idx_type> perm (dim_vector (3, 1)); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2810 perm(0) = 2; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2811 perm(1) = 1; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2812 perm(2) = 0; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2813 strip_data = strip_data.permute (perm); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2814 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2815 // Slice the data into RGB and alpha |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2816 return slice_rgba (strip_data); |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2817 #else |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2818 err_disabled_feature ("readRGBAStrip", "Tiff"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2819 #endif |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2820 } |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2821 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2822 DEFUN (__tiff_read_rgba_tile__, args, , |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2823 "Read the stile data containing the given row and column in rgba mode") |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2824 { |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2825 #if defined (HAVE_TIFF) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2826 int nargin = args.length (); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2827 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2828 if (nargin != 3) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2829 error ("Wrong number of arguments"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2830 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2831 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2832 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2833 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2834 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2835 TIFF *tif = tiff_handle->get_file (); |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2836 |
31175
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
2837 if (! args(1).is_double_type ()) |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
2838 error ("row should be of type double"); |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
2839 if (! args(2).is_double_type ()) |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
2840 error ("col should be of type double"); |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
2841 |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
2842 uint32_t row = args(1).uint32_scalar_value (); |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
2843 uint32_t col = args(2).uint32_scalar_value (); |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2844 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2845 tiff_image_data image_data (tif); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2846 if (! image_data.is_tiled) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2847 error ("The image is stripped not tiled"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2848 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2849 if (row < 1 || row > image_data.height) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2850 error ("Row out of bounds of the image"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2851 if (col < 1 || col > image_data.width) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2852 error ("Column out of bounds of the image"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2853 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2854 // Convert from 1-based indexing to zero-based |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2855 row--; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2856 col--; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2857 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2858 uint32_t tile_width, tile_height; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2859 if (! TIFFGetField (tif, TIFFTAG_TILELENGTH, &tile_height)) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2860 error ("Failed to obtain a value for TileLength"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2861 if (! TIFFGetField (tif, TIFFTAG_TILEWIDTH, &tile_width)) |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2862 error ("Failed to obtain a value for TileWidth"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2863 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2864 // LibTIFF requires the row and columns to be the top-left corner of the |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2865 // tile, so this removes any offset to reach the top-left row and column |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2866 // of the tile |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2867 row -= row % tile_height; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2868 col -= col % tile_width; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2869 |
31174
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2870 uint16_t orientation; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2871 if (! TIFFGetFieldDefaulted (tif, TIFFTAG_ORIENTATION, &orientation)) |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2872 orientation = ORIENTATION_LEFTTOP; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2873 |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2874 // Calculate the correct dimensions for boundary tiles |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2875 uint32_t corrected_height = tile_height; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2876 uint32_t corrected_width = tile_width; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2877 if (row + tile_height > image_data.height) |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2878 corrected_height = image_data.height - row; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2879 if (col + tile_width > image_data.width) |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2880 corrected_width = image_data.width - col; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2881 |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2882 // Start with reversed dimensions to be aligned with LibTIFF and |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2883 // permute to the correct order later |
31174
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2884 dim_vector tile_dims (4, corrected_width, corrected_height); |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2885 uint8NDArray tile_data (tile_dims); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2886 uint32_t *tile_ptr |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2887 = reinterpret_cast <uint32_t *> (tile_data.fortran_vec ()); |
31174
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2888 |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2889 TIFFRGBAImage img_config; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2890 char emsg[1024]; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2891 if (! TIFFRGBAImageOK (tif, emsg) |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2892 || ! TIFFRGBAImageBegin (&img_config, tif, 0, emsg)) |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2893 error ("Failed to read tile"); |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2894 |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2895 img_config.orientation = ORIENTATION_TOPLEFT; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2896 img_config.req_orientation = orientation; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2897 img_config.row_offset = row; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2898 img_config.col_offset = col; |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2899 |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2900 bool success = TIFFRGBAImageGet (&img_config, tile_ptr, corrected_width, |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2901 corrected_height); |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2902 |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2903 TIFFRGBAImageEnd (&img_config); |
1f19e9a06f2d
Tiff: modified readRGBAStrip/Tile to correctly use the orientation tag
magedrifaat <magedrifaat@gmail.com>
parents:
31173
diff
changeset
|
2904 if (!success) |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2905 error ("Failed to read tile"); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2906 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2907 // Permute to the correct order of dimensions for Octave |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2908 Array<octave_idx_type> perm (dim_vector (3, 1)); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2909 perm(0) = 2; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2910 perm(1) = 1; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2911 perm(2) = 0; |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2912 tile_data = tile_data.permute (perm); |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2913 |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2914 // Slice the data into RGB and alpha |
31180
ae78937e24d2
__tiff__.cc: refactored repititive code into functions.
magedrifaat <magedrifaat@gmail.com>
parents:
31179
diff
changeset
|
2915 return slice_rgba (tile_data); |
31171
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2916 #else |
8bf3fa6b6977
Tiff: added readRGBAStrip and readRGBATile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31170
diff
changeset
|
2917 err_disabled_feature ("readRGBATile", "Tiff"); |
31170
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2918 #endif |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2919 } |
72a159bc5a4c
Tiff: added readRGBAImage method to read image using the RGBA interface
magedrifaat <magedrifaat@gmail.com>
parents:
31168
diff
changeset
|
2920 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
2921 DEFUN (__tiff_write__, args, , |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2922 "Write the image data to the current IFD") |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2923 { |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2924 #if defined (HAVE_TIFF) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2925 int nargin = args.length (); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2926 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2927 if (nargin < 2) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2928 error ("Wrong number of arguments\n"); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2929 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2930 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2931 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2932 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2933 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2934 TIFF *tif = tiff_handle->get_file (); |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2935 |
31162
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
2936 check_readonly (tif); |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2937 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2938 // Obtain all necessary tags |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2939 tiff_image_data image_data (tif); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2940 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2941 uint16_t sample_format; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2942 if (! TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLEFORMAT, &sample_format)) |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2943 error ("Failed to obtain a value for sample format"); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2944 |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2945 switch (sample_format) |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2946 { |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2947 case 1: |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2948 case 4: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2949 write_unsigned_image (tif, args(1), &image_data); |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2950 break; |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2951 case 2: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2952 write_signed_image (tif, args(1), &image_data); |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2953 break; |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2954 case 3: |
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2955 write_float_image (tif, args(1), &image_data); |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2956 break; |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2957 default: |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
2958 error ("Unsupported sample format"); |
31153
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2959 } |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2960 |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2961 return octave_value_list (); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2962 #else |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2963 err_disabled_feature ("write", "Tiff"); |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2964 #endif |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2965 } |
c66d6c7f025e
Tiff: implemented write method for stripped images
magedrifaat <magedrifaat@gmail.com>
parents:
31152
diff
changeset
|
2966 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
2967 DEFUN (__tiff_write_encoded_strip__, args, , |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2968 "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
|
2969 { |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2970 #if defined (HAVE_TIFF) |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2971 int nargin = args.length (); |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2972 |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
2973 // TODO(maged): add support for YCbCr data |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2974 if (nargin < 3) |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2975 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
|
2976 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2977 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2978 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2979 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2980 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
2981 TIFF *tif = tiff_handle->get_file (); |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2982 |
31162
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
2983 check_readonly (tif); |
31138
68762676dab1
Tiff writeEncodedStrip: prevent writing to a read-only file
magedrifaat <magedrifaat@gmail.com>
parents:
31137
diff
changeset
|
2984 |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2985 // Obtain all necessary tags |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2986 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
|
2987 |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2988 if (image_data.is_tiled) |
31143
a68f2dadafee
Tiff.m: added all remaining tests for implemented features.
magedrifaat <magedrifaat@gmail.com>
parents:
31142
diff
changeset
|
2989 error ("Can't write strips to a tiled image"); |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2990 |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
2991 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
|
2992 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
|
2993 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
|
2994 |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
2995 handle_write_strip_or_tile (tif, strip_no, args(2), &image_data); |
31126
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2996 |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2997 return octave_value_list (); |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2998 #else |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
2999 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
|
3000 #endif |
7851c5b9c950
Tiff: implemented writeEncodedStrip function for writing a strip to an image
magedrifaat <magedrifaat@gmail.com>
parents:
31125
diff
changeset
|
3001 } |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3002 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
3003 DEFUN (__tiff_write_encoded_tile__, args, , |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3004 "Write an encoded tile to the image") |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3005 { |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3006 #if defined (HAVE_TIFF) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3007 int nargin = args.length (); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3008 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3009 // TODO(maged): add support for YCbCr data |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3010 if (nargin < 3) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3011 error ("Too few arguments provided\n"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3012 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3013 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3014 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3015 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3016 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3017 TIFF *tif = tiff_handle->get_file (); |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3018 |
31162
28817158ca86
Tiff: changed write functions to use fcntl wrappers.
magedrifaat <magedrifaat@gmail.com>
parents:
31161
diff
changeset
|
3019 check_readonly (tif); |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3020 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3021 // Obtain all necessary tags |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3022 tiff_image_data image_data (tif); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3023 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3024 if (! image_data.is_tiled) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3025 error ("Can't write tiles to a stripped image"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3026 |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3027 uint32_t tile_no = args(1).uint32_scalar_value (); |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3028 if (tile_no < 1 || tile_no > TIFFNumberOfTiles (tif)) |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3029 error ("Tile number out of range"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3030 |
31158
f2ae7763739a
Tiff: added writeEncodedTile method to read tiles from image
magedrifaat <magedrifaat@gmail.com>
parents:
31157
diff
changeset
|
3031 handle_write_strip_or_tile (tif, tile_no, args(2), &image_data); |
31146
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3032 |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3033 return octave_value_list (); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3034 #else |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3035 err_disabled_feature ("writeEncodedTile", "Tiff"); |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3036 #endif |
50402b8dfb4a
Tiff: added writeEncodedTile function for writing tiled images
magedrifaat <magedrifaat@gmail.com>
parents:
31145
diff
changeset
|
3037 } |
31148
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3038 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
3039 DEFUN (__tiff_is_tiled__, args, , |
31148
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3040 "Get whether the image is tiled") |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3041 { |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3042 #if defined (HAVE_TIFF) |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3043 int nargin = args.length (); |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3044 |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3045 if (nargin == 0) |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3046 error ("No handle provided\n"); |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3047 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3048 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3049 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3050 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3051 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3052 TIFF *tif = tiff_handle->get_file (); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3053 |
31148
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3054 bool is_tiled = static_cast<bool> (TIFFIsTiled (tif)); |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3055 return octave_value_list (octave_value (is_tiled)); |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3056 #else |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3057 err_disabled_feature ("isTiled", "Tiff"); |
31148
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3058 #endif |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3059 } |
4bc9a1938f9a
Tiff: added isTiled method to check if the image is tiled or stripped
magedrifaat <magedrifaat@gmail.com>
parents:
31147
diff
changeset
|
3060 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
3061 DEFUN (__tiff_number_of_strips__, args, , |
31149
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3062 "Get the number of strips in the image") |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3063 { |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3064 #if defined (HAVE_TIFF) |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3065 int nargin = args.length (); |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3066 |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3067 if (nargin == 0) |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3068 error ("No handle provided\n"); |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3069 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3070 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3071 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3072 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3073 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3074 TIFF *tif = tiff_handle->get_file (); |
31152
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3075 |
31149
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3076 if (TIFFIsTiled (tif)) |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3077 error ("The image is tiled not stripped"); |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3078 |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3079 double strip_count = static_cast<double> (TIFFNumberOfStrips (tif)); |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3080 return octave_value_list (octave_value (strip_count)); |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3081 #else |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3082 err_disabled_feature ("numberOfStrips", "Tiff"); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3083 #endif |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3084 } |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3085 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
3086 DEFUN (__tiff_number_of_tiles__, args, , |
31151
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3087 "Get the number of tiles in the image") |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3088 { |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3089 #if defined (HAVE_TIFF) |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3090 int nargin = args.length (); |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3091 |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3092 if (nargin == 0) |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3093 error ("No handle provided\n"); |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3094 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3095 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3096 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3097 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3098 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3099 TIFF *tif = tiff_handle->get_file (); |
31152
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3100 |
31151
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3101 if (! TIFFIsTiled (tif)) |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3102 error ("The image is stripped not tiled"); |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3103 |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3104 double tile_count = static_cast<double> (TIFFNumberOfTiles (tif)); |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3105 return octave_value_list (octave_value (tile_count)); |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3106 #else |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3107 err_disabled_feature ("numberOfTiles", "Tiff"); |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3108 #endif |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3109 } |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3110 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
3111 DEFUN (__tiff_compute_strip__, args, , |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3112 "Get the strip index containing the given row") |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3113 { |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3114 #if defined (HAVE_TIFF) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3115 int nargin = args.length (); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3116 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3117 if (nargin < 2 || nargin > 3) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3118 error ("Wrong number of arguments\n"); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3119 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3120 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3121 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3122 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3123 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3124 TIFF *tif = tiff_handle->get_file (); |
31152
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3125 |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3126 if (TIFFIsTiled (tif)) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3127 error ("The image is tiled not stripped"); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3128 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3129 tiff_image_data image_data (tif); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3130 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3131 uint32_t row = args(1).uint32_scalar_value (); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3132 if (row > image_data.height) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3133 row = image_data.height; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3134 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3135 // Convert from 1-based to zero-based indexing but avoid underflow |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3136 if (row > 0) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3137 row--; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3138 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3139 uint16_t plane; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3140 if (nargin > 2) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3141 { |
31152
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3142 if (image_data.planar_configuration == PLANARCONFIG_CONTIG) |
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3143 error ("Can't use plane argument for images with chunky PlanarConfiguration"); |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3144 plane = args(2).uint16_scalar_value (); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3145 if (plane > image_data.samples_per_pixel) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3146 plane = image_data.samples_per_pixel; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3147 if (plane > 0) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3148 plane--; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3149 } |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3150 else |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3151 { |
31152
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3152 if (image_data.planar_configuration == PLANARCONFIG_SEPARATE) |
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3153 error ("The plane argument is required for images with separate PlanarConfiguration"); |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3154 plane = 0; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3155 } |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3156 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3157 double strip_number = TIFFComputeStrip (tif, row, plane) + 1; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3158 if (strip_number > TIFFNumberOfStrips (tif)) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3159 strip_number = TIFFNumberOfStrips (tif); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3160 return octave_value_list (octave_value (strip_number)); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3161 #else |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3162 err_disabled_feature ("computeStrip", "Tiff"); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3163 #endif |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3164 } |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3165 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
3166 DEFUN (__tiff_compute_tile__, args, , |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3167 "Get the tile index containing the given row and column") |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3168 { |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3169 #if defined (HAVE_TIFF) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3170 int nargin = args.length (); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3171 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3172 if (nargin < 2 || nargin > 3) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3173 error ("Wrong number of arguments\n"); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3174 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3175 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3176 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3177 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3178 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3179 TIFF *tif = tiff_handle->get_file (); |
31152
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3180 |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3181 if (! TIFFIsTiled (tif)) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3182 error ("The image is stripped not tiled"); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3183 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3184 uint32NDArray coords = args(1).uint32_array_value (); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3185 if (coords.dim2() < 2) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3186 error ("Coordinates must be in the shape [row, col]"); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3187 uint32_t row = coords(0, 0); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3188 uint32_t col = coords(0, 1); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3189 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3190 tiff_image_data image_data (tif); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3191 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3192 if (col > image_data.width) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3193 col = image_data.width; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3194 if (row > image_data.height) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3195 row = image_data.height; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3196 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3197 // Convert from 1-based to zero-based indexing but avoid underflow |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3198 if (row > 0) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3199 row--; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3200 if (col > 0) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3201 col--; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3202 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3203 uint16_t plane; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3204 if (nargin > 2) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3205 { |
31152
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3206 if (image_data.planar_configuration == PLANARCONFIG_CONTIG) |
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3207 error ("Can't use plane argument for images with chunky PlanarConfiguration"); |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3208 plane = args(2).uint16_scalar_value (); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3209 if (plane > image_data.samples_per_pixel) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3210 plane = image_data.samples_per_pixel; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3211 if (plane > 0) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3212 plane--; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3213 } |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3214 else |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3215 { |
31152
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3216 if (image_data.planar_configuration == PLANARCONFIG_SEPARATE) |
2244617f4da5
Tiff computeStrip: fixed inconsistency in checking plane argument.
magedrifaat <magedrifaat@gmail.com>
parents:
31151
diff
changeset
|
3217 error ("The plane argument is required for images with separate PlanarConfiguration"); |
31150
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3218 plane = 0; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3219 } |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3220 |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3221 double tile_number = TIFFComputeTile (tif, col, row, 0, plane) + 1; |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3222 if (tile_number > TIFFNumberOfTiles (tif)) |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3223 tile_number = TIFFNumberOfTiles (tif); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3224 return octave_value_list (octave_value (tile_number)); |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3225 #else |
6bede2d6f273
Tiff: added computeStrip and computeTile methods
magedrifaat <magedrifaat@gmail.com>
parents:
31149
diff
changeset
|
3226 err_disabled_feature ("computeTile", "Tiff"); |
31149
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3227 #endif |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3228 } |
d4dbc69f301e
Tiff: implemented numberOfStrips method
magedrifaat <magedrifaat@gmail.com>
parents:
31148
diff
changeset
|
3229 |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3230 DEFUN (__tiff_current_directory__, args, , |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3231 "Get the index of the current directory") |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3232 { |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3233 #if defined (HAVE_TIFF) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3234 int nargin = args.length (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3235 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3236 if (nargin != 1) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3237 error ("Wrong number of arguments\n"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3238 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3239 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3240 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3241 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3242 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3243 TIFF *tif = tiff_handle->get_file (); |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3244 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3245 uint16_t dir = TIFFCurrentDirectory (tif); |
31175
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3246 dir++; |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3247 |
31175
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3248 return octave_value_list (octave_value (static_cast<double> (dir))); |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3249 #else |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3250 err_disabled_feature ("currentDirectory", "Tiff"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3251 #endif |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3252 } |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3253 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3254 DEFUN (__tiff_last_directory__, args, , |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3255 "Get the whether the current directory is the last") |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3256 { |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3257 #if defined (HAVE_TIFF) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3258 int nargin = args.length (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3259 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3260 if (nargin != 1) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3261 error ("Wrong number of arguments\n"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3262 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3263 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3264 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3265 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3266 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3267 TIFF *tif = tiff_handle->get_file (); |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3268 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3269 bool is_last = TIFFLastDirectory (tif); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3270 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3271 return octave_value_list (octave_value (is_last)); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3272 #else |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3273 err_disabled_feature ("lastDirectory", "Tiff"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3274 #endif |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3275 } |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3276 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3277 DEFUN (__tiff_next_directory__, args, , |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3278 "Set the next IFD as the current IFD") |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3279 { |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3280 #if defined (HAVE_TIFF) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3281 int nargin = args.length (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3282 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3283 if (nargin != 1) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3284 error ("Wrong number of arguments\n"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3285 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3286 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3287 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3288 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3289 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3290 TIFF *tif = tiff_handle->get_file (); |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3291 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3292 bool is_last = TIFFLastDirectory (tif); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3293 if (is_last) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3294 error ("Current directory is the last directory"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3295 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3296 if (! TIFFReadDirectory (tif)) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3297 error ("Failed to read the next directory"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3298 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3299 return octave_value_list (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3300 #else |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3301 err_disabled_feature ("nextDirectory", "Tiff"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3302 #endif |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3303 } |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3304 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3305 DEFUN (__tiff_set_directory__, args, , |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3306 "Set the current IFD using the given index") |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3307 { |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3308 #if defined (HAVE_TIFF) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3309 int nargin = args.length (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3310 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3311 if (nargin != 2) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3312 error ("Wrong number of arguments\n"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3313 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3314 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3315 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3316 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3317 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3318 TIFF *tif = tiff_handle->get_file (); |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3319 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3320 uint16_t dir = args(1).uint16_scalar_value (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3321 if (dir < 1 || dir > TIFFNumberOfDirectories (tif)) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3322 error ("Directory index out of bounds"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3323 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3324 dir--; |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3325 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3326 if (! TIFFSetDirectory(tif, dir)) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3327 error ("Failed to read directory"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3328 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3329 return octave_value_list (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3330 #else |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3331 err_disabled_feature ("setDirectory", "Tiff"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3332 #endif |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3333 } |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3334 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3335 DEFUN (__tiff_write_directory__, args, , |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3336 "Write the current IFD to file and create a new one") |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3337 { |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3338 #if defined (HAVE_TIFF) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3339 int nargin = args.length (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3340 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3341 if (nargin != 1) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3342 error ("Wrong number of arguments\n"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3343 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3344 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3345 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3346 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3347 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3348 TIFF *tif = tiff_handle->get_file (); |
31175
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3349 |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3350 if (! TIFFWriteDirectory(tif)) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3351 error ("Failed to write directory"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3352 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3353 return octave_value_list (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3354 #else |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3355 err_disabled_feature ("writeDirectory", "Tiff"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3356 #endif |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3357 } |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3358 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3359 DEFUN (__tiff_rewrite_directory__, args, , |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3360 "Rewrite modifications to the current IFD") |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3361 { |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3362 #if defined (HAVE_TIFF) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3363 int nargin = args.length (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3364 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3365 if (nargin != 1) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3366 error ("Wrong number of arguments\n"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3367 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3368 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3369 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3370 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3371 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3372 TIFF *tif = tiff_handle->get_file (); |
31173
0abc9779f751
Tiff: modified readRGBAImage to use the orientation tag correctly
magedrifaat <magedrifaat@gmail.com>
parents:
31172
diff
changeset
|
3373 |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3374 if (! TIFFRewriteDirectory(tif)) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3375 error ("Failed to rewrite directory"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3376 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3377 return octave_value_list (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3378 #else |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3379 err_disabled_feature ("rewriteDirectory", "Tiff"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3380 #endif |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3381 } |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3382 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3383 DEFUN (__tiff_set_sub_directory__, args, , |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3384 "Set the given offset directory as the current IFD") |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3385 { |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3386 #if defined (HAVE_TIFF) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3387 int nargin = args.length (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3388 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3389 if (nargin != 2) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3390 error ("Wrong number of arguments\n"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3391 |
31177
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3392 octave_tiff_handle *tiff_handle |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3393 = octave_tiff_handle::get_tiff_handle (args(0)); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3394 check_closed (tiff_handle); |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3395 |
c7c79973007f
Tiff: added octave_tiff_handle class to wrap the Tiff file pointer
magedrifaat <magedrifaat@gmail.com>
parents:
31176
diff
changeset
|
3396 TIFF *tif = tiff_handle->get_file (); |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3397 |
31175
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3398 if (! args(1).is_double_type () && ! args(1).is_uint32_type () |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3399 && ! args(1).is_uint64_type ()) |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3400 error ("Expected offset of type double, uint32 or uint64"); |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3401 |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3402 uint16_t count; |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3403 uint64_t *offsets; |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3404 if (! TIFFGetField (tif, TIFFTAG_SUBIFD, &count, &offsets)) |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3405 error ("The current directory doesn't have sub directories"); |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3406 |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3407 uint64_t offset = args(1).uint64_scalar_value (); |
31175
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3408 |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3409 int found = 0; |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3410 for (uint16_t i = 0; i < count; i++) |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3411 if (offset == offsets[i]) |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3412 { |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3413 found = 1; |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3414 break; |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3415 } |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3416 |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3417 if (! found) |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3418 error ("No Sub directory with the given offset"); |
ed329571ec88
Tiff: added support for creating and reading sub-directories
magedrifaat <magedrifaat@gmail.com>
parents:
31174
diff
changeset
|
3419 |
31172
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3420 if (! TIFFSetSubDirectory (tif, offset)) |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3421 error ("Failed to switch to the sub directory"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3422 |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3423 return octave_value_list (); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3424 #else |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3425 err_disabled_feature ("setSubDirectory", "Tiff"); |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3426 #endif |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3427 } |
3f5f1404af8a
Tiff: added directory methods (currentDirectory, nextDirectory, ...)
magedrifaat <magedrifaat@gmail.com>
parents:
31171
diff
changeset
|
3428 |
31160
5f0c3da75926
Tiff: moved internal functions to corefcn.
magedrifaat <magedrifaat@gmail.com>
parents:
31159
diff
changeset
|
3429 DEFUN (__tiff_version__, , , |
31151
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3430 "Get the version stamp of LibTIFF") |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3431 { |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3432 #if defined (HAVE_TIFF) |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3433 std::string version = std::string (TIFFGetVersion ()); |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3434 return octave_value_list (octave_value (version)); |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3435 #else |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3436 err_disabled_feature ("getVersion", "Tiff"); |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3437 #endif |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3438 } |
6fb54834aa93
Tiff: added numberOfTiles and getVersion methods
magedrifaat <magedrifaat@gmail.com>
parents:
31150
diff
changeset
|
3439 |
31161
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3440 DEFUN (__tiff_set_errors_enabled__, args, , |
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3441 "Enables or Disables error output from LibTIFF") |
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3442 { |
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3443 #if defined (HAVE_TIFF) |
31163
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3444 // Get the default error handlers the first time this function is called |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3445 if (tiff_default_error_handler == NULL) |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3446 { |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3447 tiff_default_error_handler = TIFFSetErrorHandler (NULL); |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3448 tiff_default_warning_handler = TIFFSetWarningHandler (NULL); |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3449 } |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3450 |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3451 if (args.length () == 0) |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3452 error ("No state argument provided"); |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3453 |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3454 if (! args(0).is_bool_scalar ()) |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3455 error ("Expected logical value as argument"); |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3456 |
31178
14edd6b09efe
Tiff: added support for reading and writing signed images
magedrifaat <magedrifaat@gmail.com>
parents:
31177
diff
changeset
|
3457 // Set the error and warning handlers according to the bool parameter |
31163
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3458 if (args(0).bool_value ()) |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3459 { |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3460 TIFFSetErrorHandler (tiff_default_error_handler); |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3461 TIFFSetWarningHandler (tiff_default_warning_handler); |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3462 } |
31161
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3463 else |
31163
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3464 { |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3465 TIFFSetErrorHandler (NULL); |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3466 TIFFSetWarningHandler (NULL); |
d701c6a4cda1
Tiff: improved handling LibTIFF error output silencing.
magedrifaat <magedrifaat@gmail.com>
parents:
31162
diff
changeset
|
3467 } |
31161
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3468 |
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3469 return octave_value_list (); |
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3470 #else |
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3471 err_disabled_feature ("setErrorEnabled", "Tiff"); |
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3472 #endif |
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3473 } |
b731c8f6db95
Tiff: added setLibTIFFErrorsEnabled method to enable/disable LibTIFF errors
magedrifaat <magedrifaat@gmail.com>
parents:
31160
diff
changeset
|
3474 |
31185
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
3475 DEFUN (__tiff_make_tagid__, , , |
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
3476 "Create the TagID structure from the internal map") |
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
3477 { |
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
3478 std::map<std::string, octave_value> tag_ov_map; |
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
3479 for (auto it = tag_name_map.cbegin (); it != tag_name_map.cend (); it++) |
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
3480 tag_ov_map[it->first] = octave_value (it->second); |
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
3481 return octave_value_list(octave_scalar_map (tag_ov_map)); |
a1145ac2ce9b
Tiff: populated TagID from the C++ map to avoid having two copies
magedrifaat <magedrifaat@gmail.com>
parents:
31184
diff
changeset
|
3482 } |
31092
a736190ce738
Added the Tiff classdef files to octave
magedrifaat <magedrifaat@gmail.com>
parents:
diff
changeset
|
3483 } |