Debug

Author: ammgws

cairo_png.c

@@ -33,6 +33,9 @@ cairo_status_t cairo_surface_write_to_png_mem(cairo_surface_t *sfc,
 
   png_structp png =
     png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+  if (png == NULL) {
+    return CAIRO_STATUS_NO_MEMORY;
+  }
 
   png_infop info = png_create_info_struct(png);
   if (info == NULL) {

main.c

@@ -117,6 +117,9 @@ static void output_handle_geometry(void *data, struct wl_output *wl_output,
 
 	output->geometry.x = x;
 	output->geometry.y = y;
+	output->geometry.physical_width = physical_width;
+	output->geometry.physical_height = physical_height;
+        printf("debug phys: %dmm x %dmm\n", physical_width, physical_height);
 	output->transform = transform;
 }
 
@@ -305,6 +308,7 @@ int main(int argc, char *argv[]) {
 
 			free(geometry);
 			geometry = calloc(1, sizeof(struct grim_box));
+
 			if (!parse_box(geometry, geometry_str)) {
 				fprintf(stderr, "invalid geometry\n");
 				return EXIT_FAILURE;
@@ -478,6 +482,12 @@ int main(int argc, char *argv[]) {
 		get_output_layout_extents(&state, geometry);
 	}
 
+        printf("debug output_layout_extents: %dpx x %dpx\n", geometry->width, geometry->height);
+	//TODO
+	//int px_per_mm_x = geometry->width/(output_layout_extents_physical);
+	//int px_per_mm_y = geometry->height/(output_layout_extents_physical);
+	//printf("px/mm values: %d x %d\n", pxmm_x, pxmm_y);
+
 	cairo_surface_t *surface = render(&state, geometry, scale);
 	if (surface == NULL) {
 		return EXIT_FAILURE;
@@ -519,6 +529,7 @@ int main(int argc, char *argv[]) {
 #endif
 		}
 	}
+	printf("Status was: %d, success is %d", status, CAIRO_STATUS_SUCCESS);
 	if (status != CAIRO_STATUS_SUCCESS) {
 		fprintf(stderr, "%s\n", cairo_status_to_string(status));
 		if (status == CAIRO_STATUS_WRITE_ERROR && strlen(output_filepath) > NAME_MAX) {