[Scummvm-git-logs] scummvm master -> d5bf1396def859fcdbfc541e19df37f1dca5552c

dreammaster paulfgilbert at gmail.com
Fri Jan 4 03:01:49 CET 2019


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d5bf1396de GLK: FROTZ: os_picture_data wasn't dividing by cell size


Commit: d5bf1396def859fcdbfc541e19df37f1dca5552c
    https://github.com/scummvm/scummvm/commit/d5bf1396def859fcdbfc541e19df37f1dca5552c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-01-03T18:01:32-08:00

Commit Message:
GLK: FROTZ: os_picture_data wasn't dividing by cell size

Changed paths:
    engines/glk/frotz/glk_interface.cpp


diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp
index 0f08799..1efb751 100644
--- a/engines/glk/frotz/glk_interface.cpp
+++ b/engines/glk/frotz/glk_interface.cpp
@@ -291,7 +291,14 @@ bool GlkInterface::os_picture_data(int picture, uint *height, uint *width) {
 		*height = _pics->size();
 		return true;
 	} else {
-		return glk_image_get_info(picture, width, height);
+		bool result = glk_image_get_info(picture, width, height);
+
+		int cellW = g_conf->_monoInfo._cellW;
+		int cellH = g_conf->_monoInfo._cellH;
+		*width = (*width + cellW - 1) / cellW;
+		*height = (*height + cellH - 1) / cellH;
+
+		return result;
 	}
 }
 





More information about the Scummvm-git-logs mailing list