diff options
| -rw-r--r-- | Documentation/user-manual.txt | 4 | ||||
| -rw-r--r-- | equipment.c | 5 | ||||
| -rw-r--r-- | packaging/windows/subsurface.nsi | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 039f703b3..b9379e636 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -8,7 +8,7 @@ Autor documentation: Jacco van Koll <jko@haringstad.com> Scope of this document is the usage of the program. Please read the build manual for instructions how to build the -software and (if needed) it's dependencies. +software and (if needed) its dependencies. Audience: Fun Divers, Tec Divers, Professional Divers @@ -320,7 +320,7 @@ Maybe you have been using JDivelog and you have a lot of dives logged in this program. You don't have to type all information by hand into Subsurface, because you can import your divelogs from JDivelog. -JDivelog stores it's information into files with the extention of .jlb. +JDivelog stores its information into files with the extention of .jlb. These .jlb contain all the information that has been stored, except your images in xml format. diff --git a/equipment.c b/equipment.c index 023db75d4..482fb4e1c 100644 --- a/equipment.c +++ b/equipment.c @@ -64,9 +64,8 @@ static int convert_pressure(int mbar, double *p) return decimals; } -static int convert_volume_pressure(int ml, int mbar, double *v, double *p) +static void convert_volume_pressure(int ml, int mbar, double *v, double *p) { - int decimals = 1; double volume, pressure; volume = ml / 1000.0; @@ -78,13 +77,11 @@ static int convert_volume_pressure(int ml, int mbar, double *v, double *p) if (output_units.pressure == PSI) { pressure = mbar_to_PSI(mbar); - decimals = 0; } else pressure = mbar / 1000.0; } *v = volume; *p = pressure; - return decimals; } static void set_cylinder_type_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar) diff --git a/packaging/windows/subsurface.nsi b/packaging/windows/subsurface.nsi index 09a6eb0e6..280991f69 100644 --- a/packaging/windows/subsurface.nsi +++ b/packaging/windows/subsurface.nsi @@ -80,11 +80,14 @@ file /oname=libpangoft2-1.0-0.dll dll\libpangoft2-1.0-0.dll file /oname=libpangowin32-1.0-0.dll dll\libpangowin32-1.0-0.dll file /oname=libpixman-1-0.dll dll\libpixman-1-0.dll file /oname=libpng15-15.dll dll\libpng15-15.dll -file /oname=libtiff-3.dll dll\libtiff-3.dll +file /oname=libtiff-5.dll dll\libtiff-5.dll file /oname=libxml2-2.dll dll\libxml2-2.dll file /oname=libxslt-1.dll dll\libxslt-1.dll file /oname=pthreadGC2.dll dll\pthreadGC2.dll file /oname=zlib1.dll dll\zlib1.dll +file /oname=libusb-1.0.dll dll\libusb-1.0.dll +file /oname=SuuntoSDM.xslt ../../xslt/SuuntoSDM.xslt +file /oname=jdivelog2subsurface.xslt ../../xslt/jdivelog2subsurface.xslt sectionEnd section "uninstall" |