From 4b1acdfa5ffb56263745162a4019aa1afdbfa677 Mon Sep 17 00:00:00 2001 From: Xerbo Date: Wed, 8 Jul 2020 23:55:37 +0100 Subject: [PATCH] Improve MCIR, improve map alignment and remove useless palettes --- dsp.c | 4 ++-- palettes/WXtoImg-N15-HVCT.png | Bin 15463 -> 0 bytes palettes/WXtoImg-N18-HVCT.png | Bin 15118 -> 0 bytes palettes/WXtoImg-N19-HVCT.png | Bin 15435 -> 0 bytes pngio.c | 11 ++++++++--- 5 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 palettes/WXtoImg-N15-HVCT.png delete mode 100644 palettes/WXtoImg-N18-HVCT.png delete mode 100644 palettes/WXtoImg-N19-HVCT.png diff --git a/dsp.c b/dsp.c index e1b2906..e6a9e61 100755 --- a/dsp.c +++ b/dsp.c @@ -214,7 +214,7 @@ int getpixelrow(float *pixelv, int nrow, int *zenith, int reset) { static int npv; static int synced = 0; static double max = 0.0; - static double minDoppler = 100, previous = 0; + static double minDoppler = 1000000000, previous = 0; if(reset) synced = 0; @@ -282,7 +282,7 @@ int getpixelrow(float *pixelv, int nrow, int *zenith, int reset) { mshift = 0; } lastmshift = mshiftOrig; - + // If we are already as aligned as we can get, just continue if (mshift == 0) { synced++; diff --git a/palettes/WXtoImg-N15-HVCT.png b/palettes/WXtoImg-N15-HVCT.png deleted file mode 100644 index f5e8926124078e56cf7d447f04861fdaba05dcbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15463 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�gIb=&$H_nS!Upoj~CL~cx+56{RR!tasKC| zJ|@5S+9ZV#6ACvZ0o@xCLjD0?hGU4>iarA;)1bIUDqwaZ7)A^Z8Igwu#om z$h$$GVc?!2O60GYp22SR6M=PdfeWF}5GEJ}8DJCc8K_k7FE|bFE|l_&RC-2g_8>xW zZ5W_$xZqE(9)+ucw8l4FFwM zQbrOw&@)^a`th_3ya5p5;Su2B5D^d%kdP3OQLs@_Uc5kgg^BeNo0x!J7Kd0C45Gt5UcIRQJFlYWH)vWMncBL!+%9UMNLEdnvR2$ zi<^g+?~S;Gq?ELbtg4#2hNhPGI}=kga|=r=YZq5HcMnf5@Ao00Vc`*xQHdXul2cOC z(lhe%3kr*hOG?YW)YUgMHhpbw>FNFUy{~^@aA<0JW_E6VVR315Yx~E}&)vOW`)9w; zFD|eCT;JS2%k?bhzpsBJ`(Nb3fXW30$-#mVp5+3;csvV^0fr-Eg~t?CMlf>1B4-Oi z#1>2VT-%LA!LD+OW9&SMj7!O}Np;1osugysL)}l ze&a|x<)K^wZ3a|`U_IS*r2WCYlHdPt3EINEd#OJ6NQA)Ay^@w+!}htazoeVpzF)@v z3?ruL;3vQ)8rj&`B_Yl!ey$_zeS=qLWE-BH%NF6NSvE7L!6;BOrkQYG0$X|7DVNjx z1c-Uxyx&UF>7cd=f6Qcl3~adg6J}u9ycw_XUijPPdBC@{w(*FJX_JcH>br6gBD{nn zsf43<`ce%fQVoFl4atlb$!y^dALSoDO7IT<6QbU|KNcz`*MYr=u*VZnshgT`r2h+{ zmmaSna^!{TuKXACW-0;%6OScxvx8A5gKo{P%wKU;_(s@?biRbg--N9CQy zC*pFp^#-f%r9h6{qj&BP6M@)kw0=?iKa%w!cPuuB#ifyj{Pe%|&A#xXK^6 zs$`~Eilo)HbJ{hVDQ!KShGQ;dCIuJH~ zHhw`%^JnCp+Gv<4WY{?sd>(y z9swqIT6cIkJ9eZ8wXMRTfZ|_Y|F`Et^$JyZo!uQ&n{a@Y&Q&E3zlK?-_4M;{5M8Q2 zy3;TvE>~Fpr<8l7UGwbfO7KwY{Fikjy42xwR*~|4t8M>?`;+~47e;XNKtFHwXULJh z)s`P~Z{-$$Yx<=hFDLQc-0Cs9td`$o6Yt=56maOvJhglJ1WaVNne^4#pQV&IL7k{G zx7zHq%bCgjOI((w@VCdy9TLWnrl?CyN5#wqA7tRi{r`X3{$Gq3SsyEqsG}B$HG|pa z-%$O-M^lM|8UDuF^b9TLi^)%owitAu-3(ykk?slTFA91BbbmZ5&u7G6ChxCfRBhCU zzp*;pZdOGJr2k|RaZ}CK-W;}nDuY_4Lp{MoHZWcZ$p7EbzwcSa-0+#ctLay^%&({F zn)c58yPOw9#O0&+@)n!&=E1gu_n&Vt?sYAm7Og*XDcS3z}-qGjaYl zd4H!lgFX5w0hZR#@sZwQ#Xs3!9ngET{Qs0b?5c_ojsFu({Qnhdy#9uo;(vu2i~k8x zcV)>w&D?n@iXNBu6%pxJYXHSkMHYXz!S8w9=@i8+jU-c&3()R5PQdoO$P-ZI96)<8 zif}sw4K+)#eVJ$>S9jbTY_QEPeH2iQcVsHHofj{6S{fufvWj3qz4$-2oWV z|Are80*&X`KAZkG(2Ec#J;(Oh^uK}rZ|OgSdhvg=nv#2Uj;|F1>{i9zgu)cz*GD%B z%O9E(&}yzT*3+6Z)QueFSU346fPtE8FktglA0JfNPr$#lU8SfS?%w47?CA7mr#LPLZ>yb(LuemqPM(9?|_n66D210ng>6wZOF!}vPz(N%X9tJ(l!Fl zuNhX$9bXoN&Gb=$COpEQ|7^lEq_Kd`|D8B58iL)zeM)C7l zcrDTqf#Q?h(Pee+#&g8+c><97p&`d7x{09Hmm$EyS)lii`#B1IbV9bNM?pzFUc|k>v+n9wud$UueoTwy{PrN zr~SpEIa}USiHuY1hQEF0JVMW-bFN=LhFnhE@c#VIO_cUG?SE{c5wuj{))hx8`Ax0+Lr5}wC}TgE)YjF?)y>ol;ACQ%HBU;0*1z~$?`>u0=4uJB@v?P)kz0mV<2+Ztu{5%`H?xI^ z0;~{PcPkewV_UP=8#s!IPzI9!${+@CKxkbp&7AFwY#~mu;iP9_4mOs&kl{`U<$!7$J#O915U!S>`kebNG_rDzuJELu&aMCp_kY@mh3DBuY^={VN_yBpg0f>gv#UalV`~eYKA@l|Dhgrc z3_Y1t`u9-(L4>GzIsU_OJi_=AN~ZkV*1_D>1L`M$rk1ONjGYC<-OSnL*+bZvSXr6a qAjW2{Mueajq5sjHgRPM>K-Q5B~g1ftGAOuSSye9vD@12>o zX07+;zBx^GSJjrPE$6F4uifvJ6r@p+h>!pP0IIBvgbDxvgmi%b1SrVIEQSahSl?5RL zI1@Q(3BdEqE4Qm82{HrkCMz!qzXu14PDC5OJJAIIFuawO5L5G7Irm?!rjm2fuavn3 z1n0s-e>ZXqG5C%8^eV70@C!N-IWk8u)3KGH6p!lzg(GIV_S)JywXdfp4AG%elKaTl zs9(6x`#n!Bfe#`*28oIFP#`dUE(0L3`5UY(EC!~s=xM?*Wv&bs!b#hHNOOfbPy*Mi z%cV``;Weez9gT$K*GVL01Xw6pr%}}eHFT^Z0N@El38WM$qw=aJUG><=!4A{)`&!Xa&T#?;_?>LhE$nC`)Q* zic5a|grq*oFNsTu6lA5ME()r2gvALHAJwQ32hd9(;H*u1ki%lFa7n6(SuuZWKI@rd zM5G2XfZ~Bc414*Hu%iuP&o`S-RL5k$prHbMlu8GgVX{&Ijl->Auq&3RomlTNB1l5C z*BTMbQr83xCCmUcgL{I{(uIP7$w~p(fEYkql~PW_U@$f|xS7{Ow3m-YRJ3>GkC1oF z)=~(V16vg4Gn6=Nls^Ij6)y;+mJ0^6217%AhC@I=K*Yen;1(4XEfoa7b^^uT9D`7o3FE z8~FPtow|7_G}MGFpy%mlAeV|bw1OO&Y0U(Mf^?D60-ygWddXLQ~sB%I$OTVpU7x)>NRf7=RC z1O`ExDyArJFcf5W38+L)9*7wC>$h30->P9 zU&1vChd{M;3LK9B=UlWk=X_g^B7X;)h}{w7b(bm~G40oSjr4m(z#;BX_cZUprF}TY zb&ECQ_&r|;)^`YBX{zI5h9Lore9c93F?rp||g#mc3`pvA=PLQt0&MotK2c&*4p2|~sc1$~B%Lo`lDG-eb_+*B7Dd{W@{ zdB-}NqQJ}aq}S%XcRl@mjbRF2xqYLI>{35C*|R2!NAq(FbL)xDo!`^O+k|k~-`APP zEW%eq9FSz4K*EGafW&kF?;jc30)v2rfItlTmy`b_G%h^|^kEAOj)$bINDU?lB)R_) zZw@TcBhi;wxyfQdZWL?8t(KlgMMIN6x7SwS(^FiIu)c}-*if)z0P)eHx8fJ33ti|7 z?L#rlOKH=_a-R(#pKC+hX5QrHqtn_^ zlcH=x2809zsH-$$1g9tnz%Vjc=`)<<9PyVN+}fV=P={)((TGtazsjIS z6lEQyc`shC27`+*bxGvD9~ITq7`J?@tE)?)P6hwYF=t~%jsh{CVVPvXS$`F;EXtyv zM-8y+EUm8+s69h~uzGjXd+2*?DmrK{d0*9kp%Ss#{&ap}v}(FAXg-$a3_nFkR|k}YnvAiHkWwR0ZN9c3 z3`1zGkP$a3V?BZ-GbO|KFO@V*^lGA-L@fQn>7;1vLd-eN=gTa4_nQ2bj| zHHddi*SdpC+adN}%hW;LyQ|W9oQB^~M&ml&$Ffjbh^zVO`lrbQ@7iSoFA7vDdolnk zrL8$hfjf)={@>CVx*6+8JzZ7LO2WxdpI6qc^?*Zf25URMa4tH3Xd`(TGp)^$zi}Wp zQq1~L8gbEJ7eLQG7>8ECClEl$sy*gP_biBHkVF#WO*!0lYP4U2K`>e zIls;zlTFUL)-wqU3Ks<#L2CI>Z)Gi+o~6>~>R3RiJ>QLZsFJ#pST5JIAq5x-VZM$M zAv9k*i57rwl_>W%QH|w3hSn;d76O@t)H%XHQI$eu`g~bo8Y?I@W+e6Au?wbtvLWbT zq+A}6+Gwk3@*mEnMtHKK!KL03jhG2)o(V9@Wl15%2-WWrNjP(hFQM&SY*#PMiZvEI z&8FV7fB?S{Pyz(rYNymirku7;h7T@a8!PltIDT=N`O#IhBgSW6=u{NL&7AzWb=x(E z9%>UI864`=ULSMm;KDo{P}@rl`r)-;YM z|C0#W+g3}0K1?XzeD;kd^Xg(vC?{5iWGJlT+f)+Gw8VN-N^MsHPQ-d)9OFYXy5!FS9=l}3h& zjT_SUy(0QTO=Q|NKspOoD-zx<+F$QjW#J1z_hacij?cT>y9}?@jWZ;X|9y+f4o)%wahYwDodKQaRc9+%~x4rC_kT;kQpOGayjAcxR#KO;4 zvXn5u>wwpF9-=U9YqehQLuF*u@)!~$B^c66-_jb0i8}+;V9W8m0>_g_6~U`Je1+Sx%X{WA2gY`I~t!oc+}j# zXgeN)lyRlq4@%@UqshlmfA(>?2}-^7^XE*`%93+3a5GghIsD1)my%>+{-_larb%tf z!#uZ4AQFoTAX%nJp7|hny7aBv?UUlW9oUYROZ|3-Y(}iHZvpljcS2+h1_8UYm(_-? z*V~mAy$jUw-?F3d406d=8h%h{gnLRkiOi`=D*N@8QH1ZoW@Q2}a4;Ybc1CmkFj+dV zNWal}xggJyFn_nKcmO3S)l1%rJhH70jO>-=_s?eJU|f(JCQOwCBWnZtFa^c@9lT?3&O=g)q0=fRb&i2#+{Cc0YNSs2&5mnrGqa8rVpc6;97y&hvcvQ$mMXq$DhS!Y;llBc4 z2Vsx0Yx|8qwSDV;cPMP~3aXg9V4HZ6aB;1hw+xtJ1~y*_q@RnZ)68T2=u{S0fG?_^ zgcMrN2aGa6Q(BTd{!!)L-<$HVsVj;jQA9+kI_FY*rBu~f+~tTlqQXEZRVIHSqd1p| z0XD;=!L269-DFPU&eoAuk2JejX%tKbcs+8|EE2yCRa1HOz8r_E3$3vcD(|Qi|CJ+w z4v&O7%or}}po7vOy1S;Y5n5G-g#SpW4^&eiS&aT}p6C*XGVjFeu3Dt#$P&`9vPp3f zm3R9eKg=2jWD|3Kun>5x_2_Zd2xQScj@BlHW##I>9Qh5u?nPV7YF|-BXIoP5&owWo zhC3+(mQ|(w;Bu*RhMzEclM&=rsF{De%=RpG6~g`dl(+n#=Qc;d99>WNW1#niPW@97 z&zHc!#7@_{mBTTd$USa&t?^bp5`p*D@H;CNRYR&UE=}lDoR%t$>+PI!(A4ka6N|=| z?N5j8mTxPc)tdzkCKxJe89t>4S5&B(8j4z%v1^l8NoSN9Fv4TlA91*Jup{K!ZKaXx z#f~<~k2Xz4SqM$D=L;uGHZ1#my=ij4N`3yly7_d?(xWHr&wmytj%0U-`nn;Bj;GhC z(Y~3ZfhA@&f7h(nM2tlaep!iZb<0Z5M%t!`^tkdsGg40o&XP*Nt>r#Il6$SEdT+ux zEWnRBQUOTQ;y*7Ahgy`jFNbIKXh4r2nU7a^xZzM3Gg{1s7loxFX~wphalB^X9XB%X z&w68pwBXbgxQSvIv_NNqy_BgS>!!wpb5iP20keEd`mqA<+(xgK3j9P8QZHiEjAqr{!}1>3a5 zT1>Q{9MtbC^gx-^QRr1uTmh*ThCWiQMxQ4nI)%Gzhc9I-(M~eAF%=YxjlFdiJwCtu z7y9_-N~`pT51~;Re5VgnkY+U*4Nix zQ73FNdh6Ki4sOj&S666=8Sra@Q$w<3-nfi=RbhP)*YH+{RlvS5I;~kM(~-;!(dr7n zg3|H23?&dYapLb`j63v~Ub{~7J0&LL)H+x}tq#=kDm+EEZ0|sAZs+CUAOMSd8z!=Ya?q9nCkgg zkea&GwKdMK(R@R(v9&teDDm?`ukMgFC;!lo~GZA|BvDQ(45ZQgLeF;&1YB z$sV@*d@zslb-m^7^r=#3rDfTX^5?5W`d~eGtowWAA;eR?uTrpI<x(*3*$`8!bV#mF~VP6GkDe_GZv7fQ72Me4IA|8(DgEf1s+#uqD>#F62;%#j;9UYXi6XQP)o{kVi79G6$ z0r=I?OW;`oLUvWv-{Nz-vOd78VvfDG04rQfuW^^Bz1I$nr*>h}@l~h)PXD7iLG~N% z44zplo_j^x^D71Gu|Z>ok0`Q~<;iT88B=0(iN%*w7vNzo;-QZt$y3eOGZ)Fn9rVII zMtASAdf`4eZ3Se0PWOrC(4d~(uiaiL5p%;FM`a?yiwmVq6HQYim(=voJaG}muF$$4 zUT(5I5f&7B2rU2MxX7Z{84g=t`u3ua{cCb^yaa5UH^r;>iIUw)Scg*|%ul!r&2dkO z+zQR!oY3AkeelX-ZTXbaF8h3z&@EqC64B0=^(ag2nLM)>d7}hVZXRSrkgZbeXiNx9Bns>TU7rovb1^4N4DWP5D zJk6U8?|nYLgq5OJ*C)4Y{#jq&Rtab`4oh&BkVsNU0aGByn zcf^dlIMe?b={z5Dz16D6iTBgXU5qH~G+fWC_BKzN>4B@C^p*YVubEN^zQVRCl?~+@ zdZI|iu9KutiC&o33zp9rz60xGv%`n*JK-fDI4)5Feszd%A>*!c3UrXC8LPNpX%M;)(ZqNR(+eI$6YGr z$1eD+X4-d~h@umHC1a4uUcmcq?l@o2aFxEUcpZ&Ahkw$}^R2-)%rD%65^B_Rbv^u4 zrJ)1Fpf;J3rC`D~LTE#^M)QeWiS9%_K2E~sh`hI7U6e<>j|kc<>$y8C?Qp4JtN3}w zITi?w)fsDCJAC@H_U)#r z8ZP-oqA3=nP@yS=!9EK=^OzJaEGIeb6;u3(V7Ji7&Ig=WXlLPYDVVPJsKTS4hxy~+ zncwaxm;EG!K=A}B(l_(7S54}$-(8)gXE-C&q4hnI5?9?9*je6U3&7t}HMlzVmXKg3 zDi^?T7mFs?l9^nSRbNr8=SBo?p&kT<2%2^`;Wk#?G~^8Sl^bjh8-$}?A7r!-TPxvb zKTou4(|*t8O(wzC#Mu>VS@5oQr5e0j^a-oB)LdN{#Jr|`lf`5tsB*Mrh_u47LL%^5 zme(7Rg%j6FDfacn`9aTD+9rRq(9~-;+GbXb8G7$Lv|_j7j4nz;~o6q zi|IwCsK{5-m+;A6Sq?F7H_XVB_&k(o#M^)zBF;vM%>8iVyO92zS*n^4i>P{I$(XpF z51oG3_cY~Od&H^BLxLOLb|!4OvT8xd&KpF?>5oq}>cWZ#C5p}=-FXbUd*u)XxV~{;rp}kYUrAajuC+BhzhNkMU-^}Ctro~O1U+3CUuqdlv^PN9~TeyM`y5Ikw8 z^VZEFR`lA3G7hvUX(NfH&yyUB&3+{Uh<0q?Menos{?LYNrRU%Mm7cqe%H*&oiQ~2x z9{T+%5|BK*Jm83h*=I*9#-qbU6JEc*rgPj%=k?DesDEwn(V)|d>y2&Oo*GYx*B(Ra zwEH#e8?834vG8l zJHb16F|{JD!bc-hhybtXtJ$KJHtMG@ZP~gg!{IUT>IZmNHv#!4-$#iV!>UYd7tE`A zWDaRHizM2QIF2X`RCV+q;(XVe>!9MA zG`eQWIWGLUTRh_x@8#Jl^F~B^L5?SPS?^m)t+il-xk0@vl+Nl$S~j@BuyR+y_e<7p z*vO7e7|^Pj^6%Ow7$=xk7ZjPHHLM%i(<-qDLL&NuMh{d!xfmPajWiQS@h$Y}*X|rU zOj+voe&1-zats4{`>ihu7`1V&Ep81C-a0q7(Dski8Tsv6w|Ux}#a;2tRuC#uIQ2cNm_8i$^~j$nC+KZn^yHiET}o z>h;vyl_lLoOO}MrJ#S^xN=>7lVd8X@=%1hM5&Oo;2K18QwP6^uW1XpDf?cc_c%_H- zjD#o~@Qglrd$U9j@Y+pbRixH_ocrLjqlao$Aw9mKPHd2-_nR}Bxs)p?zHnC?~>eD+r^Bj@Ypk-b$P;J?7jzYFT_KhdRXPaAhyWWv~3aDAQ>(0^o!AO=2bV+@CPbCYsxV>ui(=gkc zCI395g*=2;Ymy{iK$~sb10LbCt!}<*Y}9#cRFJpbdQS@P9l%iKC_Z|jHi29Cn9=2` z;Yb>W*LvPnI_NI%h#Se$I9brcB2oWMjz{N#IYBr9Q*#1NNE&~A#7egKfssV^BmMWw zLhlUau^3AOW0;<_$DZ`<_p42Di!`#vs05z!XS_gM=~31ru5A}b=K4>(*L>{<1y=Ja zYek_bG0WUnW^W=lwxy+#xa$b#26yzJ>(-~T#=tr}&_!>W><~(A)f#sQQTyEn=j$X0c4!2ddQ*d{c z2S)?8d*ftdb(L9ve_E>~Uy!rnc$)Vb@P&NMK^MuuRvJTn1RH%mwrl^RE}hfk_a4E~ zgU6#_TIJ*jG?3*)*;?0MRMQSy4`o{73hPY@8Z_e@Z!%!%Nr<&kpB%|`K$i$^N(+MN z5e58S#I6wuZFrXqF77O1@CBwje$845yD+W{e>#xm3z-dVHa_6n(caD`q?+qR9GsZ0TlSHT-~*`2y4PM8;4nT z?=f?EFJQfE-!wJOLja+46AY{6c!zmYcWUZ{f!d9asrXpS_T7X}mv=r{?$`2jl36&~ zAq4byVLZwUyi{&PI*0xbR)`1{i!z>s5|XY*4uB%-(pKxj=DK@iY&`S`x@n4nGpNvz>%-Sd$H8d^hxxSUGeH;&*LSTd? zHHKs!(ILeVt=42)OSFT1+Kuxc1dHSKMfiEzp?Ua(Zl6dr8Br{GFI3A=rA1~=+r6PD zO|tWcgDzAB${i4Uz2xSFO}I~IRz$jdP1W&4K9sS6r|*9iR_q*WazyuzLAi1oN%PD< zu+he|+c9P6(Gr&iG{fAle|vh$c{&dC`}rdi{z#lhbyCuS&kU^ssyPajb?6`$@y0_D zNt8@T`5?!Nmf!f>Mwq89%BP6~aF3`Vr=r22QxniY=yOpw;`GD}Qo& zTfajsyC(Cu0mh_ z5(<<>S4Nt_wiO50K-{%N4MG8OXpBcQQ@$k)>yaEzv8Y(I3r4?@lc$8bi_};jiZ5l> zvXW#qnsy%RiW(im8<#FzZUZVHS@rL&C7@?XNuu;#5Ra8;s^83~=2|pO5hAKPDV6>U zLeMPz#^d`;e)+MMPY76-1uWXg^Xpr0c?*_NskpMM4zwExzL;dJC6cgBWiAfhi7=_y z5PstrRx@~-ZS*U(rQ-P&ZfF6 z%tXX)@LkEL=<)eb9iD1*f|8*h{GPyx>D&h6Hty5T!+t9{K`B-JL3T4mX z`#Lp|HHXmN731;?WBo$HL0!P+8+=MiM5;iIm^kwKx{QMyS`|NTpr2^(_*UPi%B^$O zHmc^ZUDiSW5Mw99Bh-#4W^IJCOQfYy^85JnfG_PviSBZ}gdAz#Nm*^HmgMQlapT(Q zi>y4Nv!jhUv&tO5d^EeEgz}P-9}`NuIuPPnwp!Ynn(i`ka0|)zSs`?i;pQMaJ<|wI zCX;rR--7L;(6QSOnOq7Y6|ihZa7pVd>o|~NW>nBqB$G30Pj1Z2B6a1roYj!GGBKO} zZ2Li2P*7-P7ICW#w$E!cWif=E_HY}UG`h-XyHm^QS+{2)+L zek86U+bCF%6?>zuK~{o$V->OCJon7~g67C;$cNuy!)@hVc8Soqt%j+WUG-%8)?N28 zc|F(8`boEYMPEY-4-Vp5C#J(!7!p(TTY?4Cq*x6Bozr(5%ur#=YDa4PekD#07<6PE z4PjJW26OuG3majIU-~deYcbhuu}x)B8 zaPxhWRHe*W$K6TchsjZKiRd48@mXsmyCmBQ`fyLPfG`mY6!WQ$!PkHBv1aLNUMfCh=_K!3{XI-rIK=3HG#_PTC?24;2J1fi; zEd;ciao0ZHp{cL9dV-^rE!_CsDEW!PpWx9ZYc0;+mE(kC+gaVxSd<{|-)pq8PS

4y)uEA0@ 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 G;Qs>`Xq8?7 diff --git a/palettes/WXtoImg-N19-HVCT.png b/palettes/WXtoImg-N19-HVCT.png deleted file mode 100644 index 98bd9fd5e5874a15baa147a24e1a94c99814e50c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15435 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 NWF!>C%SAr~{XYm`ZKnVL diff --git a/pngio.c b/pngio.c index 1365ca2..42607fb 100644 --- a/pngio.c +++ b/pngio.c @@ -107,9 +107,10 @@ int mapOverlay(char *filename, rgb_t **crow, int nrow, int zenith, int MCIR) { if(MCIR){ if(map.b < 128 && map.g > 128){ // Land + float darken = ((255-crow[y][chb].r)-100)/50; float green = CLIP(map.g/300, 0, 1); float blue = 0.15 - CLIP(map.b/960.0, 0, 1); - crow[y][cha] = (rgb_t){blue*1000, green*98, blue*500.0}; + crow[y][cha] = (rgb_t){blue*1000*darken, green*98*darken, blue*500.0*darken}; }else{ // Sea crow[y][cha] = (rgb_t){9, 17, 74}; @@ -123,6 +124,10 @@ int mapOverlay(char *filename, rgb_t **crow, int nrow, int zenith, int MCIR) { map.r *= factor/257.0; map.g *= factor/257.0; map.b *= factor/257.0; // Color -> alpha: convert black to alpha float alpha = CLIP(composite / 65535.0, 0, 1); + // Clip + map.r = CLIP(map.r, 0, 255.0); + map.g = CLIP(map.g, 0, 255.0); + map.b = CLIP(map.b, 0, 255.0); // Map overlay on channel A crow[y][cha] = RGBcomposite(map, alpha, crow[y][cha], 1); @@ -132,8 +137,8 @@ int mapOverlay(char *filename, rgb_t **crow, int nrow, int zenith, int MCIR) { // Cloud overlay on channel A if(MCIR){ - float cloud = CLIP((crow[y][chb].r - 105) / 150, 0, 1); - crow[y][cha] = RGBcomposite((rgb_t){240, 250, 255}, cloud, crow[y][cha], 1); + float cloud = CLIP((crow[y][chb].r - 113) / 90.0, 0, 1); + crow[y][cha] = RGBcomposite((rgb_t){255, 250, 245}, cloud, crow[y][cha], 1); } } }