Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
acgl
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ACGL
acgl
Commits
a8a82c32
Commit
a8a82c32
authored
Apr 19, 2012
by
Robert Menzel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed warnings, vs2010 problem
parent
6b3ae696
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
cmake
cmake
+1
-1
include/ACGL/Resource/NameManager.hh
include/ACGL/Resource/NameManager.hh
+1
-1
src/ACGL/OpenGL/Controller/TextureDataControlFilePNM.cc
src/ACGL/OpenGL/Controller/TextureDataControlFilePNM.cc
+1
-1
No files found.
cmake
@
809ae57e
Subproject commit
c22358cacf53e0b4383ef7399d910d30d75a118
b
Subproject commit
809ae57efe0fb1b44c069aacfabd3f5f988cafd
b
include/ACGL/Resource/NameManager.hh
View file @
a8a82c32
...
...
@@ -109,7 +109,7 @@ void NameManager<RESOURCE>::clearAllResources(void)
}
template
<
typename
RESOURCE
>
void
NameManager
<
RESOURCE
>::
add
(
const
std
::
string
&
_key
,
NameManager
<
RESOURCE
>::
SharedResource
_resource
)
void
NameManager
<
RESOURCE
>::
add
(
const
std
::
string
&
_key
,
typename
NameManager
<
RESOURCE
>::
SharedResource
_resource
)
{
mResourceMap
[
_key
]
=
_resource
;
}
...
...
src/ACGL/OpenGL/Controller/TextureDataControlFilePNM.cc
View file @
a8a82c32
...
...
@@ -62,7 +62,7 @@ bool TextureDataControlFilePNM::load(SharedTextureData& texture) const
filterPNMComments
(
fileStream
)
>>
header
;
// The header version determines the format of the data
InputDataFormat
inputDataFormat
;
InputDataFormat
inputDataFormat
=
BINARY_BYTES
;
// set it to something to prevent 'may be uninitialized' warnings (which can't occur here)
uint_t
components
;
if
(
header
==
"P1"
)
{
components
=
1
;
inputDataFormat
=
PLAIN_TEXT_BITMAP
;
}
else
if
(
header
==
"P2"
)
{
components
=
1
;
inputDataFormat
=
PLAIN_TEXT_DECIMAL
;
}
...
...
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