Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
34f2d265
Commit
34f2d265
authored
Sep 30, 2014
by
Christian Schulte zu Berge
Browse files
* Fixed GCC warning
* Updated CMake scripts to work with new CMake 3 and TBB 4.3
parent
3a6c7c04
Changes
2
Hide whitespace changes
Inline
Side-by-side
cmake/commonconf.cmake
View file @
34f2d265
...
...
@@ -17,27 +17,27 @@ ELSEIF(${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008 Win64")
SET
(
CAMPVIS_MSVC2008 TRUE
)
SET
(
CAMPVIS_WIN64 TRUE
)
MESSAGE
(
STATUS
"Visual Studio 2008 Build (64 Bit)"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 10"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 10"
OR
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 10 2010"
)
SET
(
CAMPVIS_MSVC2010 TRUE
)
SET
(
CAMPVIS_WIN32 TRUE
)
MESSAGE
(
STATUS
"Visual Studio 2010 Build (32 Bit)"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 10 Win64"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 10
Win64"
OR
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 10 2010
Win64"
)
SET
(
CAMPVIS_MSVC2010 TRUE
)
SET
(
CAMPVIS_WIN64 TRUE
)
MESSAGE
(
STATUS
"Visual Studio 2010 Build (64 Bit)"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 11"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 11"
OR
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 11 2012"
)
SET
(
CAMPVIS_MSVC11 TRUE
)
SET
(
CAMPVIS_WIN32 TRUE
)
MESSAGE
(
"Visual Studio 11 Build (32 Bit)"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 11 Win64"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 11
Win64"
OR
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 11 2012
Win64"
)
SET
(
CAMPVIS_MSVC11 TRUE
)
SET
(
CAMPVIS_WIN64 TRUE
)
MESSAGE
(
"Visual Studio 11 Build (64 Bit)"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 12"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 12"
OR
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 12 2013"
)
SET
(
CAMPVIS_MSVC12 TRUE
)
SET
(
CAMPVIS_WIN32 TRUE
)
MESSAGE
(
"Visual Studio 12 Build (32 Bit)"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 12 Win64"
)
ELSEIF
(
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 12
Win64"
OR
${
CMAKE_GENERATOR
}
STREQUAL
"Visual Studio 12 2013
Win64"
)
SET
(
CAMPVIS_MSVC12 TRUE
)
SET
(
CAMPVIS_WIN64 TRUE
)
MESSAGE
(
"Visual Studio 12 Build (64 Bit)"
)
...
...
@@ -218,6 +218,9 @@ IF(TBB_FOUND)
LIST
(
APPEND CampvisExternalDllsDebug
${
TBB_DLL_DEBUG
}
${
TBB_MALLOC_DLL_DEBUG
}
)
LIST
(
APPEND CampvisExternalDllsRelease
${
TBB_DLL_RELEASE
}
${
TBB_MALLOC_DLL_RELEASE
}
)
LIST
(
APPEND CampvisExternalLicenseFiles
${
TBB_LICENSE_FILE
}
)
# unfortunately, the new TBB API does no longer allow copying of mutexes, hence we need to set a fallback define
LIST
(
APPEND CampvisGlobalDefinitions
"-DTBB_DEPRECATED_MUTEX_COPYING"
)
ELSE
(
TBB_FOUND
)
MESSAGE
(
FATAL_ERROR
"TBB not found!"
)
ENDIF
(
TBB_FOUND
)
...
...
modules/devil/processors/devilimagereader.cpp
View file @
34f2d265
...
...
@@ -120,6 +120,9 @@ namespace campvis {
}
}
if
(
files
.
empty
())
return
;
tgt
::
ivec3
imageSize
(
0
,
0
,
static_cast
<
int
>
(
files
.
size
()));
uint8_t
*
buffer
=
nullptr
;
...
...
@@ -132,7 +135,7 @@ namespace campvis {
devilFormat
=
IL_RGBA
;
ILint
devilDataType
=
0
;
WeaklyTypedPointer
::
BaseType
campvisDataType
;
WeaklyTypedPointer
::
BaseType
campvisDataType
=
WeaklyTypedPointer
::
UINT8
;
size_t
numChannels
=
1
;
// start reading
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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