summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@tbzatek.englab.brq.redhat.com>2008-08-04 11:31:04 +0200
committerTomas Bzatek <tbzatek@tbzatek.englab.brq.redhat.com>2008-08-04 11:31:04 +0200
commit1792a2cb2349cb8ba8273aea4b3a6ed52e80e149 (patch)
tree0123cf11ecb951bdc6b911789464480009e5087b
parentee8d3aa3f337cef3faae8d45c6e23ab05f380db8 (diff)
downloadcataract-1792a2cb2349cb8ba8273aea4b3a6ed52e80e149.tar.xz
Fix gcc 4.1.2 compilation warnings
Add missing sample file
-rw-r--r--gallery-utils.h2
-rw-r--r--jpeg-utils.cpp4
-rw-r--r--jpeg-utils.h2
l---------sample/src/CIAF_1/preview/img_6802d.jpg1
4 files changed, 5 insertions, 4 deletions
diff --git a/gallery-utils.h b/gallery-utils.h
index 95dbcff..2c95780 100644
--- a/gallery-utils.h
+++ b/gallery-utils.h
@@ -44,4 +44,4 @@ char *make_string (const char* substr, const int count);
* fix_entities: replace all invalid & entities with &amp;
* - returns newly allocated string
*/
-void fix_entities (char **str); \ No newline at end of file
+void fix_entities (char **str);
diff --git a/jpeg-utils.cpp b/jpeg-utils.cpp
index 973b448..a66a607 100644
--- a/jpeg-utils.cpp
+++ b/jpeg-utils.cpp
@@ -375,12 +375,12 @@ calculate_sizes (const unsigned long max_width, const unsigned long max_height,
if ((*width > *height) && (max_ratio <= real_ratio))
{
- *height = max_width / real_ratio;
+ *height = (unsigned long) (max_width / real_ratio);
*width = max_width;
}
else
{
- *width = max_height * real_ratio;
+ *width = (unsigned long) (max_height * real_ratio);
*height = max_height;
}
}
diff --git a/jpeg-utils.h b/jpeg-utils.h
index 4c47d3c..ffcb3f5 100644
--- a/jpeg-utils.h
+++ b/jpeg-utils.h
@@ -84,4 +84,4 @@ void calculate_sizes (const unsigned long max_width, const unsigned long max_hei
#ifdef __cplusplus
}
-#endif \ No newline at end of file
+#endif
diff --git a/sample/src/CIAF_1/preview/img_6802d.jpg b/sample/src/CIAF_1/preview/img_6802d.jpg
new file mode 120000
index 0000000..d6b7d1d
--- /dev/null
+++ b/sample/src/CIAF_1/preview/img_6802d.jpg
@@ -0,0 +1 @@
+img_6802.jpg \ No newline at end of file