Update of /cvsroot/libufo/ufo-0.5/src/image
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5455/src/image
Modified Files:
uimageio.cpp
Log Message:
Updated to new UFileArchive API. Code clean-up.
Index: uimageio.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/image/uimageio.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** uimageio.cpp 3 May 2005 11:09:36 -0000 1.13
--- uimageio.cpp 17 Oct 2005 15:35:22 -0000 1.14
***************
*** 75,79 ****
, m_size()
, m_components(0)
! //, m_filterRule(NoFilterRule)
{
}
--- 75,79 ----
, m_size()
, m_components(0)
! //, m_filterRule(NoFilterRule)
{
}
***************
*** 84,88 ****
, m_size()
, m_components(0)
! //, m_filterRule(NoFilterRule)
{
load(fileNameA);
--- 84,88 ----
, m_size()
, m_components(0)
! //, m_filterRule(NoFilterRule)
{
load(fileNameA);
***************
*** 94,98 ****
, m_size()
, m_components(0)
! //, m_filterRule(NoFilterRule)
{
load(streamA, extensionA);
--- 94,98 ----
, m_size()
, m_components(0)
! //, m_filterRule(NoFilterRule)
{
load(streamA, extensionA);
***************
*** 108,113 ****
m_data = new unsigned char[widthA * heightA * componentsA];
//
! //FIXME !
! //use memcpy or similar
for (int i = 0; i < widthA * heightA * componentsA; ++i) {
m_data[i] = dataA[i];
--- 108,112 ----
m_data = new unsigned char[widthA * heightA * componentsA];
//
! //FIXME use memcpy or similar
for (int i = 0; i < widthA * heightA * componentsA; ++i) {
m_data[i] = dataA[i];
***************
*** 158,167 ****
m_comment = fileNameA;
! std::ifstream * fileStream = UFileArchive::getDefault()->createFileStream(
! fileNameA,
! std::ios_base::in | std::ios_base::binary
! );
!
! if (!*fileStream) {
// NULL pointers should happen
uError() << "UImageIO: file " << fileNameA
--- 157,163 ----
m_comment = fileNameA;
! std::string absolutPath = UFileArchive::getDefault()->getAbsolutePath(fileNameA);
!
! if (absolutPath.empty()) {
// NULL pointers should happen
uError() << "UImageIO: file " << fileNameA
***************
*** 169,180 ****
return false;
}
!
! bool valid = load(*fileStream, getFileExtension(fileNameA));
if (!valid) {
! uError() << "UImageIO: Failed to load image " << fileNameA << "\n";
}
- // dispose data
- UFileArchive::getDefault()->destroyFileStream(fileStream);
return valid;
--- 165,176 ----
return false;
}
!
! std::ifstream fileStream(absolutPath.c_str(), std::ios_base::in | std::ios_base::binary);
!
! bool valid = load(fileStream, getFileExtension(fileNameA));
if (!valid) {
! uError() << "UImageIO: Failed to load image " << absolutPath << "\n";
}
return valid;
|
