Index: modules/emfield/contrib/image_ncck/image_ncck.module
===================================================================
--- modules/emfield/contrib/image_ncck/image_ncck.module	(revision 752)
+++ modules/emfield/contrib/image_ncck/image_ncck.module	(working copy)
@@ -282,8 +282,8 @@
 function theme_image_ncck_image_thumbnail($field, $item, $formatter, $node) {
   if ($item['value'] && $item['provider']) {
     $code = $item['value'];
-    $width = $field['widget']['thumbnail_width'] ? $field['widget']['thumbnail_width'] : variable_get('image_ncck_default_full_width', IMAGE_NCCK_DEFAULT_FULL_WIDTH);
-    $height = $field['widget']['thumbnail_height'] ? $field['widget']['thumbnail_height'] : variable_get('image_ncck_default_full_height', IMAGE_NCCK_DEFAULT_FULL_HEIGHT);
+    $width = trim($field['widget']['thumbnail_width'])!='' ? $field['widget']['thumbnail_width'] : variable_get('image_ncck_default_full_width', IMAGE_NCCK_DEFAULT_FULL_WIDTH);
+    $height = trim($field['widget']['thumbnail_height'])!='' ? $field['widget']['thumbnail_height'] : variable_get('image_ncck_default_full_height', IMAGE_NCCK_DEFAULT_FULL_HEIGHT);
     $link = $field['widget']['thumbnail_link'] ? $field['widget']['thumbnail_link'] : variable_get('image_ncck_default_thumbnail_link', IMAGE_NCCK_DEFAULT_THUMBNAIL_LINK);
     if ($link == IMAGE_NCCK_LINK_CONTENT) {
       $link = 'node/' . $node->nid;
@@ -303,8 +303,8 @@
 function theme_image_ncck_image_full($field, $item, $formatter, $node) {
   if ($item['value'] && $item['provider']) {
     $code = $item['value'];
-    $width = $field['widget']['full_width'] ? $field['widget']['full_width'] : variable_get('image_ncck_default_full_width', IMAGE_NCCK_DEFAULT_FULL_WIDTH);
-    $height = $field['widget']['full_height'] ? $field['widget']['full_height'] : variable_get('image_ncck_default_full_height', IMAGE_NCCK_DEFAULT_FULL_HEIGHT);
+    $width = trim($field['widget']['full_width'])!='' ? $field['widget']['full_width'] : variable_get('image_ncck_default_full_width', IMAGE_NCCK_DEFAULT_FULL_WIDTH);
+    $height = trim($field['widget']['full_height'])!='' ? $field['widget']['full_height'] : variable_get('image_ncck_default_full_height', IMAGE_NCCK_DEFAULT_FULL_HEIGHT);
     $link = $field['widget']['full_link'] ? $field['widget']['full_link'] : variable_get('image_ncck_default_full_link', IMAGE_NCCK_DEFAULT_FULL_LINK);
     if ($link == IMAGE_NCCK_LINK_CONTENT) {
       $link = 'node/' . $node->nid;
@@ -328,8 +328,8 @@
 function theme_image_ncck_image_preview($field, $item, $formatter, $node) {
   if ($item['value'] && $item['provider']) {
     $code = $item['value'];
-    $width = $field['widget']['preview_width'] ? $field['widget']['preview_width'] : variable_get('image_ncck_default_preview_width', IMAGE_NCCK_DEFAULT_PREVIEW_WIDTH);
-    $height = $field['widget']['preview_height'] ? $field['widget']['preview_height'] : variable_get('image_ncck_default_preview_height', IMAGE_NCCK_DEFAULT_PREVIEW_HEIGHT);
+    $width = trim($field['widget']['preview_width'])!='' ? $field['widget']['preview_width'] : variable_get('image_ncck_default_preview_width', IMAGE_NCCK_DEFAULT_PREVIEW_WIDTH);
+    $height = trim($field['widget']['preview_height'])!='' ? $field['widget']['preview_height'] : variable_get('image_ncck_default_preview_height', IMAGE_NCCK_DEFAULT_PREVIEW_HEIGHT);
     $link = $field['widget']['preview_link'] ? $field['widget']['preview_link'] : variable_get('image_ncck_default_preview_link', IMAGE_NCCK_DEFAULT_PREVIEW_LINK);
     if ($link == IMAGE_NCCK_LINK_CONTENT) {
       $link = 'node/' . $node->nid;