Move xfa/include/fxgraphics/fx_graphics.h to xfa/fxgraphics.

This Cl moves and splits apart the fx_graphics.h file into individual classes.
The .cpp files are renamed to match the .h files. pre.h was removed at the
same time and its contents moved to the correct places as needed.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1810563002 .

15 files changed, 1450 insertions, 1002 deletions

diff --git a/xfa/fxgraphics/cagg_graphics.cpp b/xfa/fxgraphics/cagg_graphics.cpp
new file mode 100644
index 0000000000..4c9e41fea3
--- /dev/null
+++ b/xfa/fxgraphics/cagg_graphics.cpp
@@ -0,0 +1,32 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "xfa/fxgraphics/cagg_graphics.h"
+
+CAGG_Graphics::CAGG_Graphics() : m_owner(nullptr) {}
+
+FX_ERR CAGG_Graphics::Create(CFX_Graphics* owner,
+                             int32_t width,
+                             int32_t height,
+                             FXDIB_Format format) {
+  if (owner->m_renderDevice)
+    return FX_ERR_Parameter_Invalid;
+  if (m_owner)
+    return FX_ERR_Property_Invalid;
+
+  CFX_FxgeDevice* device = new CFX_FxgeDevice;
+  device->Create(width, height, format);
+  m_owner = owner;
+  m_owner->m_renderDevice = device;
+  m_owner->m_renderDevice->GetBitmap()->Clear(0xFFFFFFFF);
+  return FX_ERR_Succeeded;
+}
+
+CAGG_Graphics::~CAGG_Graphics() {
+  if (m_owner->m_renderDevice)
+    delete (CFX_FxgeDevice*)m_owner->m_renderDevice;
+  m_owner = nullptr;
+}
diff --git a/xfa/fxgraphics/cagg_graphics.h b/xfa/fxgraphics/cagg_graphics.h
new file mode 100644
index 0000000000..d19773a42b
--- /dev/null
+++ b/xfa/fxgraphics/cagg_graphics.h
@@ -0,0 +1,29 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FXGRAPHICS_CAGG_GRAPHICS_H_
+#define XFA_FXGRAPHICS_CAGG_GRAPHICS_H_
+
+#include "core/include/fxge/fx_dib.h"
+#include "xfa/fxgraphics/include/cfx_graphics.h"
+
+class CFX_Graphics;
+
+class CAGG_Graphics {
+ public:
+  CAGG_Graphics();
+  virtual ~CAGG_Graphics();
+
+  FX_ERR Create(CFX_Graphics* owner,
+                int32_t width,
+                int32_t height,
+                FXDIB_Format format);
+
+ private:
+  CFX_Graphics* m_owner;
+};
+
+#endif  // XFA_FXGRAPHICS_CAGG_GRAPHICS_H_
diff --git a/xfa/fxgraphics/cfx_color.cpp b/xfa/fxgraphics/cfx_color.cpp
new file mode 100644
index 0000000000..9cc9c14bbd
--- /dev/null
+++ b/xfa/fxgraphics/cfx_color.cpp
@@ -0,0 +1,49 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "xfa/fxgraphics/cfx_color.h"
+
+CFX_Color::CFX_Color() : m_type(FX_COLOR_None) {}
+
+CFX_Color::CFX_Color(const FX_ARGB argb) {
+  Set(argb);
+}
+
+CFX_Color::CFX_Color(CFX_Pattern* pattern, const FX_ARGB argb) {
+  Set(pattern, argb);
+}
+
+CFX_Color::CFX_Color(CFX_Shading* shading) {
+  Set(shading);
+}
+
+CFX_Color::~CFX_Color() {
+  m_type = FX_COLOR_None;
+}
+
+FX_ERR CFX_Color::Set(const FX_ARGB argb) {
+  m_type = FX_COLOR_Solid;
+  m_info.argb = argb;
+  m_info.pattern = nullptr;
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Color::Set(CFX_Pattern* pattern, const FX_ARGB argb) {
+  if (!pattern)
+    return FX_ERR_Parameter_Invalid;
+  m_type = FX_COLOR_Pattern;
+  m_info.argb = argb;
+  m_info.pattern = pattern;
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Color::Set(CFX_Shading* shading) {
+  if (!shading)
+    return FX_ERR_Parameter_Invalid;
+  m_type = FX_COLOR_Shading;
+  m_shading = shading;
+  return FX_ERR_Succeeded;
+}
diff --git a/xfa/fxgraphics/cfx_color.h b/xfa/fxgraphics/cfx_color.h
new file mode 100644
index 0000000000..5ab99d8d87
--- /dev/null
+++ b/xfa/fxgraphics/cfx_color.h
@@ -0,0 +1,45 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FXGRAPHICS_CFX_COLOR_H_
+#define XFA_FXGRAPHICS_CFX_COLOR_H_
+
+#include "core/include/fxge/fx_dib.h"
+#include "xfa/fxgraphics/include/cfx_graphics.h"
+
+class CFX_Pattern;
+class CFX_Shading;
+
+enum { FX_COLOR_None = 0, FX_COLOR_Solid, FX_COLOR_Pattern, FX_COLOR_Shading };
+
+class CFX_Color {
+ public:
+  CFX_Color();
+  // TODO(weili): Remove implicit conversions. Make this explicit.
+  CFX_Color(const FX_ARGB argb);
+
+  explicit CFX_Color(CFX_Pattern* pattern, const FX_ARGB argb = 0x0);
+  explicit CFX_Color(CFX_Shading* shading);
+  virtual ~CFX_Color();
+
+  FX_ERR Set(const FX_ARGB argb);
+  FX_ERR Set(CFX_Pattern* pattern, const FX_ARGB argb = 0x0);
+  FX_ERR Set(CFX_Shading* shading);
+
+ private:
+  friend class CFX_Graphics;
+
+  int32_t m_type;
+  union {
+    struct {
+      FX_ARGB argb;
+      CFX_Pattern* pattern;
+    } m_info;
+    CFX_Shading* m_shading;
+  };
+};
+
+#endif  // XFA_FXGRAPHICS_CFX_COLOR_H_
diff --git a/xfa/fxgraphics/fx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp
index 3247246c79..a0b1b07bca 100644
--- a/xfa/fxgraphics/fx_graphics.cpp
+++ b/xfa/fxgraphics/cfx_graphics.cpp
@@ -4,12 +4,566 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/include/fxgraphics/fx_graphics.h"
+#include "xfa/fxgraphics/include/cfx_graphics.h"
 
 #include <memory>
 
-#include "xfa/fxgraphics/fx_path_generator.h"
-#include "xfa/fxgraphics/pre.h"
+#include "xfa/fxgraphics/cagg_graphics.h"
+#include "xfa/fxgraphics/cfx_color.h"
+#include "xfa/fxgraphics/cfx_path.h"
+#include "xfa/fxgraphics/cfx_path_generator.h"
+#include "xfa/fxgraphics/cfx_pattern.h"
+#include "xfa/fxgraphics/cfx_shading.h"
+
+namespace {
+
+enum {
+  FX_CONTEXT_None = 0,
+  FX_CONTEXT_Device,
+};
+
+#define FX_HATCHSTYLE_Total 53
+
+struct FX_HATCHDATA {
+  int32_t width;
+  int32_t height;
+  uint8_t maskBits[64];
+};
+
+const FX_HATCHDATA hatchBitmapData[FX_HATCHSTYLE_Total] = {
+    {16,
+     16,
+     {
+         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x80, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00,
+         0x10, 0x10, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,
+         0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x40, 0x40, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00,
+         0x01, 0x01, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00,
+         0x40, 0x40, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
+         0x02, 0x02, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
+         0x10, 0x10, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xff, 0xff, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x81, 0x81, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00,
+         0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00,
+         0x42, 0x42, 0x00, 0x00, 0x81, 0x81, 0x00, 0x00, 0x81, 0x81, 0x00, 0x00,
+         0x42, 0x42, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
+         0x18, 0x18, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00,
+         0x81, 0x81, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x88, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x22, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x88, 0x88, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x22, 0x22, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x22, 0x22, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x22, 0x22, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xaa, 0xaa, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x11, 0x11, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
+         0xaa, 0xaa, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x44, 0x44, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
+         0xaa, 0xaa, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x11, 0x11, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x51, 0x51, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0xaa, 0xaa, 0x00, 0x00, 0x15, 0x15, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x51, 0x51, 0x00, 0x00,
+         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x15, 0x15, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xee, 0xee, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0xbb, 0xbb, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0xee, 0xee, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x77, 0x77, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00,
+         0xdd, 0xdd, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00,
+         0x77, 0x77, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00,
+         0xdd, 0xdd, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00,
+         0x77, 0x77, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00,
+         0xdd, 0xdd, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x77, 0x77, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0xdd, 0xdd, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x77, 0x77, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xef, 0xef, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0xef, 0xef, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0xfe, 0xfe, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xef, 0xef, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0xef, 0xef, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0xf7, 0xf7, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xf7, 0xf7, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x7f, 0x7f, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x88, 0x88, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x11, 0x11, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
+         0x22, 0x22, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x44, 0x44, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x11, 0x11, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x11, 0x11, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x44, 0x44, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
+         0x22, 0x22, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x11, 0x11, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xcc, 0xcc, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x33, 0x33, 0x00, 0x00,
+         0x99, 0x99, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
+         0x33, 0x33, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
+         0x66, 0x66, 0x00, 0x00, 0x33, 0x33, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00,
+         0xcc, 0xcc, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x33, 0x33, 0x00, 0x00,
+         0x99, 0x99, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x33, 0x33, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
+         0x99, 0x99, 0x00, 0x00, 0x33, 0x33, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
+         0xcc, 0xcc, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00, 0x33, 0x33, 0x00, 0x00,
+         0x66, 0x66, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00,
+         0x33, 0x33, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
+         0x99, 0x99, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xc1, 0xc1, 0x00, 0x00, 0xe0, 0xe0, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00,
+         0x38, 0x38, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00,
+         0x07, 0x07, 0x00, 0x00, 0x83, 0x83, 0x00, 0x00, 0xc1, 0xc1, 0x00, 0x00,
+         0xe0, 0xe0, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00,
+         0x1c, 0x1c, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
+         0x83, 0x83, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x83, 0x83, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00,
+         0x1c, 0x1c, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00,
+         0xe0, 0xe0, 0x00, 0x00, 0xc1, 0xc1, 0x00, 0x00, 0x83, 0x83, 0x00, 0x00,
+         0x07, 0x07, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00,
+         0x38, 0x38, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 0xe0, 0xe0, 0x00, 0x00,
+         0xc1, 0xc1, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
+         0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
+         0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
+         0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
+         0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
+         0xcc, 0xcc, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x44, 0x44, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
+         0x22, 0x22, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
+         0x22, 0x22, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x44, 0x44, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x80, 0x80, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
+         0x02, 0x02, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
+         0x20, 0x20, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00,
+         0x10, 0x10, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00,
+         0x04, 0x04, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xb1, 0xb1, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00,
+         0x1b, 0x1b, 0x00, 0x00, 0xd8, 0xd8, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00,
+         0x0c, 0x0c, 0x00, 0x00, 0x8d, 0x8d, 0x00, 0x00, 0xb1, 0xb1, 0x00, 0x00,
+         0x30, 0x30, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x1b, 0x1b, 0x00, 0x00,
+         0xd8, 0xd8, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00,
+         0x8d, 0x8d, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x81, 0x81, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00,
+         0x18, 0x18, 0x00, 0x00, 0x81, 0x81, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00,
+         0x24, 0x24, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x81, 0x81, 0x00, 0x00,
+         0x42, 0x42, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
+         0x81, 0x81, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00,
+         0x18, 0x18, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x25, 0x25, 0x00, 0x00,
+         0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
+         0x25, 0x25, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x18, 0x18, 0x00, 0x00, 0x25, 0x25, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x25, 0x25, 0x00, 0x00,
+         0xc0, 0xc0, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00,
+         0x42, 0x42, 0x00, 0x00, 0x81, 0x81, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
+         0x02, 0x02, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
+         0x18, 0x18, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00,
+         0x81, 0x81, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xff, 0xff, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x88, 0x88, 0x00, 0x00, 0x54, 0x54, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x45, 0x45, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x14, 0x14, 0x00, 0x00,
+         0x22, 0x22, 0x00, 0x00, 0x51, 0x51, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x54, 0x54, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x45, 0x45, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x14, 0x14, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x51, 0x51, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
+         0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
+         0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
+         0xf0, 0xf0, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
+         0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x01, 0x01, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x10, 0x10, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x22, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x03, 0x03, 0x00, 0x00, 0x84, 0x84, 0x00, 0x00, 0x48, 0x48, 0x00, 0x00,
+         0x30, 0x30, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00,
+         0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00,
+         0x84, 0x84, 0x00, 0x00, 0x48, 0x48, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00,
+         0x0c, 0x0c, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
+         0x01, 0x01, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xff, 0xff, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x99, 0x99, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x66, 0x66, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x99, 0x99, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x77, 0x77, 0x00, 0x00, 0x89, 0x89, 0x00, 0x00, 0x8f, 0x8f, 0x00, 0x00,
+         0x8f, 0x8f, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, 0x98, 0x98, 0x00, 0x00,
+         0xf8, 0xf8, 0x00, 0x00, 0xf8, 0xf8, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00,
+         0x89, 0x89, 0x00, 0x00, 0x8f, 0x8f, 0x00, 0x00, 0x8f, 0x8f, 0x00, 0x00,
+         0x77, 0x77, 0x00, 0x00, 0x98, 0x98, 0x00, 0x00, 0xf8, 0xf8, 0x00, 0x00,
+         0xf8, 0xf8, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xff, 0xff, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0xff, 0xff, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
+         0x88, 0x88, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x99, 0x99, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
+         0x99, 0x99, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
+         0x66, 0x66, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00,
+         0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00,
+         0x99, 0x99, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
+         0x99, 0x99, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
+         0xf0, 0xf0, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00,
+         0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
+         0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
+         0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00,
+         0x0f, 0x0f, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x82, 0x82, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x28, 0x28, 0x00, 0x00,
+         0x10, 0x10, 0x00, 0x00, 0x28, 0x28, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
+         0x82, 0x82, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x82, 0x82, 0x00, 0x00,
+         0x44, 0x44, 0x00, 0x00, 0x28, 0x28, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
+         0x28, 0x28, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x82, 0x82, 0x00, 0x00,
+         0x01, 0x01, 0x00, 0x00,
+     }},
+    {16,
+     16,
+     {
+         0x10, 0x10, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x7c, 0x7c, 0x00, 0x00,
+         0xfe, 0xfe, 0x00, 0x00, 0x7c, 0x7c, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00,
+         0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
+         0x38, 0x38, 0x00, 0x00, 0x7c, 0x7c, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00,
+         0x7c, 0x7c, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00,
+     }},
+};
+
+}  // namespace
 
 CFX_Graphics::CFX_Graphics()
     : m_renderDevice(nullptr), m_aggGraphics(nullptr) {}
@@ -767,52 +1321,32 @@ FX_ERR CFX_Graphics::FillPathWithPattern(CFX_Path* path,
   CFX_DIBitmap bmp;
   bmp.Create(width, height, FXDIB_Argb);
   m_renderDevice->GetDIBits(&bmp, 0, 0);
-  switch (pattern->m_type) {
-    case FX_PATTERN_Bitmap: {
-      int32_t xStep = FXSYS_round(pattern->m_bitmapInfo.x1Step);
-      int32_t yStep = FXSYS_round(pattern->m_bitmapInfo.y1Step);
-      int32_t xCount = width / xStep + 1;
-      int32_t yCount = height / yStep + 1;
-      for (int32_t i = 0; i <= yCount; i++) {
-        for (int32_t j = 0; j <= xCount; j++) {
-          bmp.TransferBitmap(j * xStep, i * yStep, xStep, yStep,
-                             pattern->m_bitmapInfo.bitmap, 0, 0);
-        }
-      }
-      break;
-    }
-    case FX_PATTERN_Hatch: {
-      FX_HatchStyle hatchStyle =
-          m_info.fillColor->m_info.pattern->m_hatchInfo.hatchStyle;
-      if (hatchStyle < FX_HATCHSTYLE_Horizontal ||
-          hatchStyle > FX_HATCHSTYLE_SolidDiamond) {
-        return FX_ERR_Intermediate_Value_Invalid;
-      }
-      const FX_HATCHDATA& data = hatchBitmapData[hatchStyle];
-      CFX_DIBitmap mask;
-      mask.Create(data.width, data.height, FXDIB_1bppMask);
-      FXSYS_memcpy(mask.GetBuffer(), data.maskBits,
-                   mask.GetPitch() * data.height);
-      CFX_FloatRect rectf = path->GetPathData()->GetBoundingBox();
-      if (matrix) {
-        rectf.Transform((const CFX_Matrix*)matrix);
-      }
-      FX_RECT rect(FXSYS_round(rectf.left), FXSYS_round(rectf.top),
-                   FXSYS_round(rectf.right), FXSYS_round(rectf.bottom));
-      CFX_FxgeDevice device;
-      device.Attach(&bmp);
-      device.FillRect(&rect,
-                      m_info.fillColor->m_info.pattern->m_hatchInfo.backArgb);
-      for (int32_t j = rect.bottom; j < rect.top; j += mask.GetHeight()) {
-        for (int32_t i = rect.left; i < rect.right; i += mask.GetWidth()) {
-          device.SetBitMask(
-              &mask, i, j,
-              m_info.fillColor->m_info.pattern->m_hatchInfo.foreArgb);
-        }
-      }
-      break;
+
+  FX_HatchStyle hatchStyle = m_info.fillColor->m_info.pattern->m_hatchStyle;
+  if (hatchStyle < FX_HATCHSTYLE_Horizontal ||
+      hatchStyle > FX_HATCHSTYLE_SolidDiamond) {
+    return FX_ERR_Intermediate_Value_Invalid;
+  }
+  const FX_HATCHDATA& data = hatchBitmapData[hatchStyle];
+  CFX_DIBitmap mask;
+  mask.Create(data.width, data.height, FXDIB_1bppMask);
+  FXSYS_memcpy(mask.GetBuffer(), data.maskBits, mask.GetPitch() * data.height);
+  CFX_FloatRect rectf = path->GetPathData()->GetBoundingBox();
+  if (matrix) {
+    rectf.Transform((const CFX_Matrix*)matrix);
+  }
+  FX_RECT rect(FXSYS_round(rectf.left), FXSYS_round(rectf.top),
+               FXSYS_round(rectf.right), FXSYS_round(rectf.bottom));
+  CFX_FxgeDevice device;
+  device.Attach(&bmp);
+  device.FillRect(&rect, m_info.fillColor->m_info.pattern->m_backArgb);
+  for (int32_t j = rect.bottom; j < rect.top; j += mask.GetHeight()) {
+    for (int32_t i = rect.left; i < rect.right; i += mask.GetWidth()) {
+      device.SetBitMask(&mask, i, j,
+                        m_info.fillColor->m_info.pattern->m_foreArgb);
     }
   }
+
   m_renderDevice->SaveState();
   m_renderDevice->SetClip_PathFill(path->GetPathData(), (CFX_Matrix*)matrix,
                                    fillMode);
@@ -1030,365 +1564,3 @@ CFX_Graphics::TInfo& CFX_Graphics::TInfo::operator=(const TInfo& other) {
   fontSpacing = other.fontSpacing;
   return *this;
 }
-
-CAGG_Graphics::CAGG_Graphics() {
-  m_owner = nullptr;
-}
-
-FX_ERR CAGG_Graphics::Create(CFX_Graphics* owner,
-                             int32_t width,
-                             int32_t height,
-                             FXDIB_Format format) {
-  if (owner->m_renderDevice)
-    return FX_ERR_Parameter_Invalid;
-  if (m_owner)
-    return FX_ERR_Property_Invalid;
-
-  CFX_FxgeDevice* device = new CFX_FxgeDevice;
-  device->Create(width, height, format);
-  m_owner = owner;
-  m_owner->m_renderDevice = device;
-  m_owner->m_renderDevice->GetBitmap()->Clear(0xFFFFFFFF);
-  return FX_ERR_Succeeded;
-}
-
-CAGG_Graphics::~CAGG_Graphics() {
-  if (m_owner->m_renderDevice)
-    delete (CFX_FxgeDevice*)m_owner->m_renderDevice;
-  m_owner = nullptr;
-}
-
-CFX_Path::CFX_Path() {
-  m_generator = nullptr;
-}
-
-FX_ERR CFX_Path::Create() {
-  if (m_generator)
-    return FX_ERR_Property_Invalid;
-
-  m_generator = new CFX_PathGenerator;
-  m_generator->Create();
-  return FX_ERR_Succeeded;
-}
-
-CFX_Path::~CFX_Path() {
-  delete m_generator;
-}
-
-FX_ERR CFX_Path::MoveTo(FX_FLOAT x, FX_FLOAT y) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->MoveTo(x, y);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::LineTo(FX_FLOAT x, FX_FLOAT y) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->LineTo(x, y);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::BezierTo(FX_FLOAT ctrlX1,
-                          FX_FLOAT ctrlY1,
-                          FX_FLOAT ctrlX2,
-                          FX_FLOAT ctrlY2,
-                          FX_FLOAT toX,
-                          FX_FLOAT toY) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->BezierTo(ctrlX1, ctrlY1, ctrlX2, ctrlY2, toX, toY);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::ArcTo(FX_FLOAT left,
-                       FX_FLOAT top,
-                       FX_FLOAT width,
-                       FX_FLOAT height,
-                       FX_FLOAT startAngle,
-                       FX_FLOAT sweepAngle) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->ArcTo(left + width / 2, top + height / 2, width / 2, height / 2,
-                     startAngle, sweepAngle);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::Close() {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->Close();
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::AddLine(FX_FLOAT x1, FX_FLOAT y1, FX_FLOAT x2, FX_FLOAT y2) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->AddLine(x1, y1, x2, y2);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::AddBezier(FX_FLOAT startX,
-                           FX_FLOAT startY,
-                           FX_FLOAT ctrlX1,
-                           FX_FLOAT ctrlY1,
-                           FX_FLOAT ctrlX2,
-                           FX_FLOAT ctrlY2,
-                           FX_FLOAT endX,
-                           FX_FLOAT endY) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->AddBezier(startX, startY, ctrlX1, ctrlY1, ctrlX2, ctrlY2, endX,
-                         endY);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::AddRectangle(FX_FLOAT left,
-                              FX_FLOAT top,
-                              FX_FLOAT width,
-                              FX_FLOAT height) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->AddRectangle(left, top, left + width, top + height);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::AddEllipse(FX_FLOAT left,
-                            FX_FLOAT top,
-                            FX_FLOAT width,
-                            FX_FLOAT height) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->AddEllipse(left + width / 2, top + height / 2, width / 2,
-                          height / 2);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::AddEllipse(const CFX_RectF& rect) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->AddEllipse(rect.left + rect.Width() / 2,
-                          rect.top + rect.Height() / 2, rect.Width() / 2,
-                          rect.Height() / 2);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::AddArc(FX_FLOAT left,
-                        FX_FLOAT top,
-                        FX_FLOAT width,
-                        FX_FLOAT height,
-                        FX_FLOAT startAngle,
-                        FX_FLOAT sweepAngle) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->AddArc(left + width / 2, top + height / 2, width / 2, height / 2,
-                      startAngle, sweepAngle);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::AddPie(FX_FLOAT left,
-                        FX_FLOAT top,
-                        FX_FLOAT width,
-                        FX_FLOAT height,
-                        FX_FLOAT startAngle,
-                        FX_FLOAT sweepAngle) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->AddPie(left + width / 2, top + height / 2, width / 2, height / 2,
-                      startAngle, sweepAngle);
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::AddSubpath(CFX_Path* path) {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->AddPathData(path->GetPathData());
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Path::Clear() {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  m_generator->GetPathData()->SetPointCount(0);
-  return FX_ERR_Succeeded;
-}
-
-FX_BOOL CFX_Path::IsEmpty() {
-  if (!m_generator)
-    return FX_ERR_Property_Invalid;
-  if (m_generator->GetPathData()->GetPointCount() == 0) {
-    return TRUE;
-  }
-  return FALSE;
-}
-
-CFX_PathData* CFX_Path::GetPathData() {
-  if (!m_generator)
-    return nullptr;
-  return m_generator->GetPathData();
-}
-
-CFX_Color::CFX_Color() : m_type(FX_COLOR_None) {}
-
-CFX_Color::CFX_Color(const FX_ARGB argb) {
-  Set(argb);
-}
-
-CFX_Color::CFX_Color(CFX_Pattern* pattern, const FX_ARGB argb) {
-  Set(pattern, argb);
-}
-
-CFX_Color::CFX_Color(CFX_Shading* shading) {
-  Set(shading);
-}
-
-CFX_Color::~CFX_Color() {
-  m_type = FX_COLOR_None;
-}
-
-FX_ERR CFX_Color::Set(const FX_ARGB argb) {
-  m_type = FX_COLOR_Solid;
-  m_info.argb = argb;
-  m_info.pattern = nullptr;
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Color::Set(CFX_Pattern* pattern, const FX_ARGB argb) {
-  if (!pattern)
-    return FX_ERR_Parameter_Invalid;
-  m_type = FX_COLOR_Pattern;
-  m_info.argb = argb;
-  m_info.pattern = pattern;
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Color::Set(CFX_Shading* shading) {
-  if (!shading)
-    return FX_ERR_Parameter_Invalid;
-  m_type = FX_COLOR_Shading;
-  m_shading = shading;
-  return FX_ERR_Succeeded;
-}
-
-CFX_Pattern::CFX_Pattern() {
-  m_type = FX_PATTERN_None;
-  m_matrix.SetIdentity();
-}
-
-FX_ERR CFX_Pattern::Create(CFX_DIBitmap* bitmap,
-                           const FX_FLOAT xStep,
-                           const FX_FLOAT yStep,
-                           CFX_Matrix* matrix) {
-  if (!bitmap)
-    return FX_ERR_Parameter_Invalid;
-  if (m_type != FX_PATTERN_None) {
-    return FX_ERR_Property_Invalid;
-  }
-  m_type = FX_PATTERN_Bitmap;
-  m_bitmapInfo.bitmap = bitmap;
-  m_bitmapInfo.x1Step = xStep;
-  m_bitmapInfo.y1Step = yStep;
-  if (matrix) {
-    m_matrix.Set(matrix->a, matrix->b, matrix->c, matrix->d, matrix->e,
-                 matrix->f);
-  }
-  return FX_ERR_Succeeded;
-}
-
-FX_ERR CFX_Pattern::Create(FX_HatchStyle hatchStyle,
-                           const FX_ARGB foreArgb,
-                           const FX_ARGB backArgb,
-                           CFX_Matrix* matrix) {
-  if (hatchStyle < FX_HATCHSTYLE_Horizontal ||
-      hatchStyle > FX_HATCHSTYLE_SolidDiamond) {
-    return FX_ERR_Parameter_Invalid;
-  }
-  if (m_type != FX_PATTERN_None) {
-    return FX_ERR_Property_Invalid;
-  }
-  m_type = FX_PATTERN_Hatch;
-  m_hatchInfo.hatchStyle = hatchStyle;
-  m_hatchInfo.foreArgb = foreArgb;
-  m_hatchInfo.backArgb = backArgb;
-  if (matrix) {
-    m_matrix.Set(matrix->a, matrix->b, matrix->c, matrix->d, matrix->e,
-                 matrix->f);
-  }
-  return FX_ERR_Succeeded;
-}
-
-CFX_Pattern::~CFX_Pattern() {
-  m_type = FX_PATTERN_None;
-}
-
-CFX_Shading::CFX_Shading() {
-  m_type = FX_SHADING_None;
-}
-
-FX_ERR CFX_Shading::CreateAxial(const CFX_PointF& beginPoint,
-                                const CFX_PointF& endPoint,
-                                FX_BOOL isExtendedBegin,
-                                FX_BOOL isExtendedEnd,
-                                const FX_ARGB beginArgb,
-                                const FX_ARGB endArgb) {
-  if (m_type != FX_SHADING_None) {
-    return FX_ERR_Property_Invalid;
-  }
-  m_type = FX_SHADING_Axial;
-  m_beginPoint = beginPoint;
-  m_endPoint = endPoint;
-  m_isExtendedBegin = isExtendedBegin;
-  m_isExtendedEnd = isExtendedEnd;
-  m_beginArgb = beginArgb;
-  m_endArgb = endArgb;
-  return InitArgbArray();
-}
-
-FX_ERR CFX_Shading::CreateRadial(const CFX_PointF& beginPoint,
-                                 const CFX_PointF& endPoint,
-                                 const FX_FLOAT beginRadius,
-                                 const FX_FLOAT endRadius,
-                                 FX_BOOL isExtendedBegin,
-                                 FX_BOOL isExtendedEnd,
-                                 const FX_ARGB beginArgb,
-                                 const FX_ARGB endArgb) {
-  if (m_type != FX_SHADING_None) {
-    return FX_ERR_Property_Invalid;
-  }
-  m_type = FX_SHADING_Radial;
-  m_beginPoint = beginPoint;
-  m_endPoint = endPoint;
-  m_beginRadius = beginRadius;
-  m_endRadius = endRadius;
-  m_isExtendedBegin = isExtendedBegin;
-  m_isExtendedEnd = isExtendedEnd;
-  m_beginArgb = beginArgb;
-  m_endArgb = endArgb;
-  return InitArgbArray();
-}
-
-CFX_Shading::~CFX_Shading() {
-  m_type = FX_SHADING_None;
-}
-
-FX_ERR CFX_Shading::InitArgbArray() {
-  int32_t a1, r1, g1, b1;
-  ArgbDecode(m_beginArgb, a1, r1, g1, b1);
-  int32_t a2, r2, g2, b2;
-  ArgbDecode(m_endArgb, a2, r2, g2, b2);
-  FX_FLOAT f = (FX_FLOAT)(FX_SHADING_Steps - 1);
-  FX_FLOAT aScale = (FX_FLOAT)(1.0 * (a2 - a1) / f);
-  FX_FLOAT rScale = (FX_FLOAT)(1.0 * (r2 - r1) / f);
-  FX_FLOAT gScale = (FX_FLOAT)(1.0 * (g2 - g1) / f);
-  FX_FLOAT bScale = (FX_FLOAT)(1.0 * (b2 - b1) / f);
-  int32_t a3, r3, g3, b3;
-  for (int32_t i = 0; i < FX_SHADING_Steps; i++) {
-    a3 = (int32_t)(i * aScale);
-    r3 = (int32_t)(i * rScale);
-    g3 = (int32_t)(i * gScale);
-    b3 = (int32_t)(i * bScale);
-    m_argbArray[i] =
-        FXARGB_TODIB(FXARGB_MAKE((a1 + a3), (r1 + r3), (g1 + g3), (b1 + b3)));
-  }
-  return FX_ERR_Succeeded;
-}
diff --git a/xfa/fxgraphics/cfx_path.cpp b/xfa/fxgraphics/cfx_path.cpp
new file mode 100644
index 0000000000..2acdc3eac2
--- /dev/null
+++ b/xfa/fxgraphics/cfx_path.cpp
@@ -0,0 +1,179 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "xfa/fxgraphics/cfx_path.h"
+
+#include "xfa/fxgraphics/cfx_path_generator.h"
+
+CFX_Path::CFX_Path() {
+  m_generator = nullptr;
+}
+
+FX_ERR CFX_Path::Create() {
+  if (m_generator)
+    return FX_ERR_Property_Invalid;
+
+  m_generator = new CFX_PathGenerator;
+  m_generator->Create();
+  return FX_ERR_Succeeded;
+}
+
+CFX_Path::~CFX_Path() {
+  delete m_generator;
+}
+
+FX_ERR CFX_Path::MoveTo(FX_FLOAT x, FX_FLOAT y) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->MoveTo(x, y);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::LineTo(FX_FLOAT x, FX_FLOAT y) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->LineTo(x, y);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::BezierTo(FX_FLOAT ctrlX1,
+                          FX_FLOAT ctrlY1,
+                          FX_FLOAT ctrlX2,
+                          FX_FLOAT ctrlY2,
+                          FX_FLOAT toX,
+                          FX_FLOAT toY) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->BezierTo(ctrlX1, ctrlY1, ctrlX2, ctrlY2, toX, toY);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::ArcTo(FX_FLOAT left,
+                       FX_FLOAT top,
+                       FX_FLOAT width,
+                       FX_FLOAT height,
+                       FX_FLOAT startAngle,
+                       FX_FLOAT sweepAngle) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->ArcTo(left + width / 2, top + height / 2, width / 2, height / 2,
+                     startAngle, sweepAngle);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::Close() {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->Close();
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::AddLine(FX_FLOAT x1, FX_FLOAT y1, FX_FLOAT x2, FX_FLOAT y2) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->AddLine(x1, y1, x2, y2);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::AddBezier(FX_FLOAT startX,
+                           FX_FLOAT startY,
+                           FX_FLOAT ctrlX1,
+                           FX_FLOAT ctrlY1,
+                           FX_FLOAT ctrlX2,
+                           FX_FLOAT ctrlY2,
+                           FX_FLOAT endX,
+                           FX_FLOAT endY) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->AddBezier(startX, startY, ctrlX1, ctrlY1, ctrlX2, ctrlY2, endX,
+                         endY);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::AddRectangle(FX_FLOAT left,
+                              FX_FLOAT top,
+                              FX_FLOAT width,
+                              FX_FLOAT height) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->AddRectangle(left, top, left + width, top + height);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::AddEllipse(FX_FLOAT left,
+                            FX_FLOAT top,
+                            FX_FLOAT width,
+                            FX_FLOAT height) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->AddEllipse(left + width / 2, top + height / 2, width / 2,
+                          height / 2);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::AddEllipse(const CFX_RectF& rect) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->AddEllipse(rect.left + rect.Width() / 2,
+                          rect.top + rect.Height() / 2, rect.Width() / 2,
+                          rect.Height() / 2);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::AddArc(FX_FLOAT left,
+                        FX_FLOAT top,
+                        FX_FLOAT width,
+                        FX_FLOAT height,
+                        FX_FLOAT startAngle,
+                        FX_FLOAT sweepAngle) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->AddArc(left + width / 2, top + height / 2, width / 2, height / 2,
+                      startAngle, sweepAngle);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::AddPie(FX_FLOAT left,
+                        FX_FLOAT top,
+                        FX_FLOAT width,
+                        FX_FLOAT height,
+                        FX_FLOAT startAngle,
+                        FX_FLOAT sweepAngle) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->AddPie(left + width / 2, top + height / 2, width / 2, height / 2,
+                      startAngle, sweepAngle);
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::AddSubpath(CFX_Path* path) {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->AddPathData(path->GetPathData());
+  return FX_ERR_Succeeded;
+}
+
+FX_ERR CFX_Path::Clear() {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  m_generator->GetPathData()->SetPointCount(0);
+  return FX_ERR_Succeeded;
+}
+
+FX_BOOL CFX_Path::IsEmpty() {
+  if (!m_generator)
+    return FX_ERR_Property_Invalid;
+  if (m_generator->GetPathData()->GetPointCount() == 0) {
+    return TRUE;
+  }
+  return FALSE;
+}
+
+CFX_PathData* CFX_Path::GetPathData() {
+  if (!m_generator)
+    return nullptr;
+  return m_generator->GetPathData();
+}
diff --git a/xfa/fxgraphics/cfx_path.h b/xfa/fxgraphics/cfx_path.h
new file mode 100644
index 0000000000..e8e31b3876
--- /dev/null
+++ b/xfa/fxgraphics/cfx_path.h
@@ -0,0 +1,78 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FXGRAPHICS_CFX_PATH_H_
+#define XFA_FXGRAPHICS_CFX_PATH_H_
+
+#include "core/include/fxcrt/fx_system.h"
+#include "xfa/fxgraphics/include/cfx_graphics.h"
+
+class CFX_PathData;
+class CFX_PathGenerator;
+
+class CFX_Path {
+ public:
+  CFX_Path();
+  virtual ~CFX_Path();
+
+  FX_ERR Create();
+  FX_ERR MoveTo(FX_FLOAT x, FX_FLOAT y);
+  FX_ERR LineTo(FX_FLOAT x, FX_FLOAT y);
+  FX_ERR BezierTo(FX_FLOAT ctrlX1,
+                  FX_FLOAT ctrlY1,
+                  FX_FLOAT ctrlX2,
+                  FX_FLOAT ctrlY2,
+                  FX_FLOAT toX,
+                  FX_FLOAT toY);
+  FX_ERR ArcTo(FX_FLOAT left,
+               FX_FLOAT top,
+               FX_FLOAT width,
+               FX_FLOAT height,
+               FX_FLOAT startAngle,
+               FX_FLOAT sweepAngle);
+  FX_ERR Close();
+
+  FX_ERR AddLine(FX_FLOAT x1, FX_FLOAT y1, FX_FLOAT x2, FX_FLOAT y2);
+  FX_ERR AddBezier(FX_FLOAT startX,
+                   FX_FLOAT startY,
+                   FX_FLOAT ctrlX1,
+                   FX_FLOAT ctrlY1,
+                   FX_FLOAT ctrlX2,
+                   FX_FLOAT ctrlY2,
+                   FX_FLOAT endX,
+                   FX_FLOAT endY);
+  FX_ERR AddRectangle(FX_FLOAT left,
+                      FX_FLOAT top,
+                      FX_FLOAT width,
+                      FX_FLOAT height);
+  FX_ERR AddEllipse(FX_FLOAT left,
+                    FX_FLOAT top,
+                    FX_FLOAT width,
+                    FX_FLOAT height);
+  FX_ERR AddEllipse(const CFX_RectF& rect);
+  FX_ERR AddArc(FX_FLOAT left,
+                FX_FLOAT top,
+                FX_FLOAT width,
+                FX_FLOAT height,
+                FX_FLOAT startAngle,
+                FX_FLOAT sweepAngle);
+  FX_ERR AddPie(FX_FLOAT left,
+                FX_FLOAT top,
+                FX_FLOAT width,
+                FX_FLOAT height,
+                FX_FLOAT startAngle,
+                FX_FLOAT sweepAngle);
+  FX_ERR AddSubpath(CFX_Path* path);
+  FX_ERR Clear();
+
+  FX_BOOL IsEmpty();
+  CFX_PathData* GetPathData();
+
+ private:
+  CFX_PathGenerator* m_generator;
+};
+
+#endif  // XFA_FXGRAPHICS_CFX_PATH_H_
diff --git a/xfa/fxgraphics/fx_path_generator.cpp b/xfa/fxgraphics/cfx_path_generator.cpp
index cbe0f29239..ace3da154f 100644
--- a/xfa/fxgraphics/fx_path_generator.cpp
+++ b/xfa/fxgraphics/cfx_path_generator.cpp
@@ -4,9 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxgraphics/fx_path_generator.h"
-
-#include "xfa/fxgraphics/pre.h"
+#include "xfa/fxgraphics/cfx_path_generator.h"
 
 CFX_PathGenerator::CFX_PathGenerator() {
   m_pPathData = NULL;
diff --git a/xfa/fxgraphics/fx_path_generator.h b/xfa/fxgraphics/cfx_path_generator.h
index 3087a64366..efe316697d 100644
--- a/xfa/fxgraphics/fx_path_generator.h
+++ b/xfa/fxgraphics/cfx_path_generator.h
@@ -4,19 +4,22 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXGRAPHICS_FX_PATH_GENERATOR_H_
-#define XFA_FXGRAPHICS_FX_PATH_GENERATOR_H_
+#ifndef XFA_FXGRAPHICS_CFX_PATH_GENERATOR_H_
+#define XFA_FXGRAPHICS_CFX_PATH_GENERATOR_H_
 
 #include "core/include/fxge/fx_ge.h"
 
 class CFX_PathGenerator {
  public:
   CFX_PathGenerator();
-  void Create();
   ~CFX_PathGenerator();
+
+  void Create();
   CFX_PathData* GetPathData() const { return m_pPathData; }
+
   void AddPathData(CFX_PathData* path_data);
   void AddPathData(FX_PATHPOINT* points, int count);
+
   void MoveTo(FX_FLOAT x, FX_FLOAT y);
   void LineTo(FX_FLOAT x, FX_FLOAT y);
   void BezierTo(FX_FLOAT ctrl_x1,
@@ -61,4 +64,4 @@ class CFX_PathGenerator {
   CFX_PathData* m_pPathData;
 };
 
-#endif  // XFA_FXGRAPHICS_FX_PATH_GENERATOR_H_
+#endif  // XFA_FXGRAPHICS_CFX_PATH_GENERATOR_H_
diff --git a/xfa/fxgraphics/cfx_pattern.cpp b/xfa/fxgraphics/cfx_pattern.cpp
new file mode 100644
index 0000000000..f70a78d566
--- /dev/null
+++ b/xfa/fxgraphics/cfx_pattern.cpp
@@ -0,0 +1,26 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "xfa/fxgraphics/cfx_pattern.h"
+
+CFX_Pattern::CFX_Pattern(FX_HatchStyle hatchStyle,
+                         const FX_ARGB foreArgb,
+                         const FX_ARGB backArgb,
+                         CFX_Matrix* matrix)
+    : m_hatchStyle(hatchStyle), m_foreArgb(foreArgb), m_backArgb(backArgb) {
+  ASSERT(m_hatchStyle >= FX_HATCHSTYLE_Horizontal &&
+         m_hatchStyle <= FX_HATCHSTYLE_SolidDiamond);
+
+  if (matrix) {
+    // TODO(dsinclair): Add a Set(const CFX_Matrix&) method. pdfium:436
+    m_matrix.Set(matrix->a, matrix->b, matrix->c, matrix->d, matrix->e,
+                 matrix->f);
+  } else {
+    m_matrix.SetIdentity();
+  }
+}
+
+CFX_Pattern::~CFX_Pattern() {}
diff --git a/xfa/fxgraphics/cfx_pattern.h b/xfa/fxgraphics/cfx_pattern.h
new file mode 100644
index 0000000000..e4c1b096f6
--- /dev/null
+++ b/xfa/fxgraphics/cfx_pattern.h
@@ -0,0 +1,36 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FXGRAPHICS_CFX_PATTERN_H_
+#define XFA_FXGRAPHICS_CFX_PATTERN_H_
+
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
+#include "xfa/fxgraphics/include/cfx_graphics.h"
+
+class CFX_DIBitmap;
+class CFX_Matrix;
+
+class CFX_Pattern {
+ public:
+  CFX_Pattern(FX_HatchStyle hatchStyle,
+              const FX_ARGB foreArgb,
+              const FX_ARGB backArgb,
+              CFX_Matrix* matrix = nullptr);
+
+  virtual ~CFX_Pattern();
+
+ private:
+  friend class CFX_Graphics;
+
+  CFX_Matrix m_matrix;
+
+  const FX_HatchStyle m_hatchStyle;
+  const FX_ARGB m_foreArgb;
+  const FX_ARGB m_backArgb;
+};
+
+#endif  // XFA_FXGRAPHICS_CFX_PATTERN_H_
diff --git a/xfa/fxgraphics/cfx_shading.cpp b/xfa/fxgraphics/cfx_shading.cpp
new file mode 100644
index 0000000000..8be8b03e26
--- /dev/null
+++ b/xfa/fxgraphics/cfx_shading.cpp
@@ -0,0 +1,78 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "xfa/fxgraphics/cfx_shading.h"
+
+CFX_Shading::CFX_Shading(const CFX_PointF& beginPoint,
+                         const CFX_PointF& endPoint,
+                         FX_BOOL isExtendedBegin,
+                         FX_BOOL isExtendedEnd,
+                         const FX_ARGB beginArgb,
+                         const FX_ARGB endArgb)
+    : m_type(FX_SHADING_Axial),
+      m_beginPoint(beginPoint),
+      m_endPoint(endPoint),
+      m_beginRadius(0),
+      m_endRadius(0),
+      m_isExtendedBegin(isExtendedBegin),
+      m_isExtendedEnd(isExtendedEnd),
+      m_beginArgb(beginArgb),
+      m_endArgb(endArgb) {
+  InitArgbArray();
+}
+
+CFX_Shading::CFX_Shading(const CFX_PointF& beginPoint,
+                         const CFX_PointF& endPoint,
+                         const FX_FLOAT beginRadius,
+                         const FX_FLOAT endRadius,
+                         FX_BOOL isExtendedBegin,
+                         FX_BOOL isExtendedEnd,
+                         const FX_ARGB beginArgb,
+                         const FX_ARGB endArgb)
+    : m_type(FX_SHADING_Radial),
+      m_beginPoint(beginPoint),
+      m_endPoint(endPoint),
+      m_beginRadius(beginRadius),
+      m_endRadius(endRadius),
+      m_isExtendedBegin(isExtendedBegin),
+      m_isExtendedEnd(isExtendedEnd),
+      m_beginArgb(beginArgb),
+      m_endArgb(endArgb) {
+  InitArgbArray();
+}
+
+CFX_Shading::~CFX_Shading() {}
+
+void CFX_Shading::InitArgbArray() {
+  int32_t a1;
+  int32_t r1;
+  int32_t g1;
+  int32_t b1;
+  ArgbDecode(m_beginArgb, a1, r1, g1, b1);
+
+  int32_t a2;
+  int32_t r2;
+  int32_t g2;
+  int32_t b2;
+  ArgbDecode(m_endArgb, a2, r2, g2, b2);
+
+  FX_FLOAT f = (FX_FLOAT)(FX_SHADING_Steps - 1);
+  FX_FLOAT aScale = 1.0 * (a2 - a1) / f;
+  FX_FLOAT rScale = 1.0 * (r2 - r1) / f;
+  FX_FLOAT gScale = 1.0 * (g2 - g1) / f;
+  FX_FLOAT bScale = 1.0 * (b2 - b1) / f;
+
+  for (int32_t i = 0; i < FX_SHADING_Steps; i++) {
+    int32_t a3 = static_cast<int32_t>(i * aScale);
+    int32_t r3 = static_cast<int32_t>(i * rScale);
+    int32_t g3 = static_cast<int32_t>(i * gScale);
+    int32_t b3 = static_cast<int32_t>(i * bScale);
+
+    // TODO(dsinclair): Add overloads for FX_ARGB. pdfium:437
+    m_argbArray[i] =
+        FXARGB_TODIB(FXARGB_MAKE(a1 + a3, r1 + r3, g1 + g3, b1 + b3));
+  }
+}
diff --git a/xfa/fxgraphics/cfx_shading.h b/xfa/fxgraphics/cfx_shading.h
new file mode 100644
index 0000000000..d56807616a
--- /dev/null
+++ b/xfa/fxgraphics/cfx_shading.h
@@ -0,0 +1,56 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FXGRAPHICS_CFX_SHADING_H_
+#define XFA_FXGRAPHICS_CFX_SHADING_H_
+
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_system.h"
+#include "core/include/fxge/fx_dib.h"
+
+#define FX_SHADING_Steps 256
+
+enum CFX_Shading_Type { FX_SHADING_Axial = 1, FX_SHADING_Radial };
+
+class CFX_Shading {
+ public:
+  // Axial shading.
+  CFX_Shading(const CFX_PointF& beginPoint,
+              const CFX_PointF& endPoint,
+              FX_BOOL isExtendedBegin,
+              FX_BOOL isExtendedEnd,
+              const FX_ARGB beginArgb,
+              const FX_ARGB endArgb);
+
+  // Radial shading.
+  CFX_Shading(const CFX_PointF& beginPoint,
+              const CFX_PointF& endPoint,
+              const FX_FLOAT beginRadius,
+              const FX_FLOAT endRadius,
+              FX_BOOL isExtendedBegin,
+              FX_BOOL isExtendedEnd,
+              const FX_ARGB beginArgb,
+              const FX_ARGB endArgb);
+  virtual ~CFX_Shading();
+
+ private:
+  friend class CFX_Graphics;
+
+  void InitArgbArray();
+
+  const CFX_Shading_Type m_type;
+  const CFX_PointF m_beginPoint;
+  const CFX_PointF m_endPoint;
+  const FX_FLOAT m_beginRadius;
+  const FX_FLOAT m_endRadius;
+  const FX_BOOL m_isExtendedBegin;
+  const FX_BOOL m_isExtendedEnd;
+  const FX_ARGB m_beginArgb;
+  const FX_ARGB m_endArgb;
+  FX_ARGB m_argbArray[FX_SHADING_Steps];
+};
+
+#endif  // XFA_FXGRAPHICS_CFX_SHADING_H_
diff --git a/xfa/fxgraphics/include/cfx_graphics.h b/xfa/fxgraphics/include/cfx_graphics.h
new file mode 100644
index 0000000000..121ae3a744
--- /dev/null
+++ b/xfa/fxgraphics/include/cfx_graphics.h
@@ -0,0 +1,253 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef XFA_FXGRAPHICS_INCLUDE_CFX_GRAPHICS_H_
+#define XFA_FXGRAPHICS_INCLUDE_CFX_GRAPHICS_H_
+
+#include "core/include/fxcrt/fx_system.h"
+#include "core/include/fxge/fx_dib.h"
+#include "core/include/fxge/fx_ge.h"
+
+class CFX_Color;
+class CFX_Path;
+class CAGG_Graphics;
+
+#define FX_ERR_Succeeded 0
+#define FX_ERR_Indefinite -1
+#define FX_ERR_Parameter_Invalid -100
+#define FX_ERR_Property_Invalid -200
+#define FX_ERR_Intermediate_Value_Invalid -300
+#define FX_ERR_Method_Not_Supported -400
+#define FX_ERR_Out_Of_Memory -500
+
+using FX_ERR = int;
+using FX_DeviceCap = int32_t;
+using FX_FillMode = int32_t;
+
+enum FX_DashStyle {
+  FX_DASHSTYLE_Solid = 0,
+  FX_DASHSTYLE_Dash = 1,
+  FX_DASHSTYLE_Dot = 2,
+  FX_DASHSTYLE_DashDot = 3,
+  FX_DASHSTYLE_DashDotDot = 4
+};
+
+enum FX_StrokeAlignment {
+  FX_STROKEALIGNMENT_Center = 0,
+  FX_STROKEALIGNMENT_Inset = 1,
+  FX_STROKEALIGNMENT_Outset = 2,
+  FX_STROKEALIGNMENT_Left = 3,
+  FX_STROKEALIGNMENT_Right = 4
+};
+
+enum FX_HatchStyle {
+  FX_HATCHSTYLE_Horizontal = 0,
+  FX_HATCHSTYLE_Vertical = 1,
+  FX_HATCHSTYLE_ForwardDiagonal = 2,
+  FX_HATCHSTYLE_BackwardDiagonal = 3,
+  FX_HATCHSTYLE_Cross = 4,
+  FX_HATCHSTYLE_DiagonalCross = 5,
+  FX_HATCHSTYLE_05Percent = 6,
+  FX_HATCHSTYLE_10Percent = 7,
+  FX_HATCHSTYLE_20Percent = 8,
+  FX_HATCHSTYLE_25Percent = 9,
+  FX_HATCHSTYLE_30Percent = 10,
+  FX_HATCHSTYLE_40Percent = 11,
+  FX_HATCHSTYLE_50Percent = 12,
+  FX_HATCHSTYLE_60Percent = 13,
+  FX_HATCHSTYLE_70Percent = 14,
+  FX_HATCHSTYLE_75Percent = 15,
+  FX_HATCHSTYLE_80Percent = 16,
+  FX_HATCHSTYLE_90Percent = 17,
+  FX_HATCHSTYLE_LightDownwardDiagonal = 18,
+  FX_HATCHSTYLE_LightUpwardDiagonal = 19,
+  FX_HATCHSTYLE_DarkDownwardDiagonal = 20,
+  FX_HATCHSTYLE_DarkUpwardDiagonal = 21,
+  FX_HATCHSTYLE_WideDownwardDiagonal = 22,
+  FX_HATCHSTYLE_WideUpwardDiagonal = 23,
+  FX_HATCHSTYLE_LightVertical = 24,
+  FX_HATCHSTYLE_LightHorizontal = 25,
+  FX_HATCHSTYLE_NarrowVertical = 26,
+  FX_HATCHSTYLE_NarrowHorizontal = 27,
+  FX_HATCHSTYLE_DarkVertical = 28,
+  FX_HATCHSTYLE_DarkHorizontal = 29,
+  FX_HATCHSTYLE_DashedDownwardDiagonal = 30,
+  FX_HATCHSTYLE_DashedUpwardDiagonal = 31,
+  FX_HATCHSTYLE_DashedHorizontal = 32,
+  FX_HATCHSTYLE_DashedVertical = 33,
+  FX_HATCHSTYLE_SmallConfetti = 34,
+  FX_HATCHSTYLE_LargeConfetti = 35,
+  FX_HATCHSTYLE_ZigZag = 36,
+  FX_HATCHSTYLE_Wave = 37,
+  FX_HATCHSTYLE_DiagonalBrick = 38,
+  FX_HATCHSTYLE_HorizontalBrick = 39,
+  FX_HATCHSTYLE_Weave = 40,
+  FX_HATCHSTYLE_Plaid = 41,
+  FX_HATCHSTYLE_Divot = 42,
+  FX_HATCHSTYLE_DottedGrid = 43,
+  FX_HATCHSTYLE_DottedDiamond = 44,
+  FX_HATCHSTYLE_Shingle = 45,
+  FX_HATCHSTYLE_Trellis = 46,
+  FX_HATCHSTYLE_Sphere = 47,
+  FX_HATCHSTYLE_SmallGrid = 48,
+  FX_HATCHSTYLE_SmallCheckerBoard = 49,
+  FX_HATCHSTYLE_LargeCheckerBoard = 50,
+  FX_HATCHSTYLE_OutlinedDiamond = 51,
+  FX_HATCHSTYLE_SolidDiamond = 52
+};
+
+class CFX_RenderDevice;
+
+class CFX_Graphics {
+ public:
+  CFX_Graphics();
+  virtual ~CFX_Graphics();
+
+  FX_ERR Create(CFX_RenderDevice* renderDevice, FX_BOOL isAntialiasing = TRUE);
+  FX_ERR Create(int32_t width,
+                int32_t height,
+                FXDIB_Format format,
+                FX_BOOL isNative = TRUE,
+                FX_BOOL isAntialiasing = TRUE);
+
+  FX_ERR GetDeviceCap(const int32_t capID, FX_DeviceCap& capVal);
+  FX_ERR IsPrinterDevice(FX_BOOL& isPrinter);
+  FX_ERR EnableAntialiasing(FX_BOOL isAntialiasing);
+
+  FX_ERR SaveGraphState();
+  FX_ERR RestoreGraphState();
+
+  FX_ERR GetLineCap(CFX_GraphStateData::LineCap& lineCap) const;
+  FX_ERR GetDashCount(int32_t& dashCount) const;
+  FX_ERR GetLineDash(FX_FLOAT& dashPhase, FX_FLOAT* dashArray) const;
+  FX_ERR GetLineJoin(CFX_GraphStateData::LineJoin& lineJoin) const;
+  FX_ERR GetMiterLimit(FX_FLOAT& miterLimit) const;
+  FX_ERR GetLineWidth(FX_FLOAT& lineWidth) const;
+  FX_ERR GetStrokeAlignment(FX_StrokeAlignment& strokeAlignment) const;
+  FX_ERR GetClipRect(CFX_RectF& rect) const;
+  CFX_Matrix* GetMatrix();
+  CFX_RenderDevice* GetRenderDevice();
+
+  FX_ERR SetLineCap(CFX_GraphStateData::LineCap lineCap);
+  FX_ERR SetLineDash(FX_FLOAT dashPhase,
+                     FX_FLOAT* dashArray,
+                     int32_t dashCount);
+  FX_ERR SetLineDash(FX_DashStyle dashStyle);
+  FX_ERR SetLineJoin(CFX_GraphStateData::LineJoin lineJoin);
+  FX_ERR SetMiterLimit(FX_FLOAT miterLimit);
+  FX_ERR SetLineWidth(FX_FLOAT lineWidth, FX_BOOL isActOnDash = FALSE);
+  FX_ERR SetStrokeAlignment(FX_StrokeAlignment strokeAlignment);
+  FX_ERR SetStrokeColor(CFX_Color* color);
+  FX_ERR SetFillColor(CFX_Color* color);
+  FX_ERR SetClipRect(const CFX_RectF& rect);
+  FX_ERR SetFont(CFX_Font* font);
+  FX_ERR SetFontSize(const FX_FLOAT size);
+  FX_ERR SetFontHScale(const FX_FLOAT scale);
+  FX_ERR SetCharSpacing(const FX_FLOAT spacing);
+  FX_ERR SetTextDrawingMode(const int32_t mode);
+
+  FX_ERR StrokePath(CFX_Path* path, CFX_Matrix* matrix = NULL);
+  FX_ERR FillPath(CFX_Path* path,
+                  FX_FillMode fillMode = FXFILL_WINDING,
+                  CFX_Matrix* matrix = NULL);
+  FX_ERR ClipPath(CFX_Path* path,
+                  FX_FillMode fillMode = FXFILL_WINDING,
+                  CFX_Matrix* matrix = NULL);
+  FX_ERR DrawImage(CFX_DIBSource* source,
+                   const CFX_PointF& point,
+                   CFX_Matrix* matrix = NULL);
+  FX_ERR StretchImage(CFX_DIBSource* source,
+                      const CFX_RectF& rect,
+                      CFX_Matrix* matrix = NULL);
+  FX_ERR ConcatMatrix(const CFX_Matrix* matrix);
+  FX_ERR ClearClip();
+  FX_ERR ShowText(const CFX_PointF& point,
+                  const CFX_WideString& text,
+                  CFX_Matrix* matrix = NULL);
+  FX_ERR CalcTextRect(CFX_RectF& rect,
+                      const CFX_WideString& text,
+                      FX_BOOL isMultiline = FALSE,
+                      CFX_Matrix* matrix = NULL);
+  FX_ERR Transfer(CFX_Graphics* graphics, const CFX_Matrix* matrix);
+  FX_ERR Transfer(CFX_Graphics* graphics,
+                  FX_FLOAT srcLeft,
+                  FX_FLOAT srcTop,
+                  const CFX_RectF& dstRect,
+                  const CFX_Matrix* matrix);
+
+  FX_ERR InverseRect(const CFX_RectF& rect);
+  FX_ERR XorDIBitmap(const CFX_DIBitmap* srcBitmap, const CFX_RectF& rect);
+  FX_ERR EqvDIBitmap(const CFX_DIBitmap* srcBitmap, const CFX_RectF& rect);
+
+ protected:
+  int32_t m_type;
+
+ private:
+  struct TInfo {
+    TInfo()
+        : isAntialiasing(TRUE),
+          strokeAlignment(FX_STROKEALIGNMENT_Center),
+          isActOnDash(FALSE),
+          strokeColor(nullptr),
+          fillColor(nullptr),
+          font(nullptr),
+          fontSize(40.0),
+          fontHScale(1.0),
+          fontSpacing(0.0) {}
+    explicit TInfo(const TInfo& info);
+    TInfo& operator=(const TInfo& other);
+
+    CFX_GraphStateData graphState;
+    FX_BOOL isAntialiasing;
+    FX_StrokeAlignment strokeAlignment;
+    CFX_Matrix CTM;
+    FX_BOOL isActOnDash;
+    CFX_Color* strokeColor;
+    CFX_Color* fillColor;
+    CFX_Font* font;
+    FX_FLOAT fontSize;
+    FX_FLOAT fontHScale;
+    FX_FLOAT fontSpacing;
+  } m_info;
+
+  FX_ERR RenderDeviceSetLineDash(FX_DashStyle dashStyle);
+  FX_ERR RenderDeviceStrokePath(CFX_Path* path, CFX_Matrix* matrix);
+  FX_ERR RenderDeviceFillPath(CFX_Path* path,
+                              FX_FillMode fillMode,
+                              CFX_Matrix* matrix);
+  FX_ERR RenderDeviceDrawImage(CFX_DIBSource* source,
+                               const CFX_PointF& point,
+                               CFX_Matrix* matrix);
+  FX_ERR RenderDeviceStretchImage(CFX_DIBSource* source,
+                                  const CFX_RectF& rect,
+                                  CFX_Matrix* matrix);
+  FX_ERR RenderDeviceShowText(const CFX_PointF& point,
+                              const CFX_WideString& text,
+                              CFX_Matrix* matrix);
+
+  FX_ERR StrokePathWithPattern(CFX_Path* path, CFX_Matrix* matrix);
+  FX_ERR StrokePathWithShading(CFX_Path* path, CFX_Matrix* matrix);
+
+  FX_ERR FillPathWithPattern(CFX_Path* path,
+                             FX_FillMode fillMode,
+                             CFX_Matrix* matrix);
+  FX_ERR FillPathWithShading(CFX_Path* path,
+                             FX_FillMode fillMode,
+                             CFX_Matrix* matrix);
+
+  FX_ERR SetDIBitsWithMatrix(CFX_DIBSource* source, CFX_Matrix* matrix);
+  FX_ERR CalcTextInfo(const CFX_WideString& text,
+                      FX_DWORD* charCodes,
+                      FXTEXT_CHARPOS* charPos,
+                      CFX_RectF& rect);
+
+  CFX_RenderDevice* m_renderDevice;
+  CFX_PtrArray m_infoStack;
+  CAGG_Graphics* m_aggGraphics;
+  friend class CAGG_Graphics;
+};
+
+#endif  // XFA_FXGRAPHICS_INCLUDE_CFX_GRAPHICS_H_
diff --git a/xfa/fxgraphics/pre.h b/xfa/fxgraphics/pre.h
deleted file mode 100644
index fb0ac55839..0000000000
--- a/xfa/fxgraphics/pre.h
+++ /dev/null
@@ -1,586 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FXGRAPHICS_PRE_H_
-#define XFA_FXGRAPHICS_PRE_H_
-
-enum {
-  FX_CONTEXT_None = 0,
-  FX_CONTEXT_Device,
-};
-enum { FX_COLOR_None = 0, FX_COLOR_Solid, FX_COLOR_Pattern, FX_COLOR_Shading };
-enum { FX_PATTERN_None = 0, FX_PATTERN_Bitmap, FX_PATTERN_Hatch };
-enum { FX_SHADING_None = 0, FX_SHADING_Axial, FX_SHADING_Radial };
-
-#define FX_HATCHSTYLE_Total 53
-
-struct FX_HATCHDATA {
-  int32_t width;
-  int32_t height;
-  uint8_t maskBits[64];
-};
-typedef FX_HATCHDATA const* FX_LPCHATCHDATA;
-
-static const FX_HATCHDATA hatchBitmapData[FX_HATCHSTYLE_Total] = {
-    {16,
-     16,
-     {
-         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x80, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00,
-         0x10, 0x10, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,
-         0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x40, 0x40, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00,
-         0x01, 0x01, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00,
-         0x40, 0x40, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-         0x02, 0x02, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
-         0x10, 0x10, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xff, 0xff, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x81, 0x81, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00,
-         0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00,
-         0x42, 0x42, 0x00, 0x00, 0x81, 0x81, 0x00, 0x00, 0x81, 0x81, 0x00, 0x00,
-         0x42, 0x42, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
-         0x18, 0x18, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00,
-         0x81, 0x81, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x88, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x22, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x88, 0x88, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x22, 0x22, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x22, 0x22, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x22, 0x22, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xaa, 0xaa, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x11, 0x11, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
-         0xaa, 0xaa, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x44, 0x44, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
-         0xaa, 0xaa, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x11, 0x11, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x51, 0x51, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0xaa, 0xaa, 0x00, 0x00, 0x15, 0x15, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x51, 0x51, 0x00, 0x00,
-         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x15, 0x15, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xee, 0xee, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0xbb, 0xbb, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0xee, 0xee, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x77, 0x77, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00,
-         0xdd, 0xdd, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00,
-         0x77, 0x77, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00,
-         0xdd, 0xdd, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00,
-         0x77, 0x77, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00,
-         0xdd, 0xdd, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x77, 0x77, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0xdd, 0xdd, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x77, 0x77, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xdd, 0xdd, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xef, 0xef, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0xef, 0xef, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0xfe, 0xfe, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xef, 0xef, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0xef, 0xef, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0xf7, 0xf7, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xf7, 0xf7, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x7f, 0x7f, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x88, 0x88, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x11, 0x11, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
-         0x22, 0x22, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x44, 0x44, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x11, 0x11, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x11, 0x11, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x44, 0x44, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
-         0x22, 0x22, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x11, 0x11, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xcc, 0xcc, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x33, 0x33, 0x00, 0x00,
-         0x99, 0x99, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
-         0x33, 0x33, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
-         0x66, 0x66, 0x00, 0x00, 0x33, 0x33, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00,
-         0xcc, 0xcc, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x33, 0x33, 0x00, 0x00,
-         0x99, 0x99, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x33, 0x33, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
-         0x99, 0x99, 0x00, 0x00, 0x33, 0x33, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
-         0xcc, 0xcc, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00, 0x33, 0x33, 0x00, 0x00,
-         0x66, 0x66, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00,
-         0x33, 0x33, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
-         0x99, 0x99, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xc1, 0xc1, 0x00, 0x00, 0xe0, 0xe0, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00,
-         0x38, 0x38, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00,
-         0x07, 0x07, 0x00, 0x00, 0x83, 0x83, 0x00, 0x00, 0xc1, 0xc1, 0x00, 0x00,
-         0xe0, 0xe0, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00,
-         0x1c, 0x1c, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
-         0x83, 0x83, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x83, 0x83, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00,
-         0x1c, 0x1c, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00,
-         0xe0, 0xe0, 0x00, 0x00, 0xc1, 0xc1, 0x00, 0x00, 0x83, 0x83, 0x00, 0x00,
-         0x07, 0x07, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00,
-         0x38, 0x38, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 0xe0, 0xe0, 0x00, 0x00,
-         0xc1, 0xc1, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
-         0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
-         0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
-         0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
-         0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0x00, 0x00,
-         0xcc, 0xcc, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x44, 0x44, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
-         0x22, 0x22, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
-         0x22, 0x22, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x44, 0x44, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x80, 0x80, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00,
-         0x02, 0x02, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-         0x20, 0x20, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00,
-         0x10, 0x10, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00,
-         0x04, 0x04, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xb1, 0xb1, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00,
-         0x1b, 0x1b, 0x00, 0x00, 0xd8, 0xd8, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00,
-         0x0c, 0x0c, 0x00, 0x00, 0x8d, 0x8d, 0x00, 0x00, 0xb1, 0xb1, 0x00, 0x00,
-         0x30, 0x30, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x1b, 0x1b, 0x00, 0x00,
-         0xd8, 0xd8, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00,
-         0x8d, 0x8d, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x81, 0x81, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00,
-         0x18, 0x18, 0x00, 0x00, 0x81, 0x81, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00,
-         0x24, 0x24, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x81, 0x81, 0x00, 0x00,
-         0x42, 0x42, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
-         0x81, 0x81, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00,
-         0x18, 0x18, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x25, 0x25, 0x00, 0x00,
-         0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
-         0x25, 0x25, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x18, 0x18, 0x00, 0x00, 0x25, 0x25, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x25, 0x25, 0x00, 0x00,
-         0xc0, 0xc0, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00,
-         0x42, 0x42, 0x00, 0x00, 0x81, 0x81, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-         0x02, 0x02, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
-         0x18, 0x18, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00, 0x42, 0x42, 0x00, 0x00,
-         0x81, 0x81, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xff, 0xff, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x88, 0x88, 0x00, 0x00, 0x54, 0x54, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x45, 0x45, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x14, 0x14, 0x00, 0x00,
-         0x22, 0x22, 0x00, 0x00, 0x51, 0x51, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x54, 0x54, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x45, 0x45, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x14, 0x14, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x51, 0x51, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
-         0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x55, 0x55, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
-         0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
-         0xf0, 0xf0, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00,
-         0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x01, 0x01, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x10, 0x10, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x22, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x03, 0x03, 0x00, 0x00, 0x84, 0x84, 0x00, 0x00, 0x48, 0x48, 0x00, 0x00,
-         0x30, 0x30, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00,
-         0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00,
-         0x84, 0x84, 0x00, 0x00, 0x48, 0x48, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00,
-         0x0c, 0x0c, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-         0x01, 0x01, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xff, 0xff, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x99, 0x99, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x66, 0x66, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x99, 0x99, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x77, 0x77, 0x00, 0x00, 0x89, 0x89, 0x00, 0x00, 0x8f, 0x8f, 0x00, 0x00,
-         0x8f, 0x8f, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, 0x98, 0x98, 0x00, 0x00,
-         0xf8, 0xf8, 0x00, 0x00, 0xf8, 0xf8, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00,
-         0x89, 0x89, 0x00, 0x00, 0x8f, 0x8f, 0x00, 0x00, 0x8f, 0x8f, 0x00, 0x00,
-         0x77, 0x77, 0x00, 0x00, 0x98, 0x98, 0x00, 0x00, 0xf8, 0xf8, 0x00, 0x00,
-         0xf8, 0xf8, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xff, 0xff, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0xff, 0xff, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00, 0x88, 0x88, 0x00, 0x00,
-         0x88, 0x88, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x99, 0x99, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
-         0x99, 0x99, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
-         0x66, 0x66, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00,
-         0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x99, 0x99, 0x00, 0x00,
-         0x99, 0x99, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00,
-         0x99, 0x99, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
-         0xf0, 0xf0, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00,
-         0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
-         0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00,
-         0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00,
-         0x0f, 0x0f, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x82, 0x82, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x28, 0x28, 0x00, 0x00,
-         0x10, 0x10, 0x00, 0x00, 0x28, 0x28, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
-         0x82, 0x82, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x82, 0x82, 0x00, 0x00,
-         0x44, 0x44, 0x00, 0x00, 0x28, 0x28, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
-         0x28, 0x28, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00, 0x82, 0x82, 0x00, 0x00,
-         0x01, 0x01, 0x00, 0x00,
-     }},
-    {16,
-     16,
-     {
-         0x10, 0x10, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x7c, 0x7c, 0x00, 0x00,
-         0xfe, 0xfe, 0x00, 0x00, 0x7c, 0x7c, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00,
-         0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
-         0x38, 0x38, 0x00, 0x00, 0x7c, 0x7c, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00,
-         0x7c, 0x7c, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00,
-     }},
-};
-#if defined(__WIN32__) || defined(_WIN32)
-#define FX_START_TIMER    \
-  SYSTEMTIME start, stop; \
-  ::GetLocalTime(&start);
-#define FX_STOP_TIMER                                            \
-  ::GetLocalTime(&stop);                                         \
-  WORD wSecond = stop.wSecond - start.wSecond;                   \
-  WORD wMilliseconds = stop.wMilliseconds - start.wMilliseconds; \
-  char buf[256];                                                 \
-  memset(buf, 0, sizeof(buf));                                   \
-  snprintf(buf, sizeof(buf) - 1, "duration is %d millisecond\n", \
-           wSecond * 1000 + wMilliseconds);                      \
-  ::OutputDebugString(buf);
-#elif defined(__linux) || defined(linux)
-#define FX_START_TIMER
-#define FX_STOP_TIMER
-#elif defined(__APPLE__) || defined(__MACOSX__)
-#define FX_START_TIMER        \
-  NSTimeInterval start, stop; \
-  start = [NSDate timeIntervalSinceReferenceDate];
-#define FX_STOP_TIMER                             \
-  stop = [NSDate timeIntervalSinceReferenceDate]; \
-  NSTimeInterval duration = stop - start;         \
-  printf("duration is %f millisecond\n", duration * 1000);
-#else
-#endif
-
-#endif  // XFA_FXGRAPHICS_PRE_H_