Prep for release 0.7.8.

jmcnamara · Aug 30, 2018 · 2fd7a4f · 2fd7a4f
1 parent b203f94
commit 2fd7a4f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/Changes.txt b/Changes.txt
@@ -2,6 +2,15 @@
 @page changes Changes
 
 
+## 0.7.8 August 30 2018
+
+- Added `worksheet_insert_image_buffer()` function to insert images from
+  memory buffers. See @ref image_buffer.c.
+  Feature request [#125][gh_125].
+
+  [gh_125]: https://github.com/jmcnamara/libxlsxwriter/issues/125
+
+
 ## 0.7.7 May 16 2018
 
 - Fix to ensure the use of wide filenames on Windows with Microsoft Visual

diff --git a/include/xlsxwriter.h b/include/xlsxwriter.h
@@ -18,6 +18,6 @@
 #include "xlsxwriter/format.h"
 #include "xlsxwriter/utility.h"
 
-#define LXW_VERSION "0.7.7"
+#define LXW_VERSION "0.7.8"
 
 #endif /* __LXW_XLSXWRITER_H__ */
diff --git a/include/xlsxwriter/worksheet.h b/include/xlsxwriter/worksheet.h
@@ -1676,7 +1676,7 @@ lxw_error worksheet_insert_image_opt(lxw_worksheet *worksheet,
 lxw_error worksheet_insert_image_buffer(lxw_worksheet *worksheet,
                                         lxw_row_t row,
                                         lxw_col_t col,
-                                        unsigned char *image_buffer,
+                                        const unsigned char *image_buffer,
                                         size_t image_size);
 
 /**
@@ -1713,7 +1713,7 @@ lxw_error worksheet_insert_image_buffer(lxw_worksheet *worksheet,
 lxw_error worksheet_insert_image_buffer_opt(lxw_worksheet *worksheet,
                                             lxw_row_t row,
                                             lxw_col_t col,
-                                            unsigned char *image_buffer,
+                                            const unsigned char *image_buffer,
                                             size_t image_size,
                                             lxw_image_options *options);
 

diff --git a/libxlsxwriter.podspec b/libxlsxwriter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "libxlsxwriter"
-  s.version               = "0.7.7"
+  s.version               = "0.7.8"
   s.summary               = "Libxlsxwriter: A C library for creating Excel XLSX files."
   s.ios.deployment_target = "6.0"
   s.osx.deployment_target = "10.8"

diff --git a/src/worksheet.c b/src/worksheet.c
@@ -5366,8 +5366,9 @@ worksheet_insert_image(lxw_worksheet *self,
 
 lxw_error
 worksheet_insert_image_buffer_opt(lxw_worksheet *self,
-                                  lxw_row_t row_num, lxw_col_t col_num,
-                                  unsigned char *image_buffer,
+                                  lxw_row_t row_num,
+                                  lxw_col_t col_num,
+                                  const unsigned char *image_buffer,
                                   size_t image_size,
                                   lxw_image_options *user_options)
 {
@@ -5440,8 +5441,10 @@ worksheet_insert_image_buffer_opt(lxw_worksheet *self,
 
 lxw_error
 worksheet_insert_image_buffer(lxw_worksheet *self,
-                              lxw_row_t row_num, lxw_col_t col_num,
-                              unsigned char *image_buffer, size_t image_size)
+                              lxw_row_t row_num,
+                              lxw_col_t col_num,
+                              const unsigned char *image_buffer,
+                              size_t image_size)
 {
     return worksheet_insert_image_buffer_opt(self, row_num, col_num,
                                              image_buffer, image_size, NULL);

diff --git a/third_party/tmpfileplus/tmpfileplus.c b/third_party/tmpfileplus/tmpfileplus.c
@@ -189,7 +189,7 @@ static FILE *mktempfile_internal(const char *tmpdir, const char *pfx, char **tmp
  */
 {
 	FILE *fp;
-	int fd;
+	int fd = 0;
 	char randpart[] = "1234567890";
 	size_t lentempname;
 	int i;