2e3514ccacc941c9b8ffcaecb83438b4c3053e5e
Merge parents 4cbae69 a13fa51
kate
  Thu Oct 22 20:35:34 2015 -0700
Resolving merge

diff --cc src/inc/memgfx.h
index 790ae3b,c11e765..b7e72f7
--- src/inc/memgfx.h
+++ src/inc/memgfx.h
@@@ -1,36 -1,39 +1,37 @@@
 -/*****************************************************************************
 - * Copyright (C) 2000 Jim Kent.  This source code may be freely used         *
 - * for personal, academic, and non-profit purposes.  Commercial use          *
 - * permitted only by explicit agreement with Jim Kent (jim_kent@pacbell.net) *
 - *****************************************************************************/
  /* Memgfx - stuff to do graphics in memory buffers.
   * Typically will just write these out as .gif or .png files.
   * This stuff is byte-a-pixel for simplicity.
   * It can do 256 colors.
 - */
 + *
 + * This file is copyright 2000 Jim Kent, but license is hereby
 + * granted for all use - public, private or commercial. */
 +
  #ifndef MEMGFX_H
  #define MEMGFX_H
  
  #ifndef GFXPOLY_H
  #include "gfxPoly.h"
  #endif
  
  typedef unsigned int Color;
  
- // BIGENDIAN machines:
  
  #if defined(__sgi__) || defined(__sgi) || defined(__powerpc__) || defined(sparc) || defined(__ppc__) || defined(__s390__) || defined(__s390x__)
  
+ // BIGENDIAN machines:
+ 
  #define MEMGFX_BIGENDIAN	1
  #define MG_WHITE   0xffffffff
  #define MG_BLACK   0x000000ff
  #define MG_RED     0xff0000ff
  #define MG_GREEN   0x00ff00ff
  #define MG_BLUE    0x0000ffff
  #define MG_CYAN    0x00ffffff
  #define MG_MAGENTA 0xff00ffff
  #define MG_YELLOW  0xffff00ff
  #define MG_GRAY    0x808080ff
  
  #define MAKECOLOR_32(r,g,b) (((unsigned int)0xff) | ((unsigned int)b<<8) | ((unsigned int)g << 16) | ((unsigned int)r << 24))
  #define COLOR_32_RED(c) (((c)>>24)&0xff)
  #define COLOR_32_GREEN(c) (((c)>>16)&0xff)
  #define COLOR_32_BLUE(c) (((c)>>8)&0xff)