2012-09-04, 13:51
Hi All,
CPicture::CreateTiledThumb does not use the new static wrapper CBaseTexture::LoadFromFile (introduced 4 jul 2012 by Jonathan). I'm not sure if this was intentional, but as the prototype for the non-static function was changed at the same time (has no more defaults), CPicture::CreateTiledThumb now used the wrong version.
I'll leave it to the experts to make the definitive decision which LoadFromFile() version to use, but this one line fix at least restores the tiled thumbnails functionality.
xbmc/pictures/Picture.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/pictures/Picture.cpp b/xbmc/pictures/Picture.cpp
index 0980efb..3651aca 100644
--- a/xbmc/pictures/Picture.cpp
+++ b/xbmc/pictures/Picture.cpp
@@ -151,7 +151,7 @@ bool CPicture::CreateTiledThumb(const std::vector<std:tring> &files, const std
// load in the image
CTexture texture;
unsigned int width = tile_width - 2*tile_gap, height = tile_height - 2*tile_gap;
- if (texture.LoadFromFile(files[i], width, height, g_guiSettings.GetBool("pictures.useexifrotation")) && texture.GetWidth() && texture.GetHeight())
+ if (texture.LoadFromFile(files[i], width, height, g_guiSettings.GetBool("pictures.useexifrotation"), NULL, NULL) && texture.GetWidth() && texture.GetHeight())
{
GetScale(texture.GetWidth(), texture.GetHeight(), width, height);
Cheers,
Aardvark
CPicture::CreateTiledThumb does not use the new static wrapper CBaseTexture::LoadFromFile (introduced 4 jul 2012 by Jonathan). I'm not sure if this was intentional, but as the prototype for the non-static function was changed at the same time (has no more defaults), CPicture::CreateTiledThumb now used the wrong version.
I'll leave it to the experts to make the definitive decision which LoadFromFile() version to use, but this one line fix at least restores the tiled thumbnails functionality.
xbmc/pictures/Picture.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/pictures/Picture.cpp b/xbmc/pictures/Picture.cpp
index 0980efb..3651aca 100644
--- a/xbmc/pictures/Picture.cpp
+++ b/xbmc/pictures/Picture.cpp
@@ -151,7 +151,7 @@ bool CPicture::CreateTiledThumb(const std::vector<std:tring> &files, const std
// load in the image
CTexture texture;
unsigned int width = tile_width - 2*tile_gap, height = tile_height - 2*tile_gap;
- if (texture.LoadFromFile(files[i], width, height, g_guiSettings.GetBool("pictures.useexifrotation")) && texture.GetWidth() && texture.GetHeight())
+ if (texture.LoadFromFile(files[i], width, height, g_guiSettings.GetBool("pictures.useexifrotation"), NULL, NULL) && texture.GetWidth() && texture.GetHeight())
{
GetScale(texture.GetWidth(), texture.GetHeight(), width, height);
Cheers,
Aardvark