Skip to content

Commit f8cc65d

Browse files
jcupittjcupitt
committed
break alpha out to a separate menu
and bump the version
1 parent 5bcd166 commit f8cc65d

File tree

5 files changed

+157
-39
lines changed

5 files changed

+157
-39
lines changed

‎ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
started 8.5.1 22/1/17
2+
- fix a crash bug
3+
- make separate Image / Alpha menu, add Add, Extract, Drop
4+
15
started 8.5 24/1/17
26
- add max_slope to lhist
37
- gaussnoise goes via vips8 now

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl
1717

1818
m4_define([nip_major_version], [8])
1919
m4_define([nip_minor_version], [5])
20-
m4_define([nip_micro_version], [0])
20+
m4_define([nip_micro_version], [1])
2121
m4_define([nip_version],
2222
[nip_major_version.nip_minor_version.nip_micro_version])
2323

‎doc/src/nipguide.tex

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
\fancyhead[LE,RO]{\leftmark} % left-even, right-odd
1818
\fancyhead[RE,LO]{\nip{} Manual} % right-even, left-odd
1919
\fancyfoot[LE,RO]{\thepage} % left-even, right-odd
20-
\fancyfoot[RE,LO]{September 2016}
20+
\fancyfoot[RE,LO]{March 2017}
2121

2222
\begin{document}
2323

@@ -28,7 +28,7 @@
2828
\begin{center}
2929
\huge
3030
\nip{} Manual\\[0.2em]
31-
\large Version 8.4\\
31+
\large Version 8.5\\
3232
\vspace{0.5in}
3333
\large
3434
John Cupitt,

‎share/nip2/start/Image.def

+58-24
Original file line numberDiff line numberDiff line change
@@ -1060,30 +1060,6 @@ Image_band_item = class
10601060

10611061
Bandwise_item = Image_join_item.Bandwise_item;
10621062

1063-
sep1 = Menuseparator;
1064-
1065-
Flatten_item = class Menuaction "_Flatten" "flatten alpha out of image" {
1066-
action x = class
1067-
_result {
1068-
_vislevel = 3;
1069-
1070-
bg = Expression "Background" 0;
1071-
1072-
_result = map_unary (flattenimage bg) x;
1073-
}
1074-
}
1075-
1076-
Premultiply_item = class Menuaction "_Premultiply" "premultiply alpha" {
1077-
action x = premultiply x;
1078-
}
1079-
1080-
Unpremultiply_item = class
1081-
Menuaction "_Unpremultiply" "unpremultiply alpha" {
1082-
action x = unpremultiply x;
1083-
}
1084-
1085-
Blend_alpha_item = Filter_blend_item.Blend_alpha_item;
1086-
10871063
sep1a = Menuseparator;
10881064

10891065
Bandand_item = class
@@ -1147,6 +1123,64 @@ Image_band_item = class
11471123
}
11481124
}
11491125

