From 93c34cab6ae326bf2ff21a69c973a3922ca9ece7 Mon Sep 17 00:00:00 2001
From: Tomas Gavenciak <gavento@ucw.cz>
Date: Sat, 11 Jun 2011 22:29:58 +0200
Subject: [PATCH] Rename GP_Pixel_Access to GP_GetPutPixel

---
 include/core/GP_Core.h                               | 2 +-
 include/core/{GP_Pixel_Access.h => GP_GetPutPixel.h} | 8 ++++----
 include/gfx/GP_Gfx.h                                 | 2 +-
 libs/core/{GP_Pixel_Access.c => GP_GetPutPixel.c}    | 2 +-
 libs/core/Makefile                                   | 2 +-
 pylib/gfxprim/generators/core/make_GP_Pixel.py       | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename include/core/{GP_Pixel_Access.h => GP_GetPutPixel.h} (95%)
 rename libs/core/{GP_Pixel_Access.c => GP_GetPutPixel.c} (98%)

diff --git a/include/core/GP_Core.h b/include/core/GP_Core.h
index a00f1d7e..6d452912 100644
--- a/include/core/GP_Core.h
+++ b/include/core/GP_Core.h
@@ -45,6 +45,6 @@
 #include "core/GP_Pixel.h"
 
 /* Individual pixel access */
-#include "core/GP_Pixel_Access.h"
+#include "core/GP_GetPutPixel.h"
 
 #endif /* GP_CORE_H */
diff --git a/include/core/GP_Pixel_Access.h b/include/core/GP_GetPutPixel.h
similarity index 95%
rename from include/core/GP_Pixel_Access.h
rename to include/core/GP_GetPutPixel.h
index 331d7eb2..102bf9a9 100644
--- a/include/core/GP_Pixel_Access.h
+++ b/include/core/GP_GetPutPixel.h
@@ -20,8 +20,8 @@
  *                                                                           *
  *****************************************************************************/
 
-#ifndef GP_PIXEL_ACCESS_H
-#define GP_PIXEL_ACCESS_H
+#ifndef CORE_GP_GETPUTPIXEL_H
+#define CORE_GP_GETPUTPIXEL_H
 
 #include "GP_Context.h"
 #include "GP_FnPerBpp.h"
@@ -30,7 +30,7 @@
 /* 
  * Generated header
  */
-#include "GP_Pixel_Access.gen.h"
+#include "GP_GetPutPixel.gen.h"
 
 /*
  * GetPixel with context transformations and clipping.
@@ -62,4 +62,4 @@ static inline void GP_PutPixel_Raw(GP_Context *context, int x, int y, GP_Pixel p
 		context, x, y, p);
 }
 
-#endif /* GP_PIXEL_ACCESS_H */
+#endif /* CORE_GP_GETPUTPIXEL_H */
diff --git a/include/gfx/GP_Gfx.h b/include/gfx/GP_Gfx.h
index 2f42cb14..aa578b4a 100644
--- a/include/gfx/GP_Gfx.h
+++ b/include/gfx/GP_Gfx.h
@@ -37,7 +37,7 @@
 #include "core/GP_Transform.h"
 #include "core/GP_Context.h"
 #include "core/GP_WritePixel.h"
-#include "core/GP_Pixel_Access.h"
+#include "core/GP_GetPutPixel.h"
 #include "core/GP_Color.h"
 
 /* public drawing API */
diff --git a/libs/core/GP_Pixel_Access.c b/libs/core/GP_GetPutPixel.c
similarity index 98%
rename from libs/core/GP_Pixel_Access.c
rename to libs/core/GP_GetPutPixel.c
index f2b8924e..fe37216b 100644
--- a/libs/core/GP_Pixel_Access.c
+++ b/libs/core/GP_GetPutPixel.c
@@ -20,7 +20,7 @@
  *                                                                           *
  *****************************************************************************/
 
-#include "GP_Pixel_Access.h"
+#include "GP_GetPutPixel.h"
 #include "GP_Transform.h"
 
 GP_Pixel GP_GetPixel(GP_Context *context, int x, int y)
diff --git a/libs/core/Makefile b/libs/core/Makefile
index 3808736e..9ed6c659 100644
--- a/libs/core/Makefile
+++ b/libs/core/Makefile
@@ -1,6 +1,6 @@
 TOPDIR=../..
 GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c
-GENHEADERS=GP_Pixel_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_Pixel_Access.gen.h
+GENHEADERS=GP_Pixel_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h
 CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c))
 LIBNAME=core
 
diff --git a/pylib/gfxprim/generators/core/make_GP_Pixel.py b/pylib/gfxprim/generators/core/make_GP_Pixel.py
index 0a1ff3b3..21cb2523 100644
--- a/pylib/gfxprim/generators/core/make_GP_Pixel.py
+++ b/pylib/gfxprim/generators/core/make_GP_Pixel.py
@@ -67,8 +67,8 @@ def core_GP_Pixel_gen(h, c):
   gen_convert_to(pixeltypes['VA12'], pixeltypes['RGBA8888'], h, c)
 
 
-@generator(CHeaderGenerator(name = 'GP_Pixel_Access.gen.h'),
-           descr = 'Access pixel bytes, Put and GetPixel\nDo not include directly, use GP_Pixel.h',
+@generator(CHeaderGenerator(name = 'GP_GetPutPixel.gen.h'),
+           descr = 'Access pixel bytes, Get and PutPixel\nDo not include directly, use GP_Pixel.h',
            authors = ["2011 - Tomas Gavenciak <gavento@ucw.cz>"])
 def core_GP_Pixel_Scale_gen(h):
   h.rhead('#include "GP_Common.h"\n\n');
-- 
2.11.4.GIT