Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
0c6ac865
Commit
0c6ac865
authored
Jul 02, 2012
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
windowscodecs: Don't fail if the TIFF library doesn't have the functions to disable warnings.
parent
e67f6c23
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
tiffformat.c
dlls/windowscodecs/tiffformat.c
+6
-7
No files found.
dlls/windowscodecs/tiffformat.c
View file @
0c6ac865
...
...
@@ -67,8 +67,6 @@ MAKE_FUNCPTR(TIFFReadEncodedStrip);
MAKE_FUNCPTR
(
TIFFReadEncodedTile
);
MAKE_FUNCPTR
(
TIFFSetDirectory
);
MAKE_FUNCPTR
(
TIFFSetField
);
MAKE_FUNCPTR
(
TIFFSetWarningHandler
);
MAKE_FUNCPTR
(
TIFFSetWarningHandlerExt
);
MAKE_FUNCPTR
(
TIFFWriteDirectory
);
MAKE_FUNCPTR
(
TIFFWriteScanline
);
#undef MAKE_FUNCPTR
...
...
@@ -82,6 +80,8 @@ static void *load_libtiff(void)
if
(
!
libtiff_handle
&&
(
libtiff_handle
=
wine_dlopen
(
SONAME_LIBTIFF
,
RTLD_NOW
,
NULL
,
0
))
!=
NULL
)
{
void
*
(
*
pTIFFSetWarningHandler
)(
void
*
);
void
*
(
*
pTIFFSetWarningHandlerExt
)(
void
*
);
#define LOAD_FUNCPTR(f) \
if((p##f = wine_dlsym(libtiff_handle, #f, NULL, 0)) == NULL) { \
...
...
@@ -101,19 +101,18 @@ static void *load_libtiff(void)
LOAD_FUNCPTR
(
TIFFReadEncodedTile
);
LOAD_FUNCPTR
(
TIFFSetDirectory
);
LOAD_FUNCPTR
(
TIFFSetField
);
LOAD_FUNCPTR
(
TIFFSetWarningHandler
);
LOAD_FUNCPTR
(
TIFFSetWarningHandlerExt
);
LOAD_FUNCPTR
(
TIFFWriteDirectory
);
LOAD_FUNCPTR
(
TIFFWriteScanline
);
#undef LOAD_FUNCPTR
if
((
pTIFFSetWarningHandler
=
wine_dlsym
(
libtiff_handle
,
"TIFFSetWarningHandler"
,
NULL
,
0
)))
pTIFFSetWarningHandler
(
NULL
);
if
((
pTIFFSetWarningHandlerExt
=
wine_dlsym
(
libtiff_handle
,
"TIFFSetWarningHandlerExt"
,
NULL
,
0
)))
pTIFFSetWarningHandlerExt
(
NULL
);
}
result
=
libtiff_handle
;
pTIFFSetWarningHandler
(
NULL
);
pTIFFSetWarningHandlerExt
(
NULL
);
LeaveCriticalSection
(
&
init_tiff_cs
);
return
result
;
}
...
...
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