Merge remote-tracking branch 'upstream/master'

[16.git] / src / lib / planar.h

diff --git a/src/lib/planar.h b/src/lib/planar.h
old mode 100644 (file)
new mode 100755 (executable)
index 38ee46e..6e58066
--- a/src/lib/planar.h
+++ b/src/lib/planar.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 &  joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -20,33 +20,25 @@
  *
  */
 /*
- * Functions and types for a planar image buffer.  
+ * Functions and types for a planar image buffer.
  * This is meant to be able to load into video memory faster.
  */
-#include "src/lib/bitmap.h"
-
 #ifndef PLANAR_H
 #define PLANAR_H
-typedef struct {
-  byte *plane[4];     /* 4 planes of image data */
-  word width;         /* width of the image (spread across 4 planes) */
-  word height;        /* height of the image (spread across 4 planes) */
-  word pwidth;        /* the number of bytes in each plane */
-} planar_buf_t;
 
+#include "src/lib/modex16.h"
 
 /* creates a planar buffer from the bitmap data.
    The planar buffer is dynamically allocated, and should
    be destroyed with the planar_buf_free function when no longer
    needed.
  */
-planar_buf_t *planar_buf_from_bitmap(bitmap_t *b);
-
+planar_buf_t huge *planar_buf_from_bitmap(bitmap_t *b);
 
 /* allocates a planar buffer with specified dimensions */
-planar_buf_t *planar_buf_alloc(word width, word height);
-
+planar_buf_t huge *planar_buf_alloc(word width, word height);
 
 /* deallocates a planar buffer */
 void planar_buf_free(planar_buf_t *p);
+
 #endif