Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
5d43d3ca
Commit
5d43d3ca
authored
Feb 12, 2014
by
Stuart Cunningham
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Windows build of grfmt_tiff.cpp by using libtiff's integer types.
parent
8bbce0a2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
grfmt_tiff.cpp
modules/highgui/src/grfmt_tiff.cpp
+6
-6
No files found.
modules/highgui/src/grfmt_tiff.cpp
View file @
5d43d3ca
...
...
@@ -117,15 +117,15 @@ bool TiffDecoder::readHeader()
if
(
tif
)
{
uint
wdth
=
0
,
hght
=
0
;
u
short
photometric
=
0
;
uint
32
wdth
=
0
,
hght
=
0
;
u
int16
photometric
=
0
;
m_tif
=
tif
;
if
(
TIFFGetField
(
tif
,
TIFFTAG_IMAGEWIDTH
,
&
wdth
)
&&
TIFFGetField
(
tif
,
TIFFTAG_IMAGELENGTH
,
&
hght
)
&&
TIFFGetField
(
tif
,
TIFFTAG_PHOTOMETRIC
,
&
photometric
))
{
u
short
bpp
=
8
,
ncn
=
photometric
>
1
?
3
:
1
;
u
int16
bpp
=
8
,
ncn
=
photometric
>
1
?
3
:
1
;
TIFFGetField
(
tif
,
TIFFTAG_BITSPERSAMPLE
,
&
bpp
);
TIFFGetField
(
tif
,
TIFFTAG_SAMPLESPERPIXEL
,
&
ncn
);
...
...
@@ -178,12 +178,12 @@ bool TiffDecoder::readData( Mat& img )
if
(
m_tif
&&
m_width
&&
m_height
)
{
TIFF
*
tif
=
(
TIFF
*
)
m_tif
;
uint
tile_width0
=
m_width
,
tile_height0
=
0
;
uint
32
tile_width0
=
m_width
,
tile_height0
=
0
;
int
x
,
y
,
i
;
int
is_tiled
=
TIFFIsTiled
(
tif
);
u
short
photometric
;
u
int16
photometric
;
TIFFGetField
(
tif
,
TIFFTAG_PHOTOMETRIC
,
&
photometric
);
u
short
bpp
=
8
,
ncn
=
photometric
>
1
?
3
:
1
;
u
int16
bpp
=
8
,
ncn
=
photometric
>
1
?
3
:
1
;
TIFFGetField
(
tif
,
TIFFTAG_BITSPERSAMPLE
,
&
bpp
);
TIFFGetField
(
tif
,
TIFFTAG_SAMPLESPERPIXEL
,
&
ncn
);
const
int
bitsPerByte
=
8
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment