From 6be4efea4a285e83cab72fc629b621c73bdb930f Mon Sep 17 00:00:00 2001
From: Mike Stewart <stewart@MediaDoneRight.com>
Date: Sun, 11 Dec 2011 18:01:26 -0800
Subject: [PATCH] Test Patch: Remove Color Module Base Image Dependency from
 Bartik

---
 core/modules/color/color.module      |    4 ++--
 core/themes/bartik/color/base.png    |  Bin 106 -> 0 bytes
 core/themes/bartik/color/color.inc   |    5 +----
 core/themes/bartik/color/preview.png |  Bin 106 -> 0 bytes
 4 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 core/themes/bartik/color/base.png
 delete mode 100644 core/themes/bartik/color/preview.png

diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index 3c193d5..d5bbf26 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -333,7 +333,7 @@ function color_scheme_form_submit($form, &$form_state) {
   }
 
   // Make sure enough memory is available, if PHP's memory limit is compiled in.
-  if (function_exists('memory_get_usage')) {
+  if (isset($info['base_image']) && function_exists('memory_get_usage')) {
     // Fetch source image dimensions.
     $source = drupal_get_path('theme', $theme) . '/' . $info['base_image'];
     list($width, $height) = getimagesize($source);
@@ -397,7 +397,7 @@ function color_scheme_form_submit($form, &$form_state) {
   }
 
   // Render new images, if image has been provided.
-  if ($info['base_image']) {
+  if (isset($info['base_image'])) {
     _color_render_images($theme, $info, $paths, $palette);
   }
 
diff --git a/core/themes/bartik/color/base.png b/core/themes/bartik/color/base.png
deleted file mode 100644
index 58cc088a49e9259fefc2282f1795a5450f884065..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xe=P)t@$*Ub5D}fYqfKQ0)|NsA&ACW!*<SKc(
vIEGZjy*<Fl2;?;___sc<V}k*Z2?GtxhA|9`0#7EL2Z?yP`njxgN@xNAie?+v

diff --git a/core/themes/bartik/color/color.inc b/core/themes/bartik/color/color.inc
index b4c813d..d132fde 100644
--- a/core/themes/bartik/color/color.inc
+++ b/core/themes/bartik/color/color.inc
@@ -119,14 +119,11 @@ $info = array(
   // with their filename as used in the stylesheet.
   'slices' => array(),
 
-  // Reference color used for blending. Matches the base.png's colors.
+  // Reference color used for blending.
   'blend_target' => '#ffffff',
 
   // Preview files.
   'preview_css' => 'color/preview.css',
   'preview_js' => 'color/preview.js',
   'preview_html' => 'color/preview.html',
-
-  // Base file for image generation.
-  'base_image' => 'color/base.png',
 );
diff --git a/core/themes/bartik/color/preview.png b/core/themes/bartik/color/preview.png
deleted file mode 100644
index 58cc088a49e9259fefc2282f1795a5450f884065..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106
zcmeAS@N?(olHy`uVBq!ia0y~yU}^xe=P)t@$*Ub5D}fYqfKQ0)|NsA&ACW!*<SKc(
vIEGZjy*<Fl2;?;___sc<V}k*Z2?GtxhA|9`0#7EL2Z?yP`njxgN@xNAie?+v

-- 
1.7.5.4