ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CV/Changes
(Generate patch)

Comparing CV/Changes (file contents):
Revision 1.83 by root, Sat Sep 24 16:14:17 2005 UTC vs.
Revision 1.241 by root, Mon Jan 4 04:50:53 2021 UTC

1TODO/FIXME: popup menu doesn't cause refresh (or maybe only internal refresh) 1TODO: mkv
2TODO/FIXME: pixmap-bg-trick sometimes doesn't work (race?) 2TODO/FIXME: pixmap-bg-trick sometimes doesn't work (race?)
3TODO/FIXME: cursor movement does not clear selection 3TODO/FIXME: remove event does not recalculate schanuzer content size
4TODO: rename, mass-rename 4TODO: with manual placement, initial contents aren't displayed
5TODO: update a file that has been removed etc.
6TODO: note to self, the reason mplayer hangs during long copies is that execve hangs, because it closes an fd to the target file.
5 7
8TODO: "mädhcne" utf-8 bug move to ERROR is a directory
9TODO: up == select dir
10TODO: CV_THUMBNAIL_SCALE
11TODO: Pango-WARNING **: Invalid UTF-8 string passed to pango_layout_set_text() at /opt/bin/cv line 224.
12TODO: dir_is_movie in load_image bluray: ffmpeg etc.
13
14TODO: "j" and "#" keys for movies
15TODO: cv 5/ 6/ (hla) bad icon label in schnauzere
16 - INCOMPATIBLE CHANGE: .cvrc is now sourced much earlier, before loading
17 modules. cvrc_boot and cvrc_start functions are called later.
18 - INCOMPATIBLE CHANGE: mplayer support has been completely removed.
19 - INCOMPATIBLE CHANGE: viewer now defaults to "maxpect" (shift-M) mode.
20 - support heif/avif now via pixbufloader (which seesm to not have
21 working autodetection, so we do our own).
22 - cv now uses mpv to generate video thumbnails - maybe slower, maybe overall
23 worse, but at least there is no dependency on mplayer anymore.
24 - cv now expects mpv to be in the CV_MPV, not CV_MPALYER, env variable.
25 - the Schnauzer now autoscales everything according to the first monitor's
26 DPI when the dpi is >= 110. This can be disabled by adding this to your .cvrc:
27 $Gtk2::CV::Schnauzer::DISPLAYSCALE = 1;
28 - redid "splash" image to be 16:9 (and also super-ugly, but nobody cares).
29 - support mpv's --input-ipc-file option, in addition to --input-file
30 (untested).
31 - rather brutally remove LC_ALL and override LC_NUMERIC, as perl and gtk2
32 sometimes fail to format numbers correctly and fall back to the
33 locale-specific format (which perl should never do).
34 - added a "Subdir view", showing only subdirectories in the cluster view and
35 immediately entering them.
36 - add .cvrc changable variable $Gtk2::CV::Schnauzer::DISPLAYSCALE,
37 defaults to 1 - for use with hidpi displays.
38 - add .cvrc changable variable $Gtk2::CV::Schnauzer::ICONSCALE,
39 defaults to 1 - modifies actual icon file size.
40 - add .cvrc changable variable $Gtk2::CV::Schnauzer::FONTSCALE,
41 defaults to icon scale - modified icon font height.
42 - while CV is effectively single-threaded, it might need thread support
43 to be initialized in Gtk2/xcb.
44 - remove hyper scaling mode.
45 - "," is now the opposite (modulo rounding) from ".".
46 - do not duplicate filetype detection in schnauzer and CV.xs, always use
47 the xs code.
48
491.8 Mon Apr 29 15:10:44 CEST 2019
50 - work around newer versions of mpv no longer having a pause command.
51 - always use mpv to display gif images, because it's hard to detect whether a gif
52 is animated or not.
53 - use a better(?), more "sharp" method to detect keyboard accelerators and to decide
54 which keys to pass to the schnauzer from the image window.
55 - new selection method. Alt-A / select files i same directory, can be repeated.
56 - rename select by prefix to select by adjacent name.
57 - increase search range for adjacent name to 10000.
58 - change meta-mask to mod1-mask, as gtk+ has silently changed the meaning of meta
59 over the years (so much for api stability...).
60 - newer perl versions somehow manage to leak the prefetch file handle somehow,
61 try tro work aorund.
62 - implement (undocumented) filename_display_name hook in Gt2k::CV::Schnauer.
63 - use symbolic names for entry indices in Schnauzer, for sanity, as the design
64 is now stable enough.
65 - use loop-file=inf for mpv instead of -loop 0, which only works for mplayer.
66 - add metadata clustering plugin.
67 - use ffprobe also if libmagic cannot detect anything, to decide whether the
68 file is (maybe) an image or (maybe) a video.
69 - namecluster now respects default modifier mask.
70
711.71 Tue Jul 31 00:57:03 CEST 2018
72 - fix 'o' key osd level switching in mpv (similar to old mplayer mode).
73 - do not error out on incomplete JPEG files, generate fake EOI marker instead
74 to enable the decoder to output a partial file.
75
761.7 Wed Dec 27 18:47:50 CET 2017
77 - DEFAULT CHANGED: cv will now default to mpv instead of mplayer.
78 use CV_MPLAYER=mplayer to get the previous behaviour.
79 - new env variable, CV_MPLAYER, defaulting to mpv.
80 - make "mplayer" configurable via CV_MPLAYER, support mpv.
81 - support mpv ipc protocol for remote control.
82 - implement audio visualisation when playing audio streams,
83 remove support for CV_AUDIO_PLAYER.
84 - port to newer versions of gtk2, which require including gdkx.h.
85 - preliminary & optional webp load and thumbnail support.
86 - use mmap to "load" files and decode from memory buffers.
87 - use internal fileype function to detect filetype when generating
88 hthumbnails, instead of relaying on file extension (for speed).
89 - add internal magic_buffer/magic_buffer_mime functions.
90 - add more fallback extensions for audio when mimetype detection fails.
91
921.61 Sat Jun 24 01:55:48 CEST 2017
93 - work around parser bug in 5.18.1 (-a).
94 - very simple "better than nothing" jpeg cmyk/ycck format decoding.
95 - use ffprobe instead of mplayer to probe video size/type.
96 - switch to using AnyEvent::Fork as provider for the processpool, which ought
97 to save gobs of memory.
98 - much improved async communications with worker processes.
99 - batch expose events together, in an attempt to reduce the amount of
100 expose races in gtk+ (does not fix scrolling races).
101 - create #cpu + 1 worker jobs now, not 1.5 * #cpu + 1 as before.
102 - better shell-quoting: use ""-style for utf-8 filenames and paste as unicode,
103 use bash's $'' syntax for other filenames.
104 - no longer pass a-z from viewer to schnauzer.
105 - properly serialise jobs by priority, instead of executing
106 jobs in parallel on the same path *sometimes*.
107 - escape select-by-prefix menu item labels.
108 - work around more perl unicode bugs.
109 - slightly improved filetype detection.
110 - add "cp" job for external plugins.
111 - work around even more perl unicode bugs that the perl5-porters
112 don't want to fix because of backwards compatibility.
113 - do not stupidly load big video files into memory just
114 to make a thumbnail.
115 - don't modify global $_ in aio callbacks.
116 - make drag-rectangle more visible.
117 - do not enter the last directory on the commandline, if more
118 than one argument is specified.
119 - started using AnyEvent.
120 - space by default activates first file, or first directory, if no files
121 (as opposed to first file or last directory in previous versions).
122 - fix race condition where the schnauzer might stay non-sensitive
123 on fast directory changes.
124 - allow reversal of rotation via .cvrc $REVERSE_ROTATION = 1.
125 - delay initialisation of Gtk2::CV::Schnauzer until first use.
126 - fix a runtime error when starting namecluster with newer gtk's.
127 - do not rely on /dev/shm being world-writable, use
128 /run/shm, /dev/shm and /tmp, in this order.
129 - expect mplayer to sometimes generate more than 2 frames when 1 is
130 requested.
131 - tune video thumbnail generation a bit.
132 - more fixups for "file -i" failing.
133 - properly follows symlinks instead of bailing out.
134 - support perl multicore specification (http://perlmulticore.schmorp.de/)
135 for jpeg loading and image transformations, although nothing takes
136 advantage of this *yet*.
137 - ctrl-up/down in schnauzer tries to move name cluster cursor.
138 - ctrl-shift-T in image window now sets default rotation for
139 subsequent image loads.
140 - ctrl-shift-G in schnauzer now removes thumbnails.
141 - implement j (cycle subtitle) and # (cycle audio track)
142 in mplayer mode.
143 - respect load time (ctrl-shift-T) rotation setting for videos
144 (no clue how to do that at runtime).
145 - print jpeg error messages to stderr.
146
1471.56 Thu Oct 28 14:13:36 CEST 2010
148 - try an ugly workaround against Gtk's CONTINUED brokenness
149 with regards to non-ascii filenames :(.
150 - REALLY hide paths that are in the process of being removed
151 from the Schnauzer.
152 - when selecting entries, stat them all and fine their total
153 size(s) + filesystem overhead after a delay.
154 - take advantage of the Guard module.
155 - work around mplayer grabbing the focus.
156 - improve mplayer window size bug workaround. *sigh*.
157 - try not to keep a handle to a guard file to avoid
158 running into rename races with nfs.
159 - work around perl bug #77798 in some parts.
160 - slight namecluster speed improvement.
161 - work around newer libmagic versions adding mime attributes.
162
1631.55 Tue Jan 26 03:18:45 CET 2010
164 - schnauzer did usually not give the correct number for
165 "# entries selected".
166 - added new "renamer" plugin that is useful for mass renames
167 of very similar filenames.
168 - apply a heavy dose of common::sense.
169 - enable assert's (which perl disables...).
170 - take advantage of IO::AIO::aio_readdirx.
171 - speed up file move duplicate detection.
172
1731.54 Mon Apr 27 04:23:33 CEST 2009
174 - implement automatic reloading on SIGUSR1, as per suggestions
175 by Trevor Cordes.
176 - remove -\d\d\d file ending first on move collision.
177 - ctrl-shift-d now deletes despite CV_TRASHCAN.
178 - very hacky video thumbnailing via mplayer.
179 - ctrl-d errornously worked like ctrl-shift-d (cost 50gb of data).
180 - work around glib/gtk's filename corruption bugs when saving thumbnails
181 by writing the file ourselves.
182 - work around some other glib/gtk string corruption bugs.
183 - really only warn about pipe close failures :/.
184 - add hide attribute to jobs that will remove the file and do not
185 show those files in the schnauzer (but in-progress jobs
186 will still be shown, unfortunately).
187 - work around some more unicode issues in perl.
188 - correctly parse .rm as file extension in the schnauzer.
189 - always pre-fork the maximum number of worker slaves,
190 as forking later can consume way too much memory.
191 - update glade to work around annoying warnings in newer gtk.
192 - work around changes in newer glade. *sigh*.
193 - document that we need libgtk2.0-dev, too.
194 - avoid endless loops in mv.
195
1961.53 Tue Jul 8 14:03:12 CEST 2008
197 - only warn about pipe close failures in printdialog, do not die.
198 - do not try to handle filenames in unicode, instead, only
199 convert at display time.
200 - kill any media players on destroy and not in the finaliser,
201 as gtk+'s lazy finalisation and mplayers stubbornness to
202 continue running without control socket and output window
203 can be annoying.
204 - add recursive delete (lamely implemented using rm -rf).
205 - update progressbar after a timeout in addition to after
206 enough work has done to ensure it is being displayed
207 quickly for long jobs.
208
2091.51 Sun Jan 27 17:48:14 CET 2008
210 - run more stats in parallel in schnauzer scanning.
211 - do not deselect cursor on scroll if a range is selected.
212
2131.5 Sun Nov 25 15:15:27 CET 2007
214 - rudimentary support for audio.
215 - fix Gtk2::Ex::PodViewer rename (patch by Randy J. Ray).
216
2171.4 Sat Mar 17 14:11:48 CET 2007
218 - upgraded to IO::AIO 2.1 features.
219 - errors in IO::AIO callback execution will be logged and will
220 not freeze AIO operations anymore.
221 - jpeg2000 support by running jasper externally (imageviewer only).
222 - directory scanning now asynchronous.
223 - increased progress update frequency and reduced delay.
224 - add/enable icons for mp2/mp3/ogm.
225 - better ogm support.
226 - use mplayer for just about anything as opposed to just for video/*.
227 - fix auto rotation in older perls.
228
2291.3 Wed Sep 27 23:59:27 CEST 2006
230 - simplify redraw, avoid unnecessary schnauzer redraws.
231 - add rotate entries to the schnauzer menu, adapted
232 from a patch by Corris Randall.
233 - use new experimental (but much faster) clustering feature vector
234 based on moments and not on a histogram.
235 - reimplement file movement to use IO::AIO natively, thus much faster
236 and lower on resources.
237
2381.2 Fri Mar 31 12:55:15 CEST 2006
239 - fix unnecessarily redraws on partial exposes (scrolling etc).
240 - fixed CV_TRASHCAN support.
241 - "a" calls exiftran to rotate the image on-disk.
242 - don't run jobs on the same file in parallel.
243 - filenames were sometiems encoded twice when loading xvpics.
244 - do not sort filenames given on the commandline.
245 - set dithering to 'max', as contrary to documentation 'normal'
246 doesn't dither on (my) 8-bit-displays.
247 - enable dithering for xvpics.
248 - use libmagic for filetype detection.
249 - set window roles.
250 - changed xor color from 0x8080 PC to 0x8000, as the former yields
251 useless results on gtk 2.8.
252 - fix p7 thumbnail reading.
253
2541.1 Fri Oct 28 15:47:53 CEST 2005
255 - jobs for files currently shown in a schnauzer get prioritised.
6 - directories visited in a session are shown darker. 256 - directories visited in a session are shown darker.
7 - unvisited directory with .xvpics in them are shown differently. 257 - unvisited directory with .xvpics in them are shown differently.
8 - add Remove Thumbnails menu entry. 258 - add Remove Thumbnails menu entry.
9 - allow restricting image size to something less than the screen 259 - allow restricting image size to something less than the screen
10 (ctrl-shift-m). 260 (ctrl-shift-m).
11 - fix a bug where background processes stopped processing jobs. 261 - fix a bug where background processes stopped processing jobs.
12 - primary selection support for schnauzer selections. 262 - primary selection support for schnauzer selections.
13 - documented and implemented scorlling behaviour while drag-selecting. 263 - documented and implemented scorlling behaviour while drag-selecting.
14 - implemented Select=>By Prefix. 264 - implemented Select=>By Prefix.
15 - background loading of .xvpics (and checking for symlinks-to-dirs). 265 - background loading of .xvpics (and checking for symlinks-to-dirs).
16 - use overlays to differentiate between directories that 266 - use overlays to differentiate between directories that
17 are empty, have .xvpics or are symlinks-to-directories. 267 are empty, have .xvpics or are symlinks-to-directories.
18 - better/slower expose handling (we need double-refreshes due to 268 - better/slower expose handling (we need double-refreshes due to
19 probable bugs in gtk+ or X11). 269 probable bugs in gtk+ or X11).
270 - implement a dirstack (statestack) and make use of it.
271 - don't forget cursor position on ctrl-g and similar commands.
272 - implemented keep_only_thumbnailed and remove_thumbnailed.
273 - implemented multiple-image-window support in cv.
274 - do some extra random resizes on the mplayer window to get it
275 to notice the damned window size.
276 - reap fork'ed job processes to avoid ressource leaks.
277 - fixed GNU R clustering.
20 278
211.0 Wed Sep 7 18:41:38 CEST 2005 2791.0 Wed Sep 7 18:41:38 CEST 2005
22 - fix alpha handling: we now compose with a checkerboard, 280 - fix alpha handling: we now compose with a checkerboard,
23 but exposing hidden pixel data is also supported in the code. 281 but exposing hidden pixel data is also supported in the code.
24 - use jpg instead of P7 format for thumbnails and remove p7 282 - use jpg instead of P7 format for thumbnails and remove p7
25 write support: better quality, smaller filesize. 283 write support: better quality, smaller filesize.
26 - evaluate _NET_FRAME_EXTENTS to get actual maximum screen size. 284 - evaluate _NET_FRAME_EXTENTS to get actual maximum screen size.
27 - better mplayer integration (resize handling, aspect handling). 285 - better mplayer integration (resize handling, aspect handling).
28 - fix some bugs when a Schnauzer window was resized and got 286 - fix some bugs when a Schnauzer window was resized and got
29 the wrong offset. 287 the wrong offset.
30 - don't crash when trying to crop to a size of less than a pixel. 288 - don't crash when trying to crop to a size of less than a pixel.
31 - schnauzer now has two modes: directors view or single-file view. 289 - schnauzer now has two modes: directors view or single-file view.
32 this changes it's behaviour on rescan and other occasions. 290 this changes it's behaviour on rescan and other occasions.
33 - reduce the amount of random dithering. 291 - reduce the amount of random dithering.
34 - load jpeg files ~20% faster, create jpeg thumbnails an order 292 - load jpeg files ~20% faster, create jpeg thumbnails an order
35 of magnitude faster. 293 of magnitude faster.
36 - improved bin/cv documentation. 294 - improved bin/cv documentation.
37 - improve scanning performance further by usign the directory 295 - improve scanning performance further by usign the directory
38 link count and by stat'ing possible directories early. 296 link count and by stat'ing possible directories early.
39 - do file data prefetch after space or backspace and 0.3s. 297 - do file data prefetch after space or backspace and 0.3s.
40 - better and faster casefolding. 298 - better and faster casefolding.
41 - use pango's ellipsise functionality and cut at the end. 299 - use pango's ellipsise functionality and cut at the end.
42 - moved the R clustering algo to a separate plugin (and fix it). 300 - moved the R clustering algo to a separate plugin (and fix it).
43 - moved the filename clustering algo to a separate plugin. 301 - moved the filename clustering algo to a separate plugin.
44 - try very hard to get the window size correct befre first map. 302 - try very hard to get the window size correct befre first map.
45 - only load the default title image when necessary (saves mem & cpu). 303 - only load the default title image when necessary (saves mem & cpu).
46 - change drag xor colour to #808080, uglier, but visible on all 304 - change drag xor colour to #808080, uglier, but visible on all
47 images. 305 images.
48 - added icon for .tif files. 306 - added icon for .tif files.
49 - updated icons for some file-extensions. 307 - updated icons for some file-extensions.
50 - created a job system and create thumbnails in parallel and 308 - created a job system and create thumbnails in parallel and
51 in the background. 309 in the background.
52 - more careful handling of filename encodings. 310 - more careful handling of filename encodings.
53 - use gdk_pixbuf_rotate_simple instead of our own functions. 311 - use gdk_pixbuf_rotate_simple instead of our own functions.
54 - played with resizing logic once more. 312 - played with resizing logic once more.
55 313
560.5 Mon Jul 11 05:48:13 CEST 2005 3140.5 Mon Jul 11 05:48:13 CEST 2005
57 - image window resizing now works again. 315 - image window resizing now works again.
58 - much improved resize/move handling (still not up to xv's level). 316 - much improved resize/move handling (still not up to xv's level).
59 - every schnauzer now has an associated label/info field. 317 - every schnauzer now has an associated label/info field.
60 - better ^D performance. 318 - better ^D performance.
61 - can now play videos if mplayer is in the path (and probably is 319 - can now play videos if mplayer is in the path (and probably is
62 identical to my versions and your config file is empty etc. etc. 320 identical to my versions and your config file is empty etc. etc.
63 the usual caveats about embedding mplayer...) 321 the usual caveats about embedding mplayer...)
64 (http://itdp.fh-biergarten.de/mplayer-dev-eng/2004-12/txt00028.txt fixes 322 (http://itdp.fh-biergarten.de/mplayer-dev-eng/2004-12/txt00028.txt fixes
65 the resize problems). 323 the resize problems).
66 - remove gtk20-compatibility cruft. 324 - remove gtk20-compatibility cruft.
67 - added progress window for lengthy operations. 325 - added progress window for lengthy operations.
68 - removed <parent> entry, use popup=>Up. 326 - removed <parent> entry, use popup=>Up.
69 - change of contact address. 327 - change of contact address.
70 - updated icons for some file-extensions. 328 - updated icons for some file-extensions.
71 - make cv's info label wrap as not to change horizontal window width 329 - make cv's info label wrap as not to change horizontal window width
72 (doesn't work, but that's general gtk2 brokenness). 330 (doesn't work, but that's general gtk2 brokenness).
73 - use set_absolute_size for the schnauzer font. doesn't result in an 331 - use set_absolute_size for the schnauzer font. doesn't result in an
74 absolute size, but at least results in the same height everywhere. 332 absolute size, but at least results in the same height everywhere.
75 - implemented a primitive plugin system (see Gtk2::CV::Plugin and 333 - implemented a primitive plugin system (see Gtk2::CV::Plugin and
76 eg/plugin-skeleton). 334 eg/plugin-skeleton).
77 - removed bin/cvc's clusteriser. 335 - removed bin/cvc's clusteriser.
78 - added a new clusteriser algorithm, use Popup=>"Filename clustering..." 336 - added a new clusteriser algorithm, use Popup=>"Filename clustering..."
79 - set _X_CWD to current dir in bin/cv (a rather special feature...). 337 - set _X_CWD to current dir in bin/cv (a rather special feature...).
80 - further directory scanning speed improvements. 338 - further directory scanning speed improvements.
81 - IO::AIO use for some speedups and more concurrency. 339 - IO::AIO use for some speedups and more concurrency.
82 340
830.3 Sun Aug 1 21:59:49 CEST 2004 3410.3 Sun Aug 1 21:59:49 CEST 2004
84 - cv * now correctly loads && selects the first image again. 342 - cv * now correctly loads && selects the first image again.
85 - changed selection behaviour to select ranges not rectangles 343 - changed selection behaviour to select ranges not rectangles
86 (could be configurable at runtime). 344 (could be configurable at runtime).
87 - many small bugfixes. 345 - many small bugfixes.
88 - better display behaviour when viewing many images quickly. 346 - better display behaviour when viewing many images quickly.
89 - changed sort order to sth... strange (case insensitive, 347 - changed sort order to sth... strange (case insensitive,
90 numbers < 5 digits sorted in numerical order). 348 numbers < 5 digits sorted in numerical order).
91 349
920.2 Thu Nov 20 07:49:55 CET 2003 3500.2 Thu Nov 20 07:49:55 CET 2003
93 - add DSC comments (except for %%page). 351 - add DSC comments (except for %%page).
94 - implemented binary encoding for postscript printing. 352 - implemented binary encoding for postscript printing.
95 - ctrl-s == rescan. 353 - ctrl-s == rescan.
96 - less-latency resizes. 354 - less-latency resizes.
97 - after implementing filename_to_unicode maybe it is time to use it... 355 - after implementing filename_to_unicode maybe it is time to use it...
98 356
990.15 Wed Nov 12 21:33:32 CET 2003 3570.15 Wed Nov 12 21:33:32 CET 2003
100 - add nifty print dialog, using glade and GladeXML. GladeXML needs 358 - add nifty print dialog, using glade and GladeXML. GladeXML needs
101 some convinience functions, but is ok to use. 359 some convinience functions, but is ok to use.
102 - improved schnauzer scrolling and geometry hints. 360 - improved schnauzer scrolling and geometry hints.
103 - bugfixes, as usual. 361 - bugfixes, as usual.
104 - implemented ctrl-u. 362 - implemented ctrl-u.
105 - implemented maxpect-always mode. 363 - implemented maxpect-always mode.
106 364
1070.14 Mon Nov 10 20:11:15 CET 2003 3650.14 Mon Nov 10 20:11:15 CET 2003
108 - use subpixbufs for cropping. 366 - use subpixbufs for cropping.
109 - don't force redraws anymore, hopefully the result is the same. 367 - don't force redraws anymore, hopefully the result is the same.
110 - primitive printing with automaxpect (always to /tmp/x, watch out!). 368 - primitive printing with automaxpect (always to /tmp/x, watch out!).
111 - off-by-one error in flip code fixed. 369 - off-by-one error in flip code fixed.
112 - replaced nearest interpolation to tiles for thumbnail generation. 370 - replaced nearest interpolation to tiles for thumbnail generation.
113 - much improved thumbnail dithering. 371 - much improved thumbnail dithering.
114 - applied drag_rect patch by muppet, together with some infrastructure 372 - applied drag_rect patch by muppet, together with some infrastructure
115 improvements. 373 improvements.
116 - faster and less accurate text "autoscaling". 374 - faster and less accurate text "autoscaling".
117 375
1180.13 Sat Nov 8 14:13:24 CET 2003 3760.13 Sat Nov 8 14:13:24 CET 2003
119 - Applied patch by muppet to backport it to gtk2.0, 377 - Applied patch by muppet to backport it to gtk2.0,
120 plus portabiity fixes. 378 plus portabiity fixes.

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines