[gimp] libgimp: cleanup in GimpTileBackendPlugin



commit 05d552e634aa3ec515f40ef6fe3213678c449f48
Author: Michael Natterer <mitch gimp org>
Date:   Sat Jul 20 02:43:58 2019 +0200

    libgimp: cleanup in GimpTileBackendPlugin

 libgimp/gimptilebackendplugin.c | 33 +++++++++++++++++++++------------
 libgimp/gimptilebackendplugin.h |  7 ++++---
 2 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/libgimp/gimptilebackendplugin.c b/libgimp/gimptilebackendplugin.c
index e250605ab5..ac747bf8f9 100644
--- a/libgimp/gimptilebackendplugin.c
+++ b/libgimp/gimptilebackendplugin.c
@@ -1,5 +1,9 @@
-/* gimptilebackendtilemanager.c
- * Copyright (C) 2012 Øyvind Kolås <pippin gimp org>
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimptilebackendplugin.c
+ * Copyright (C) 2011-2019 Øyvind Kolås <pippin gimp org>
+ *                         Michael Natterer <mitch gimp org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -227,7 +231,7 @@ gimp_tile_read (GimpTileBackendPlugin *backend_plugin,
 
   if (gimp_tile.ewidth * gimp_tile.eheight * priv->bpp == tile_size)
     {
-      memcpy (tile_data, (gchar *) gimp_tile.data, tile_size);
+      memcpy (tile_data, gimp_tile.data, tile_size);
     }
   else
     {
@@ -237,8 +241,8 @@ gimp_tile_read (GimpTileBackendPlugin *backend_plugin,
 
       for (row = 0; row < gimp_tile.eheight; row++)
         {
-          memcpy (tile_data + row * tile_stride,
-                  (gchar *) gimp_tile.data + row * gimp_tile_stride,
+          memcpy (tile_data      + row * tile_stride,
+                  gimp_tile.data + row * gimp_tile_stride,
                   gimp_tile_stride);
         }
     }
@@ -270,7 +274,7 @@ gimp_tile_write (GimpTileBackendPlugin *backend_plugin,
 
   if (gimp_tile.ewidth * gimp_tile.eheight * priv->bpp == tile_size)
     {
-      memcpy ((gchar *) gimp_tile.data, tile_data, tile_size);
+      memcpy (gimp_tile.data, tile_data, tile_size);
     }
   else
     {
@@ -280,8 +284,8 @@ gimp_tile_write (GimpTileBackendPlugin *backend_plugin,
 
       for (row = 0; row < gimp_tile.eheight; row++)
         {
-          memcpy ((gchar *) gimp_tile.data + row * gimp_tile_stride,
-                  tile_data + row * tile_stride,
+          memcpy (gimp_tile.data + row * gimp_tile_stride,
+                  tile_data      + row * tile_stride,
                   gimp_tile_stride);
         }
     }
@@ -421,11 +425,15 @@ gimp_tile_put (GimpTileBackendPlugin *backend_plugin,
   tile_data.data        = NULL;
 
   if (tile_info->use_shm)
-    memcpy (gimp_shm_addr (),
-            tile->data,
-            tile->ewidth * tile->eheight * priv->bpp);
+    {
+      memcpy (gimp_shm_addr (),
+              tile->data,
+              tile->ewidth * tile->eheight * priv->bpp);
+    }
   else
-    tile_data.data = tile->data;
+    {
+      tile_data.data = tile->data;
+    }
 
   if (! gp_tile_data_write (_writechannel, &tile_data, NULL))
     gimp_quit ();
@@ -437,5 +445,6 @@ gimp_tile_put (GimpTileBackendPlugin *backend_plugin,
 
   gimp_read_expect_msg (&msg, GP_TILE_ACK);
   gp_unlock ();
+
   gimp_wire_destroy (&msg);
 }
diff --git a/libgimp/gimptilebackendplugin.h b/libgimp/gimptilebackendplugin.h
index fb885b460e..cfb77c53a8 100644
--- a/libgimp/gimptilebackendplugin.h
+++ b/libgimp/gimptilebackendplugin.h
@@ -1,8 +1,9 @@
 /* GIMP - The GNU Image Manipulation Program
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  *
- * gimptilebackendtilemanager.h
- * Copyright (C) 2011 Øyvind Kolås <pippin gimp org>
+ * gimptilebackendplugin.h
+ * Copyright (C) 2011-2019 Øyvind Kolås <pippin gimp org>
+ *                         Michael Natterer <mitch gimp org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,4 +57,4 @@ GeglTileBackend * _gimp_tile_backend_plugin_new      (gint32 drawable_id,
 
 G_END_DECLS
 
-#endif /* __GIMP_TILE_BACKEND_plugin_H__ */
+#endif /* __GIMP_TILE_BACKEND_PLUGIN_H__ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]