From f32f765331bcc966dcc80f433136a15eb16cd78b Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 25 Jan 2019 12:22:42 +0000
Subject: [PATCH] plugin/bmp: LoadIco now has just_best parameter, IconDes: can
 now import .ico files

git-svn-id: svn://ultimatepp.org/upp/trunk@12715 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/IconDes/IconDes.h   |   1 +
 uppsrc/IconDes/List.cpp    |  33 ++++++++++++++++++++++++---------
 uppsrc/ide/icon.ico        | Bin 10134 -> 10134 bytes
 uppsrc/plugin/bmp/Icon.cpp |  20 +++++++++++++++++---
 uppsrc/plugin/bmp/bmp.h    |   2 +-
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/uppsrc/IconDes/IconDes.h b/uppsrc/IconDes/IconDes.h
index 7dbf9f24c..cef051991 100644
--- a/uppsrc/IconDes/IconDes.h
+++ b/uppsrc/IconDes/IconDes.h
@@ -4,6 +4,7 @@
 #include <CtrlLib/CtrlLib.h>
 #include <Painter/Painter.h>
 #include <RichEdit/RichEdit.h>
+#include <plugin/bmp/bmp.h>
 
 namespace Upp {
 
diff --git a/uppsrc/IconDes/List.cpp b/uppsrc/IconDes/List.cpp
index 86973c4ef..c38e6a3bb 100644
--- a/uppsrc/IconDes/List.cpp
+++ b/uppsrc/IconDes/List.cpp
@@ -264,7 +264,7 @@ FileSel& IconDes::ImgFile()
 {
 	static FileSel sel;
 	ONCELOCK {
-		sel.Type("Image files", "*.png *.bmp *.jpg *.jpeg *.gif");
+		sel.Type("Image files", "*.png *.bmp *.jpg *.jpeg *.gif *.ico");
 		sel.AllFilesType();
 		sel.Multi();
 #ifdef _MULTITHREADED
@@ -285,14 +285,29 @@ void IconDes::InsertFile()
 	if(!ImgFile().ExecuteOpen()) return;
 	for(int i = 0; i < ImgFile().GetCount(); i++) {
 		String fn = ImgFile()[i];
-		Image m = StreamRaster::LoadFileAny(fn);
-		if(IsNull(m))
-			Exclamation(DeQtf(fn) + " not an image.");
-		String id = Filter(GetFileTitle(fn), CharFilterImageId);
-		if(!IsAlpha(*id) && *id != '_')
-			id = '_' + id;
-		SetRes(m, IMAGE_RESOLUTION_STANDARD);
-		ImageInsert(id, m);
+		Index<Image> ml;
+		if(ToLower(GetFileExt(fn)) == ".ico")
+			for(Image m : ReadIcon(LoadFile(fn), true))
+				ml.FindAdd(m);
+		else {
+			Image mm = StreamRaster::LoadFileAny(fn);
+			if(IsNull(mm))
+				Exclamation(DeQtf(fn) + " not an image.");
+			else
+				ml.Add(mm);
+		}
+		int ii = 0;
+		DDUMP(ml.GetCount());
+		for(Image m : ml) {
+			String id = Filter(GetFileTitle(fn), CharFilterImageId);
+			if(!IsAlpha(*id) && *id != '_')
+				id = '_' + id;
+			if(ii)
+				id << "_" << ii;
+			SetRes(m, IMAGE_RESOLUTION_STANDARD);
+			ImageInsert(id, m);
+			ii++;
+		}
 	}
 }
 
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index cbfd06c67e7d1b9a1f6cd71053b5d0221ef6e79a..263d620ac4c67391a0ba1cfd60057430defebc9f 100644
GIT binary patch
literal 10134
zcmeHNy^rfe5a0MCv7z8n(9jTtlkSx#<?85)T#rsN^+_jLlvGI@2?^4{pMhRM``Q#V
zG*om?qNcn*0Ljd6cE{e`csC~GMIhar*5ldv_|5FD$4TB(YNW>M>Pj(vohen*-E5}i
zpJ@I!nrrpBQtMAGeWBDJpLO~-Bc;CkqSODGDE0HTQg0|6AP{!MSEcSL?ggnKEPuq{
zecOg6n*DyyV?Zpn+itfF2JGQ4F(BKzo<tfDdFTOO+?g1RPcstR^JhG^A$#F%G;2<D
zh7)6I>vZbvvf-Gb11B#Gp`brmaUEpn*gzI%U)RRho)m#?qy8qI<fXY@!PdXW#!3Ns
zwku}hcrxh&>yJ47{@6mqMZE+3If${>>i}Qv4_&)9cINut<gC{Uc(Cnabn~3cp}#+K
z5YIO_hm6Yp`dq1f+Knys6o1%y+`|XH=rc1K_cWx>Y)x;YsaHCE1!#2-&P?Cj=?HO8
zIr!~4mh&v!<QI<;*7nun%#jey!QeYS)?64_Yq&0XC-@w3Y<%2H-NIqx`$hVbpAWYh
zLec%n=fH=?%R{iif$#gD9Y2!8#qa|;Tok`2hZFJjzG3f<jf35F&%;rF9iPk`IylGn
znUZ_*AawnAa6(Cka|s)<@8cZ9fo37<BXQWb&A>n9m&eCS`0IciCEq^IHE_w!CF&z_
z*q0Gy7Y_FVHe%n$IfetxLexj%uy0#&e-5w_`##Pw7}B{!eIyS1w)j|i_m5{Tihq~`
za+G}gIM?8m&O+2j;;^q%znng69ZtkIc^&URc+6rs5dMHzTy)QcB8TGBJjVtP*%)ju
z#yQ`Aj1Bxy4#@FR_<cEiV0@fKXAS%uE`T4+;X?Sq9L|7`XP}R8{-qZPrzvkgaQa-*
zx$?8o^T;_<6w5qA0WP>UcXNpPJ76aW2lY!HT@HilJOP?rj;;?`!RD0)tU!B8U(%+b
z@uJixePgdwI%M?u+H=6*VSwG=L+M9UqI>$C!>1z2)DPc&uZkv9zyI>9Dw0M`@Cu^&
zhUO@o@AAKwE2?1VVHZ2U=;r-<UK^}Wbi8}lV%agOs*3yBabZi&$lIpDIUrYZ#IUK&
z;q6=1Twkk3a`I*5ax4ev5d*$rZ_CGWu<H%oAIl-+C-WaN2kf)p#CRYF?2GKtQ0|`x
zdvAx{m&0h8rmbN*8kNgsS`uR_^1PfZmt}5bOim_Ctt`uws7xjk++a@2i7V$xB6{}A
z^F;hh#Ls9*e3mmyE{ZbEva;w>q*z(&AHAWiI^*xby3cNV{@n?E_D8$VjvDH@^jwWn
zIybL<R?fVCZU^_c*FLNJPoTfFy*}2PMEBZfonCywJ{#>-gO${snL-XrW8mwlvxBI+
zYXfTW5L=?o3qrSNgA!7o-WY`S+90B5179zR(A$JwF!aiCNY_l)GBF1HuE7M8t=9$-
zJsX7d^tNJ%pxzjS_1Yk!XM>m?2Clwa40>A<k=`TOzswl;>)YwIK}636Aw9i~86v1R
z24TH6IM5eNTs9y|h}K(Q%H^GgK0x{;g!KWpe=|*=4K@8Iz7OgTD0}~9OY)HKgJ042
z$o)qT3Viml=3B#iLXH=hOsC`L(G>wylR77^)MSn8Vv%f8vLJq=c|HeMDu2YasIm(7
z#2=XN(p7N_O?ro`N9X-Kr`Ksq|HsIuA)n{|;X3&cJ@WW@vEbT`Zd`YAI-O3(_4DF(
zI_2dp=#@XI>&0zVb@IA?cH~W6yYjkzGWLK-Hk<lMW2FnC<Yu#eB2GDIdA`}W^3CQO
zOP|l@uKYN^arD)E?#hqzneAUyB6Aj5RXxshK6D@|Iucbiv+B!MRrRGKKR9x_TDkJw
v>cO^87pqk(?{>R%akskP?b;=$qF46@AB^NXTeeh3ZlxW_?=~+N{(b0g!s1%e

literal 10134
zcmeHNzi%r=5MJk;%UwlW(9mERq`U?Z$thj9a5@(#()E!dS)`+iTT4jb4*m=({stE`
zG!%#mBx=g{2R!MRZ+2&Y-R;KDF@6-8XgxPO^L;Zrx3`!0J*5V!RF{{E<?EqRE4mtw
zwfz&#|3-7xf3DQi$DY4Z>hDjS|II+D?>=+>f6kQp`E#Y-5FJv0cEF!X&58Gf(o(K?
z<kH8nElsq$-Hyi|TpYLAY+4M&11}t~eP2%@Erbwy0E;Wb!TD)MxFbC0;~0t;ZP~mz
z@fl5u#jZ10ud9YR#Rp9&43Q+BqIew?7{tI9aO|`E8c7Tso5dSGsY`3!L5uH+@k&6Q
zwqu4TvdN$5KY04_xP{=wdiTIHiHX;J09NDSv%T>v*Vm?I-7DlntmAO=TuT=p&vf|W
zfMeKL*}G4b+7)hW=uC-+@5ePTz~Y=4)0oqcb7o`CHkx{s!#hCT?d+Mpxx+K$k+Sja
zK9>C~+SHe4NqhU&63mg2t-<6EFy34`v-a@1<ed;}@c8+0E$bGIm>8EipW=G>sG%(S
ze2O*l!xPmZxuKCi#veU@riPQ{Pt<VI{5>@sm|x#F+`H#S=kA94;aR-qr?5ae``F)8
za!m-zu75f^lziBih>`d{%^X2$HnJGuVXUnn-sPvyk50sWK#fvwpXN32l7o*dMtB&@
z8Raf??*(EczE3kpkeZDwMtB%&SKMC%VkEv#GY6*(KC&3$VXV!M&WArdbJG0X8c?Iu
z+oyRA!P42tVuXjW!TM$Qd3`uAzp3l_^9PSvt_I4#2Ny58=YyD2{4~$p(5V=cJK{Lz
z`;T)Yf2s!5c&hw;HT=i<u@{3L#5J5Cf3}7b<xkddg#360`ULx5&H~Xi72OZ)zEE_n
z{A~0*a={dFnP(`WC9ki;8nXBx*#Smp{ZfakVXt)_keVUS_J^Vn^D29E!0ytwMcdMN
ztJFt*W2aQH&*;PYbI8HNBo4n1r7uxQ=JY*BEY;ai{qXJgs%nSok6(UO)mf`9@Cu^&
zmga~qhP=QIs~R)Y`~`dmK>K!ij;0e&6YWmzcn~o5$6Oq@QS>b>4a5U49I$;~4A$`$
z65zoBKj?%z!W+NDY0UtDEI#ym9Cn@YdW8e|#RskHu?&IF^K+c!e}6nmcQxnmew@3O
zemV~4<2f>|P_V>H-mabKKS+*(mtVWUr~4>1XnwD^ws3P1^h)rKqux)-qOgI*U{IH3
zQIle+mdpCFEbFDQG5PpdYG+*+B=zj^5f_-#_AIoQvzhoAw_MHyUxR;0L-^SqdUjRS
z#c)_xu0-M*T732beLUXx!TOxt^!&RM&e<RRb9T_unM?O|P|z)WJ!iYmBF+bSwy|%c
zVYatb9P6K@zzYYkzR#lE1@47FIG1Oz4Z6g0Zv0`5U3}<wsogr`^$G{-7oUE1nM)`F
zpXcYgz;PHJ{ctts^80b_TKefYoG+-KrqO(fm%Lp&(f_02KlnMDJ*)P1(&@~S0+c2o
z_S4A@q0?Ol&=C*Q3Z1+Voc0`0!|L;!fV5u+Wc(Zu`=t<io6rk}UO9p2HPdH3GXear
z!32x%*8v$n2c-P;w&D~?zX?eDbwI|?0XaVcLcePUy)8+|ABo(*p$Ull>-;((<L7{s
zpWeotBI!2)X}=EW_$wA(Hd53uy|=zBm+v(E3DG+t?N7j7GX4Mhdr<#^vctI<$v%G%
zenJ1|X7l@(3i|#}tv7#Z9nrxor}!*J<-_1osj9hHos(AT;t8MA>DjuV2+~(tpHHBb
zI={nb)eIZNlfGrWEf&=^JjD$@Bf&f4c)!o-K5b~7vF!8v+<W#ZPSInR57Q~H-T2Ct
zvy0JaRIVPT*P{`)w`v+{^=f+EG|qlnJp}f8wF>R0)xC*FinH~4b+2<3Q<Af*_0v6R
zszKY6^*Xe#*57#k^T{N%?<QA)znM%z`))G!@l7K(S21jwyRoi^Hbg^PqG`t7`i6_9
z`6{q)1G`u(Li=WM>&F+<#lqU#?Y5ZSEauy-Z8<G^F*o_4$iDGy&-KjZhdvMf1>Qgy
AaR2}S

diff --git a/uppsrc/plugin/bmp/Icon.cpp b/uppsrc/plugin/bmp/Icon.cpp
index baec2b88e..d48648686 100644
--- a/uppsrc/plugin/bmp/Icon.cpp
+++ b/uppsrc/plugin/bmp/Icon.cpp
@@ -4,12 +4,12 @@ namespace Upp {
 
 #include "bmphdr.h"
 
-Vector<Image> ReadIcon(String data)
+Vector<Image> ReadIcon(String data, bool just_best)
 {
+	VectorMap<Size, Tuple2<int, Image> > best;
 	Vector<Image> out;
 	const byte *in = data;
 	int count = Peek16le(in + OFFSETOF(BMP_ICONDIR, idCount));
-	out.SetCount(count);
 	for(int i = 0; i < count; i++) {
 		const byte *hdr = in + sizeof(BMP_ICONDIR) + i * sizeof(BMP_ICONDIRENTRY);
 		dword offset = Peek32le(hdr + OFFSETOF(BMP_ICONDIRENTRY, dwImageOffset));
@@ -97,8 +97,22 @@ Vector<Image> ReadIcon(String data)
 				while(--cx);
 			}
 		}
-		out[i] = buffer;
+		Image m = buffer;
+		if(just_best) {
+			int q = best.Find(m.GetSize());
+			auto x = MakeTuple(bitcount, m);
+			if(q < 0)
+				best.Add(m.GetSize(), x);
+			else
+			if(bitcount > best[q].a)
+				best[q] = x;
+		}
+		else
+			out.Add(m);
 	}
+	if(just_best)
+		for(auto x : best)
+			out.Add(x.b);
 	return out;
 }
 
diff --git a/uppsrc/plugin/bmp/bmp.h b/uppsrc/plugin/bmp/bmp.h
index 7c4a84e31..b71ffd713 100644
--- a/uppsrc/plugin/bmp/bmp.h
+++ b/uppsrc/plugin/bmp/bmp.h
@@ -62,7 +62,7 @@ enum {
 	WI_CURSOR = 0x10,
 };
 
-Vector<Image> ReadIcon(String data);
+Vector<Image> ReadIcon(String data, bool just_best = false);
 String        WriteIcon(const Vector<Image>& icons, int flags = WI_COLOR);
 
 }