archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 16:31:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

cellSearch: improve populate_photo_info, read image headers

Browse source
This commit is contained in:
Megamouse 2022-07-23 21:19:43 +02:00
parent a5317d50a5
commit 3d73915358
5 changed files with 94 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

45
rpcs3/main_application.cpp
View file

@ -31,6 +31,7 @@
#endif
#include <QFileInfo> // This shouldn't be outside rpcs3qt...
#include <QImageReader> // This shouldn't be outside rpcs3qt...
#include <thread>
LOG_CHANNEL(sys_log, "SYS");
@ -147,6 +148,50 @@ EmuCallbacks main_application::CreateCallbacks()
}
};
callbacks.get_image_info = [](const std::string& filename, std::string& sub_type, s32& width, s32& height, s32& orientation) -> bool
{
sub_type.clear();
width = 0;
height = 0;
orientation = 0; // CELL_SEARCH_ORIENTATION_UNKNOWN
bool success = false;
Emu.BlockingCallFromMainThread([&]()
{
const QImageReader reader(QString::fromStdString(filename));
if (reader.canRead())
{
const QSize size = reader.size();
width = size.width();
height = size.height();
sub_type = reader.subType().toStdString();
switch (reader.transformation())
{
case QImageIOHandler::Transformation::TransformationNone:
orientation = 1; // CELL_SEARCH_ORIENTATION_TOP_LEFT = 0°
break;
case QImageIOHandler::Transformation::TransformationRotate90:
orientation = 2; // CELL_SEARCH_ORIENTATION_TOP_RIGHT = 90°
break;
case QImageIOHandler::Transformation::TransformationRotate180:
orientation = 3; // CELL_SEARCH_ORIENTATION_BOTTOM_RIGHT = 180°
break;
case QImageIOHandler::Transformation::TransformationRotate270:
orientation = 4; // CELL_SEARCH_ORIENTATION_BOTTOM_LEFT = 270°
break;
default:
// Ignore other transformations for now
break;
}
success = true;
sys_log.notice("get_image_info found image: filename='%s', sub_type='%s', width=%d, height=%d, orientation=%d", filename, sub_type, width, height, orientation);
}
});
return success;
};
callbacks.resolve_path = [](std::string_view sv)
{
return QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();