1126+
Image_alpha_item = class
1127+
Menupullright "_Alpha" "manipulate image alpha" {
1128+
1129+
Add_item = class Menuaction "_Add" "add alpha" {
1130+
action x = class
1131+
_result {
1132+
_vislevel = 3;
1133+
1134+
opacity = Expression "Opacity (255 == solid)" 255;
1135+
1136+
_result = x ++ to_real opacity;
1137+
}
1138+
}
1139+
1140+
Flatten_item = class Menuaction "_Flatten" "flatten alpha out of image" {
1141+
action x = class
1142+
_result {
1143+
_vislevel = 3;
1144+
1145+
bg = Expression "Background" 0;
1146+
1147+
_result = map_unary (flattenimage bg) x;
1148+
}
1149+
}
1150+
1151+
Extract_item = class Menuaction "_Extract" "extract alpha" {
1152+
action x
1153+
= map_unary exb x
1154+
{
1155+
exb x = extract_bands (x.bands - 1) 1 x;
1156+
}
1157+
}
1158+
1159+
Drop_item = class Menuaction "_Drop" "drop alpha" {
1160+
action x
1161+
= map_unary exb x
1162+
{
1163+
exb x = extract_bands 0 (x.bands - 1) x;
1164+
}
1165+
}
1166+
1167+
sep1 = Menuseparator;
1168+
1169+
Premultiply_item = class Menuaction "_Premultiply" "premultiply alpha" {
1170+
action x = premultiply x;
1171+
}
1172+
1173+
Unpremultiply_item = class
1174+
Menuaction "_Unpremultiply" "unpremultiply alpha" {
1175+
action x = unpremultiply x;
1176+
}
1177+
1178+
sep2 = Menuseparator;
1179+
1180+
Blend_alpha_item = Filter_blend_item.Blend_alpha_item;
1181+
1182+
}
1183+
11501184
Image_crop_item = class
11511185
Menuaction "_Crop" "extract a rectangular area from an image" {
11521186
action x

‎test/workspaces/test_image.ws

+92-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<root xmlns="http://www.vips.ecs.soton.ac.uk/nip/8.5.0">
3-
<Workspace window_x="50" window_y="80" window_width="1258" window_height="799" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" locked="false" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="test_image" caption="Default empty workspace" filename="$HOME/GIT/nip2/test/workspaces/test_image.ws">
3+
<Workspace window_x="36" window_y="64" window_width="1258" window_height="1134" view="WORKSPACE_MODE_REGULAR" scale="1" offset="0" locked="false" lpane_position="400" lpane_open="false" rpane_position="100" rpane_open="false" local_defs="// private definitions for this workspace&#10;" name="test_image" caption="Default empty workspace" filename="$HOME/GIT/nip2/test/workspaces/test_image.ws">
44
<Column x="0" y="0" open="true" selected="false" sform="false" next="17" name="B" caption="Colour / Colourspace">
55
<Subcolumn vislevel="3">
66
<Row popup="false" name="B1">
@@ -12,7 +12,7 @@
1212
</Row>
1313
</Subcolumn>
1414
</Column>
15-
<Column x="455" y="0" open="true" selected="false" sform="false" next="10" name="AB" caption="Image / New">
15+
<Column x="517" y="0" open="true" selected="false" sform="false" next="10" name="AB" caption="Image / New">
1616
<Subcolumn vislevel="3">
1717
<Row popup="false" name="AB1">
1818
<Rhs vislevel="3" flags="7">
@@ -154,7 +154,7 @@
154154
</Row>
155155
</Subcolumn>
156156
</Column>
157-
<Column x="1152" y="0" open="true" selected="false" sform="false" next="49" name="BB" caption="Image / Format">
157+
<Column x="1301" y="0" open="true" selected="false" sform="false" next="49" name="BB" caption="Image / Format">
158158
<Subcolumn vislevel="3">
159159
<Row popup="false" name="BB1">
160160
<Rhs vislevel="0" flags="4">
@@ -240,7 +240,7 @@
240240
</Row>
241241
</Subcolumn>
242242
</Column>
243-
<Column x="4875" y="0" open="true" selected="true" sform="false" next="11" name="CB" caption="Image / Join">
243+
<Column x="5933" y="0" open="true" selected="false" sform="false" next="11" name="CB" caption="Image / Join">
244244
<Subcolumn vislevel="3">
245245
<Row popup="false" name="CB1">
246246
<Rhs vislevel="0" flags="4">
@@ -496,7 +496,7 @@
496496
</Row>
497497
</Subcolumn>
498498
</Column>
499-
<Column x="5505" y="0" open="true" selected="false" sform="false" next="5" name="DB" caption="Image / Tile">
499+
<Column x="6636" y="0" open="true" selected="false" sform="false" next="5" name="DB" caption="Image / Tile">
500500
<Subcolumn vislevel="3">
501501
<Row popup="false" name="DB1">
502502
<Rhs vislevel="0" flags="4">
@@ -615,7 +615,7 @@
615615
</Row>
616616
</Subcolumn>
617617
</Column>
618-
<Column x="2136" y="0" open="true" selected="false" sform="false" next="6" name="EB" caption="Image / Levels">
618+
<Column x="2391" y="0" open="true" selected="false" sform="false" next="6" name="EB" caption="Image / Levels">
619619
<Subcolumn vislevel="3">
620620
<Row popup="false" name="EB1">
621621
<Rhs vislevel="0" flags="4">
@@ -789,7 +789,7 @@
789789
</Row>
790790
</Subcolumn>
791791
</Column>
792-
<Column x="2834" y="0" open="true" selected="false" sform="false" next="20" name="FB" caption="Image / Transform">
792+
<Column x="3191" y="0" open="true" selected="false" sform="false" next="20" name="FB" caption="Image / Transform">
793793
<Subcolumn vislevel="3">
794794
<Row popup="false" name="FB1">
795795
<Rhs vislevel="0" flags="4">
@@ -1176,7 +1176,7 @@
11761176
</Row>
11771177
</Subcolumn>
11781178
</Column>
1179-
<Column x="6240" y="0" open="true" selected="false" sform="false" next="18" name="GB" caption="Image / Patterns">
1179+
<Column x="7490" y="0" open="true" selected="false" sform="false" next="18" name="GB" caption="Image / Patterns">
11801180
<Subcolumn vislevel="3">
11811181
<Row popup="false" name="GB1">
11821182
<Rhs vislevel="3" flags="7">
@@ -1299,7 +1299,7 @@
12991299
</Row>
13001300
</Subcolumn>
13011301
</Column>
1302-
<Column x="6770" y="0" open="true" selected="false" sform="false" next="8" name="HB" caption="Image / Test">
1302+
<Column x="8081" y="0" open="true" selected="false" sform="false" next="8" name="HB" caption="Image / Test">
13031303
<Subcolumn vislevel="3">
13041304
<Row popup="false" name="HB1">
13051305
<Rhs vislevel="3" flags="7">
@@ -1352,7 +1352,7 @@
13521352
</Row>
13531353
</Subcolumn>
13541354
</Column>
1355-
<Column x="3586" y="0" open="true" selected="false" sform="false" next="23" name="A" caption="Image / Band">
1355+
<Column x="4021" y="0" open="true" selected="false" sform="false" next="23" name="A" caption="Image / Band">
13561356
<Subcolumn vislevel="3">
13571357
<Row popup="false" name="A1">
13581358
<Rhs vislevel="0" flags="4">
@@ -1587,7 +1587,7 @@
15871587
</Row>
15881588
</Subcolumn>
15891589
</Column>
1590-
<Column x="1561" y="0" open="true" selected="false" sform="false" next="9" name="C" caption="Image / Header">
1590+
<Column x="1771" y="0" open="true" selected="false" sform="false" next="9" name="C" caption="Image / Header">
15911591
<Subcolumn vislevel="3">
15921592
<Row popup="false" name="C1">
15931593
<Rhs vislevel="0" flags="4">
@@ -1711,7 +1711,7 @@
17111711
</Row>
17121712
</Subcolumn>
17131713
</Column>
1714-
<Column x="4123" y="0" open="true" selected="false" sform="false" next="20" name="D" caption="Image / Select">
1714+
<Column x="5075" y="0" open="true" selected="false" sform="false" next="20" name="D" caption="Image / Select">
17151715
<Subcolumn vislevel="3">
17161716
<Row popup="false" name="D17">
17171717
<Rhs vislevel="0" flags="4">
@@ -1931,5 +1931,85 @@
19311931
</Row>
19321932
</Subcolumn>
19331933
</Column>
1934+
<Column x="4635" y="0" open="true" selected="true" sform="false" next="14" name="F" caption="Image / Alpha">
1935+
<Subcolumn vislevel="3">
1936+
<Row popup="false" name="F1">
1937+
<Rhs vislevel="0" flags="4">
1938+
<iImage image_left="0" image_top="0" image_mag="0" show_status="false" show_paintbox="false" show_convert="false" show_rulers="false" scale="0" offset="0" falsecolour="false" type="true"/>
1939+
<Subcolumn vislevel="0"/>
1940+
<iText formula="B1"/>
1941+
</Rhs>
1942+
</Row>
1943+
<Row popup="false" name="F2">
1944+
<Rhs vislevel="3" flags="7">
1945+
<iImage image_left="0" image_top="0" image_mag="0" show_status="false" show_paintbox="false" show_convert="false" show_rulers="false" scale="0" offset="0" falsecolour="false" type="true"/>
1946+
<Subcolumn vislevel="1"/>
1947+
<iText formula="Image_alpha_item.Add_item.action F1"/>
1948+
</Rhs>
1949+
</Row>
1950+
<Row popup="false" name="F3">
1951+
<Rhs vislevel="3" flags="7">
1952+
<iImage image_left="0" image_top="0" image_mag="0" show_status="false" show_paintbox="false" show_convert="false" show_rulers="false" scale="0" offset="0" falsecolour="false" type="true"/>
1953+
<Subcolumn vislevel="1"/>
1954+
<iText formula="Image_alpha_item.Flatten_item.action F2"/>
1955+
</Rhs>
1956+
</Row>
1957+
<Row popup="false" name="F4">
1958+
<Rhs vislevel="2" flags="4">
1959+
<iText formula="if min (F3 == F1) == 255 then &quot;ok!&quot; else error &quot;erp&quot;"/>
1960+
</Rhs>
1961+
</Row>
1962+
<Row popup="false" name="F5">
1963+
<Rhs vislevel="2" flags="5">
1964+
<iImage image_left="0" image_top="0" image_mag="0" show_status="false" show_paintbox="false" show_convert="false" show_rulers="false" scale="0" offset="0" falsecolour="false" type="true"/>
1965+
<Subcolumn vislevel="0"/>
1966+
<iText formula="Image_alpha_item.Extract_item.action F2"/>
1967+
</Rhs>
1968+
</Row>
1969+
<Row popup="false" name="F6">
1970+
<Rhs vislevel="1" flags="4">
1971+
<iText formula="if min (F5 == 255) == 255 then &quot;ok!&quot; else error &quot;erp!&quot;"/>
1972+
</Rhs>
1973+
</Row>
1974+
<Row popup="false" name="F7">
1975+
<Rhs vislevel="2" flags="5">
1976+
<iImage image_left="0" image_top="0" image_mag="0" show_status="false" show_paintbox="false" show_convert="false" show_rulers="false" scale="0" offset="0" falsecolour="false" type="true"/>
1977+
<Subcolumn vislevel="0"/>
1978+
<iText formula="Image_alpha_item.Drop_item.action F2"/>
1979+
</Rhs>
1980+
</Row>
1981+
<Row popup="false" name="F8">
1982+
<Rhs vislevel="1" flags="4">
1983+
<iText formula="if min (F7 == F1) == 255 then &quot;ok!&quot; else error &quot;erp&quot;"/>
1984+
</Rhs>
1985+
</Row>
1986+
<Row popup="false" name="F9">
1987+
<Rhs vislevel="2" flags="5">
1988+
<iImage window_x="72" window_y="72" window_width="570" window_height="727" image_left="272" image_top="326" image_mag="1" show_status="true" show_paintbox="false" show_convert="false" show_rulers="false" scale="1" offset="0" falsecolour="false" type="true"/>
1989+
<Subcolumn vislevel="0"/>
1990+
<iText formula="Image_alpha_item.Premultiply_item.action F2"/>
1991+
</Rhs>
1992+
</Row>
1993+
<Row popup="false" name="F11">
1994+
<Rhs vislevel="2" flags="5">
1995+
<iImage image_left="0" image_top="0" image_mag="0" show_status="false" show_paintbox="false" show_convert="false" show_rulers="false" scale="0" offset="0" falsecolour="false" type="true"/>
1996+
<Subcolumn vislevel="0"/>
1997+
<iText formula="Image_alpha_item.Unpremultiply_item.action F9"/>
1998+
</Rhs>
1999+
</Row>
2000+
<Row popup="false" name="F12">
2001+
<Rhs vislevel="2" flags="5">
2002+
<iImage image_left="0" image_top="0" image_mag="0" show_status="false" show_paintbox="false" show_convert="false" show_rulers="false" scale="0" offset="0" falsecolour="false" type="true"/>
2003+
<Subcolumn vislevel="0"/>
2004+
<iText formula="Image_alpha_item.Drop_item.action F11"/>
2005+
</Rhs>
2006+
</Row>
2007+
<Row popup="false" name="F13">
2008+
<Rhs vislevel="1" flags="4">
2009+
<iText formula="if min (F12 == F1) == 255 then &quot;ok!&quot; else error &quot;erp&quot;"/>
2010+
</Rhs>
2011+
</Row>
2012+
</Subcolumn>
2013+
</Column>
19342014
</Workspace>
19352015
</root>

0 commit comments

Comments
 (0)