This closes qax-os#2234, allowing insert ICO format images

Author: xuri

picture.go

@@ -63,11 +63,11 @@ func parseGraphicOptions(opts *GraphicOptions) *GraphicOptions {
 
 // AddPicture provides the method to add picture in a sheet by given picture
 // format set (such as offset, scale, aspect ratio setting and print settings)
-// and file path, supported image types: BMP, EMF, EMZ, GIF, JPEG, JPG, PNG,
-// SVG, TIF, TIFF, WMF, and WMZ. This function is concurrency-safe. Note that
-// this function only supports adding pictures placed over the cells currently,
-// and doesn't support adding pictures placed in cells or creating the Kingsoft
-// WPS Office embedded image cells. For example:
+// and file path, supported image types: BMP, EMF, EMZ, GIF, ICO, JPEG, JPG,
+// PNG, SVG, TIF, TIFF, WMF, and WMZ. This function is concurrency-safe. Note
+// that this function only supports adding pictures placed over the cells
+// currently, and doesn't support adding pictures placed in cells or creating
+// the Kingsoft WPS Office embedded image cells. For example:
 //
 //	package main
 //
@@ -186,10 +186,10 @@ func (f *File) AddPicture(sheet, cell, name string, opts *GraphicOptions) error
 // AddPictureFromBytes provides the method to add picture in a sheet by given
 // picture format set (such as offset, scale, aspect ratio setting and print
 // settings), file base name, extension name and file bytes, supported image
-// types: EMF, EMZ, GIF, JPEG, JPG, PNG, SVG, TIF, TIFF, WMF, and WMZ. Note that
-// this function only supports adding pictures placed over the cells currently,
-// and doesn't support adding pictures placed in cells or creating the Kingsoft
-// WPS Office embedded image cells. For example:
+// types: EMF, EMZ, GIF, ICO, JPEG, JPG, PNG, SVG, TIF, TIFF, WMF, and WMZ. Note
+// that this function only supports adding pictures placed over the cells
+// currently, and doesn't support adding pictures placed in cells or creating
+// the Kingsoft WPS Office embedded image cells. For example:
 //
 //	package main
 //

sheet.go

@@ -527,7 +527,7 @@ func (f *File) getSheetXMLPath(sheet string) (string, bool) {
 }
 
 // SetSheetBackground provides a function to set background picture by given
-// worksheet name and file path. Supported image types: BMP, EMF, EMZ, GIF,
+// worksheet name and file path. Supported image types: BMP, EMF, EMZ, GIF, ICO,
 // JPEG, JPG, PNG, SVG, TIF, TIFF, WMF, and WMZ.
 func (f *File) SetSheetBackground(sheet, picture string) error {
 	var err error
@@ -541,7 +541,7 @@ func (f *File) SetSheetBackground(sheet, picture string) error {
 
 // SetSheetBackgroundFromBytes provides a function to set background picture by
 // given worksheet name, extension name and image data. Supported image types:
-// BMP, EMF, EMZ, GIF, JPEG, JPG, PNG, SVG, TIF, TIFF, WMF, and WMZ.
+// BMP, EMF, EMZ, GIF, ICO, JPEG, JPG, PNG, SVG, TIF, TIFF, WMF, and WMZ.
 func (f *File) SetSheetBackgroundFromBytes(sheet, extension string, picture []byte) error {
 	if len(picture) == 0 {
 		return ErrParameterInvalid

templates.go

@@ -492,8 +492,9 @@ var supportedDefinedNameAfterStartCharCodeRange = []int{
 // supportedImageTypes defined supported image types.
 var supportedImageTypes = map[string]string{
 	".bmp": ".bmp", ".emf": ".emf", ".emz": ".emz", ".gif": ".gif",
-	".jpeg": ".jpeg", ".jpg": ".jpeg", ".png": ".png", ".svg": ".svg",
-	".tif": ".tiff", ".tiff": ".tiff", ".wmf": ".wmf", ".wmz": ".wmz",
+	".ico": ".ico", ".jpeg": ".jpeg", ".jpg": ".jpeg", ".png": ".png",
+	".svg": ".svg", ".tif": ".tiff", ".tiff": ".tiff", ".wmf": ".wmf",
+	".wmz": ".wmz",
 }
 
 // supportedCalcMode defined supported formula calculate mode.

vml.go

@@ -1110,7 +1110,7 @@ func extractVMLFont(font []decodeVMLFont) []RichTextRun {
 
 // AddHeaderFooterImage provides a mechanism to set the graphics that can be
 // referenced in the header and footer definitions via &G, supported image
-// types: EMF, EMZ, GIF, JPEG, JPG, PNG, SVG, TIF, TIFF, WMF, and WMZ.
+// types: EMF, EMZ, GIF, ICO, JPEG, JPG, PNG, SVG, TIF, TIFF, WMF, and WMZ.
 //
 // The extension should be provided with a "." in front, e.g. ".png".
 // The width and height should have units in them, e.g. "100pt".

workbook.go

@@ -310,7 +310,7 @@ func (f *File) setContentTypePartRelsExtensions() error {
 // for relationship parts and the Main Document part.
 func (f *File) setContentTypePartImageExtensions() error {
 	imageTypes := map[string]string{
-		"bmp": "image/", "jpeg": "image/", "png": "image/", "gif": "image/",
+		"bmp": "image/", "ico": "image/x-", "jpeg": "image/", "png": "image/", "gif": "image/",
 		"svg": "image/", "tiff": "image/", "emf": "image/x-", "wmf": "image/x-",
 		"emz": "image/x-", "wmz": "image/x-",
 	}