Changeset 1024 for trunk/platform/g12/lib.c

Timestamp:

01/07/11 04:26:07 (2 years ago)

Author:

reyalP

Message:

g12 and sx30 updates from philmoz in ​http://chdk.setepontos.com/index.php?topic=650.msg59326#msg59326

• Cleaned up the image offset code.
• minor bug fixes and corrected address for exmem_alloc
• moved SCREEN_COLOR define into gui_draw.h so it can be easily overridden (found in five places and default value was white on the SX30 and G12).
• added some defines configured in makefile.inc so that gui_debug_draw_values can be used to show memory properly (was hard wired to VX addresses).

File:

• trunk/platform/g12/lib.c (modified) (1 diff)

trunk/platform/g12/lib.c

@@ -103 +103 @@
         return vp_h[shooting_get_prop(PROPCASE_ASPECT_RATIO)];
 }
+
+// viewport image offset - used when image size != viewport size (zebra, histogram, motion detect & edge overlay)
+// returns the byte offset into the viewport buffer where the image pixels start (to skip any black borders)
+int vid_get_viewport_image_offset() {
+        return (vid_get_viewport_yoffset() * vid_get_viewport_buffer_width() + vid_get_viewport_xoffset()) * 3;
+}
+
+// viewport image offset - used when image size != viewport size (zebra, histogram, motion detect & edge overlay)
+// returns the byte offset to skip at the end of a viewport buffer row to get to the next row.
+int vid_get_viewport_row_offset() {
+        return (vid_get_viewport_buffer_width() - vid_get_viewport_width()) * 3;
+}