Skip to content

Commit

Permalink
VERSION: 7.2 - NEW: python loadImage
Browse files Browse the repository at this point in the history
  • Loading branch information
renambot-uic committed Sep 21, 2015
1 parent 5da8d77 commit 99e21e6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define __OMEGA_VERSION_

#define OMEGA_VERSION_MAJOR 7
#define OMEGA_VERSION_MINOR 1
#define OMEGA_VERSION_MINOR 2
#define OMEGA_VERSION_REVISION 0

#define _VSTH(v) #v
Expand Down
8 changes: 7 additions & 1 deletion src/omega/omegaPythonApi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,12 @@ PixelData* loadImage(const String& filename)
return data;
}
return NULL;
//return ImageFile(filename, data);
}

///////////////////////////////////////////////////////////////////////////////
bool saveImage(PixelData* img, const String& filename, ImageUtils::ImageFormat fmt)
{
return ImageUtils::saveImage(filename, img, fmt);
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1670,6 +1675,7 @@ BOOST_PYTHON_MODULE(omega)
def("isMaster", isMaster);
def("isHeadless", isHeadless);
def("loadImage", loadImage, PYAPI_RETURN_REF);
def("saveImage", saveImage);

def("addDataPath", addDataPath);
def("resetDataPaths", addDataPath);
Expand Down

0 comments on commit 99e21e6

Please sign in to comment.